[openssh-commits] [openssh] 02/02: Move ifdef OPENSSL_HAS_ECC.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 857f49e91eeae6feb781ef5f5e26c38ca3d953ec
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Mon Nov 18 14:15:26 2019 +1100

    Move ifdef OPENSSL_HAS_ECC.
    
    Found by -Wimplicit-fallthrough: one ECC case was not inside the ifdef.
    ok djm@
---
 sshkey.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sshkey.c b/sshkey.c
index 40e764dd..90dcec07 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -2430,6 +2430,7 @@ sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp,
 		DSA_print_fp(stderr, key->dsa, 8);
 #endif
 		break;
+# ifdef OPENSSL_HAS_ECC
 	case KEY_ECDSA_CERT:
 	case KEY_ECDSA_SK_CERT:
 		/* Skip nonce */
@@ -2438,7 +2439,6 @@ sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp,
 			goto out;
 		}
 		/* FALLTHROUGH */
-# ifdef OPENSSL_HAS_ECC
 	case KEY_ECDSA:
 	case KEY_ECDSA_SK:
 		if ((key = sshkey_new(type)) == NULL) {

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.