From: Damien Miller <djm@mindrot.org>
Date: Fri, 1 Nov 2019 03:49:25 +0000 (+1100)
Subject: conditionalise SK sign/verify on ENABLE_SK
X-Git-Tag: V_8_2_P1~363
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03f9205f0fb49ea2507eacc143737a8511ae5a4e;p=thirdparty%2Fopenssh-portable.git

conditionalise SK sign/verify on ENABLE_SK

Spotted by Darren and his faux-Vax
---

diff --git a/sshkey.c b/sshkey.c
index 4744dfbef..861d77689 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -2684,11 +2684,13 @@ sshkey_sign(struct sshkey *key,
 	case KEY_ECDSA:
 		r = ssh_ecdsa_sign(key, sigp, lenp, data, datalen, compat);
 		break;
+#  ifdef ENABLE_SK
 	case KEY_ECDSA_SK_CERT:
 	case KEY_ECDSA_SK:
 		r = sshsk_ecdsa_sign(sk_provider, key, sigp, lenp,
 		    data, datalen, compat);
 		break;
+#  endif /* ENABLE_SK */
 # endif /* OPENSSL_HAS_ECC */
 	case KEY_RSA_CERT:
 	case KEY_RSA:
@@ -2734,10 +2736,12 @@ sshkey_verify(const struct sshkey *key,
 	case KEY_ECDSA_CERT:
 	case KEY_ECDSA:
 		return ssh_ecdsa_verify(key, sig, siglen, data, dlen, compat);
+#  ifdef ENABLE_SK
 	case KEY_ECDSA_SK_CERT:
 	case KEY_ECDSA_SK:
 		return ssh_ecdsa_sk_verify(key, sig, siglen, data, dlen,
 		    compat);
+#  endif /* ENABLE_SK */
 # endif /* OPENSSL_HAS_ECC */
 	case KEY_RSA_CERT:
 	case KEY_RSA: