From: Darren Tucker <dtucker@dtucker.net>
Date: Sat, 25 Jan 2020 02:05:42 +0000 (+1100)
Subject: Put EC key export inside OPENSSL_HAS_ECC.
X-Git-Tag: V_8_2_P1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e16dfa94f86358033531c4a97dcb51508ef84d49;p=thirdparty%2Fopenssh-portable.git

Put EC key export inside OPENSSL_HAS_ECC.

Fixes link error when building against an OpenSSL that does not have
ECC.
---

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 14d2357a7..d29f97bb3 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -406,10 +406,12 @@ do_convert_to_pem(struct sshkey *k)
 		if (!PEM_write_DSA_PUBKEY(stdout, k->dsa))
 			fatal("PEM_write_DSA_PUBKEY failed");
 		break;
+#ifdef OPENSSL_HAS_ECC
 	case KEY_ECDSA:
 		if (!PEM_write_EC_PUBKEY(stdout, k->ecdsa))
 			fatal("PEM_write_EC_PUBKEY failed");
 		break;
+#endif
 	default:
 		fatal("%s: unsupported key type %s", __func__, sshkey_type(k));
 	}