Test the TLS_RSA_WITH_NULL_SHA cipher suite. Bug 161529. Also, order

tests so all SSL3 tests are done before all TLS tests.

security/nss/tests/ssl/ssl.sh

@@ -189,7 +189,7 @@ ssl_cov()
   html_head "SSL Cipher Coverage $NORM_EXT"
 
   testname=""
-  sparam="-c ABCDEFabcdefghijklmnvy"
+  sparam="-c ABCDEFabcdefghijklmnvyz"
   start_selfserv # Launch the server
                
   p=""
@@ -206,10 +206,6 @@ ssl_cov()
           if [ $tls = "TLS" ]; then
               TLS_FLAG=""
           fi
-          sparam=""
-          if [ ${param} = "i" ]; then
-              sparam='-c i'
-          fi
 
           is_selfserv_alive
           echo "tstclnt -p ${PORT} -h ${HOST} -c ${param} ${TLS_FLAG} \\"

security/nss/tests/ssl/sslcov.txt

@@ -13,32 +13,36 @@
   noTLS   D    SSL2 RC2 128 CBC EXPORT40 WITH MD5
    TLS    E    SSL2 DES 64 CBC WITH MD5
   noTLS   F    SSL2 DES 192 EDE3 CBC WITH MD5
+#
+# noTLS   a    SSL3 FORTEZZA DMS WITH FORTEZZA CBC SHA
+# noTLS   b    SSL3 FORTEZZA DMS WITH RC4 128 SHA
   noTLS   c    SSL3 RSA WITH RC4 128 MD5
   noTLS   d    SSL3 RSA WITH 3DES EDE CBC SHA
   noTLS   e    SSL3 RSA WITH DES CBC SHA
   noTLS   f    SSL3 RSA EXPORT WITH RC4 40 MD5
   noTLS   g    SSL3 RSA EXPORT WITH RC2 CBC 40 MD5
+# noTLS   h    SSL3 FORTEZZA DMS WITH NULL SHA
+  noTLS   i    SSL3 RSA WITH NULL MD5
   noTLS   j    SSL3 RSA FIPS WITH 3DES EDE CBC SHA
   noTLS   k    SSL3 RSA FIPS WITH DES CBC SHA
   noTLS   l    SSL3 RSA EXPORT WITH DES CBC SHA   (new)
   noTLS   m    SSL3 RSA EXPORT WITH RC4 56 SHA    (new)
+  noTLS   n    SSL3 RSA WITH RC4 128 SHA
+  noTLS   v    SSL3 RSA WITH AES 128 CBC SHA
+  noTLS   y    SSL3 RSA WITH AES 256 CBC SHA
+  noTLS   z    SSL3 RSA WITH NULL SHA
+#
    TLS    c    TLS RSA WITH RC4 128 MD5
    TLS    d    TLS RSA WITH 3DES EDE CBC SHA
    TLS    e    TLS RSA WITH DES CBC SHA
    TLS    f    TLS RSA EXPORT WITH RC4 40 MD5
    TLS    g    TLS RSA EXPORT WITH RC2 CBC 40 MD5
+   TLS    i    TLS RSA WITH NULL MD5
    TLS    j    TLS RSA FIPS WITH 3DES EDE CBC SHA
    TLS    k    TLS RSA FIPS WITH DES CBC SHA
    TLS    l    TLS RSA EXPORT WITH DES CBC SHA   (new)
    TLS    m    TLS RSA EXPORT WITH RC4 56 SHA    (new)
-# The NULL ciphers have to be last because we need to restart selfserve
-# (NULL is not enabled by default)
-   TLS    i    TLS RSA WITH NULL MD5
-  noTLS   i    SSL3 RSA WITH NULL MD5
-# added on nelson's request
    TLS    n    TLS RSA WITH RC4 128 SHA
-  noTLS   n    SSL3 RSA WITH RC4 128 SHA
    TLS    v    TLS RSA WITH AES 128 CBC SHA
-  noTLS   v    SSL3 RSA WITH AES 128 CBC SHA
    TLS    y    TLS RSA WITH AES 256 CBC SHA
-  noTLS   y    SSL3 RSA WITH AES 256 CBC SHA
+   TLS    z    TLS RSA WITH NULL SHA