[openssh-commits] [openssh] 01/01: conditionalise SK sign/verify on ENABLE_SK

[git+noreply at mindrot.org]

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

djm pushed a commit to branch master
in repository openssh.

commit 03f9205f0fb49ea2507eacc143737a8511ae5a4e
Author: Damien Miller <djm at mindrot.org>
Date:   Fri Nov 1 14:49:25 2019 +1100

    conditionalise SK sign/verify on ENABLE_SK
    
    Spotted by Darren and his faux-Vax
---
 sshkey.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sshkey.c b/sshkey.c
index 4744dfbe..861d7768 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:

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