Corrected issue #9

GSA · Feb 28, 2019 · 3314c81 · 3314c81
1 parent dba4d8f
commit 3314c81
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/certutils/mkall.sh b/certutils/mkall.sh
@@ -52,7 +52,7 @@ cp -p data/pem/$SUBJ.crt "$DEST"
 
 ## Gen3 OCSP valid signer using RSA 2048 (RSA 2048 CA)
 SUBJ=ICAM_Test_Card_OCSP_PIV_RSA_2048_Valid_Signer_gen3
-sh mkcert.sh -b -s $SUBJ -i ICAM_Test_Card_PIV_RSA_2048_Signing_CA_-_gold_gen3 -t icam-piv-ocsp-valid-rsa-2048 -r rsa2048 --cakey piv-rsa-2048 || exit $?
+sh mkcert.sh -b -s $SUBJ -i ICAM_Test_Card_PIV_RSA_2048_Signing_CA_-_gold_gen3 -t icam-piv-ocsp-valid-rsa-2048 -r rsa2048 --cakey rsa2048 || exit $?
 DEST="../cards/ICAM_Card_Objects/ICAM_CA_and_Signer"
 cp -p data/$SUBJ.p12 "$DEST"
 cp -p data/pem/$SUBJ.crt "$DEST"
@@ -285,7 +285,7 @@ cp -p data/pem/ICAM_*_$T.crt "$DEST"
 renameIn "$DEST" 1 1
 
 ## Card 16
-T=Card_Authent_FASCN_mismatch
+T=Card_Authentication_FASCN_mismatch
 sh mkcert.sh -w -b -s "ICAM_Test_Card_PIV_Dig_Sig_SP_800-73-4_$T" -i ICAM_Test_Card_PIV_Signing_CA_-_gold_gen1-2 -n 16 -t piv-dig-sig || exit $?
 sh mkcert.sh -w -b -s "ICAM_Test_Card_PIV_Key_Mgmt_SP_800-73-4_$T" -i ICAM_Test_Card_PIV_Signing_CA_-_gold_gen1-2 -n 16 -t piv-key-mgmt || exit $?
 DEST="../cards/ICAM_Card_Objects/16_$T"

