- (dtucker) [kex.c] Only enable CURVE25519_SHA256 if we actually have

   EVP_sha256.

2 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 08bfbef9a..1c2362461 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
  - (dtucker) [openbsd-compat/openbsd-compat.h] Add null implementation of
    arc4random_stir for platforms that have arc4random but don't have
    arc4random_stir (right now this is only OpenBSD -current).
+ - (dtucker) [kex.c] Only enable CURVE25519_SHA256 if we actually have
+   EVP_sha256.
 
 20131107
  - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)
diff --git a/kex.c b/kex.c
index 0b139dc67..59cb448cd 100644
--- a/kex.c
+++ b/kex.c
@@ -80,7 +80,9 @@ static const struct kexalg kexalgs[] = {
         { KEX_ECDH_SHA2_NISTP384, KEX_ECDH_SHA2, NID_secp384r1, EVP_sha384 },
         { KEX_ECDH_SHA2_NISTP521, KEX_ECDH_SHA2, NID_secp521r1, EVP_sha512 },
 #endif
+#ifdef HAVE_EVP_SHA256
         { KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, EVP_sha256 },
+#endif
         { NULL, -1, -1, NULL},
 };