1b6f66
diff --git a/tests/ssl/sslauth.txt b/tests/ssl/sslauth.txt
1b6f66
--- a/tests/ssl/sslauth.txt
1b6f66
+++ b/tests/ssl/sslauth.txt
1b6f66
@@ -3,28 +3,28 @@
1b6f66
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
1b6f66
 #
1b6f66
 # This file defines the tests for client auth.
1b6f66
 #
1b6f66
 #        expected
1b6f66
 # Enable  return  server     client                         Test Case name
1b6f66
 #  ECC     value  params     params
1b6f66
 # ------- ------  ------     ------                         ---------------
1b6f66
-  noECC     0       -r           -w_nss_-n_none           TLS Request don't require client auth (client does not provide auth)
1b6f66
-  noECC     0       -r           -w_bogus_-n_TestUser     TLS Request don't require client auth (bad password)
1b6f66
-  noECC     0       -r           -w_nss_-n_TestUser       TLS Request don't require client auth (client auth)
1b6f66
-  noECC    254      -r_-r        -w_nss_-n_none           TLS Require client auth (client does not provide auth)
1b6f66
-  noECC    254      -r_-r        -w_bogus_-n_TestUser     TLS Require client auth (bad password)
1b6f66
-  noECC     0       -r_-r        -w_nss_-n_TestUser_      TLS Require client auth (client auth)
1b6f66
-  noECC     0       -r           -V_:ssl3_-w_nss_-n_none        SSL3 Request don't require client auth (client does not provide auth)
1b6f66
-  noECC     0       -r           -V_:ssl3_-n_TestUser_-w_bogus  SSL3 Request don't require client auth (bad password)
1b6f66
-  noECC     0       -r           -V_:ssl3_-n_TestUser_-w_nss    SSL3 Request don't require client auth (client auth)
1b6f66
-  noECC    254      -r_-r        -V_:ssl3_-w_nss_-n_none        SSL3 Require client auth (client does not provide auth)
1b6f66
-  noECC    254      -r_-r        -V_:ssl3_-n_TestUser_-w_bogus  SSL3 Require client auth (bad password)
1b6f66
-  noECC     0       -r_-r        -V_:ssl3_-n_TestUser_-w_nss    SSL3 Require client auth (client auth)
1b6f66
+  noECC     0       -r           -V_ssl3:_-w_nss_-n_none           TLS Request don't require client auth (client does not provide auth)
1b6f66
+  noECC     0       -r           -V_ssl3:_-w_bogus_-n_TestUser     TLS Request don't require client auth (bad password)
1b6f66
+  noECC     0       -r           -V_ssl3:_-w_nss_-n_TestUser       TLS Request don't require client auth (client auth)
1b6f66
+  noECC    254      -r_-r        -V_ssl3:_-w_nss_-n_none           TLS Require client auth (client does not provide auth)
1b6f66
+  noECC    254      -r_-r        -V_ssl3:_-w_bogus_-n_TestUser     TLS Require client auth (bad password)
1b6f66
+  noECC     0       -r_-r        -V_ssl3:_-w_nss_-n_TestUser_      TLS Require client auth (client auth)
1b6f66
+  noECC     0       -r           -V_ssl3:ssl3_-w_nss_-n_none        SSL3 Request don't require client auth (client does not provide auth)
1b6f66
+  noECC     0       -r           -V_ssl3:ssl3_-n_TestUser_-w_bogus  SSL3 Request don't require client auth (bad password)
1b6f66
+  noECC     0       -r           -V_ssl3:ssl3_-n_TestUser_-w_nss    SSL3 Request don't require client auth (client auth)
1b6f66
+  noECC    254      -r_-r        -V_ssl3:ssl3_-w_nss_-n_none        SSL3 Require client auth (client does not provide auth)
1b6f66
+  noECC    254      -r_-r        -V_ssl3:ssl3_-n_TestUser_-w_bogus  SSL3 Require client auth (bad password)
1b6f66
+  noECC     0       -r_-r        -V_ssl3:ssl3_-n_TestUser_-w_nss    SSL3 Require client auth (client auth)
1b6f66
   noECC     0       -r_-r_-r     -V_ssl3:_-w_nss_-n_none        TLS Request don't require client auth on 2nd hs (client does not provide auth)
1b6f66
   noECC     0       -r_-r_-r     -V_ssl3:_-w_bogus_-n_TestUser  TLS Request don't require client auth on 2nd hs (bad password)
1b6f66
   noECC     0       -r_-r_-r     -V_ssl3:_-w_nss_-n_TestUser    TLS Request don't require client auth on 2nd hs (client auth)
1b6f66
   noECC     1       -r_-r_-r_-r  -V_ssl3:_-w_nss_-n_none        TLS Require client auth on 2nd hs (client does not provide auth)
