tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

OPENSSL_HAS_ECC.
This commit is contained in:
Darren Tucker 2014-07-22 01:07:11 +10:00
parent c8f610f6cc
commit 948a1774a7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -9,6 +9,8 @@
http://www.25thandclement.com/~william/projects/streamlocal.html http://www.25thandclement.com/~william/projects/streamlocal.html
OK djm@ markus@ OK djm@ markus@
- (djm) [regress/multiplex.sh] Not all netcat accept the -N option. - (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 20140721
- (dtucker) [cipher.c openbsd-compat/openssl-compat.h] Restore the bits - (dtucker) [cipher.c openbsd-compat/openssl-compat.h] Restore the bits

4
sshkey.c
View File

@ -657,9 +657,9 @@ cert_compare(struct sshkey_cert *a, struct sshkey_cert *b)
int int
sshkey_equal_public(const struct sshkey *a, const struct sshkey *b) 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; BN_CTX *bnctx;
#endif /* WITH_OPENSSL */ #endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */
if (a == NULL || b == NULL || if (a == NULL || b == NULL ||
sshkey_type_plain(a->type) != sshkey_type_plain(b->type)) sshkey_type_plain(a->type) != sshkey_type_plain(b->type))