summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker <dtucker>2014-07-21 15:07:11 +0000
committerdtucker <dtucker>2014-07-21 15:07:11 +0000
commitd155d34f2937ca195474b8b924e1d13cacd1f97c (patch)
tree5cf63b2ab3923540a0c79a5d1eb880a55411e6aa
parenta2a36e49d38f3f47b6bec39de221ac8f1167a46a (diff)
downloadopenssh-d155d34f2937ca195474b8b924e1d13cacd1f97c.tar.gz
- (dtucker) [sshkey.c] ifdef out unused variable when compiling without
OPENSSL_HAS_ECC.
-rw-r--r--ChangeLog2
-rw-r--r--sshkey.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dcd8d3ee..987647b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
http://www.25thandclement.com/~william/projects/streamlocal.html
OK djm@ markus@
- (djm) [regress/multiplex.sh] Not all netcat accept the -N option.
+ - (dtucker) [sshkey.c] ifdef out unused variable when compiling without
+ OPENSSL_HAS_ECC.
20140721
- (dtucker) [cipher.c openbsd-compat/openssl-compat.h] Restore the bits
diff --git a/sshkey.c b/sshkey.c
index 14110cda..fdd0c8a8 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -657,9 +657,9 @@ cert_compare(struct sshkey_cert *a, struct sshkey_cert *b)
int
sshkey_equal_public(const struct sshkey *a, const struct sshkey *b)
{
-#ifdef WITH_OPENSSL
+#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
BN_CTX *bnctx;
-#endif /* WITH_OPENSSL */
+#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */
if (a == NULL || b == NULL ||
sshkey_type_plain(a->type) != sshkey_type_plain(b->type))