143 lines
4.7 KiB
Diff
143 lines
4.7 KiB
Diff
|
|
# HG changeset patch
|
|
# User Kai Engert <kaie@kuix.de>
|
|
# Date 1506452962 -7200
|
|
# Node ID fe8b221d3bded99b2b21e2e62fb27cc8c659ec2f
|
|
# Parent 96a835be15192281d67a8b1046b7f159ff6deb12
|
|
Bug 1382278, add test to confirm implicit init with certutil -A is working, r=rrelyea
|
|
|
|
diff --git a/tests/cert/cert.sh b/tests/cert/cert.sh
|
|
--- a/tests/cert/cert.sh
|
|
+++ b/tests/cert/cert.sh
|
|
@@ -1941,32 +1941,42 @@ cert_test_distrust()
|
|
cert_test_ocspresp()
|
|
{
|
|
echo "$SCRIPTNAME: OCSP response creation selftest"
|
|
OR_ACTION="perform selftest"
|
|
RETEXPECTED=0
|
|
ocspr ${SERVER_CADIR} "serverCA" "chain-1-serverCA" -f "${R_PWFILE}" 2>&1
|
|
}
|
|
|
|
+cert_test_implicit_db_init()
|
|
+{
|
|
+ echo "$SCRIPTNAME: test implicit database init"
|
|
+
|
|
+ CU_ACTION="Add cert with trust flags to db with implicit init"
|
|
+ mkdir ${IMPLICIT_INIT_DIR}
|
|
+ certu -A -n ca -t 'C,C,C' -d ${P_R_IMPLICIT_INIT_DIR} -i "${SERVER_CADIR}/serverCA.ca.cert"
|
|
+}
|
|
+
|
|
############################## cert_cleanup ############################
|
|
# local shell function to finish this script (no exit since it might be
|
|
# sourced)
|
|
########################################################################
|
|
cert_cleanup()
|
|
{
|
|
cert_log "$SCRIPTNAME: finished $SCRIPTNAME"
|
|
html "</TABLE><BR>"
|
|
cd ${QADIR}
|
|
. common/cleanup.sh
|
|
}
|
|
|
|
################## main #################################################
|
|
|
|
cert_init
|
|
cert_all_CA
|
|
+cert_test_implicit_db_init
|
|
cert_extended_ssl
|
|
cert_ssl
|
|
cert_smime_client
|
|
if [[ -n "$NSS_TEST_ENABLE_FIPS" ]]; then
|
|
cert_fips
|
|
fi
|
|
cert_eccurves
|
|
cert_extensions
|
|
diff --git a/tests/common/init.sh b/tests/common/init.sh
|
|
--- a/tests/common/init.sh
|
|
+++ b/tests/common/init.sh
|
|
@@ -63,16 +63,17 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
|
|
DBPASSDIR=${HOSTDIR}/dbpass
|
|
ECCURVES_DIR=${HOSTDIR}/eccurves
|
|
DISTRUSTDIR=${HOSTDIR}/distrust
|
|
|
|
SERVER_CADIR=${HOSTDIR}/serverCA
|
|
CLIENT_CADIR=${HOSTDIR}/clientCA
|
|
EXT_SERVERDIR=${HOSTDIR}/ext_server
|
|
EXT_CLIENTDIR=${HOSTDIR}/ext_client
|
|
+ IMPLICIT_INIT_DIR=${HOSTDIR}/implicit_init
|
|
|
|
IOPR_CADIR=${HOSTDIR}/CA_iopr
|
|
IOPR_SSL_SERVERDIR=${HOSTDIR}/server_ssl_iopr
|
|
IOPR_SSL_CLIENTDIR=${HOSTDIR}/client_ssl_iopr
|
|
IOPR_OCSP_CLIENTDIR=${HOSTDIR}/client_ocsp_iopr
|
|
|
|
CERT_EXTENSIONS_DIR=${HOSTDIR}/cert_extensions
|
|
STAPLINGDIR=${HOSTDIR}/stapling
|
|
@@ -531,16 +532,17 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
|
|
D_SERVER="Server.$version"
|
|
D_CLIENT="Client.$version"
|
|
D_NOLOGIN="NoLogin.$version"
|
|
D_FIPS="FIPS.$version"
|
|
D_DBPASS="DBPASS.$version"
|
|
D_ECCURVES="ECCURVES.$version"
|
|
D_EXT_SERVER="ExtendedServer.$version"
|
|
D_EXT_CLIENT="ExtendedClient.$version"
|
|
+ D_IMPLICIT_INIT="ImplicitInit.$version"
|
|
D_CERT_EXTENSTIONS="CertExtensions.$version"
|
|
D_DISTRUST="Distrust.$version"
|
|
|
|
# we need relative pathnames of these files abd directories, since our
|
|
# tools can't handle the unix style absolut pathnames on cygnus
|
|
|
|
R_CADIR=../CA
|
|
R_SERVERDIR=../server
|
|
@@ -550,16 +552,17 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
|
|
R_IOPR_SSL_CLIENTDIR=../client_ssl_iopr
|
|
R_IOPR_OCSP_CLIENTDIR=../client_ocsp_iopr
|
|
R_ALICEDIR=../alicedir
|
|
R_BOBDIR=../bobdir
|
|
R_DAVEDIR=../dave
|
|
R_EVEDIR=../eve
|
|
R_EXT_SERVERDIR=../ext_server
|
|
R_EXT_CLIENTDIR=../ext_client
|
|
+ R_IMPLICIT_INIT_DIR=../implicit_init
|
|
R_CERT_EXT=../cert_extensions
|
|
R_STAPLINGDIR=../stapling
|
|
R_NOLOGINDIR=../nologin
|
|
R_SSLGTESTDIR=../ssl_gtests
|
|
R_GTESTDIR=../gtests
|
|
|
|
#
|
|
# profiles are either paths or domains depending on the setting of
|
|
@@ -570,27 +573,29 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
|
|
P_R_BOBDIR=${R_BOBDIR}
|
|
P_R_DAVEDIR=${R_DAVEDIR}
|
|
P_R_EVEDIR=${R_EVEDIR}
|
|
P_R_SERVERDIR=${R_SERVERDIR}
|
|
P_R_CLIENTDIR=${R_CLIENTDIR}
|
|
P_R_NOLOGINDIR=${R_NOLOGINDIR}
|
|
P_R_EXT_SERVERDIR=${R_EXT_SERVERDIR}
|
|
P_R_EXT_CLIENTDIR=${R_EXT_CLIENTDIR}
|
|
+ P_R_IMPLICIT_INIT_DIR=${R_IMPLICIT_INIT_DIR}
|
|
if [ -n "${MULTIACCESS_DBM}" ]; then
|
|
P_R_CADIR="multiaccess:${D_CA}"
|
|
P_R_ALICEDIR="multiaccess:${D_ALICE}"
|
|
P_R_BOBDIR="multiaccess:${D_BOB}"
|
|
P_R_DAVEDIR="multiaccess:${D_DAVE}"
|
|
P_R_EVEDIR="multiaccess:${D_EVE}"
|
|
P_R_SERVERDIR="multiaccess:${D_SERVER}"
|
|
P_R_CLIENTDIR="multiaccess:${D_CLIENT}"
|
|
P_R_NOLOGINDIR="multiaccess:${D_NOLOGIN}"
|
|
P_R_EXT_SERVERDIR="multiaccess:${D_EXT_SERVER}"
|
|
P_R_EXT_CLIENTDIR="multiaccess:${D_EXT_CLIENT}"
|
|
+ P_R_IMPLICIT_INIT_DIR="multiaccess:${D_IMPLICIT_INIT}"
|
|
fi
|
|
|
|
R_PWFILE=../tests.pw
|
|
R_EMPTY_FILE=../tests_empty
|
|
R_NOISE_FILE=../tests_noise
|
|
|
|
R_FIPSPWFILE=../tests.fipspw
|
|
R_FIPSBADPWFILE=../tests.fipsbadpw
|
|
|