diff options
| author | Elio Maldonado <emaldona@redhat.com> | 2016-05-20 20:42:11 +0200 |
|---|---|---|
| committer | Elio Maldonado <emaldona@redhat.com> | 2016-05-20 20:42:11 +0200 |
| commit | 6550fc1b2d4c30a31bc28a3f461cd379d5242e21 (patch) | |
| tree | 24c87798364d1a18cac1b8495f15743332c6c966 /tests/ssl | |
| parent | 6a316457bdbbc12d26df24c3014a3ce1dcbd5730 (diff) | |
| download | nss-hg-6550fc1b2d4c30a31bc28a3f461cd379d5242e21.tar.gz | |
Bug 923089, Support TLS 1.2 PRF with SHA-384 as the hash function. Patch by Elio. Some improvements by Martin that have r=kaie. Some fixes and changes requested by reviewer by Kai. Overall r=martin.thomson
Diffstat (limited to 'tests/ssl')
| -rwxr-xr-x | tests/ssl/ssl.sh | 11 | ||||
| -rw-r--r-- | tests/ssl/sslcov.txt | 7 |
2 files changed, 16 insertions, 2 deletions
diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh index 4143b67ef..896f64710 100755 --- a/tests/ssl/ssl.sh +++ b/tests/ssl/ssl.sh @@ -83,14 +83,21 @@ ssl_init() USER_NICKNAME=TestUser NORM_EXT="" + EC_SUITES=":C001:C002:C003:C004:C005:C006:C007:C008:C009:C00A:C00B:C00C:C00D" + EC_SUITES="${EC_SUITES}:C00E:C00F:C010:C011:C012:C013:C014:C023:C024:C027" + EC_SUITES="${EC_SUITES}:C028:C02B:C02C:C02F:C030:CCA8:CCA9:CCAA" + + NON_EC_SUITES=":0016:0032:0033:0038:0039:003B:003C:003D:0040:0041:0067:006A:006B" + NON_EC_SUITES="${NON_EC_SUITES}:0084:009C:009D:009E:009F:00A2:00A3:CCAAcdefgijklmnvyz" + if [ -z "$NSS_DISABLE_ECC" ] ; then ECC_STRING=" - with ECC" # List of cipher suites to test, including ECC cipher suites. - CIPHER_SUITES="-c :C001:C002:C003:C004:C005:C006:C007:C008:C009:C00A:C00B:C00C:C00D:C00E:C00F:C010:C011:C012:C013:C014:C023:C027:C02B:C02F:CCA8:CCA9:CCAA:0016:0032:0033:0038:0039:003B:003C:003D:0040:0041:0067:006A:006B:0084:009C:009E:00A2cdefgijklmnvyz" + CIPHER_SUITES="-c ${EC_SUITES}${NON_EC_SUITES}" else ECC_STRING="" # List of cipher suites to test, excluding ECC cipher suites. - CIPHER_SUITES="-c :0016:0032:0033:0038:0039:003B:003C:003D:0040:0041:0067:006A:006B:0084:009C:009E:00A2:CCAAcdefgijklmnvyz" + CIPHER_SUITES="-c ${NON_EC_SUITES}" fi if [ "${OS_ARCH}" != "WINNT" ]; then diff --git a/tests/ssl/sslcov.txt b/tests/ssl/sslcov.txt index 4dbe207be..8d0aa89f5 100644 --- a/tests/ssl/sslcov.txt +++ b/tests/ssl/sslcov.txt @@ -21,6 +21,9 @@ noECC SSL3 v SSL3_RSA_WITH_AES_128_CBC_SHA noECC SSL3 y SSL3_RSA_WITH_AES_256_CBC_SHA noECC SSL3 z SSL3_RSA_WITH_NULL_SHA + noECC TLS12 :009F TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 + noECC TLS12 :00A3 TLS_DHE_DSS_WITH_AES_256_GCM_SHA384 + noECC TLS12 :009D TLS_RSA_WITH_AES_256_GCM_SHA384 # noECC SSL3 :0041 TLS_RSA_WITH_CAMELLIA_128_CBC_SHA # noECC SSL3 :0084 TLS_RSA_WITH_CAMELLIA_256_CBC_SHA # @@ -154,8 +157,12 @@ ECC TLS12 :C013 TLS12_ECDHE_RSA_WITH_AES_128_CBC_SHA ECC TLS12 :C014 TLS12_ECDHE_RSA_WITH_AES_256_CBC_SHA ECC TLS12 :C023 TLS12_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 + ECC TLS12 :C024 TLS12_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 ECC TLS12 :C027 TLS12_ECDHE_RSA_WITH_AES_128_CBC_SHA256 + ECC TLS12 :C028 TLS12_ECDHE_RSA_WITH_AES_256_CBC_SHA384 ECC TLS12 :C02B TLS12_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 + ECC TLS12 :C02C TLS12_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 ECC TLS12 :C02F TLS12_ECDHE_RSA_WITH_AES_128_GCM_SHA256 + ECC TLS12 :C030 TLS12_ECDHE_RSA_WITH_AES_256_GCM_SHA384 ECC TLS12 :CCA8 TLS12_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 ECC TLS12 :CCA9 TLS12_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 |