summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--sshkey.c4
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 @@
9 http://www.25thandclement.com/~william/projects/streamlocal.html 9 http://www.25thandclement.com/~william/projects/streamlocal.html
10 OK djm@ markus@ 10 OK djm@ markus@
11 - (djm) [regress/multiplex.sh] Not all netcat accept the -N option. 11 - (djm) [regress/multiplex.sh] Not all netcat accept the -N option.
12 - (dtucker) [sshkey.c] ifdef out unused variable when compiling without
13 OPENSSL_HAS_ECC.
12 14
1320140721 1520140721
14 - (dtucker) [cipher.c openbsd-compat/openssl-compat.h] Restore the bits 16 - (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)
657int 657int
658sshkey_equal_public(const struct sshkey *a, const struct sshkey *b) 658sshkey_equal_public(const struct sshkey *a, const struct sshkey *b)
659{ 659{
660#ifdef WITH_OPENSSL 660#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
661 BN_CTX *bnctx; 661 BN_CTX *bnctx;
662#endif /* WITH_OPENSSL */ 662#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */
663 663
664 if (a == NULL || b == NULL || 664 if (a == NULL || b == NULL ||
665 sshkey_type_plain(a->type) != sshkey_type_plain(b->type)) 665 sshkey_type_plain(a->type) != sshkey_type_plain(b->type))