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 | 701d43b8594365b55421e8bc4c53efa920c09ed5 (patch) | |
tree | aceb60a25d26b8d5f3b132df40e59c9218f8b66e /cli-authpubkey.c | |
parent | 79bedc90a1efc9ba0b2c6565bd5264a7817e68d4 (diff) |
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; |