diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2020-05-24 14:16:58 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2020-05-24 14:16:58 +0800 |
| commit | 7871273feb1a2e76857ddcc80b1fe7e7081b60b1 (patch) | |
| tree | 092ae0172714b15d062ed9c47a1ae913321a0c96 /cli-authpubkey.c | |
| parent | 71a3cec2995291047445255e3159a7867f05f947 (diff) | |
| download | dropbear-7871273feb1a2e76857ddcc80b1fe7e7081b60b1.tar.gz | |
send and handle SSH_MSG_EXT_INFO only at the correct point
- other fixes for rsa pubkey auth
- only include ext-info handling when rsa pubkey auth is compiled
Diffstat (limited to 'cli-authpubkey.c')
| -rw-r--r-- | cli-authpubkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cli-authpubkey.c b/cli-authpubkey.c index 8426e84..49f79c3 100644 --- a/cli-authpubkey.c +++ b/cli-authpubkey.c @@ -200,7 +200,7 @@ int cli_auth_pubkey() { while (cli_opts.privkeys->first) { sign_key * key = (sign_key*)cli_opts.privkeys->first->item; if (cli_ses.server_sig_algs) { -#ifdef DROPBEAR_RSA +#if DROPBEAR_RSA if (key->type == DROPBEAR_SIGNKEY_RSA) { #if DROPBEAR_RSA_SHA256 if (buf_has_algo(cli_ses.server_sig_algs, SSH_SIGNATURE_RSA_SHA256) @@ -242,7 +242,7 @@ int cli_auth_pubkey() { assume all except rsa-sha256 are OK. */ #if DROPBEAR_RSA if (key->type == DROPBEAR_SIGNKEY_RSA) { -#ifdef DROPBEAR_RSA_SHA1 +#if DROPBEAR_RSA_SHA1 sigtype = DROPBEAR_SIGNATURE_RSA_SHA1; TRACE(("no server-sig-algs, using rsa sha1")) break; |