diff --git a/certutils/mkone.sh b/certutils/mkone.sh
@@ -26,13 +26,13 @@ debug_output /tmp/$(basename $0 .sh).log
 cp -p ../cards/ICAM_Card_Objects/ICAM_CA_and_Signer/*.p12 data
 
 ## Card 39
-sh mkcert.sh -w -b -s ICAM_Test_Card_PIV-I_Auth_Fed_SP_800-73-4 -i ICAM_Test_Card_PIV-I_Signing_CA_-_gold_gen3 -n 39 -t pivi-auth || exit $?
+#sh mkcert.sh -w -b -s ICAM_Test_Card_PIV-I_Auth_Fed_SP_800-73-4 -i ICAM_Test_Card_PIV-I_Signing_CA_-_gold_gen3 -n 39 -t pivi-auth || exit $?
 #sh mkcert.sh -w -b -s ICAM_Test_Card_PIV-I_Dig_Sig_Fed_SP_800-73-4 -i ICAM_Test_Card_PIV-I_Signing_CA_-_gold_gen3 -n 39 -t pivi-dig-sig || exit $?
 #sh mkcert.sh -w -b -s ICAM_Test_Card_PIV-I_Key_Mgmt_Fed_SP_800-73-4 -i ICAM_Test_Card_PIV-I_Signing_CA_-_gold_gen3 -n 39 -t pivi-key-mgmt || exit $?
 #sh mkcert.sh -w -b -s ICAM_Test_Card_PIV-I_Card_Auth_Fed_SP_800-73-4 -i ICAM_Test_Card_PIV-I_Signing_CA_-_gold_gen3 -n 39 -t pivi-card-auth || exit $?
-DEST="../cards/ICAM_Card_Objects/39_Golden_FIPS_201-2_Fed_PIV-I"
-cp -p data/ICAM_Test_Card_PIV-I*Fed_SP_800-73-4.p12 "$DEST"
-cp -p data/pem/ICAM_Test_Card_PIV-I*Fed_SP_800-73-4.crt "$DEST"
+#DEST="../cards/ICAM_Card_Objects/39_Golden_FIPS_201-2_Fed_PIV-I"
+#cp -p data/ICAM_Test_Card_PIV-I*Fed_SP_800-73-4.p12 "$DEST"
+#cp -p data/pem/ICAM_Test_Card_PIV-I*Fed_SP_800-73-4.crt "$DEST"
 #renameIn "$DEST" 1 1
 #
 ## Card 45
@@ -143,27 +143,21 @@ cp -p data/pem/ICAM_Test_Card_PIV-I*Fed_SP_800-73-4.crt "$DEST"
 #cp -p data/$SUBJ.p12 "$DEST"
 #cp -p data/pem/$SUBJ.crt "$DEST"
 #
-## OCSP Gen3 valid OCSP signer using ECC P-384 (ECC P-384)
-#SUBJ=ICAM_Test_Card_PIV_OCSP_Valid_Signer_P384_gen3 
-#sh mkcert.sh -b -s $SUBJ -i ICAM_Test_Card_PIV_P-384_Signing_CA_gold_gen3 -t piv-ocsp-valid-gen3-p384 -r 2048 --cakey secp384r1 || exit $?
-#DEST="../cards/ICAM_Card_Objects/ICAM_CA_and_Signer"
-#cp -p data/$SUBJ.p12 "$DEST"
-#cp -p data/pem/$SUBJ.crt "$DEST"
-
-## Gen3 Secure Messaging Key Establishment using ECC P-256 (ECC P-384 CA)
-#SUBJ=ICAM_Test_Card_PIV_ECC_Issued_P-256_SM_Certificate_Signer_2
-#sh mkcert.sh -b -s $SUBJ -i ICAM_Test_Card_PIV_P-384_Signing_CA_gold_gen3 -t piv-content-signer-gen3-p384 -e prime256v1 -c secp384r1 || exit $?
-#DEST="../cards/ICAM_Card_Objects/ICAM_CA_and_Signer"
-#cp -p data/$SUBJ.p12 "$DEST"
-#cp -p data/pem/$SUBJ.crt "$DEST"
-
 ## Gen3 Secure Messaging Key Establishment using ECC P-384 (ECC P-384 CA)
 #SUBJ=ICAM_Test_Card_PIV_ECC_Issued_P-384_SM_Certificate_Signer_3
 #sh mkcert.sh -b -s $SUBJ -i ICAM_Test_Card_PIV_P-384_Signing_CA_gold_gen3 -t piv-content-signer-gen3-p384 -e secp384r1 -c secp384r1 || exit $?
+#echo "Next"; read ans
 #DEST="../cards/ICAM_Card_Objects/ICAM_CA_and_Signer"
 #cp -p data/$SUBJ.p12 "$DEST"
 #cp -p data/pem/$SUBJ.crt "$DEST"
 #
+## OCSP Gen3 valid OCSP signer using ECC P-384 (ECC P-384)
+#SUBJ=ICAM_Test_Card_PIV_OCSP_Valid_Signer_P384_gen3 
+#sh mkcert.sh -b -s $SUBJ -i ICAM_Test_Card_PIV_P-384_Signing_CA_gold_gen3 -t piv-ocsp-valid-gen3-p384 -r 2048 --cakey secp384r1 || exit $?
+#DEST="../cards/ICAM_Card_Objects/ICAM_CA_and_Signer"
+#cp -p data/$SUBJ.p12 "$DEST"
+#cp -p data/pem/$SUBJ.crt "$DEST"
+
 ## Card 37
 #sh mkcert.sh -w -b -s ICAM_Test_Card_PIV_Auth_SP_800-73-4_PPS -i ICAM_Test_Card_PIV_Signing_CA_-_gold_gen3 -n 37 -t piv-auth || exit $?
 #sh mkcert.sh -w -b -s ICAM_Test_Card_PIV_Dig_Sig_SP_800-73-4_PPS -i ICAM_Test_Card_PIV_Signing_CA_-_gold_gen3 -n 37 -t piv-dig-sig || exit $?