Order ciphersuite names alphabetically
The ciphers were originally separated by the version conditions, and the spacing was retained in case it was required later. It has been decided it would be better to have an unbroken list in alphabetically order to quickly locate ciphers when necessary Signed-off-by: Joe Subbiani <joe.subbiani@arm.com>
This commit is contained in:
parent
f05fae0f7a
commit
32df1450f1
1 changed files with 127 additions and 137 deletions
264
tests/compat.sh
264
tests/compat.sh
|
@ -246,47 +246,43 @@ add_common_ciphersuites()
|
||||||
|
|
||||||
"ECDSA")
|
"ECDSA")
|
||||||
CIPHERS="$CIPHERS \
|
CIPHERS="$CIPHERS \
|
||||||
TLS-ECDHE-ECDSA-WITH-NULL-SHA \
|
|
||||||
TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA \
|
TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA \
|
||||||
|
TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256 \
|
||||||
|
TLS-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256 \
|
||||||
TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA \
|
TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA \
|
||||||
|
TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA384 \
|
||||||
TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256 \
|
TLS-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384 \
|
||||||
TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA384 \
|
TLS-ECDHE-ECDSA-WITH-NULL-SHA \
|
||||||
TLS-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256 \
|
|
||||||
TLS-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384 \
|
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"RSA")
|
"RSA")
|
||||||
CIPHERS="$CIPHERS \
|
CIPHERS="$CIPHERS \
|
||||||
TLS-DHE-RSA-WITH-AES-128-CBC-SHA \
|
TLS-DHE-RSA-WITH-AES-128-CBC-SHA \
|
||||||
|
TLS-DHE-RSA-WITH-AES-128-CBC-SHA256 \
|
||||||
|
TLS-DHE-RSA-WITH-AES-128-GCM-SHA256 \
|
||||||
TLS-DHE-RSA-WITH-AES-256-CBC-SHA \
|
TLS-DHE-RSA-WITH-AES-256-CBC-SHA \
|
||||||
|
TLS-DHE-RSA-WITH-AES-256-CBC-SHA256 \
|
||||||
|
TLS-DHE-RSA-WITH-AES-256-GCM-SHA384 \
|
||||||
TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA \
|
TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA \
|
||||||
TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA \
|
TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA \
|
||||||
TLS-RSA-WITH-AES-256-CBC-SHA \
|
TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA \
|
||||||
TLS-RSA-WITH-CAMELLIA-256-CBC-SHA \
|
TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA256 \
|
||||||
|
TLS-ECDHE-RSA-WITH-AES-128-GCM-SHA256 \
|
||||||
|
TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA \
|
||||||
|
TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA384 \
|
||||||
|
TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384 \
|
||||||
|
TLS-ECDHE-RSA-WITH-NULL-SHA \
|
||||||
TLS-RSA-WITH-AES-128-CBC-SHA \
|
TLS-RSA-WITH-AES-128-CBC-SHA \
|
||||||
|
TLS-RSA-WITH-AES-128-CBC-SHA256 \
|
||||||
|
TLS-RSA-WITH-AES-128-GCM-SHA256 \
|
||||||
|
TLS-RSA-WITH-AES-256-CBC-SHA \
|
||||||
|
TLS-RSA-WITH-AES-256-CBC-SHA256 \
|
||||||
|
TLS-RSA-WITH-AES-256-GCM-SHA384 \
|
||||||
TLS-RSA-WITH-CAMELLIA-128-CBC-SHA \
|
TLS-RSA-WITH-CAMELLIA-128-CBC-SHA \
|
||||||
|
TLS-RSA-WITH-CAMELLIA-256-CBC-SHA \
|
||||||
TLS-RSA-WITH-NULL-MD5 \
|
TLS-RSA-WITH-NULL-MD5 \
|
||||||
TLS-RSA-WITH-NULL-SHA \
|
TLS-RSA-WITH-NULL-SHA \
|
||||||
|
|
||||||
TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA \
|
|
||||||
TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA \
|
|
||||||
TLS-ECDHE-RSA-WITH-NULL-SHA \
|
|
||||||
|
|
||||||
TLS-RSA-WITH-AES-128-CBC-SHA256 \
|
|
||||||
TLS-DHE-RSA-WITH-AES-128-CBC-SHA256 \
|
|
||||||
TLS-RSA-WITH-AES-256-CBC-SHA256 \
|
|
||||||
TLS-DHE-RSA-WITH-AES-256-CBC-SHA256 \
|
|
||||||
TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA256 \
|
|
||||||
TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA384 \
|
|
||||||
TLS-RSA-WITH-AES-128-GCM-SHA256 \
|
|
||||||
TLS-RSA-WITH-AES-256-GCM-SHA384 \
|
|
||||||
TLS-DHE-RSA-WITH-AES-128-GCM-SHA256 \
|
|
||||||
TLS-DHE-RSA-WITH-AES-256-GCM-SHA384 \
|
|
||||||
TLS-ECDHE-RSA-WITH-AES-128-GCM-SHA256 \
|
|
||||||
TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384 \
|
|
||||||
|
|
||||||
TLS-RSA-WITH-NULL-SHA256 \
|
TLS-RSA-WITH-NULL-SHA256 \
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
|
@ -328,43 +324,42 @@ add_openssl_ciphersuites()
|
||||||
case $TYPE in
|
case $TYPE in
|
||||||
|
|
||||||
"ECDSA")
|
"ECDSA")
|
||||||
CIPHERS="$CIPHERS \
|
CIPHERS="$CIPHERS \
|
||||||
TLS-ECDH-ECDSA-WITH-NULL-SHA \
|
TLS-ECDH-ECDSA-WITH-AES-128-CBC-SHA \
|
||||||
TLS-ECDH-ECDSA-WITH-AES-128-CBC-SHA \
|
|
||||||
TLS-ECDH-ECDSA-WITH-AES-256-CBC-SHA \
|
|
||||||
|
|
||||||
TLS-ECDH-ECDSA-WITH-AES-128-CBC-SHA256 \
|
TLS-ECDH-ECDSA-WITH-AES-128-CBC-SHA256 \
|
||||||
TLS-ECDH-ECDSA-WITH-AES-256-CBC-SHA384 \
|
|
||||||
TLS-ECDH-ECDSA-WITH-AES-128-GCM-SHA256 \
|
TLS-ECDH-ECDSA-WITH-AES-128-GCM-SHA256 \
|
||||||
|
TLS-ECDH-ECDSA-WITH-AES-256-CBC-SHA \
|
||||||
|
TLS-ECDH-ECDSA-WITH-AES-256-CBC-SHA384 \
|
||||||
TLS-ECDH-ECDSA-WITH-AES-256-GCM-SHA384 \
|
TLS-ECDH-ECDSA-WITH-AES-256-GCM-SHA384 \
|
||||||
TLS-ECDHE-ECDSA-WITH-ARIA-256-GCM-SHA384 \
|
TLS-ECDH-ECDSA-WITH-NULL-SHA \
|
||||||
TLS-ECDHE-ECDSA-WITH-ARIA-128-GCM-SHA256 \
|
TLS-ECDHE-ECDSA-WITH-ARIA-128-GCM-SHA256 \
|
||||||
|
TLS-ECDHE-ECDSA-WITH-ARIA-256-GCM-SHA384 \
|
||||||
TLS-ECDHE-ECDSA-WITH-CHACHA20-POLY1305-SHA256 \
|
TLS-ECDHE-ECDSA-WITH-CHACHA20-POLY1305-SHA256 \
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"RSA")
|
"RSA")
|
||||||
CIPHERS="$CIPHERS \
|
CIPHERS="$CIPHERS \
|
||||||
TLS-ECDHE-RSA-WITH-ARIA-256-GCM-SHA384 \
|
|
||||||
TLS-DHE-RSA-WITH-ARIA-256-GCM-SHA384 \
|
|
||||||
TLS-RSA-WITH-ARIA-256-GCM-SHA384 \
|
|
||||||
TLS-ECDHE-RSA-WITH-ARIA-128-GCM-SHA256 \
|
|
||||||
TLS-DHE-RSA-WITH-ARIA-128-GCM-SHA256 \
|
TLS-DHE-RSA-WITH-ARIA-128-GCM-SHA256 \
|
||||||
TLS-RSA-WITH-ARIA-128-GCM-SHA256 \
|
TLS-DHE-RSA-WITH-ARIA-256-GCM-SHA384 \
|
||||||
TLS-DHE-RSA-WITH-CHACHA20-POLY1305-SHA256 \
|
TLS-DHE-RSA-WITH-CHACHA20-POLY1305-SHA256 \
|
||||||
|
TLS-ECDHE-RSA-WITH-ARIA-128-GCM-SHA256 \
|
||||||
|
TLS-ECDHE-RSA-WITH-ARIA-256-GCM-SHA384 \
|
||||||
TLS-ECDHE-RSA-WITH-CHACHA20-POLY1305-SHA256 \
|
TLS-ECDHE-RSA-WITH-CHACHA20-POLY1305-SHA256 \
|
||||||
|
TLS-RSA-WITH-ARIA-128-GCM-SHA256 \
|
||||||
|
TLS-RSA-WITH-ARIA-256-GCM-SHA384 \
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"PSK")
|
"PSK")
|
||||||
CIPHERS="$CIPHERS \
|
CIPHERS="$CIPHERS \
|
||||||
TLS-DHE-PSK-WITH-ARIA-256-GCM-SHA384 \
|
|
||||||
TLS-DHE-PSK-WITH-ARIA-128-GCM-SHA256 \
|
TLS-DHE-PSK-WITH-ARIA-128-GCM-SHA256 \
|
||||||
TLS-PSK-WITH-ARIA-256-GCM-SHA384 \
|
TLS-DHE-PSK-WITH-ARIA-256-GCM-SHA384 \
|
||||||
TLS-PSK-WITH-ARIA-128-GCM-SHA256 \
|
|
||||||
TLS-PSK-WITH-CHACHA20-POLY1305-SHA256 \
|
|
||||||
TLS-ECDHE-PSK-WITH-CHACHA20-POLY1305-SHA256 \
|
|
||||||
TLS-DHE-PSK-WITH-CHACHA20-POLY1305-SHA256 \
|
TLS-DHE-PSK-WITH-CHACHA20-POLY1305-SHA256 \
|
||||||
|
TLS-ECDHE-PSK-WITH-CHACHA20-POLY1305-SHA256 \
|
||||||
|
TLS-PSK-WITH-ARIA-128-GCM-SHA256 \
|
||||||
|
TLS-PSK-WITH-ARIA-256-GCM-SHA384 \
|
||||||
|
TLS-PSK-WITH-CHACHA20-POLY1305-SHA256 \
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -388,96 +383,94 @@ add_gnutls_ciphersuites()
|
||||||
|
|
||||||
"ECDSA")
|
"ECDSA")
|
||||||
CIPHERS="$CIPHERS \
|
CIPHERS="$CIPHERS \
|
||||||
TLS-ECDHE-ECDSA-WITH-CAMELLIA-128-CBC-SHA256 \
|
|
||||||
TLS-ECDHE-ECDSA-WITH-CAMELLIA-256-CBC-SHA384 \
|
|
||||||
TLS-ECDHE-ECDSA-WITH-CAMELLIA-128-GCM-SHA256 \
|
|
||||||
TLS-ECDHE-ECDSA-WITH-CAMELLIA-256-GCM-SHA384 \
|
|
||||||
TLS-ECDHE-ECDSA-WITH-AES-128-CCM \
|
TLS-ECDHE-ECDSA-WITH-AES-128-CCM \
|
||||||
TLS-ECDHE-ECDSA-WITH-AES-256-CCM \
|
|
||||||
TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8 \
|
TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8 \
|
||||||
|
TLS-ECDHE-ECDSA-WITH-AES-256-CCM \
|
||||||
TLS-ECDHE-ECDSA-WITH-AES-256-CCM-8 \
|
TLS-ECDHE-ECDSA-WITH-AES-256-CCM-8 \
|
||||||
|
TLS-ECDHE-ECDSA-WITH-CAMELLIA-128-CBC-SHA256 \
|
||||||
|
TLS-ECDHE-ECDSA-WITH-CAMELLIA-128-GCM-SHA256 \
|
||||||
|
TLS-ECDHE-ECDSA-WITH-CAMELLIA-256-CBC-SHA384 \
|
||||||
|
TLS-ECDHE-ECDSA-WITH-CAMELLIA-256-GCM-SHA384 \
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"RSA")
|
"RSA")
|
||||||
CIPHERS="$CIPHERS \
|
CIPHERS="$CIPHERS \
|
||||||
TLS-ECDHE-RSA-WITH-CAMELLIA-128-CBC-SHA256 \
|
|
||||||
TLS-ECDHE-RSA-WITH-CAMELLIA-256-CBC-SHA384 \
|
|
||||||
TLS-RSA-WITH-CAMELLIA-128-CBC-SHA256 \
|
|
||||||
TLS-RSA-WITH-CAMELLIA-256-CBC-SHA256 \
|
|
||||||
TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA256 \
|
|
||||||
TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA256 \
|
|
||||||
TLS-ECDHE-RSA-WITH-CAMELLIA-128-GCM-SHA256 \
|
|
||||||
TLS-ECDHE-RSA-WITH-CAMELLIA-256-GCM-SHA384 \
|
|
||||||
TLS-DHE-RSA-WITH-CAMELLIA-128-GCM-SHA256 \
|
|
||||||
TLS-DHE-RSA-WITH-CAMELLIA-256-GCM-SHA384 \
|
|
||||||
TLS-RSA-WITH-CAMELLIA-128-GCM-SHA256 \
|
|
||||||
TLS-RSA-WITH-CAMELLIA-256-GCM-SHA384 \
|
|
||||||
TLS-RSA-WITH-AES-128-CCM \
|
|
||||||
TLS-RSA-WITH-AES-256-CCM \
|
|
||||||
TLS-DHE-RSA-WITH-AES-128-CCM \
|
TLS-DHE-RSA-WITH-AES-128-CCM \
|
||||||
TLS-DHE-RSA-WITH-AES-256-CCM \
|
|
||||||
TLS-RSA-WITH-AES-128-CCM-8 \
|
|
||||||
TLS-RSA-WITH-AES-256-CCM-8 \
|
|
||||||
TLS-DHE-RSA-WITH-AES-128-CCM-8 \
|
TLS-DHE-RSA-WITH-AES-128-CCM-8 \
|
||||||
|
TLS-DHE-RSA-WITH-AES-256-CCM \
|
||||||
TLS-DHE-RSA-WITH-AES-256-CCM-8 \
|
TLS-DHE-RSA-WITH-AES-256-CCM-8 \
|
||||||
|
TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA256 \
|
||||||
|
TLS-DHE-RSA-WITH-CAMELLIA-128-GCM-SHA256 \
|
||||||
|
TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA256 \
|
||||||
|
TLS-DHE-RSA-WITH-CAMELLIA-256-GCM-SHA384 \
|
||||||
|
TLS-ECDHE-RSA-WITH-CAMELLIA-128-CBC-SHA256 \
|
||||||
|
TLS-ECDHE-RSA-WITH-CAMELLIA-128-GCM-SHA256 \
|
||||||
|
TLS-ECDHE-RSA-WITH-CAMELLIA-256-CBC-SHA384 \
|
||||||
|
TLS-ECDHE-RSA-WITH-CAMELLIA-256-GCM-SHA384 \
|
||||||
|
TLS-RSA-WITH-AES-128-CCM \
|
||||||
|
TLS-RSA-WITH-AES-128-CCM-8 \
|
||||||
|
TLS-RSA-WITH-AES-256-CCM \
|
||||||
|
TLS-RSA-WITH-AES-256-CCM-8 \
|
||||||
|
TLS-RSA-WITH-CAMELLIA-128-CBC-SHA256 \
|
||||||
|
TLS-RSA-WITH-CAMELLIA-128-GCM-SHA256 \
|
||||||
|
TLS-RSA-WITH-CAMELLIA-256-CBC-SHA256 \
|
||||||
|
TLS-RSA-WITH-CAMELLIA-256-GCM-SHA384 \
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"PSK")
|
"PSK")
|
||||||
CIPHERS="$CIPHERS \
|
CIPHERS="$CIPHERS \
|
||||||
TLS-DHE-PSK-WITH-AES-128-CBC-SHA \
|
TLS-DHE-PSK-WITH-AES-128-CBC-SHA \
|
||||||
TLS-DHE-PSK-WITH-AES-256-CBC-SHA \
|
|
||||||
|
|
||||||
TLS-ECDHE-PSK-WITH-AES-256-CBC-SHA \
|
|
||||||
TLS-ECDHE-PSK-WITH-AES-128-CBC-SHA \
|
|
||||||
TLS-RSA-PSK-WITH-AES-256-CBC-SHA \
|
|
||||||
TLS-RSA-PSK-WITH-AES-128-CBC-SHA \
|
|
||||||
|
|
||||||
TLS-ECDHE-PSK-WITH-AES-256-CBC-SHA384 \
|
|
||||||
TLS-ECDHE-PSK-WITH-CAMELLIA-256-CBC-SHA384 \
|
|
||||||
TLS-ECDHE-PSK-WITH-AES-128-CBC-SHA256 \
|
|
||||||
TLS-ECDHE-PSK-WITH-CAMELLIA-128-CBC-SHA256 \
|
|
||||||
TLS-ECDHE-PSK-WITH-NULL-SHA384 \
|
|
||||||
TLS-ECDHE-PSK-WITH-NULL-SHA256 \
|
|
||||||
TLS-PSK-WITH-AES-128-CBC-SHA256 \
|
|
||||||
TLS-PSK-WITH-AES-256-CBC-SHA384 \
|
|
||||||
TLS-DHE-PSK-WITH-AES-128-CBC-SHA256 \
|
TLS-DHE-PSK-WITH-AES-128-CBC-SHA256 \
|
||||||
|
TLS-DHE-PSK-WITH-AES-128-CCM \
|
||||||
|
TLS-DHE-PSK-WITH-AES-128-CCM-8 \
|
||||||
|
TLS-DHE-PSK-WITH-AES-128-GCM-SHA256 \
|
||||||
|
TLS-DHE-PSK-WITH-AES-256-CBC-SHA \
|
||||||
TLS-DHE-PSK-WITH-AES-256-CBC-SHA384 \
|
TLS-DHE-PSK-WITH-AES-256-CBC-SHA384 \
|
||||||
TLS-PSK-WITH-NULL-SHA256 \
|
TLS-DHE-PSK-WITH-AES-256-CCM \
|
||||||
TLS-PSK-WITH-NULL-SHA384 \
|
TLS-DHE-PSK-WITH-AES-256-CCM-8 \
|
||||||
|
TLS-DHE-PSK-WITH-AES-256-GCM-SHA384 \
|
||||||
|
TLS-DHE-PSK-WITH-CAMELLIA-128-CBC-SHA256 \
|
||||||
|
TLS-DHE-PSK-WITH-CAMELLIA-128-GCM-SHA256 \
|
||||||
|
TLS-DHE-PSK-WITH-CAMELLIA-256-CBC-SHA384 \
|
||||||
|
TLS-DHE-PSK-WITH-CAMELLIA-256-GCM-SHA384 \
|
||||||
TLS-DHE-PSK-WITH-NULL-SHA256 \
|
TLS-DHE-PSK-WITH-NULL-SHA256 \
|
||||||
TLS-DHE-PSK-WITH-NULL-SHA384 \
|
TLS-DHE-PSK-WITH-NULL-SHA384 \
|
||||||
TLS-RSA-PSK-WITH-AES-256-CBC-SHA384 \
|
TLS-ECDHE-PSK-WITH-AES-128-CBC-SHA \
|
||||||
|
TLS-ECDHE-PSK-WITH-AES-128-CBC-SHA256 \
|
||||||
|
TLS-ECDHE-PSK-WITH-AES-256-CBC-SHA \
|
||||||
|
TLS-ECDHE-PSK-WITH-AES-256-CBC-SHA384 \
|
||||||
|
TLS-ECDHE-PSK-WITH-CAMELLIA-128-CBC-SHA256 \
|
||||||
|
TLS-ECDHE-PSK-WITH-CAMELLIA-256-CBC-SHA384 \
|
||||||
|
TLS-ECDHE-PSK-WITH-NULL-SHA256 \
|
||||||
|
TLS-ECDHE-PSK-WITH-NULL-SHA384 \
|
||||||
|
TLS-PSK-WITH-AES-128-CBC-SHA256 \
|
||||||
|
TLS-PSK-WITH-AES-128-CCM \
|
||||||
|
TLS-PSK-WITH-AES-128-CCM-8 \
|
||||||
|
TLS-PSK-WITH-AES-128-GCM-SHA256 \
|
||||||
|
TLS-PSK-WITH-AES-256-CBC-SHA384 \
|
||||||
|
TLS-PSK-WITH-AES-256-CCM \
|
||||||
|
TLS-PSK-WITH-AES-256-CCM-8 \
|
||||||
|
TLS-PSK-WITH-AES-256-GCM-SHA384 \
|
||||||
|
TLS-PSK-WITH-CAMELLIA-128-CBC-SHA256 \
|
||||||
|
TLS-PSK-WITH-CAMELLIA-128-GCM-SHA256 \
|
||||||
|
TLS-PSK-WITH-CAMELLIA-256-CBC-SHA384 \
|
||||||
|
TLS-PSK-WITH-CAMELLIA-256-GCM-SHA384 \
|
||||||
|
TLS-PSK-WITH-NULL-SHA256 \
|
||||||
|
TLS-PSK-WITH-NULL-SHA384 \
|
||||||
|
TLS-RSA-PSK-WITH-AES-128-CBC-SHA \
|
||||||
TLS-RSA-PSK-WITH-AES-128-CBC-SHA256 \
|
TLS-RSA-PSK-WITH-AES-128-CBC-SHA256 \
|
||||||
|
TLS-RSA-PSK-WITH-AES-128-GCM-SHA256 \
|
||||||
|
TLS-RSA-PSK-WITH-AES-256-CBC-SHA \
|
||||||
|
TLS-RSA-PSK-WITH-AES-256-CBC-SHA384 \
|
||||||
|
TLS-RSA-PSK-WITH-AES-256-GCM-SHA384 \
|
||||||
|
TLS-RSA-PSK-WITH-CAMELLIA-128-CBC-SHA256 \
|
||||||
|
TLS-RSA-PSK-WITH-CAMELLIA-128-GCM-SHA256 \
|
||||||
|
TLS-RSA-PSK-WITH-CAMELLIA-256-CBC-SHA384 \
|
||||||
|
TLS-RSA-PSK-WITH-CAMELLIA-256-GCM-SHA384 \
|
||||||
TLS-RSA-PSK-WITH-NULL-SHA256 \
|
TLS-RSA-PSK-WITH-NULL-SHA256 \
|
||||||
TLS-RSA-PSK-WITH-NULL-SHA384 \
|
TLS-RSA-PSK-WITH-NULL-SHA384 \
|
||||||
TLS-DHE-PSK-WITH-CAMELLIA-128-CBC-SHA256 \
|
|
||||||
TLS-DHE-PSK-WITH-CAMELLIA-256-CBC-SHA384 \
|
|
||||||
TLS-PSK-WITH-CAMELLIA-128-CBC-SHA256 \
|
|
||||||
TLS-PSK-WITH-CAMELLIA-256-CBC-SHA384 \
|
|
||||||
TLS-RSA-PSK-WITH-CAMELLIA-256-CBC-SHA384 \
|
|
||||||
TLS-RSA-PSK-WITH-CAMELLIA-128-CBC-SHA256 \
|
|
||||||
TLS-PSK-WITH-AES-128-GCM-SHA256 \
|
|
||||||
TLS-PSK-WITH-AES-256-GCM-SHA384 \
|
|
||||||
TLS-DHE-PSK-WITH-AES-128-GCM-SHA256 \
|
|
||||||
TLS-DHE-PSK-WITH-AES-256-GCM-SHA384 \
|
|
||||||
TLS-PSK-WITH-AES-128-CCM \
|
|
||||||
TLS-PSK-WITH-AES-256-CCM \
|
|
||||||
TLS-DHE-PSK-WITH-AES-128-CCM \
|
|
||||||
TLS-DHE-PSK-WITH-AES-256-CCM \
|
|
||||||
TLS-PSK-WITH-AES-128-CCM-8 \
|
|
||||||
TLS-PSK-WITH-AES-256-CCM-8 \
|
|
||||||
TLS-DHE-PSK-WITH-AES-128-CCM-8 \
|
|
||||||
TLS-DHE-PSK-WITH-AES-256-CCM-8 \
|
|
||||||
TLS-RSA-PSK-WITH-CAMELLIA-128-GCM-SHA256 \
|
|
||||||
TLS-RSA-PSK-WITH-CAMELLIA-256-GCM-SHA384 \
|
|
||||||
TLS-PSK-WITH-CAMELLIA-128-GCM-SHA256 \
|
|
||||||
TLS-PSK-WITH-CAMELLIA-256-GCM-SHA384 \
|
|
||||||
TLS-DHE-PSK-WITH-CAMELLIA-128-GCM-SHA256 \
|
|
||||||
TLS-DHE-PSK-WITH-CAMELLIA-256-GCM-SHA384 \
|
|
||||||
TLS-RSA-PSK-WITH-AES-256-GCM-SHA384 \
|
|
||||||
TLS-RSA-PSK-WITH-AES-128-GCM-SHA256 \
|
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -498,51 +491,48 @@ add_mbedtls_ciphersuites()
|
||||||
|
|
||||||
"ECDSA")
|
"ECDSA")
|
||||||
M_CIPHERS="$M_CIPHERS \
|
M_CIPHERS="$M_CIPHERS \
|
||||||
TLS-ECDH-ECDSA-WITH-CAMELLIA-128-CBC-SHA256 \
|
TLS-ECDH-ECDSA-WITH-ARIA-128-CBC-SHA256 \
|
||||||
TLS-ECDH-ECDSA-WITH-CAMELLIA-256-CBC-SHA384 \
|
|
||||||
|
|
||||||
TLS-ECDH-ECDSA-WITH-CAMELLIA-128-GCM-SHA256 \
|
|
||||||
TLS-ECDH-ECDSA-WITH-CAMELLIA-256-GCM-SHA384 \
|
|
||||||
TLS-ECDHE-ECDSA-WITH-ARIA-256-CBC-SHA384 \
|
|
||||||
TLS-ECDHE-ECDSA-WITH-ARIA-128-CBC-SHA256 \
|
|
||||||
TLS-ECDH-ECDSA-WITH-ARIA-256-GCM-SHA384 \
|
|
||||||
TLS-ECDH-ECDSA-WITH-ARIA-128-GCM-SHA256 \
|
TLS-ECDH-ECDSA-WITH-ARIA-128-GCM-SHA256 \
|
||||||
TLS-ECDH-ECDSA-WITH-ARIA-256-CBC-SHA384 \
|
TLS-ECDH-ECDSA-WITH-ARIA-256-CBC-SHA384 \
|
||||||
TLS-ECDH-ECDSA-WITH-ARIA-128-CBC-SHA256 \
|
TLS-ECDH-ECDSA-WITH-ARIA-256-GCM-SHA384 \
|
||||||
|
TLS-ECDH-ECDSA-WITH-CAMELLIA-128-CBC-SHA256 \
|
||||||
|
TLS-ECDH-ECDSA-WITH-CAMELLIA-128-GCM-SHA256 \
|
||||||
|
TLS-ECDH-ECDSA-WITH-CAMELLIA-256-CBC-SHA384 \
|
||||||
|
TLS-ECDH-ECDSA-WITH-CAMELLIA-256-GCM-SHA384 \
|
||||||
|
TLS-ECDHE-ECDSA-WITH-ARIA-128-CBC-SHA256 \
|
||||||
|
TLS-ECDHE-ECDSA-WITH-ARIA-256-CBC-SHA384 \
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"RSA")
|
"RSA")
|
||||||
M_CIPHERS="$M_CIPHERS \
|
M_CIPHERS="$M_CIPHERS \
|
||||||
TLS-ECDHE-RSA-WITH-ARIA-256-CBC-SHA384 \
|
TLS-DHE-RSA-WITH-ARIA-128-CBC-SHA256 \
|
||||||
TLS-DHE-RSA-WITH-ARIA-256-CBC-SHA384 \
|
TLS-DHE-RSA-WITH-ARIA-256-CBC-SHA384 \
|
||||||
TLS-ECDHE-RSA-WITH-ARIA-128-CBC-SHA256 \
|
TLS-ECDHE-RSA-WITH-ARIA-128-CBC-SHA256 \
|
||||||
TLS-DHE-RSA-WITH-ARIA-128-CBC-SHA256 \
|
TLS-ECDHE-RSA-WITH-ARIA-256-CBC-SHA384 \
|
||||||
TLS-RSA-WITH-ARIA-256-CBC-SHA384 \
|
|
||||||
TLS-RSA-WITH-ARIA-128-CBC-SHA256 \
|
TLS-RSA-WITH-ARIA-128-CBC-SHA256 \
|
||||||
|
TLS-RSA-WITH-ARIA-256-CBC-SHA384 \
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"PSK")
|
"PSK")
|
||||||
# *PSK-NULL-SHA suites supported by GnuTLS 3.3.5 but not 3.2.15
|
# *PSK-NULL-SHA suites supported by GnuTLS 3.3.5 but not 3.2.15
|
||||||
M_CIPHERS="$M_CIPHERS \
|
M_CIPHERS="$M_CIPHERS \
|
||||||
TLS-PSK-WITH-NULL-SHA \
|
|
||||||
TLS-DHE-PSK-WITH-NULL-SHA \
|
|
||||||
|
|
||||||
TLS-ECDHE-PSK-WITH-NULL-SHA \
|
|
||||||
TLS-RSA-PSK-WITH-NULL-SHA \
|
|
||||||
|
|
||||||
TLS-RSA-PSK-WITH-ARIA-256-CBC-SHA384 \
|
|
||||||
TLS-RSA-PSK-WITH-ARIA-128-CBC-SHA256 \
|
|
||||||
TLS-PSK-WITH-ARIA-256-CBC-SHA384 \
|
|
||||||
TLS-PSK-WITH-ARIA-128-CBC-SHA256 \
|
|
||||||
TLS-RSA-PSK-WITH-ARIA-256-GCM-SHA384 \
|
|
||||||
TLS-RSA-PSK-WITH-ARIA-128-GCM-SHA256 \
|
|
||||||
TLS-ECDHE-PSK-WITH-ARIA-256-CBC-SHA384 \
|
|
||||||
TLS-ECDHE-PSK-WITH-ARIA-128-CBC-SHA256 \
|
|
||||||
TLS-DHE-PSK-WITH-ARIA-256-CBC-SHA384 \
|
|
||||||
TLS-DHE-PSK-WITH-ARIA-128-CBC-SHA256 \
|
TLS-DHE-PSK-WITH-ARIA-128-CBC-SHA256 \
|
||||||
|
TLS-DHE-PSK-WITH-ARIA-256-CBC-SHA384 \
|
||||||
|
TLS-DHE-PSK-WITH-NULL-SHA \
|
||||||
|
TLS-ECDHE-PSK-WITH-ARIA-128-CBC-SHA256 \
|
||||||
|
TLS-ECDHE-PSK-WITH-ARIA-256-CBC-SHA384 \
|
||||||
|
TLS-ECDHE-PSK-WITH-NULL-SHA \
|
||||||
|
TLS-PSK-WITH-ARIA-128-CBC-SHA256 \
|
||||||
|
TLS-PSK-WITH-ARIA-256-CBC-SHA384 \
|
||||||
|
TLS-PSK-WITH-NULL-SHA \
|
||||||
|
TLS-RSA-PSK-WITH-ARIA-128-CBC-SHA256 \
|
||||||
|
TLS-RSA-PSK-WITH-ARIA-128-GCM-SHA256 \
|
||||||
|
TLS-RSA-PSK-WITH-ARIA-256-CBC-SHA384 \
|
||||||
|
TLS-RSA-PSK-WITH-ARIA-256-GCM-SHA384 \
|
||||||
TLS-RSA-PSK-WITH-CHACHA20-POLY1305-SHA256 \
|
TLS-RSA-PSK-WITH-CHACHA20-POLY1305-SHA256 \
|
||||||
|
TLS-RSA-PSK-WITH-NULL-SHA \
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
Loading…
Reference in a new issue