Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 785170 - Enhance NSS to run an initial set of TLS 1.1 tests

Browse Source 
r=rrelyea


git-svn-id: svn://10.0.0.236/trunk@264265 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kaie%kuix.de
2012-09-27 17:21:15 +00:00
parent 46bc676332
commit 1cecb6d137
3 changed files with 136 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/security/nss/tests/ssl/ssl.sh
View File

@@ -268,10 +268,10 @@ ssl_cov()
start_selfserv # Launch the server
VMIN="ssl2"
VMAX="tls1.0"
VMAX="tls1.1"
exec < ${SSLCOV}
while read ectype tls param testname
while read ectype testmax param testname
do
echo "${testname}" | grep "EXPORT" > /dev/null
EXP=$?
@@ -299,9 +299,12 @@ ssl_cov()
elif [ "`echo $ectype | cut -b 1`" != "#" ] ; then
echo "$SCRIPTNAME: running $testname ----------------------------"
VMAX="ssl3"
if [ "$tls" = "TLS" ]; then
if [ "$testmax" = "TLS" ]; then
VMAX="tls1.0"
fi
if [ "$testmax" = "TLS11" ]; then
VMAX="tls1.1"
fi
# These five tests need an EC cert signed with RSA
# This requires a different certificate loaded in selfserv

10
mozilla/security/nss/tests/ssl/sslauth.txt
View File

@@ -26,6 +26,12 @@
noECC 1 -r_-r_-r_-r -V_ssl3:_-w_nss_-n_none TLS Require client auth on 2nd hs (client does not provide auth)
noECC 1 -r_-r_-r_-r -V_ssl3:_-w_bogus_-n_TestUser TLS Require client auth on 2nd hs (bad password)
noECC 0 -r_-r_-r_-r -V_ssl3:_-w_nss_-n_TestUser TLS Require client auth on 2nd hs (client auth)
noECC 0 -r_-r_-r -V_ssl3:tls1.0_-w_nss_-n_none TLS 1.0 Request don't require client auth on 2nd hs (client does not provide auth)
noECC 0 -r_-r_-r -V_ssl3:tls1.0_-w_bogus_-n_TestUser TLS 1.0 Request don't require client auth on 2nd hs (bad password)
noECC 0 -r_-r_-r -V_ssl3:tls1.0_-w_nss_-n_TestUser TLS 1.0 Request don't require client auth on 2nd hs (client auth)
noECC 1 -r_-r_-r_-r -V_ssl3:tls1.0_-w_nss_-n_none TLS 1.0 Require client auth on 2nd hs (client does not provide auth)
noECC 1 -r_-r_-r_-r -V_ssl3:tls1.0_-w_bogus_-n_TestUser TLS 1.0 Require client auth on 2nd hs (bad password)
noECC 0 -r_-r_-r_-r -V_ssl3:tls1.0_-w_nss_-n_TestUser TLS 1.0 Require client auth on 2nd hs (client auth)
noECC 0 -r_-r_-r -V_ssl3:ssl3_-w_nss_-n_none SSL3 Request don't require client auth on 2nd hs (client does not provide auth)
noECC 0 -r_-r_-r -V_ssl3:ssl3_-n_TestUser_-w_bogus SSL3 Request don't require client auth on 2nd hs (bad password)
noECC 0 -r_-r_-r -V_ssl3:ssl3_-n_TestUser_-w_nss SSL3 Request don't require client auth on 2nd hs (client auth)
@@ -47,6 +53,10 @@
ECC 0 -r_-r_-r -V_ssl3:_-w_nss_-n_TestUser-ec TLS Request don't require client auth on 2nd hs (EC) (client auth)
ECC 1 -r_-r_-r_-r -V_ssl3:_-w_bogus_-n_TestUser-ec TLS Require client auth on 2nd hs (EC) (bad password)
ECC 0 -r_-r_-r_-r -V_ssl3:_-w_nss_-n_TestUser-ec_ TLS Require client auth on 2nd hs (EC) (client auth)
ECC 0 -r_-r_-r -V_ssl3:tls1.0_-w_bogus_-n_TestUser-ec TLS 1.0 Request don't require client auth on 2nd hs (EC) (bad password)
ECC 0 -r_-r_-r -V_ssl3:tls1.0_-w_nss_-n_TestUser-ec TLS 1.0 Request don't require client auth on 2nd hs (EC) (client auth)
ECC 1 -r_-r_-r_-r -V_ssl3:tls1.0_-w_bogus_-n_TestUser-ec TLS 1.0 Require client auth on 2nd hs (EC) (bad password)
ECC 0 -r_-r_-r_-r -V_ssl3:tls1.0_-w_nss_-n_TestUser-ec_ TLS 1.0 Require client auth on 2nd hs (EC) (client auth)
ECC 0 -r_-r_-r -V_ssl3:ssl3_-n_TestUser-ec_-w_bogus SSL3 Request don't require client auth on 2nd hs (EC) (bad password)
ECC 0 -r_-r_-r -V_ssl3:ssl3_-n_TestUser-ec_-w_nss SSL3 Request don't require client auth on 2nd hs (EC) (client auth)
ECC 1 -r_-r_-r_-r -V_ssl3:ssl3_-n_TestUser-ec_-w_bogus SSL3 Require client auth on 2nd hs (EC) (bad password)

