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) [myprosal.h] Don't include curve25519-sha256@libssh.org in 

the proposal if the version of OpenSSL we're using doesn't support ECC.
This commit is contained in:
Darren Tucker 2014-06-11 07:37:25 +10:00
parent 67508ac256
commit d7af0cc5bf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
- (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] Only do NISTP256 regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] Only do NISTP256
curve tests if OpenSSL has them. curve tests if OpenSSL has them.
- (dtucker) [myprosal.h] Don't include curve25519-sha256@libssh.org in
the proposal if the version of OpenSSL we're using doesn't support ECC.
20140527 20140527
- (djm) [cipher.c] Fix merge botch. - (djm) [cipher.c] Fix merge botch.

9
myproposal.h
View File

@ -78,8 +78,13 @@
#endif #endif
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
#define KEX_SERVER_KEX \ # ifdef OPENSSL_HAS_ECC
"curve25519-sha256@libssh.org," \ # define KEX_CURVE25519_METHODS "curve25519-sha256@libssh.org,"
# else
# define KEX_CURVE25519_METHODS ""
# endif
#define KEX_SERVER_KEX \
KEX_CURVE25519_METHODS \
KEX_ECDH_METHODS \ KEX_ECDH_METHODS \
KEX_SHA256_METHODS \ KEX_SHA256_METHODS \
"diffie-hellman-group14-sha1" "diffie-hellman-group14-sha1"