]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Move ifdef OPENSSL_HAS_ECC.
authorDarren Tucker <dtucker@dtucker.net>
Mon, 18 Nov 2019 03:15:26 +0000 (14:15 +1100)
committerDarren Tucker <dtucker@dtucker.net>
Mon, 18 Nov 2019 03:15:26 +0000 (14:15 +1100)
Found by -Wimplicit-fallthrough: one ECC case was not inside the ifdef.
ok djm@

sshkey.c

index 40e764dd4d85358291a55d437dfd0074a907ce74..90dcec079e900fac633946211e19d8907985ed92 100644 (file)
--- 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) {