ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-03-14 15:48:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Turn checkpubkey() and send_msg_userauth_pk_ok()'s algo argument into char *

Browse Source
This commit is contained in:
Gaël PORTAY 2015-05-02 23:17:43 +02:00
parent 6f05e810d9
commit 5cf43d76bf
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
svr-authpubkey.c
View File

@ -70,10 +70,10 @@
#define MIN_AUTHKEYS_LINE 10 /* "ssh-rsa AB" - short but doesn't matter */ #define MIN_AUTHKEYS_LINE 10 /* "ssh-rsa AB" - short but doesn't matter */
#define MAX_AUTHKEYS_LINE 4200 /* max length of a line in authkeys */ #define MAX_AUTHKEYS_LINE 4200 /* max length of a line in authkeys */
static int checkpubkey(unsigned char* algo, unsigned int algolen, static int checkpubkey(char* algo, unsigned int algolen,
unsigned char* keyblob, unsigned int keybloblen); unsigned char* keyblob, unsigned int keybloblen);
static int checkpubkeyperms(); static int checkpubkeyperms();
static void send_msg_userauth_pk_ok(unsigned char* algo, unsigned int algolen, static void send_msg_userauth_pk_ok(char* algo, unsigned int algolen,
unsigned char* keyblob, unsigned int keybloblen); unsigned char* keyblob, unsigned int keybloblen);
static int checkfileperm(char * filename); static int checkfileperm(char * filename);
@ -82,7 +82,7 @@ static int checkfileperm(char * filename);
void svr_auth_pubkey() { void svr_auth_pubkey() {
unsigned char testkey; /* whether we're just checking if a key is usable */ unsigned char testkey; /* whether we're just checking if a key is usable */
unsigned char* algo = NULL; /* pubkey algo */ char* algo = NULL; /* pubkey algo */
unsigned int algolen; unsigned int algolen;
unsigned char* keyblob = NULL; unsigned char* keyblob = NULL;
unsigned int keybloblen; unsigned int keybloblen;
@ -98,7 +98,7 @@ void svr_auth_pubkey() {
* actual attempt*/ * actual attempt*/
testkey = (buf_getbool(ses.payload) == 0); testkey = (buf_getbool(ses.payload) == 0);
algo = buf_getstring(ses.payload, &algolen); algo = (char *) buf_getstring(ses.payload, &algolen);
keybloblen = buf_getint(ses.payload); keybloblen = buf_getint(ses.payload);
keyblob = buf_getptr(ses.payload, keybloblen); keyblob = buf_getptr(ses.payload, keybloblen);
@ -173,14 +173,14 @@ out:
/* Reply that the key is valid for auth, this is sent when the user sends /* Reply that the key is valid for auth, this is sent when the user sends
* a straight copy of their pubkey to test, to avoid having to perform * a straight copy of their pubkey to test, to avoid having to perform
* expensive signing operations with a worthless key */ * expensive signing operations with a worthless key */
static void send_msg_userauth_pk_ok(unsigned char* algo, unsigned int algolen, static void send_msg_userauth_pk_ok(char* algo, unsigned int algolen,
unsigned char* keyblob, unsigned int keybloblen) { unsigned char* keyblob, unsigned int keybloblen) {
TRACE(("enter send_msg_userauth_pk_ok")) TRACE(("enter send_msg_userauth_pk_ok"))
CHECKCLEARTOWRITE(); CHECKCLEARTOWRITE();
buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_PK_OK); buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_PK_OK);
buf_putstring(ses.writepayload, algo, algolen); buf_putstring(ses.writepayload, (const unsigned char *) algo, algolen);
buf_putstring(ses.writepayload, keyblob, keybloblen); buf_putstring(ses.writepayload, keyblob, keybloblen);
encrypt_packet(); encrypt_packet();
@ -191,7 +191,7 @@ static void send_msg_userauth_pk_ok(unsigned char* algo, unsigned int algolen,
/* Checks whether a specified publickey (and associated algorithm) is an /* Checks whether a specified publickey (and associated algorithm) is an
* acceptable key for authentication */ * acceptable key for authentication */
/* Returns DROPBEAR_SUCCESS if key is ok for auth, DROPBEAR_FAILURE otherwise */ /* Returns DROPBEAR_SUCCESS if key is ok for auth, DROPBEAR_FAILURE otherwise */
static int checkpubkey(unsigned char* algo, unsigned int algolen, static int checkpubkey(char* algo, unsigned int algolen,
unsigned char* keyblob, unsigned int keybloblen) { unsigned char* keyblob, unsigned int keybloblen) {
FILE * authfile = NULL; FILE * authfile = NULL;
@ -330,7 +330,7 @@ static int checkpubkey(unsigned char* algo, unsigned int algolen,
TRACE(("checkpubkey: line pos = %d len = %d", line->pos, line->len)) TRACE(("checkpubkey: line pos = %d len = %d", line->pos, line->len))
ret = cmp_base64_key(keyblob, keybloblen, algo, algolen, line, NULL); ret = cmp_base64_key(keyblob, keybloblen, (const unsigned char *) algo, algolen, line, NULL);
if (ret == DROPBEAR_SUCCESS && options_buf) { if (ret == DROPBEAR_SUCCESS && options_buf) {
ret = svr_add_pubkey_options(options_buf, line_num, filename); ret = svr_add_pubkey_options(options_buf, line_num, filename);