From: Darren Tucker <dtucker@dtucker.net>
Date: Sun, 15 Dec 2019 07:27:02 +0000 (+1100)
Subject: Put SK ECDSA bits inside ifdef OPENSSL_HAS_ECC.
X-Git-Tag: V_8_2_P1~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fff8ff6dd580e1a72ba09a6775d185175cdc8d13;p=thirdparty%2Fopenssh-portable.git

Put SK ECDSA bits inside ifdef OPENSSL_HAS_ECC.

Fixes build when linking against OpenSSLs built with no-ec.
---

diff --git a/ssh-ecdsa-sk.c b/ssh-ecdsa-sk.c
index 7a2355c1a..083787952 100644
--- a/ssh-ecdsa-sk.c
+++ b/ssh-ecdsa-sk.c
@@ -54,6 +54,7 @@ ssh_ecdsa_sk_verify(const struct sshkey *key,
     const u_char *data, size_t datalen, u_int compat,
     struct sshkey_sig_details **detailsp)
 {
+#ifdef OPENSSL_HAS_ECC
 	ECDSA_SIG *sig = NULL;
 	BIGNUM *sig_r = NULL, *sig_s = NULL;
 	u_char sig_flags;
@@ -200,4 +201,7 @@ ssh_ecdsa_sk_verify(const struct sshkey *key,
 	BN_clear_free(sig_s);
 	free(ktype);
 	return ret;
+#else
+	return SSH_ERR_INTERNAL_ERROR;
+#endif
 }