mirror of git://anongit.mindrot.org/openssh.git
- (dtucker) [myproposal.h] Conditionally enable CURVE25519_SHA256.
This commit is contained in:
parent
1c8ce34909
commit
d94240b2f6
|
@ -23,6 +23,7 @@
|
|||
arc4random_stir (right now this is only OpenBSD -current).
|
||||
- (dtucker) [kex.c] Only enable CURVE25519_SHA256 if we actually have
|
||||
EVP_sha256.
|
||||
- (dtucker) [myproposal.h] Conditionally enable CURVE25519_SHA256.
|
||||
|
||||
20131107
|
||||
- (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)
|
||||
|
|
|
@ -57,16 +57,19 @@
|
|||
#ifdef HAVE_EVP_SHA256
|
||||
# define KEX_SHA256_METHODS \
|
||||
"diffie-hellman-group-exchange-sha256,"
|
||||
#define KEX_CURVE25519_METHODS \
|
||||
"curve25519-sha256@libssh.org,"
|
||||
#define SHA2_HMAC_MODES \
|
||||
"hmac-sha2-256," \
|
||||
"hmac-sha2-512,"
|
||||
#else
|
||||
# define KEX_SHA256_METHODS
|
||||
# define KEX_CURVE25519_METHODS
|
||||
# define SHA2_HMAC_MODES
|
||||
#endif
|
||||
|
||||
# define KEX_DEFAULT_KEX \
|
||||
"curve25519-sha256@libssh.org," \
|
||||
KEX_CURVE25519_METHODS \
|
||||
KEX_ECDH_METHODS \
|
||||
KEX_SHA256_METHODS \
|
||||
"diffie-hellman-group-exchange-sha1," \
|
||||
|
|
Loading…
Reference in New Issue