diff options
Diffstat (limited to 'nss/tests/ssl/ssl.sh')
| -rwxr-xr-x | nss/tests/ssl/ssl.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/nss/tests/ssl/ssl.sh b/nss/tests/ssl/ssl.sh index b34c9c0..944849a 100755 --- a/nss/tests/ssl/ssl.sh +++ b/nss/tests/ssl/ssl.sh @@ -1006,7 +1006,7 @@ ssl_run() do case "${SSL_RUN}" in "stapling") - if [ -nz "$NSS_DISABLE_LIBPKIX" ]; then + if [ -z "$NSS_DISABLE_LIBPKIX" ]; then ssl_stapling fi ;; @@ -1038,7 +1038,14 @@ ssl_run_all() ORIG_P_R_SERVERDIR=$P_R_SERVERDIR ORIG_P_R_CLIENTDIR=$P_R_CLIENTDIR - USER_NICKNAME=TestUser + # Exercise PKCS#11 URI parsing. The token actually changes its name + # in FIPS mode, so cope with that. Note there's also semicolon in here + # but it doesn't need escaping/quoting; the shell copes. + if [ "${CLIENT_MODE}" = "fips" ]; then + USER_NICKNAME="pkcs11:token=NSS%20FIPS%20140-2%20Certificate%20DB;object=TestUser" + else + USER_NICKNAME="pkcs11:token=NSS%20Certificate%20DB;object=TestUser" + fi NORM_EXT="" cd ${CLIENTDIR} @@ -1051,7 +1058,8 @@ ssl_run_all() P_R_SERVERDIR=$P_R_EXT_SERVERDIR P_R_CLIENTDIR=$P_R_EXT_CLIENTDIR - USER_NICKNAME=ExtendedSSLUser + # A different URI test; specify CKA_LABEL but not the token. + USER_NICKNAME="pkcs11:object=ExtendedSSLUser" NORM_EXT="Extended Test" cd ${CLIENTDIR} |