Fix EC suites version requirements in compat.sh

This commit is contained in:
Manuel Pégourié-Gonnard 2013-12-12 11:37:11 +01:00
parent 5538970d32
commit 07b54e06da

View File

@ -129,6 +129,8 @@ case $TYPE in
O_SERVER_ARGS="$O_SERVER_BASE -cert data_files/server5.crt -key data_files/server5.key" O_SERVER_ARGS="$O_SERVER_BASE -cert data_files/server5.crt -key data_files/server5.key"
O_CLIENT_ARGS="$O_CLIENT_BASE -cert data_files/server6.crt -key data_files/server6.key" O_CLIENT_ARGS="$O_CLIENT_BASE -cert data_files/server6.crt -key data_files/server6.key"
if [ "$MODE" != "ssl3" ];
then
P_CIPHERS=" \ P_CIPHERS=" \
TLS-ECDHE-ECDSA-WITH-NULL-SHA \ TLS-ECDHE-ECDSA-WITH-NULL-SHA \
TLS-ECDHE-ECDSA-WITH-RC4-128-SHA \ TLS-ECDHE-ECDSA-WITH-RC4-128-SHA \
@ -144,6 +146,7 @@ case $TYPE in
ECDHE-ECDSA-AES128-SHA \ ECDHE-ECDSA-AES128-SHA \
ECDHE-ECDSA-AES256-SHA \ ECDHE-ECDSA-AES256-SHA \
" "
fi
if [ "$MODE" = "tls1_2" ]; if [ "$MODE" = "tls1_2" ];
then then
@ -188,11 +191,6 @@ case $TYPE in
TLS-RSA-WITH-NULL-SHA \ TLS-RSA-WITH-NULL-SHA \
TLS-RSA-WITH-DES-CBC-SHA \ TLS-RSA-WITH-DES-CBC-SHA \
TLS-DHE-RSA-WITH-DES-CBC-SHA \ TLS-DHE-RSA-WITH-DES-CBC-SHA \
TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA \
TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA \
TLS-ECDHE-RSA-WITH-3DES-EDE-CBC-SHA \
TLS-ECDHE-RSA-WITH-RC4-128-SHA \
TLS-ECDHE-RSA-WITH-NULL-SHA \
" "
O_CIPHERS=" \ O_CIPHERS=" \
@ -212,12 +210,26 @@ case $TYPE in
NULL-SHA \ NULL-SHA \
DES-CBC-SHA \ DES-CBC-SHA \
EDH-RSA-DES-CBC-SHA \ EDH-RSA-DES-CBC-SHA \
"
if [ "$MODE" != "ssl3" ];
then
P_CIPHERS=" \
TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA \
TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA \
TLS-ECDHE-RSA-WITH-3DES-EDE-CBC-SHA \
TLS-ECDHE-RSA-WITH-RC4-128-SHA \
TLS-ECDHE-RSA-WITH-NULL-SHA \
"
O_CIPHERS=" \
ECDHE-RSA-AES256-SHA \ ECDHE-RSA-AES256-SHA \
ECDHE-RSA-AES128-SHA \ ECDHE-RSA-AES128-SHA \
ECDHE-RSA-DES-CBC3-SHA \ ECDHE-RSA-DES-CBC3-SHA \
ECDHE-RSA-RC4-SHA \ ECDHE-RSA-RC4-SHA \
ECDHE-RSA-NULL-SHA \ ECDHE-RSA-NULL-SHA \
" "
fi
if [ "$MODE" = "tls1_2" ]; if [ "$MODE" = "tls1_2" ];
then then