Mercurial > dropbear
changeset 1881:d39cfedaf015
extract pubkey_info when seuccesfully auth with a key and free it in the cleanup function
| author | HansH111 <hans@atbas.org> |
|---|---|
| date | Sun, 13 Mar 2022 17:38:13 +0000 |
| parents | 4c1560627693 |
| children | 2839daa507b3 |
| files | svr-authpubkey.c svr-authpubkeyoptions.c |
| diffstat | 2 files changed, 23 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/svr-authpubkey.c Sun Mar 13 17:37:44 2022 +0000 +++ b/svr-authpubkey.c Sun Mar 13 17:38:13 2022 +0000 @@ -261,7 +261,7 @@ const char* algo, unsigned int algolen, const unsigned char* keyblob, unsigned int keybloblen) { buffer *options_buf = NULL; - unsigned int pos, len; + unsigned int pos, len, infopos, infolen; int ret = DROPBEAR_FAILURE; if (line->len < MIN_AUTHKEYS_LINE || line->len > MAX_AUTHKEYS_LINE) { @@ -344,6 +344,11 @@ for (len = 0; line->pos < line->len; len++) { if (buf_getbyte(line) == ' ') break; } + /* findout the length of the public key info */ + infopos = line->pos; + for (infolen = 0; line->pos < line->len; infolen++) { + if (buf_getbyte(line) == ' ') break; + } buf_setpos(line, pos); buf_setlen(line, line->pos + len); @@ -351,8 +356,20 @@ ret = cmp_base64_key(keyblob, keybloblen, (const unsigned char *) algo, algolen, line, NULL); - if (ret == DROPBEAR_SUCCESS && options_buf) { - ret = svr_add_pubkey_options(options_buf, line_num, filename); + if (ret == DROPBEAR_SUCCESS) { + if (options_buf) { + ret = svr_add_pubkey_options(options_buf, line_num, filename); + } + /* save the (optional) public key information */ + if (infolen) { + ses.authstate.pubkey_info = m_malloc(infolen + 1); + if (ses.authstate.pubkey_info) { + strncpy(ses.authstate.pubkey_info, &line->data[infopos], infolen); + ses.authstate.pubkey_info[infolen]='\0'; + } + } else { + ses.authstate.pubkey_info = NULL; + } } out:
--- a/svr-authpubkeyoptions.c Sun Mar 13 17:37:44 2022 +0000 +++ b/svr-authpubkeyoptions.c Sun Mar 13 17:38:13 2022 +0000 @@ -115,6 +115,9 @@ } m_free(ses.authstate.pubkey_options); } + if (ses.authstate.pubkey_info) { + m_free(ses.authstate.pubkey_info); + } } /* helper for svr_add_pubkey_options. returns DROPBEAR_SUCCESS if the option is matched,