1b6f66
   noECC     1       -r_-r_-r_-r  -V_ssl3:_-w_bogus_-n_TestUser  TLS Require client auth on 2nd hs (bad password)
1b6f66
   noECC     0       -r_-r_-r_-r  -V_ssl3:_-w_nss_-n_TestUser    TLS Require client auth on 2nd hs (client auth)
1b6f66
   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)
1b6f66
   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)
1b6f66
@@ -36,24 +36,24 @@
1b6f66
   noECC     0       -r_-r_-r     -V_ssl3:ssl3_-n_TestUser_-w_bogus SSL3 Request don't require client auth on 2nd hs (bad password)
1b6f66
   noECC     0       -r_-r_-r     -V_ssl3:ssl3_-n_TestUser_-w_nss SSL3 Request don't require client auth on 2nd hs (client auth)
1b6f66
   noECC     1       -r_-r_-r_-r  -V_ssl3:ssl3_-w_nss_-n_none     SSL3 Require client auth on 2nd hs (client does not provide auth)
1b6f66
   noECC     1       -r_-r_-r_-r  -V_ssl3:ssl3_-n_TestUser_-w_bogus SSL3 Require client auth on 2nd hs (bad password)
1b6f66
   noECC     0       -r_-r_-r_-r  -V_ssl3:ssl3_-n_TestUser_-w_nss SSL3 Require client auth on 2nd hs (client auth)
1b6f66
 #
1b6f66
 # Use EC cert for client authentication
1b6f66
 #
1b6f66
-   ECC      0       -r           -w_bogus_-n_TestUser-ec     TLS Request don't require client auth (EC) (bad password)
1b6f66
-   ECC      0       -r           -w_nss_-n_TestUser-ec       TLS Request don't require client auth (EC) (client auth)
1b6f66
-   ECC     254      -r_-r        -w_bogus_-n_TestUser-ec     TLS Require client auth (EC) (bad password)
1b6f66
-   ECC      0       -r_-r        -w_nss_-n_TestUser-ec_      TLS Require client auth (EC) (client auth)
1b6f66
-   ECC      0       -r           -V_:ssl3_-n_TestUser-ec_-w_bogus  SSL3 Request don't require client auth (EC) (bad password)
1b6f66
-   ECC      0       -r           -V_:ssl3_-n_TestUser-ec_-w_nss    SSL3 Request don't require client auth (EC) (client auth)
1b6f66
-   ECC     254      -r_-r        -V_:ssl3_-n_TestUser-ec_-w_bogus  SSL3 Require client auth (EC) (bad password)
1b6f66
-   ECC      0       -r_-r        -V_:ssl3_-n_TestUser-ec_-w_nss    SSL3 Require client auth (EC) (client auth)
1b6f66
+   ECC      0       -r           -V_ssl3:_-w_bogus_-n_TestUser-ec     TLS Request don't require client auth (EC) (bad password)
1b6f66
+   ECC      0       -r           -V_ssl3:_-w_nss_-n_TestUser-ec       TLS Request don't require client auth (EC) (client auth)
1b6f66
+   ECC     254      -r_-r        -V_ssl3:_-w_bogus_-n_TestUser-ec     TLS Require client auth (EC) (bad password)
1b6f66
+   ECC      0       -r_-r        -V_ssl3:_-w_nss_-n_TestUser-ec_      TLS Require client auth (EC) (client auth)
1b6f66
+   ECC      0       -r           -V_ssl3:ssl3_-n_TestUser-ec_-w_bogus  SSL3 Request don't require client auth (EC) (bad password)
1b6f66
+   ECC      0       -r           -V_ssl3:ssl3_-n_TestUser-ec_-w_nss    SSL3 Request don't require client auth (EC) (client auth)
1b6f66
+   ECC     254      -r_-r        -V_ssl3:ssl3_-n_TestUser-ec_-w_bogus  SSL3 Require client auth (EC) (bad password)
1b6f66
+   ECC      0       -r_-r        -V_ssl3:ssl3_-n_TestUser-ec_-w_nss    SSL3 Require client auth (EC) (client auth)
1b6f66
    ECC      0       -r_-r_-r     -V_ssl3:_-w_bogus_-n_TestUser-ec  TLS Request don't require client auth on 2nd hs (EC) (bad password)
1b6f66
    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)
1b6f66
    ECC      1       -r_-r_-r_-r  -V_ssl3:_-w_bogus_-n_TestUser-ec  TLS Require client auth on 2nd hs (EC) (bad password)
1b6f66
    ECC      0       -r_-r_-r_-r  -V_ssl3:_-w_nss_-n_TestUser-ec_   TLS Require client auth on 2nd hs (EC) (client auth)
1b6f66
    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)
1b6f66
    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)
1b6f66
    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)
1b6f66
    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)