turn on client auth tests

6 files changed, 14 insertions, 8 deletions

diff --git a/security/nss/tests/ssl/ssl.sh b/security/nss/tests/ssl/ssl.sh
index c440d376b..b7c58e6ad 100755
--- a/security/nss/tests/ssl/ssl.sh
+++ b/security/nss/tests/ssl/ssl.sh
@@ -152,7 +152,13 @@ kill_selfserv()
   if [ ${fileout} -eq 1 ]; then
       cat ${SERVEROUTFILE}
   fi
-  ${SLEEP}  #FIXME linux waits 30 seconds - find a shorter way (sockets free)
+  # On Linux selfserv needs up to 30 seconds to fully die and free
+  # the port.  Wait until the port is free. (Bug 129701)
+  if [ "${OS_ARCH}" = "Linux" ]; then
+      until selfserv -b -p ${PORT} 2>/dev/null; do
+          sleep 1
+      done
+  fi
   rm ${SERVERPID}
 }
 
@@ -317,7 +323,7 @@ ssl_cleanup()
 if [ -z  "$DO_REM_ST" -a -z  "$DO_DIST_ST" ] ; then
     ssl_init
     ssl_cov
-#    ssl_auth
+    ssl_auth
 #    ssl_stress
 
 #    SERVERDIR=$EXT_SERVERDIR
diff --git a/security/nss/tests/ssl/sslauth.txt b/security/nss/tests/ssl/sslauth.txt
index 173312774..a2d8e7ddd 100644
--- a/security/nss/tests/ssl/sslauth.txt
+++ b/security/nss/tests/ssl/sslauth.txt
@@ -8,15 +8,15 @@
      0       -r           -w_nss                   TLS Request don't require client auth (client does not provide auth)
      0       -r           -w_bogus_-n_TestUser     TLS Request don't require client auth (bad password)
      0       -r           -w_nss_-n_TestUser       TLS Request don't require client auth (client auth)
-     0       -r_-r        -w_nss                   TLS Require client auth (client does not provide auth)
-    254      -r_-r        -w_bogus_-n_TestUser     TLS Require client auth (bad password)
-     0       -r_-r        -w_nss_-n_TestUser_      TLS Require client auth (client auth)
+#     0       -r_-r        -w_nss                   TLS Require client auth (client does not provide auth)
+#    254      -r_-r        -w_bogus_-n_TestUser     TLS Require client auth (bad password)
+#     0       -r_-r        -w_nss_-n_TestUser_      TLS Require client auth (client auth)
      0       -r           -T_-w_nss                SSL3 Request don't require client auth (client does not provide auth)
      0       -r           -T_-n_TestUser_-w_bogus  SSL3 Request don't require client auth (bad password)
      0       -r           -T_-n_TestUser_-w_nss    SSL3 Request don't require client auth (client auth)
-     0       -r_-r        -T_-w_nss                SSL3 Require client auth (client does not provide auth)
-    254      -r_-r        -T_-n_TestUser_-w_bogus  SSL3 Require client auth (bad password)
-     0       -r_-r        -T_-n_TestUser_-w_nss    SSL3 Require client auth (client auth)
+#     0       -r_-r        -T_-w_nss                SSL3 Require client auth (client does not provide auth)
+#    254      -r_-r        -T_-n_TestUser_-w_bogus  SSL3 Require client auth (bad password)
+#     0       -r_-r        -T_-n_TestUser_-w_nss    SSL3 Require client auth (client auth)
      0       -r_-r_-r     -w_nss                   TLS Request don't require client auth on 2nd hs (client does not provide auth)
      0       -r_-r_-r     -w_bogus_-n_TestUser     TLS Request don't require client auth on 2nd hs (bad password)
      0       -r_-r_-r     -w_nss_-n_TestUser       TLS Request don't require client auth on 2nd hs (client auth)
diff --git a/security/nss/tests/stan/client/cert7.db b/security/nss/tests/stan/client/cert7.db
index d52d98ef4..ec966363c 100644
--- a/security/nss/tests/stan/client/cert7.db
+++ b/security/nss/tests/stan/client/cert7.db
diff --git a/security/nss/tests/stan/client/key3.db b/security/nss/tests/stan/client/key3.db
index 9f66a34d0..801897434 100644
--- a/security/nss/tests/stan/client/key3.db
+++ b/security/nss/tests/stan/client/key3.db
diff --git a/security/nss/tests/stan/server/cert7.db b/security/nss/tests/stan/server/cert7.db
index 9652ff253..b07f40615 100644
--- a/security/nss/tests/stan/server/cert7.db
+++ b/security/nss/tests/stan/server/cert7.db
diff --git a/security/nss/tests/stan/server/key3.db b/security/nss/tests/stan/server/key3.db
index 5e56d1bb2..31700a1a5 100644
--- a/security/nss/tests/stan/server/key3.db
+++ b/security/nss/tests/stan/server/key3.db