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) [myproposal.h] Do not advertise AES GSM ciphers if we don't have 

the required OpenSSL support.  Patch from naddy at freebsd.
This commit is contained in:
Darren Tucker 2013-06-11 11:47:24 +10:00
parent 6d8bd57448
commit 97b62f41ad
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -11,6 +11,8 @@
bz#1917, also reported and tested by tedu@. ok djm@ markus@. bz#1917, also reported and tested by tedu@. ok djm@ markus@.
- (dtucker) [Makefile.in configure.ac fixalgorithms] Remove unsupported - (dtucker) [Makefile.in configure.ac fixalgorithms] Remove unsupported
algorithms (Ciphers, MACs and HostKeyAlgorithms) from man pages. algorithms (Ciphers, MACs and HostKeyAlgorithms) from man pages.
- (dtucker) [myproposal.h] Do not advertise AES GSM ciphers if we don't have
the required OpenSSL support. Patch from naddy at freebsd.
20130605 20130605
- (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of - (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of

9
myproposal.h
View File

@ -45,6 +45,13 @@
# define HOSTKEY_ECDSA_METHODS # define HOSTKEY_ECDSA_METHODS
#endif #endif
#ifdef OPENSSL_HAVE_EVPGCM
# define AESGCM_CIPHER_MODES \
"aes128-gcm@openssh.com,aes256-gcm@openssh.com,"
#else
# define AESGCM_CIPHER_MODES
#endif
/* Old OpenSSL doesn't support what we need for DHGEX-sha256 */ /* Old OpenSSL doesn't support what we need for DHGEX-sha256 */
#ifdef HAVE_EVP_SHA256 #ifdef HAVE_EVP_SHA256
# define KEX_SHA256_METHODS \ # define KEX_SHA256_METHODS \
@ -73,7 +80,7 @@
#define KEX_DEFAULT_ENCRYPT \ #define KEX_DEFAULT_ENCRYPT \
"aes128-ctr,aes192-ctr,aes256-ctr," \ "aes128-ctr,aes192-ctr,aes256-ctr," \
"arcfour256,arcfour128," \ "arcfour256,arcfour128," \
"aes128-gcm@openssh.com,aes256-gcm@openssh.com," \ AESGCM_CIPHER_MODES \
"aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \
"aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se"
#ifdef HAVE_EVP_SHA256 #ifdef HAVE_EVP_SHA256