From dcf247fb6892c493fa1882d0fff4cb9013c20799 Mon Sep 17 00:00:00 2001 From: Tim Taubert Date: Fri, 16 Sep 2016 10:49:37 -0700 Subject: Bug 1252849 - Remove export-grade cipher suites r=mt --- tests/iopr/server_scr/cipher.list | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'tests/iopr') diff --git a/tests/iopr/server_scr/cipher.list b/tests/iopr/server_scr/cipher.list index b2519ae72..668084c37 100644 --- a/tests/iopr/server_scr/cipher.list +++ b/tests/iopr/server_scr/cipher.list @@ -9,31 +9,22 @@ nss openssl iis # SSL3_RSA_WITH_NULL_MD5 NULL-MD5 i SSL3_RSA_WITH_NULL_SHA NULL-SHA z -SSL3_RSA_EXPORT_WITH_RC4_40_MD5 EXP-RC4-MD5 f SSL3_RSA_WITH_RC4_128_MD5 RC4-MD5 c SSL3_RSA_WITH_RC4_128_SHA RC4-SHA n -SSL3_RSA_EXPORT_WITH_RC2_CBC_40_MD5 EXP-RC2-CBC-MD5 g SSL3_RSA_WITH_IDEA_CBC_SHA IDEA-CBC-SHA -SSL3_RSA_EXPORT_WITH_DES40_CBC_SHA EXP-DES-CBC-SHA SSL3_RSA_WITH_DES_CBC_SHA DES-CBC-SHA e SSL3_RSA_WITH_3DES_EDE_CBC_SHA DES-CBC3-SHA d -SSL3_DH_DSS_EXPORT_WITH_DES40_CBC_SHA Not_implemented. SSL3_DH_DSS_WITH_DES_CBC_SHA Not_implemented. SSL3_DH_DSS_WITH_3DES_EDE_CBC_SHA Not_implemented. -SSL3_DH_RSA_EXPORT_WITH_DES40_CBC_SHA Not_implemented. SSL3_DH_RSA_WITH_DES_CBC_SHA Not_implemented. SSL3_DH_RSA_WITH_3DES_EDE_CBC_SHA Not_implemented. -SSL3_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA EXP-EDH-DSS-DES-CBC-SHA SSL3_DHE_DSS_WITH_DES_CBC_SHA EDH-DSS-CBC-SHA s SSL3_DHE_DSS_WITH_3DES_EDE_CBC_SHA EDH-DSS-DES-CBC3-SHA q -SSL3_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA EXP-EDH-RSA-DES-CBC-SHA SSL3_DHE_RSA_WITH_DES_CBC_SHA EDH-RSA-DES-CBC-SHA SSL3_DHE_RSA_WITH_3DES_EDE_CBC_SHA EDH-RSA-DES-CBC3-SHA -SSL3_DH_anon_EXPORT_WITH_RC4_40_MD5 EXP-ADH-RC4-MD5 SSL3_DH_anon_WITH_RC4_128_MD5 ADH-RC4-MD5 -SSL3_DH_anon_EXPORT_WITH_DES40_CBC_SHA EXP-ADH-DES-CBC-SHA SSL3_DH_anon_WITH_DES_CBC_SHA ADH-DES-CBC-SHA SSL3_DH_anon_WITH_3DES_EDE_CBC_SHA ADH-DES-CBC3-SHA @@ -47,39 +38,27 @@ SSL3_FORTEZZA_KEA_WITH_RC4_128_SHA Not_implemented. SSL3_RSA_WITH_AES_128_CBC_SHA AES128-SHA SSL3_RSA_WITH_AES_256_CBC_SHA AES256-SHA -SSL3_RSA_EXPORT_WITH_DES_CBC_SHA EXP1024-DES-CBC-SHA l -SSL3_RSA_EXPORT_WITH_RC4_56_SHA EXP1024-RC4-SHA m - # #TLS v1.0 cipher suites. # TLS_RSA_WITH_NULL_MD5 NULL-MD5 TLS_RSA_WITH_NULL_SHA NULL-SHA -TLS_RSA_EXPORT_WITH_RC4_40_MD5 EXP-RC4-MD5 TLS_RSA_WITH_RC4_128_MD5 RC4-MD5 TLS_RSA_WITH_RC4_128_SHA RC4-SHA -TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5 EXP-RC2-CBC-MD5 TLS_RSA_WITH_IDEA_CBC_SHA IDEA-CBC-SHA -TLS_RSA_EXPORT_WITH_DES40_CBC_SHA EXP-DES-CBC-SHA TLS_RSA_WITH_DES_CBC_SHA DES-CBC-SHA TLS_RSA_WITH_3DES_EDE_CBC_SHA DES-CBC3-SHA -TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA Not_implemented. TLS_DH_DSS_WITH_DES_CBC_SHA Not_implemented. TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA Not_implemented. -TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA Not_implemented. TLS_DH_RSA_WITH_DES_CBC_SHA Not_implemented. TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA Not_implemented. -TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA EXP-EDH-DSS-DES-CBC-SHA TLS_DHE_DSS_WITH_DES_CBC_SHA EDH-DSS-CBC-SHA TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA EDH-DSS-DES-CBC3-SHA -TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA EXP-EDH-RSA-DES-CBC-SHA TLS_DHE_RSA_WITH_DES_CBC_SHA EDH-RSA-DES-CBC-SHA TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA EDH-RSA-DES-CBC3-SHA -TLS_DH_anon_EXPORT_WITH_RC4_40_MD5 EXP-ADH-RC4-MD5 TLS_DH_anon_WITH_RC4_128_MD5 ADH-RC4-MD5 -TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA EXP-ADH-DES-CBC-SHA TLS_DH_anon_WITH_DES_CBC_SHA ADH-DES-CBC-SHA TLS_DH_anon_WITH_3DES_EDE_CBC_SHA ADH-DES-CBC3-SHA @@ -104,14 +83,10 @@ TLS_DH_anon_WITH_AES_128_CBC_SHA ADH-AES128-SHA TLS_DH_anon_WITH_AES_256_CBC_SHA ADH-AES256-SHA # -#Additional Export 1024 and other cipher suites +#Additional cipher suites # #Note: these ciphers can also be used in SSL v3. # -TLS_RSA_EXPORT_WITH_DES_CBC_SHA EXP1024-DES-CBC-SHA -TLS_RSA_EXPORT_WITH_RC4_56_SHA EXP1024-RC4-SHA -TLS_DHE_DSS_EXPORT_WITH_DES_CBC_SHA EXP1024-DHE-DSS-DES-CBC-SHA -TLS_DHE_DSS_EXPORT_WITH_RC4_56_SHA EXP1024-DHE-DSS-RC4-SHA TLS_DHE_DSS_WITH_RC4_128_SHA DHE-DSS-RC4-SHA # -- cgit v1.2.1