198
mozilla/security/nss/tests/ssl/sslcov.txt
View File

@@ -10,89 +10,131 @@
# Enable Enable Cipher Test Name
# EC TLS
#
noECC noTLS A SSL2_RC4_128_WITH_MD5
noECC TLS B SSL2_RC4_128_EXPORT40_WITH_MD5
noECC TLS C SSL2_RC2_128_CBC_WITH_MD5
noECC noTLS D SSL2_RC2_128_CBC_EXPORT40_WITH_MD5
noECC TLS E SSL2_DES_64_CBC_WITH_MD5
noECC noTLS F SSL2_DES_192_EDE3_CBC_WITH_MD5
noECC SSL3 A SSL2_RC4_128_WITH_MD5
noECC TLS10 B SSL2_RC4_128_EXPORT40_WITH_MD5
noECC TLS10 C SSL2_RC2_128_CBC_WITH_MD5
noECC SSL3 D SSL2_RC2_128_CBC_EXPORT40_WITH_MD5
noECC TLS10 E SSL2_DES_64_CBC_WITH_MD5
noECC SSL3 F SSL2_DES_192_EDE3_CBC_WITH_MD5
#
noECC noTLS c SSL3_RSA_WITH_RC4_128_MD5
noECC noTLS d SSL3_RSA_WITH_3DES_EDE_CBC_SHA
noECC noTLS e SSL3_RSA_WITH_DES_CBC_SHA
noECC noTLS f SSL3_RSA_EXPORT_WITH_RC4_40_MD5
noECC noTLS g SSL3_RSA_EXPORT_WITH_RC2_CBC_40_MD5
noECC noTLS i SSL3_RSA_WITH_NULL_MD5
noECC noTLS j SSL3_RSA_FIPS_WITH_3DES_EDE_CBC_SHA
noECC noTLS k SSL3_RSA_FIPS_WITH_DES_CBC_SHA
noECC noTLS l SSL3_RSA_EXPORT_WITH_DES_CBC_SHA (new)
noECC noTLS m SSL3_RSA_EXPORT_WITH_RC4_56_SHA (new)
noECC noTLS n SSL3_RSA_WITH_RC4_128_SHA
noECC noTLS v SSL3_RSA_WITH_AES_128_CBC_SHA
noECC noTLS y SSL3_RSA_WITH_AES_256_CBC_SHA
noECC noTLS z SSL3_RSA_WITH_NULL_SHA
# noECC noTLS :0041 TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
# noECC noTLS :0084 TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
noECC TLS11 B SSL2_RC4_128_EXPORT40_WITH_MD5
noECC TLS11 C SSL2_RC2_128_CBC_WITH_MD5
noECC TLS11 E SSL2_DES_64_CBC_WITH_MD5
#
noECC TLS c TLS_RSA_WITH_RC4_128_MD5
noECC TLS d TLS_RSA_WITH_3DES_EDE_CBC_SHA
noECC TLS e TLS_RSA_WITH_DES_CBC_SHA
noECC TLS f TLS_RSA_EXPORT_WITH_RC4_40_MD5
noECC TLS g TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
noECC TLS i TLS_RSA_WITH_NULL_MD5
noECC TLS j TLS_RSA_FIPS_WITH_3DES_EDE_CBC_SHA
noECC TLS k TLS_RSA_FIPS_WITH_DES_CBC_SHA
noECC TLS l TLS_RSA_EXPORT_WITH_DES_CBC_SHA (new)
noECC TLS m TLS_RSA_EXPORT_WITH_RC4_56_SHA (new)
noECC TLS n TLS_RSA_WITH_RC4_128_SHA
noECC TLS v TLS_RSA_WITH_AES_128_CBC_SHA
noECC TLS y TLS_RSA_WITH_AES_256_CBC_SHA
noECC TLS z TLS_RSA_WITH_NULL_SHA
# noECC TLS :0041 TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
# noECC TLS :0084 TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
noECC SSL3 c SSL3_RSA_WITH_RC4_128_MD5
noECC SSL3 d SSL3_RSA_WITH_3DES_EDE_CBC_SHA
noECC SSL3 e SSL3_RSA_WITH_DES_CBC_SHA
noECC SSL3 f SSL3_RSA_EXPORT_WITH_RC4_40_MD5
noECC SSL3 g SSL3_RSA_EXPORT_WITH_RC2_CBC_40_MD5
noECC SSL3 i SSL3_RSA_WITH_NULL_MD5
noECC SSL3 j SSL3_RSA_FIPS_WITH_3DES_EDE_CBC_SHA
noECC SSL3 k SSL3_RSA_FIPS_WITH_DES_CBC_SHA
noECC SSL3 l SSL3_RSA_EXPORT_WITH_DES_CBC_SHA (new)
noECC SSL3 m SSL3_RSA_EXPORT_WITH_RC4_56_SHA (new)
noECC SSL3 n SSL3_RSA_WITH_RC4_128_SHA
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 SSL3 :0041 TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
# noECC SSL3 :0084 TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
#
noECC TLS10 c TLS_RSA_WITH_RC4_128_MD5
noECC TLS10 d TLS_RSA_WITH_3DES_EDE_CBC_SHA
noECC TLS10 e TLS_RSA_WITH_DES_CBC_SHA
noECC TLS10 f TLS_RSA_EXPORT_WITH_RC4_40_MD5
noECC TLS10 g TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
noECC TLS10 i TLS_RSA_WITH_NULL_MD5
noECC TLS10 j TLS_RSA_FIPS_WITH_3DES_EDE_CBC_SHA
noECC TLS10 k TLS_RSA_FIPS_WITH_DES_CBC_SHA
noECC TLS10 l TLS_RSA_EXPORT_WITH_DES_CBC_SHA (new)
noECC TLS10 m TLS_RSA_EXPORT_WITH_RC4_56_SHA (new)
noECC TLS10 n TLS_RSA_WITH_RC4_128_SHA
noECC TLS10 v TLS_RSA_WITH_AES_128_CBC_SHA
noECC TLS10 y TLS_RSA_WITH_AES_256_CBC_SHA
noECC TLS10 z TLS_RSA_WITH_NULL_SHA
# noECC TLS10 :0041 TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
# noECC TLS10 :0084 TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
#
#
noECC TLS11 c TLS11_RSA_WITH_RC4_128_MD5
noECC TLS11 d TLS11_RSA_WITH_3DES_EDE_CBC_SHA
noECC TLS11 e TLS11_RSA_WITH_DES_CBC_SHA
# 40 bit ciphers not allowed in tls 1.1
# noECC TLS11 f TLS11_RSA_EXPORT_WITH_RC4_40_MD5
# noECC TLS11 g TLS11_RSA_EXPORT_WITH_RC2_CBC_40_MD5
noECC TLS11 i TLS11_RSA_WITH_NULL_MD5
noECC TLS11 j TLS11_RSA_FIPS_WITH_3DES_EDE_CBC_SHA
noECC TLS11 k TLS11_RSA_FIPS_WITH_DES_CBC_SHA
noECC TLS11 l TLS11_RSA_EXPORT_WITH_DES_CBC_SHA (new)
noECC TLS11 m TLS11_RSA_EXPORT_WITH_RC4_56_SHA (new)
noECC TLS11 n TLS11_RSA_WITH_RC4_128_SHA
noECC TLS11 v TLS11_RSA_WITH_AES_128_CBC_SHA
noECC TLS11 y TLS11_RSA_WITH_AES_256_CBC_SHA
noECC TLS11 z TLS11_RSA_WITH_NULL_SHA
#
# ECC ciphers (SSL3)
#
ECC noTLS :C001 SSL3_ECDH_ECDSA_WITH_NULL_SHA
ECC noTLS :C002 SSL3_ECDH_ECDSA_WITH_RC4_128_SHA
ECC noTLS :C003 SSL3_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
ECC noTLS :C004 SSL3_ECDH_ECDSA_WITH_AES_128_CBC_SHA
ECC noTLS :C005 SSL3_ECDH_ECDSA_WITH_AES_256_CBC_SHA
ECC noTLS :C006 SSL3_ECDHE_ECDSA_WITH_NULL_SHA
ECC noTLS :C007 SSL3_ECDHE_ECDSA_WITH_RC4_128_SHA
ECC noTLS :C008 SSL3_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
ECC noTLS :C009 SSL3_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
ECC noTLS :C00A SSL3_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
ECC noTLS :C00B SSL3_ECDH_RSA_WITH_NULL_SHA
ECC noTLS :C00C SSL3_ECDH_RSA_WITH_RC4_128_SHA
ECC noTLS :C00D SSL3_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
ECC noTLS :C00E SSL3_ECDH_RSA_WITH_AES_128_CBC_SHA
ECC noTLS :C00F SSL3_ECDH_RSA_WITH_AES_256_CBC_SHA
ECC noTLS :C010 SSL3_ECDHE_RSA_WITH_NULL_SHA
ECC noTLS :C011 SSL3_ECDHE_RSA_WITH_RC4_128_SHA
ECC noTLS :C012 SSL3_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
ECC noTLS :C013 SSL3_ECDHE_RSA_WITH_AES_128_CBC_SHA
ECC noTLS :C014 SSL3_ECDHE_RSA_WITH_AES_256_CBC_SHA
ECC SSL3 :C001 SSL3_ECDH_ECDSA_WITH_NULL_SHA
ECC SSL3 :C002 SSL3_ECDH_ECDSA_WITH_RC4_128_SHA
ECC SSL3 :C003 SSL3_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
ECC SSL3 :C004 SSL3_ECDH_ECDSA_WITH_AES_128_CBC_SHA
ECC SSL3 :C005 SSL3_ECDH_ECDSA_WITH_AES_256_CBC_SHA
ECC SSL3 :C006 SSL3_ECDHE_ECDSA_WITH_NULL_SHA
ECC SSL3 :C007 SSL3_ECDHE_ECDSA_WITH_RC4_128_SHA
ECC SSL3 :C008 SSL3_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
ECC SSL3 :C009 SSL3_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
ECC SSL3 :C00A SSL3_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
ECC SSL3 :C00B SSL3_ECDH_RSA_WITH_NULL_SHA
ECC SSL3 :C00C SSL3_ECDH_RSA_WITH_RC4_128_SHA
ECC SSL3 :C00D SSL3_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
ECC SSL3 :C00E SSL3_ECDH_RSA_WITH_AES_128_CBC_SHA
ECC SSL3 :C00F SSL3_ECDH_RSA_WITH_AES_256_CBC_SHA
ECC SSL3 :C010 SSL3_ECDHE_RSA_WITH_NULL_SHA
ECC SSL3 :C011 SSL3_ECDHE_RSA_WITH_RC4_128_SHA
ECC SSL3 :C012 SSL3_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
ECC SSL3 :C013 SSL3_ECDHE_RSA_WITH_AES_128_CBC_SHA
ECC SSL3 :C014 SSL3_ECDHE_RSA_WITH_AES_256_CBC_SHA
#
# ECC ciphers (TLS)
#
ECC TLS :C001 TLS_ECDH_ECDSA_WITH_NULL_SHA
ECC TLS :C002 TLS_ECDH_ECDSA_WITH_RC4_128_SHA
ECC TLS :C003 TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
ECC TLS :C004 TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA
ECC TLS :C005 TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA
ECC TLS :C006 TLS_ECDHE_ECDSA_WITH_NULL_SHA
ECC TLS :C007 TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
ECC TLS :C008 TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
ECC TLS :C009 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
ECC TLS :C00A TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
ECC TLS :C00B TLS_ECDH_RSA_WITH_NULL_SHA
ECC TLS :C00C TLS_ECDH_RSA_WITH_RC4_128_SHA
ECC TLS :C00D TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
ECC TLS :C00E TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
ECC TLS :C00F TLS_ECDH_RSA_WITH_AES_256_CBC_SHA
ECC TLS :C010 TLS_ECDHE_RSA_WITH_NULL_SHA
ECC TLS :C011 TLS_ECDHE_RSA_WITH_RC4_128_SHA
ECC TLS :C012 TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
ECC TLS :C013 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
ECC TLS :C014 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
ECC TLS10 :C001 TLS_ECDH_ECDSA_WITH_NULL_SHA
ECC TLS10 :C002 TLS_ECDH_ECDSA_WITH_RC4_128_SHA
ECC TLS10 :C003 TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
ECC TLS10 :C004 TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA
ECC TLS10 :C005 TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA
ECC TLS10 :C006 TLS_ECDHE_ECDSA_WITH_NULL_SHA
ECC TLS10 :C007 TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
ECC TLS10 :C008 TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
ECC TLS10 :C009 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
ECC TLS10 :C00A TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
ECC TLS10 :C00B TLS_ECDH_RSA_WITH_NULL_SHA
ECC TLS10 :C00C TLS_ECDH_RSA_WITH_RC4_128_SHA
ECC TLS10 :C00D TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
ECC TLS10 :C00E TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
ECC TLS10 :C00F TLS_ECDH_RSA_WITH_AES_256_CBC_SHA
ECC TLS10 :C010 TLS_ECDHE_RSA_WITH_NULL_SHA
ECC TLS10 :C011 TLS_ECDHE_RSA_WITH_RC4_128_SHA
ECC TLS10 :C012 TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
ECC TLS10 :C013 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
ECC TLS10 :C014 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
#
ECC TLS11 :C001 TLS11_ECDH_ECDSA_WITH_NULL_SHA
ECC TLS11 :C002 TLS11_ECDH_ECDSA_WITH_RC4_128_SHA
ECC TLS11 :C003 TLS11_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
ECC TLS11 :C004 TLS11_ECDH_ECDSA_WITH_AES_128_CBC_SHA
ECC TLS11 :C005 TLS11_ECDH_ECDSA_WITH_AES_256_CBC_SHA
ECC TLS11 :C006 TLS11_ECDHE_ECDSA_WITH_NULL_SHA
ECC TLS11 :C007 TLS11_ECDHE_ECDSA_WITH_RC4_128_SHA
ECC TLS11 :C008 TLS11_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
ECC TLS11 :C009 TLS11_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
ECC TLS11 :C00A TLS11_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
ECC TLS11 :C00B TLS11_ECDH_RSA_WITH_NULL_SHA
ECC TLS11 :C00C TLS11_ECDH_RSA_WITH_RC4_128_SHA
ECC TLS11 :C00D TLS11_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
ECC TLS11 :C00E TLS11_ECDH_RSA_WITH_AES_128_CBC_SHA
ECC TLS11 :C00F TLS11_ECDH_RSA_WITH_AES_256_CBC_SHA
ECC TLS11 :C010 TLS11_ECDHE_RSA_WITH_NULL_SHA
ECC TLS11 :C011 TLS11_ECDHE_RSA_WITH_RC4_128_SHA
ECC TLS11 :C012 TLS11_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
ECC TLS11 :C013 TLS11_ECDHE_RSA_WITH_AES_128_CBC_SHA
ECC TLS11 :C014 TLS11_ECDHE_RSA_WITH_AES_256_CBC_SHA