diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | sshkey.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -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 | ||
13 | 20140721 | 15 | 20140721 |
14 | - (dtucker) [cipher.c openbsd-compat/openssl-compat.h] Restore the bits | 16 | - (dtucker) [cipher.c openbsd-compat/openssl-compat.h] Restore the bits |
@@ -657,9 +657,9 @@ cert_compare(struct sshkey_cert *a, struct sshkey_cert *b) | |||
657 | int | 657 | int |
658 | sshkey_equal_public(const struct sshkey *a, const struct sshkey *b) | 658 | sshkey_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)) |