Skip to content

N
nx-libs
Commit da5da209 authored by Eamon Walsh's avatar Eamon Walsh Committed by Ulrich Sibiller
Browse files
Options

Fix multiple warnings in os/xdmauth.c.

v1: Eamon Walsh v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
parent b60f66bb
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
nx-X11/programs/Xserver/os/xdmauth.c
View file @ da5da209
...@@ -69,8 +69,8 @@ XdmAuthenticationValidator (ARRAY8Ptr privateData, ARRAY8Ptr incomingData, ...@@ -69,8 +69,8 @@ XdmAuthenticationValidator (ARRAY8Ptr privateData, ARRAY8Ptr incomingData,
{ {
XdmAuthKeyPtr incoming; XdmAuthKeyPtr incoming;
XdmcpUnwrap (incomingData->data, &privateKey, XdmcpUnwrap (incomingData->data, (unsigned char *)&privateKey,
incomingData->data,incomingData->length); incomingData->data,incomingData->length);
if (packet_type == ACCEPT) { if (packet_type == ACCEPT) {
if (incomingData->length != 8) if (incomingData->length != 8)
return FALSE; return FALSE;
...@@ -89,7 +89,8 @@ XdmAuthenticationGenerator (ARRAY8Ptr privateData, ARRAY8Ptr outgoingData, ...@@ -89,7 +89,8 @@ XdmAuthenticationGenerator (ARRAY8Ptr privateData, ARRAY8Ptr outgoingData,
outgoingData->data = 0; outgoingData->data = 0;
if (packet_type == REQUEST) { if (packet_type == REQUEST) {
if (XdmcpAllocARRAY8 (outgoingData, 8)) if (XdmcpAllocARRAY8 (outgoingData, 8))
XdmcpWrap (&rho, &privateKey, outgoingData->data, 8); XdmcpWrap ((unsigned char *)&rho, (unsigned char *)&privateKey,
outgoingData->data, 8);
} }
return TRUE; return TRUE;
} }
...@@ -99,7 +100,8 @@ XdmAuthenticationAddAuth (int name_len, char *name, ...@@ -99,7 +100,8 @@ XdmAuthenticationAddAuth (int name_len, char *name,
int data_len, char *data) int data_len, char *data)
{ {
Bool ret; Bool ret;
XdmcpUnwrap (data, (unsigned char *)&privateKey, data, data_len); XdmcpUnwrap ((unsigned char *)data, (unsigned char *)&privateKey,
(unsigned char *)data, data_len);
authFromXDMCP = TRUE; authFromXDMCP = TRUE;
ret = AddAuthorization (name_len, name, data_len, data); ret = AddAuthorization (name_len, name, data_len, data);
authFromXDMCP = FALSE; authFromXDMCP = FALSE;
...@@ -152,11 +154,11 @@ XdmAuthenticationInit (char *cookie, int cookie_len) ...@@ -152,11 +154,11 @@ XdmAuthenticationInit (char *cookie, int cookie_len)
} }
XdmcpGenerateKey (&rho); XdmcpGenerateKey (&rho);
XdmcpRegisterAuthentication (XdmAuthenticationName, XdmAuthenticationNameLen, XdmcpRegisterAuthentication (XdmAuthenticationName, XdmAuthenticationNameLen,
(unsigned char *)&rho, (char *)&rho,
sizeof (rho), sizeof (rho),
XdmAuthenticationValidator, (ValidatorFunc)XdmAuthenticationValidator,
XdmAuthenticationGenerator, (GeneratorFunc)XdmAuthenticationGenerator,
XdmAuthenticationAddAuth); (AddAuthorFunc)XdmAuthenticationAddAuth);
} }
#endif /* XDMCP */ #endif /* XDMCP */
...@@ -387,7 +389,7 @@ XdmCheckCookie (unsigned short cookie_length, char *cookie, ...@@ -387,7 +389,7 @@ XdmCheckCookie (unsigned short cookie_length, char *cookie,
if (!plain) if (!plain)
return (XID) -1; return (XID) -1;
for (auth = xdmAuth; auth; auth=auth->next) { for (auth = xdmAuth; auth; auth=auth->next) {
XdmcpUnwrap (cookie, (unsigned char *)&auth->key, plain, cookie_length); XdmcpUnwrap ((unsigned char *)cookie, (unsigned char *)&auth->key, plain, cookie_length);
if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, xclient, reason)) != NULL) if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, xclient, reason)) != NULL)
{ {
client->next = xdmClients; client->next = xdmClients;
...@@ -432,7 +434,7 @@ XdmToID (unsigned short cookie_length, char *cookie) ...@@ -432,7 +434,7 @@ XdmToID (unsigned short cookie_length, char *cookie)
if (!plain) if (!plain)
return (XID) -1; return (XID) -1;
for (auth = xdmAuth; auth; auth=auth->next) { for (auth = xdmAuth; auth; auth=auth->next) {
XdmcpUnwrap (cookie, (unsigned char *)&auth->key, plain, cookie_length); XdmcpUnwrap ((unsigned char *)cookie, (unsigned char *)&auth->key, plain, cookie_length);
if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, NULL, NULL)) != NULL) if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, NULL, NULL)) != NULL)
{ {
free (client); free (client);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment