Merge new security defaults for programs (RC4 disabled, SSL3 disabled)

This commit is contained in:
Paul Bakker 2015-01-14 16:26:54 +01:00
commit 5b8f7eaa3e
14 changed files with 149 additions and 23 deletions

View file

@ -920,6 +920,10 @@ static int ssl_ciphersuite_match( ssl_context *ssl, int suite_id,
suite_info->max_minor_ver < ssl->minor_ver )
return( 0 );
if( ssl->arc4_disabled == SSL_ARC4_DISABLED &&
suite_info->cipher == POLARSSL_CIPHER_ARC4_128 )
return( 0 );
#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
if( ssl_ciphersuite_uses_ec( suite_info ) &&
( ssl->handshake->curves == NULL ||