From 382e7dd3c45288c53e0a4b9d1ff3bcfa85681c8b Mon Sep 17 00:00:00 2001
From: "sonja.mirtitsch%sun.com" <sonja.mirtitsch%sun.com>
Date: Thu, 27 Sep 2001 16:37:46 +0000
Subject: [PATCH] putting new tests back, since the ciphers have been fixed
 again

---
 security/nss/tests/ssl/ssl.sh     | 4 ++--
 security/nss/tests/ssl/sslcov.txt | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/security/nss/tests/ssl/ssl.sh b/security/nss/tests/ssl/ssl.sh
index dd1d438231b..75928d5ab0e 100755
--- a/security/nss/tests/ssl/ssl.sh
+++ b/security/nss/tests/ssl/ssl.sh
@@ -127,7 +127,7 @@ wait_for_selfserv()
       html_failed "<TR><TD> Wait for Server "
       echo "RETRY: tstclnt -p ${PORT} -h ${HOST} -q -d . < ${REQUEST_FILE}"
       tstclnt -p ${PORT} -h ${HOST} -q -d . < ${REQUEST_FILE}
-  elif [ sparam = "-c ABCDEFabcdefghijklm" ] ; then # "$1" = "cov" ] ; then
+  elif [ sparam = "-c ABCDEFabcdefghijklmnvy" ] ; then # "$1" = "cov" ] ; then
       html_passed "<TR><TD> Wait for Server"
   fi
   is_selfserv_alive
@@ -180,7 +180,7 @@ ssl_cov()
   html_head "SSL Cipher Coverage"
 
   testname=""
-  sparam="-c ABCDEFabcdefghijklm"
+  sparam="-c ABCDEFabcdefghijklmnvy"
   start_selfserv # Launch the server
                
   cat ${SSLCOV} | while read tls param testname
diff --git a/security/nss/tests/ssl/sslcov.txt b/security/nss/tests/ssl/sslcov.txt
index 8df8f4f2cef..e60e06d2830 100644
--- a/security/nss/tests/ssl/sslcov.txt
+++ b/security/nss/tests/ssl/sslcov.txt
@@ -35,3 +35,10 @@
 # (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