50b1097643
Almost all of the places the string is assigned point to a literal string constant, so use const char * for those, and const char ** for function calls that return it via an argument. Fortunately the top level function, ClientAuthorized, which returns the string as its return value is called from only one place, ProcEstablishConnection. ProcEstablishConnection stores either that return value or a string literal in char *reason. It only uses reason as an argument to SendConnSetup. SendConnSetup passes the reason argument to strlen & WriteToClient, both of which already have const qualifiers on their args. Thus added const to the reason variable in ProcEstablishConnection and the reason argument to SendConnSetup. Fixes gcc warnings: dispatch.c: In function 'ProcEstablishConnection': dispatch.c:3711:9: warning: assignment discards qualifiers from pointer target type auth.c: In function 'CheckAuthorization': auth.c:218:14: warning: assignment discards qualifiers from pointer target type auth.c:220:20: warning: assignment discards qualifiers from pointer target type connection.c: In function 'ClientAuthorized': connection.c:683:3: warning: return discards qualifiers from pointer target type mitauth.c: In function 'MitCheckCookie': mitauth.c:88:13: warning: assignment discards qualifiers from pointer target type xdmauth.c:259:14: warning: assignment discards qualifiers from pointer target type xdmauth.c:270:14: warning: assignment discards qualifiers from pointer target type xdmauth.c:277:11: warning: assignment discards qualifiers from pointer target type xdmauth.c:293:15: warning: assignment discards qualifiers from pointer target type xdmauth.c:313:14: warning: assignment discards qualifiers from pointer target type xdmauth.c:322:11: warning: assignment discards qualifiers from pointer target type rpcauth.c: In function 'SecureRPCCheck': rpcauth.c:136:10: warning: assignment discards qualifiers from pointer target type Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
198 lines
4.0 KiB
C
198 lines
4.0 KiB
C
/*
|
|
|
|
Copyright 1988, 1998 The Open Group
|
|
|
|
Permission to use, copy, modify, distribute, and sell this software and its
|
|
documentation for any purpose is hereby granted without fee, provided that
|
|
the above copyright notice appear in all copies and that both that
|
|
copyright notice and this permission notice appear in supporting
|
|
documentation.
|
|
|
|
The above copyright notice and this permission notice shall be included
|
|
in all copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
Except as contained in this notice, the name of The Open Group shall
|
|
not be used in advertising or otherwise to promote the sale, use or
|
|
other dealings in this Software without prior written authorization
|
|
from The Open Group.
|
|
|
|
*/
|
|
|
|
/*
|
|
* MIT-MAGIC-COOKIE-1 authorization scheme
|
|
* Author: Keith Packard, MIT X Consortium
|
|
*/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include <X11/X.h>
|
|
#include "os.h"
|
|
#include "osdep.h"
|
|
#include "dixstruct.h"
|
|
|
|
static struct auth {
|
|
struct auth *next;
|
|
unsigned short len;
|
|
char *data;
|
|
XID id;
|
|
} *mit_auth;
|
|
|
|
int
|
|
MitAddCookie (
|
|
unsigned short data_length,
|
|
const char *data,
|
|
XID id)
|
|
{
|
|
struct auth *new;
|
|
|
|
new = malloc(sizeof (struct auth));
|
|
if (!new)
|
|
return 0;
|
|
new->data = malloc((unsigned) data_length);
|
|
if (!new->data) {
|
|
free(new);
|
|
return 0;
|
|
}
|
|
new->next = mit_auth;
|
|
mit_auth = new;
|
|
memmove(new->data, data, (int) data_length);
|
|
new->len = data_length;
|
|
new->id = id;
|
|
return 1;
|
|
}
|
|
|
|
XID
|
|
MitCheckCookie (
|
|
unsigned short data_length,
|
|
const char *data,
|
|
ClientPtr client,
|
|
const char **reason)
|
|
{
|
|
struct auth *auth;
|
|
|
|
for (auth = mit_auth; auth; auth=auth->next) {
|
|
if (data_length == auth->len &&
|
|
memcmp (data, auth->data, (int) data_length) == 0)
|
|
return auth->id;
|
|
}
|
|
*reason = "Invalid MIT-MAGIC-COOKIE-1 key";
|
|
return (XID) -1;
|
|
}
|
|
|
|
int
|
|
MitResetCookie (void)
|
|
{
|
|
struct auth *auth, *next;
|
|
|
|
for (auth = mit_auth; auth; auth=next) {
|
|
next = auth->next;
|
|
free(auth->data);
|
|
free(auth);
|
|
}
|
|
mit_auth = 0;
|
|
return 0;
|
|
}
|
|
|
|
XID
|
|
MitToID (
|
|
unsigned short data_length,
|
|
char *data)
|
|
{
|
|
struct auth *auth;
|
|
|
|
for (auth = mit_auth; auth; auth=auth->next) {
|
|
if (data_length == auth->len &&
|
|
memcmp (data, auth->data, data_length) == 0)
|
|
return auth->id;
|
|
}
|
|
return (XID) -1;
|
|
}
|
|
|
|
int
|
|
MitFromID (
|
|
XID id,
|
|
unsigned short *data_lenp,
|
|
char **datap)
|
|
{
|
|
struct auth *auth;
|
|
|
|
for (auth = mit_auth; auth; auth=auth->next) {
|
|
if (id == auth->id) {
|
|
*data_lenp = auth->len;
|
|
*datap = auth->data;
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
MitRemoveCookie (
|
|
unsigned short data_length,
|
|
const char *data)
|
|
{
|
|
struct auth *auth, *prev;
|
|
|
|
prev = 0;
|
|
for (auth = mit_auth; auth; prev = auth, auth=auth->next) {
|
|
if (data_length == auth->len &&
|
|
memcmp (data, auth->data, data_length) == 0)
|
|
{
|
|
if (prev)
|
|
prev->next = auth->next;
|
|
else
|
|
mit_auth = auth->next;
|
|
free(auth->data);
|
|
free(auth);
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#ifdef XCSECURITY
|
|
|
|
static char cookie[16]; /* 128 bits */
|
|
|
|
XID
|
|
MitGenerateCookie (
|
|
unsigned data_length,
|
|
const char *data,
|
|
XID id,
|
|
unsigned *data_length_return,
|
|
char **data_return)
|
|
{
|
|
int i = 0;
|
|
int status;
|
|
|
|
while (data_length--)
|
|
{
|
|
cookie[i++] += *data++;
|
|
if (i >= sizeof (cookie)) i = 0;
|
|
}
|
|
GenerateRandomData(sizeof (cookie), cookie);
|
|
status = MitAddCookie(sizeof (cookie), cookie, id);
|
|
if (!status)
|
|
{
|
|
id = -1;
|
|
}
|
|
else
|
|
{
|
|
*data_return = cookie;
|
|
*data_length_return = sizeof (cookie);
|
|
}
|
|
return id;
|
|
}
|
|
|
|
#endif /* XCSECURITY */
|