diff options
| author | Kai Engert <kaie@kuix.de> | 2016-05-19 21:19:23 +0200 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2016-05-19 21:19:23 +0200 |
| commit | 10f3e387fb1f589dc6cb61c8194ad7b56f71dcd6 (patch) | |
| tree | a28e9fac25db517c568d6bd950013da8854ee7ca /tests/ssl | |
| parent | 62b5705befa33b979124e62f6a1485821ebb4465 (diff) | |
| download | nss-hg-10f3e387fb1f589dc6cb61c8194ad7b56f71dcd6.tar.gz | |
Bug 923089, backed out for test failures.
Diffstat (limited to 'tests/ssl')
| -rwxr-xr-x | tests/ssl/ssl.sh | 11 | ||||
| -rw-r--r-- | tests/ssl/sslcov.txt | 7 |
2 files changed, 2 insertions, 16 deletions
diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh index 896f64710..4143b67ef 100755 --- a/tests/ssl/ssl.sh +++ b/tests/ssl/ssl.sh @@ -83,21 +83,14 @@ 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 ${EC_SUITES}${NON_EC_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" else ECC_STRING="" # List of cipher suites to test, excluding ECC cipher suites. - CIPHER_SUITES="-c ${NON_EC_SUITES}" + CIPHER_SUITES="-c :0016:0032:0033:0038:0039:003B:003C:003D:0040:0041:0067:006A:006B:0084:009C:009E:00A2:CCAAcdefgijklmnvyz" fi if [ "${OS_ARCH}" != "WINNT" ]; then diff --git a/tests/ssl/sslcov.txt b/tests/ssl/sslcov.txt index 8d0aa89f5..4dbe207be 100644 --- a/tests/ssl/sslcov.txt +++ b/tests/ssl/sslcov.txt @@ -21,9 +21,6 @@ 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 # @@ -157,12 +154,8 @@ 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 |