tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-26 23:34:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [myproposal.h] Make the conditional algorithm support consistent

Browse Source 
and add some comments so it's clear what goes where.
This commit is contained in:
Darren Tucker 2013-06-11 12:10:02 +10:00
parent 97b62f41ad
commit b8ae92d08b
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -13,6 +13,8 @@
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 - (dtucker) [myproposal.h] Do not advertise AES GSM ciphers if we don't have
the required OpenSSL support. Patch from naddy at freebsd. the required OpenSSL support. Patch from naddy at freebsd.
- (dtucker) [myproposal.h] Make the conditional algorithm support consistent
and add some comments so it's clear what goes where.
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

17
myproposal.h
View File

@ -26,6 +26,8 @@
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
/* conditional algorithm support */
#ifdef OPENSSL_HAS_ECC #ifdef OPENSSL_HAS_ECC
# define KEX_ECDH_METHODS \ # define KEX_ECDH_METHODS \
"ecdh-sha2-nistp256," \ "ecdh-sha2-nistp256," \
@ -52,12 +54,15 @@
# define AESGCM_CIPHER_MODES # define AESGCM_CIPHER_MODES
#endif #endif
/* 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 \
"diffie-hellman-group-exchange-sha256," "diffie-hellman-group-exchange-sha256,"
#define SHA2_HMAC_MODES \
"hmac-sha2-256," \
"hmac-sha2-512,"
#else #else
# define KEX_SHA256_METHODS # define KEX_SHA256_METHODS
# define SHA2_HMAC_MODES
#endif #endif
# define KEX_DEFAULT_KEX \ # define KEX_DEFAULT_KEX \
@ -77,19 +82,15 @@
"ssh-rsa," \ "ssh-rsa," \
"ssh-dss" "ssh-dss"
/* the actual algorithms */
#define KEX_DEFAULT_ENCRYPT \ #define KEX_DEFAULT_ENCRYPT \
"aes128-ctr,aes192-ctr,aes256-ctr," \ "aes128-ctr,aes192-ctr,aes256-ctr," \
"arcfour256,arcfour128," \ "arcfour256,arcfour128," \
AESGCM_CIPHER_MODES \ 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
#define SHA2_HMAC_MODES \
"hmac-sha2-256," \
"hmac-sha2-512,"
#else
# define SHA2_HMAC_MODES
#endif
#define KEX_DEFAULT_MAC \ #define KEX_DEFAULT_MAC \
"hmac-md5-etm@openssh.com," \ "hmac-md5-etm@openssh.com," \
"hmac-sha1-etm@openssh.com," \ "hmac-sha1-etm@openssh.com," \