Mercurial > dropbear
diff svr-auth.c @ 1120:391bb7d560c6
Merge branch 'fix-pointer-sign-warnings' into fix-warnings
| author | Gaël PORTAY <gael.portay@gmail.com> |
|---|---|
| date | Tue, 05 May 2015 20:42:38 +0200 |
| parents | 7b84c3492a95 |
| children | aaf576b27a10 |
line wrap: on
line diff
--- a/svr-auth.c Sat May 02 16:02:22 2015 +0200 +++ b/svr-auth.c Tue May 05 20:42:38 2015 +0200 @@ -36,7 +36,7 @@ #include "dbrandom.h" static void authclear(); -static int checkusername(unsigned char *username, unsigned int userlen); +static int checkusername(char *username, unsigned int userlen); /* initialise the first time for a session, resetting all parameters */ void svr_authinitialise() { @@ -89,7 +89,7 @@ buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_BANNER); buf_putbufstring(ses.writepayload, banner); - buf_putstring(ses.writepayload, "en", 2); + buf_putstring(ses.writepayload, (const unsigned char *)"en", 2); encrypt_packet(); @@ -100,7 +100,7 @@ * checking, and handle success or failure */ void recv_msg_userauth_request() { - unsigned char *username = NULL, *servicename = NULL, *methodname = NULL; + char *username = NULL, *servicename = NULL, *methodname = NULL; unsigned int userlen, servicelen, methodlen; int valid_user = 0; @@ -119,9 +119,9 @@ svr_opts.banner = NULL; } - username = buf_getstring(ses.payload, &userlen); - servicename = buf_getstring(ses.payload, &servicelen); - methodname = buf_getstring(ses.payload, &methodlen); + username = (char *)buf_getstring(ses.payload, &userlen); + servicename = (char *)buf_getstring(ses.payload, &servicelen); + methodname = (char *)buf_getstring(ses.payload, &methodlen); /* only handle 'ssh-connection' currently */ if (servicelen != SSH_SERVICE_CONNECTION_LEN @@ -227,7 +227,7 @@ /* Check that the username exists and isn't disallowed (root), and has a valid shell. * returns DROPBEAR_SUCCESS on valid username, DROPBEAR_FAILURE on failure */ -static int checkusername(unsigned char *username, unsigned int userlen) { +static int checkusername(char *username, unsigned int userlen) { char* listshell = NULL; char* usershell = NULL; @@ -333,14 +333,14 @@ typebuf = buf_new(30); /* long enough for PUBKEY and PASSWORD */ if (ses.authstate.authtypes & AUTH_TYPE_PUBKEY) { - buf_putbytes(typebuf, AUTH_METHOD_PUBKEY, AUTH_METHOD_PUBKEY_LEN); + buf_putbytes(typebuf, (const unsigned char *)AUTH_METHOD_PUBKEY, AUTH_METHOD_PUBKEY_LEN); if (ses.authstate.authtypes & AUTH_TYPE_PASSWORD) { buf_putbyte(typebuf, ','); } } if (ses.authstate.authtypes & AUTH_TYPE_PASSWORD) { - buf_putbytes(typebuf, AUTH_METHOD_PASSWORD, AUTH_METHOD_PASSWORD_LEN); + buf_putbytes(typebuf, (const unsigned char *)AUTH_METHOD_PASSWORD, AUTH_METHOD_PASSWORD_LEN); } buf_putbufstring(ses.writepayload, typebuf);