- (dtucker) [sshkey.c] ifdef out unused variable when compiling without

   OPENSSL_HAS_ECC.

2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index dcd8d3ee5..987647b96 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 14110cdad..fdd0c8a89 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))