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) [kex.c] Only enable CURVE25519_SHA256 if we actually have 

EVP_sha256.
This commit is contained in:
Darren Tucker 2013-11-08 19:50:32 +11:00
parent ccdb9bec46
commit 1c8ce34909
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21,6 +21,8 @@
- (dtucker) [openbsd-compat/openbsd-compat.h] Add null implementation of - (dtucker) [openbsd-compat/openbsd-compat.h] Add null implementation of
arc4random_stir for platforms that have arc4random but don't have arc4random_stir for platforms that have arc4random but don't have
arc4random_stir (right now this is only OpenBSD -current). arc4random_stir (right now this is only OpenBSD -current).
- (dtucker) [kex.c] Only enable CURVE25519_SHA256 if we actually have
EVP_sha256.
20131107 20131107
- (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5) - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)

2
kex.c
View File

@ -80,7 +80,9 @@ static const struct kexalg kexalgs[] = {
{ KEX_ECDH_SHA2_NISTP384, KEX_ECDH_SHA2, NID_secp384r1, EVP_sha384 }, { KEX_ECDH_SHA2_NISTP384, KEX_ECDH_SHA2, NID_secp384r1, EVP_sha384 },
{ KEX_ECDH_SHA2_NISTP521, KEX_ECDH_SHA2, NID_secp521r1, EVP_sha512 }, { KEX_ECDH_SHA2_NISTP521, KEX_ECDH_SHA2, NID_secp521r1, EVP_sha512 },
#endif #endif
#ifdef HAVE_EVP_SHA256
{ KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, EVP_sha256 }, { KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, EVP_sha256 },
#endif
{ NULL, -1, -1, NULL}, { NULL, -1, -1, NULL},
}; };