Fix some version/peer requirements in compat.sh

This commit is contained in:
Manuel Pégourié-Gonnard 2014-07-13 13:57:24 +02:00
parent 2fbf311391
commit 7457cb3a56

View File

@ -202,7 +202,6 @@ add_common_ciphersuites()
TLS-RSA-WITH-RC4-128-MD5 \ TLS-RSA-WITH-RC4-128-MD5 \
TLS-RSA-WITH-NULL-MD5 \ TLS-RSA-WITH-NULL-MD5 \
TLS-RSA-WITH-NULL-SHA \ TLS-RSA-WITH-NULL-SHA \
TLS-RSA-WITH-NULL-SHA256 \
" "
G_CIPHERS="$G_CIPHERS \ G_CIPHERS="$G_CIPHERS \
+DHE-RSA:+AES-128-CBC:+SHA1 \ +DHE-RSA:+AES-128-CBC:+SHA1 \
@ -219,7 +218,6 @@ add_common_ciphersuites()
+RSA:+ARCFOUR-128:+MD5 \ +RSA:+ARCFOUR-128:+MD5 \
+RSA:+NULL:+MD5 \ +RSA:+NULL:+MD5 \
+RSA:+NULL:+SHA1 \ +RSA:+NULL:+SHA1 \
+RSA:+NULL:+SHA256 \
" "
O_CIPHERS="$O_CIPHERS \ O_CIPHERS="$O_CIPHERS \
DHE-RSA-AES128-SHA \ DHE-RSA-AES128-SHA \
@ -410,6 +408,15 @@ add_gnutls_ciphersuites()
;; ;;
"RSA") "RSA")
if [ "$MODE" != "ssl3" ];
then
P_CIPHERS="$P_CIPHERS \
TLS-RSA-WITH-NULL-SHA256 \
"
G_CIPHERS="$G_CIPHERS \
+RSA:+NULL:+SHA256 \
"
fi
if [ "$MODE" = "tls1_2" ]; if [ "$MODE" = "tls1_2" ];
then then
P_CIPHERS="$P_CIPHERS \ P_CIPHERS="$P_CIPHERS \
@ -579,6 +586,12 @@ add_polarssl_ciphersuites()
;; ;;
"RSA") "RSA")
if [ "$MODE" == "ssl3" ];
then
P_CIPHERS="$P_CIPHERS \
TLS-RSA-WITH-NULL-SHA256 \
"
fi
if [ "$MODE" = "tls1_2" ]; if [ "$MODE" = "tls1_2" ];
then then
P_CIPHERS="$P_CIPHERS \ P_CIPHERS="$P_CIPHERS \