Re-signed all Gen3 card objects

Updated mkcert.sh to create content signer .p12 files with predictable friendly names. Re-generated content signer .p12 files with predictable friendly names. Moved properties files into corresponding card directories. Modified signing tool to widen file chooser. Added more error handling around wrong key alias. Fixed a few Javadoc warnings.
GSA · Nov 21, 2017 · ee66fff · ee66fff
1 parent 0480947
commit ee66fff
Show file tree

Hide file tree

Showing 144 changed files with 102 additions and 74 deletions.
diff --git a/build.xml b/build.xml
@@ -8,7 +8,6 @@
 		<mkdir dir="${dir.distro}" />
 		<mkdir dir="${dir.distro}/lib/" />
 		<mkdir dir="${dir.distro}/cards/" />
-		<mkdir dir="${dir.distro}/config/" />
 		<mkdir dir="${dir.distro}/doc/" />
 		<mkdir dir="${dir.distro}/logs/" />
 		<mkdir dir="${dir.distro}/certutils/" />
@@ -36,11 +35,6 @@
 				<include name="**/*.jar" />
 			</fileset>
 		</copy>
-		<copy todir="${dir.distro}/config">
-			<fileset dir="${dir.buildfile}/config">
-				<include name="**/*.properties" />
-			</fileset>
-		</copy>
 		<copy todir="${dir.distro}/lib">
 			<fileset dir="${dir.buildfile}/lib" excludes="**/*.jar"/>
 		</copy>
@@ -123,7 +117,6 @@
 			<zipfileset dir="${dir.buildfile}/src/" prefix="src/" />
 			<zipfileset dir="${dir.buildfile}/cards/" prefix="cards/" />
 			<zipfileset dir="${dir.buildfile}/certutils/" prefix="certutils/" />
-			<zipfileset dir="${dir.buildfile}/config/" prefix="config/" />
 			<zipfileset dir="${dir.buildfile}/doc/" prefix="doc/" />
 			<zipfileset dir="${dir.buildfile}/lib/" prefix="lib/" />
 			<zipfileset dir="${dir.buildfile}/logs/" prefix="log/" />

diff --git a/cards/ICAM_Card_Objects/37_Golden_FIPS_201-2_PIV_PPS_F=512_D=64/10 - Face Object b/cards/ICAM_Card_Objects/37_Golden_FIPS_201-2_PIV_PPS_F=512_D=64/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/37_Golden_FIPS_201-2_PIV_PPS_F=512_D=64/2 - Security Object b/cards/ICAM_Card_Objects/37_Golden_FIPS_201-2_PIV_PPS_F=512_D=64/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/37_Golden_FIPS_201-2_PIV_PPS_F=512_D=64/8 - CHUID Object b/cards/ICAM_Card_Objects/37_Golden_FIPS_201-2_PIV_PPS_F=512_D=64/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/37_Golden_FIPS_201-2_PIV_PPS_F=512_D=64/9 - Fingerprints b/cards/ICAM_Card_Objects/37_Golden_FIPS_201-2_PIV_PPS_F=512_D=64/9 - Fingerprints
diff --git a/config/c37-chuid.properties → ...2_PIV_PPS_F=512_D=64/c37-chuid.properties b/config/c37-chuid.properties → ...2_PIV_PPS_F=512_D=64/c37-chuid.properties
diff --git a/config/c37-facial-image.properties → ...PS_F=512_D=64/c37-facial-image.properties b/config/c37-facial-image.properties → ...PS_F=512_D=64/c37-facial-image.properties
diff --git a/config/c37-fingerprints.properties → ...PS_F=512_D=64/c37-fingerprints.properties b/config/c37-fingerprints.properties → ...PS_F=512_D=64/c37-fingerprints.properties
diff --git a/config/c37-printed-information.properties → ...2_D=64/c37-printed-information.properties b/config/c37-printed-information.properties → ...2_D=64/c37-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/38_Bad_Hash_in_Sec_Object/10 - Face Object b/cards/ICAM_Card_Objects/38_Bad_Hash_in_Sec_Object/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/38_Bad_Hash_in_Sec_Object/2 - Security Object b/cards/ICAM_Card_Objects/38_Bad_Hash_in_Sec_Object/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/38_Bad_Hash_in_Sec_Object/8 - CHUID Object b/cards/ICAM_Card_Objects/38_Bad_Hash_in_Sec_Object/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/38_Bad_Hash_in_Sec_Object/9 - Fingerprints b/cards/ICAM_Card_Objects/38_Bad_Hash_in_Sec_Object/9 - Fingerprints
diff --git a/config/c38-chuid.properties → ...d_Hash_in_Sec_Object/c38-chuid.properties b/config/c38-chuid.properties → ...d_Hash_in_Sec_Object/c38-chuid.properties
diff --git a/config/c38-facial-image.properties → ...in_Sec_Object/c38-facial-image.properties b/config/c38-facial-image.properties → ...in_Sec_Object/c38-facial-image.properties
diff --git a/config/c38-fingerprints.properties → ...in_Sec_Object/c38-fingerprints.properties b/config/c38-fingerprints.properties → ...in_Sec_Object/c38-fingerprints.properties
diff --git a/config/c38-printed-information.properties → ...Object/c38-printed-information.properties b/config/c38-printed-information.properties → ...Object/c38-printed-information.properties
diff --git a/config/c38-printed-information2.properties → ...bject/c38-printed-information2.properties b/config/c38-printed-information2.properties → ...bject/c38-printed-information2.properties
diff --git a/cards/ICAM_Card_Objects/39_Golden_FIPS_201-2_Fed_PIV-I/10 - Face Object b/cards/ICAM_Card_Objects/39_Golden_FIPS_201-2_Fed_PIV-I/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/39_Golden_FIPS_201-2_Fed_PIV-I/2 - Security Object b/cards/ICAM_Card_Objects/39_Golden_FIPS_201-2_Fed_PIV-I/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/39_Golden_FIPS_201-2_Fed_PIV-I/8 - CHUID Object b/cards/ICAM_Card_Objects/39_Golden_FIPS_201-2_Fed_PIV-I/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/39_Golden_FIPS_201-2_Fed_PIV-I/9 - Fingerprints b/cards/ICAM_Card_Objects/39_Golden_FIPS_201-2_Fed_PIV-I/9 - Fingerprints
diff --git a/config/c39-chuid.properties → ...FIPS_201-2_Fed_PIV-I/c39-chuid.properties b/config/c39-chuid.properties → ...FIPS_201-2_Fed_PIV-I/c39-chuid.properties
diff --git a/config/c39-facial-image.properties → ...1-2_Fed_PIV-I/c39-facial-image.properties b/config/c39-facial-image.properties → ...1-2_Fed_PIV-I/c39-facial-image.properties
diff --git a/config/c39-fingerprints.properties → ...1-2_Fed_PIV-I/c39-fingerprints.properties b/config/c39-fingerprints.properties → ...1-2_Fed_PIV-I/c39-fingerprints.properties
diff --git a/config/c39-printed-information.properties → ..._PIV-I/c39-printed-information.properties b/config/c39-printed-information.properties → ..._PIV-I/c39-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/41_Re-keyed_Card/10 - Face Object b/cards/ICAM_Card_Objects/41_Re-keyed_Card/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/41_Re-keyed_Card/2 - Security Object b/cards/ICAM_Card_Objects/41_Re-keyed_Card/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/41_Re-keyed_Card/8 - CHUID Object b/cards/ICAM_Card_Objects/41_Re-keyed_Card/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/41_Re-keyed_Card/9 - Fingerprints b/cards/ICAM_Card_Objects/41_Re-keyed_Card/9 - Fingerprints
diff --git a/config/c41-chuid.properties → ...cts/41_Re-keyed_Card/c41-chuid.properties b/config/c41-chuid.properties → ...cts/41_Re-keyed_Card/c41-chuid.properties
diff --git a/config/c41-facial-image.properties → ...Re-keyed_Card/c41-facial-image.properties b/config/c41-facial-image.properties → ...Re-keyed_Card/c41-facial-image.properties
diff --git a/config/c41-fingerprints.properties → ...Re-keyed_Card/c41-fingerprints.properties b/config/c41-fingerprints.properties → ...Re-keyed_Card/c41-fingerprints.properties
diff --git a/config/c41-printed-information.properties → ...d_Card/c41-printed-information.properties b/config/c41-printed-information.properties → ...d_Card/c41-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/42_OCSP_Expired/10 - Face Object b/cards/ICAM_Card_Objects/42_OCSP_Expired/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/42_OCSP_Expired/2 - Security Object b/cards/ICAM_Card_Objects/42_OCSP_Expired/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/42_OCSP_Expired/8 - CHUID Object b/cards/ICAM_Card_Objects/42_OCSP_Expired/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/42_OCSP_Expired/9 - Fingerprints b/cards/ICAM_Card_Objects/42_OCSP_Expired/9 - Fingerprints
diff --git a/config/c42-chuid.properties → ...ects/42_OCSP_Expired/c42-chuid.properties b/config/c42-chuid.properties → ...ects/42_OCSP_Expired/c42-chuid.properties
diff --git a/config/c42-facial-image.properties → ..._OCSP_Expired/c42-facial-image.properties b/config/c42-facial-image.properties → ..._OCSP_Expired/c42-facial-image.properties
diff --git a/config/c42-fingerprints.properties → ..._OCSP_Expired/c42-fingerprints.properties b/config/c42-fingerprints.properties → ..._OCSP_Expired/c42-fingerprints.properties
diff --git a/config/c42-printed-information.properties → ...xpired/c42-printed-information.properties b/config/c42-printed-information.properties → ...xpired/c42-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/43_OCSP_revoked_w_nocheck/10 - Face Object b/cards/ICAM_Card_Objects/43_OCSP_revoked_w_nocheck/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/43_OCSP_revoked_w_nocheck/2 - Security Object b/cards/ICAM_Card_Objects/43_OCSP_revoked_w_nocheck/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/43_OCSP_revoked_w_nocheck/8 - CHUID Object b/cards/ICAM_Card_Objects/43_OCSP_revoked_w_nocheck/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/43_OCSP_revoked_w_nocheck/9 - Fingerprints b/cards/ICAM_Card_Objects/43_OCSP_revoked_w_nocheck/9 - Fingerprints
diff --git a/config/c43-chuid.properties → ...SP_revoked_w_nocheck/c43-chuid.properties b/config/c43-chuid.properties → ...SP_revoked_w_nocheck/c43-chuid.properties
diff --git a/config/c43-facial-image.properties → ...ked_w_nocheck/c43-facial-image.properties b/config/c43-facial-image.properties → ...ked_w_nocheck/c43-facial-image.properties
diff --git a/config/c43-fingerprints.properties → ...ked_w_nocheck/c43-fingerprints.properties b/config/c43-fingerprints.properties → ...ked_w_nocheck/c43-fingerprints.properties
diff --git a/config/c43-printed-information.properties → ...ocheck/c43-printed-information.properties b/config/c43-printed-information.properties → ...ocheck/c43-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/44_OCSP_revoked_wo_nocheck/10 - Face Object b/cards/ICAM_Card_Objects/44_OCSP_revoked_wo_nocheck/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/44_OCSP_revoked_wo_nocheck/11 - Printed Information b/cards/ICAM_Card_Objects/44_OCSP_revoked_wo_nocheck/11 - Printed Information
diff --git a/cards/ICAM_Card_Objects/44_OCSP_revoked_wo_nocheck/2 - Security Object b/cards/ICAM_Card_Objects/44_OCSP_revoked_wo_nocheck/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/44_OCSP_revoked_wo_nocheck/8 - CHUID Object b/cards/ICAM_Card_Objects/44_OCSP_revoked_wo_nocheck/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/44_OCSP_revoked_wo_nocheck/9 - Fingerprints b/cards/ICAM_Card_Objects/44_OCSP_revoked_wo_nocheck/9 - Fingerprints
diff --git a/config/c44-chuid.properties → ...P_revoked_wo_nocheck/c44-chuid.properties b/config/c44-chuid.properties → ...P_revoked_wo_nocheck/c44-chuid.properties
diff --git a/config/c44-facial-image.properties → ...ed_wo_nocheck/c44-facial-image.properties b/config/c44-facial-image.properties → ...ed_wo_nocheck/c44-facial-image.properties
diff --git a/config/c44-fingerprints.properties → ...ed_wo_nocheck/c44-fingerprints.properties b/config/c44-fingerprints.properties → ...ed_wo_nocheck/c44-fingerprints.properties
diff --git a/config/c44-printed-information.properties → ...ocheck/c44-printed-information.properties b/config/c44-printed-information.properties → ...ocheck/c44-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/45_OCSP_Invalid_Signature/10 - Face Object b/cards/ICAM_Card_Objects/45_OCSP_Invalid_Signature/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/45_OCSP_Invalid_Signature/2 - Security Object b/cards/ICAM_Card_Objects/45_OCSP_Invalid_Signature/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/45_OCSP_Invalid_Signature/8 - CHUID Object b/cards/ICAM_Card_Objects/45_OCSP_Invalid_Signature/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/45_OCSP_Invalid_Signature/9 - Fingerprints b/cards/ICAM_Card_Objects/45_OCSP_Invalid_Signature/9 - Fingerprints
diff --git a/config/c45-chuid.properties → ...SP_Invalid_Signature/c45-chuid.properties b/config/c45-chuid.properties → ...SP_Invalid_Signature/c45-chuid.properties
diff --git a/config/c45-facial-image.properties → ...lid_Signature/c45-facial-image.properties b/config/c45-facial-image.properties → ...lid_Signature/c45-facial-image.properties
diff --git a/config/c45-fingerprints.properties → ...lid_Signature/c45-fingerprints.properties b/config/c45-fingerprints.properties → ...lid_Signature/c45-fingerprints.properties
diff --git a/config/c45-printed-information.properties → ...nature/c45-printed-information.properties b/config/c45-printed-information.properties → ...nature/c45-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/46_Golden_FIPS_201-2_PIV/10 - Face Object b/cards/ICAM_Card_Objects/46_Golden_FIPS_201-2_PIV/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/46_Golden_FIPS_201-2_PIV/2 - Security Object b/cards/ICAM_Card_Objects/46_Golden_FIPS_201-2_PIV/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/46_Golden_FIPS_201-2_PIV/8 - CHUID Object b/cards/ICAM_Card_Objects/46_Golden_FIPS_201-2_PIV/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/46_Golden_FIPS_201-2_PIV/9 - Fingerprints b/cards/ICAM_Card_Objects/46_Golden_FIPS_201-2_PIV/9 - Fingerprints
diff --git a/config/c46-chuid.properties → ...olden_FIPS_201-2_PIV/c46-chuid.properties b/config/c46-chuid.properties → ...olden_FIPS_201-2_PIV/c46-chuid.properties
diff --git a/config/c46-facial-image.properties → ...IPS_201-2_PIV/c46-facial-image.properties b/config/c46-facial-image.properties → ...IPS_201-2_PIV/c46-facial-image.properties
diff --git a/config/c46-fingerprints.properties → ...IPS_201-2_PIV/c46-fingerprints.properties b/config/c46-fingerprints.properties → ...IPS_201-2_PIV/c46-fingerprints.properties
diff --git a/config/c46-printed-information.properties → ...-2_PIV/c46-printed-information.properties b/config/c46-printed-information.properties → ...-2_PIV/c46-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/47_Golden_FIPS_201-2_PIV_SAN_Order/10 - Face Object b/cards/ICAM_Card_Objects/47_Golden_FIPS_201-2_PIV_SAN_Order/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/47_Golden_FIPS_201-2_PIV_SAN_Order/12 - Iris b/cards/ICAM_Card_Objects/47_Golden_FIPS_201-2_PIV_SAN_Order/12 - Iris
diff --git a/cards/ICAM_Card_Objects/47_Golden_FIPS_201-2_PIV_SAN_Order/2 - Security Object b/cards/ICAM_Card_Objects/47_Golden_FIPS_201-2_PIV_SAN_Order/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/47_Golden_FIPS_201-2_PIV_SAN_Order/8 - CHUID Object b/cards/ICAM_Card_Objects/47_Golden_FIPS_201-2_PIV_SAN_Order/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/47_Golden_FIPS_201-2_PIV_SAN_Order/9 - Fingerprints b/cards/ICAM_Card_Objects/47_Golden_FIPS_201-2_PIV_SAN_Order/9 - Fingerprints
diff --git a/config/c47-chuid.properties → ..._201-2_PIV_SAN_Order/c47-chuid.properties b/config/c47-chuid.properties → ..._201-2_PIV_SAN_Order/c47-chuid.properties
diff --git a/config/c47-facial-image.properties → ...PIV_SAN_Order/c47-facial-image.properties b/config/c47-facial-image.properties → ...PIV_SAN_Order/c47-facial-image.properties
diff --git a/config/c47-fingerprints.properties → ...PIV_SAN_Order/c47-fingerprints.properties b/config/c47-fingerprints.properties → ...PIV_SAN_Order/c47-fingerprints.properties
diff --git a/config/c47-iris.properties → ...S_201-2_PIV_SAN_Order/c47-iris.properties b/config/c47-iris.properties → ...S_201-2_PIV_SAN_Order/c47-iris.properties
diff --git a/config/c47-printed-information.properties → ..._Order/c47-printed-information.properties b/config/c47-printed-information.properties → ..._Order/c47-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/49_FIPS_201-2_Facial_Image_CBEFF_Expired/10 - Face Object b/cards/ICAM_Card_Objects/49_FIPS_201-2_Facial_Image_CBEFF_Expired/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/49_FIPS_201-2_Facial_Image_CBEFF_Expired/2 - Security Object b/cards/ICAM_Card_Objects/49_FIPS_201-2_Facial_Image_CBEFF_Expired/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/49_FIPS_201-2_Facial_Image_CBEFF_Expired/8 - CHUID Object b/cards/ICAM_Card_Objects/49_FIPS_201-2_Facial_Image_CBEFF_Expired/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/49_FIPS_201-2_Facial_Image_CBEFF_Expired/9 - Fingerprints b/cards/ICAM_Card_Objects/49_FIPS_201-2_Facial_Image_CBEFF_Expired/9 - Fingerprints
diff --git a/config/c49-chuid.properties → ..._Image_CBEFF_Expired/c49-chuid.properties b/config/c49-chuid.properties → ..._Image_CBEFF_Expired/c49-chuid.properties
diff --git a/config/c49-facial-image.properties → ...CBEFF_Expired/c49-facial-image.properties b/config/c49-facial-image.properties → ...CBEFF_Expired/c49-facial-image.properties
diff --git a/config/c49-fingerprints.properties → ...CBEFF_Expired/c49-fingerprints.properties b/config/c49-fingerprints.properties → ...CBEFF_Expired/c49-fingerprints.properties
diff --git a/config/c49-printed-information.properties → ...xpired/c49-printed-information.properties b/config/c49-printed-information.properties → ...xpired/c49-printed-information.properties
diff --git a/.../ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/10 - Face Object b/.../ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/10 - Face Object
diff --git a/...AM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/2 - Security Object b/...AM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/2 - Security Object
diff --git a/.../ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/8 - CHUID Object b/.../ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/8 - CHUID Object
diff --git a/.../ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/9 - Fingerprints b/.../ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/9 - Fingerprints
diff --git a/config/c50-chuid.properties → ...Expires_before_CHUID/c50-chuid.properties b/config/c50-chuid.properties → ...Expires_before_CHUID/c50-chuid.properties
@@ -1,5 +1,5 @@
-contentFile=file=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/8 - CHUID Object
-securityObjectFile=file=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/2 - Security Object
+contentFile=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/8 - CHUID Object
+securityObjectFile=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/2 - Security Object
 updateSecurityObject=Y
 fascnOid=2.16.840.1.101.3.6.6
 fascn=D13810D828AF2C1084350DA1685828AF021086A184E739C3EB

diff --git a/config/c50-facial-image.properties → ..._before_CHUID/c50-facial-image.properties b/config/c50-facial-image.properties → ..._before_CHUID/c50-facial-image.properties
@@ -1,5 +1,5 @@
-contentFile=file=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/10 - Face Object
-securityObjectFile=file=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/2 - Security Object
+contentFile=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/10 - Face Object
+securityObjectFile=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/2 - Security Object
 updateSecurityObject=Y
 fascnOid=2.16.840.1.101.3.6.6
 fascn=D13810D828AF2C1084350DA1685828AF021086A184E739C3EB

diff --git a/config/c50-fingerprints.properties → ..._before_CHUID/c50-fingerprints.properties b/config/c50-fingerprints.properties → ..._before_CHUID/c50-fingerprints.properties
@@ -1,5 +1,5 @@
-contentFile=file=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/9 - Fingerprints
-securityObjectFile=file=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/2 - Security Object
+contentFile=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/9 - Fingerprints
+securityObjectFile=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/2 - Security Object
 updateSecurityObject=Y
 fascnOid=2.16.840.1.101.3.6.6
 fascn=D13810D828AF2C1084350DA1685828AF021086A184E739C3EB

diff --git a/config/c50-printed-information.properties → ..._CHUID/c50-printed-information.properties b/config/c50-printed-information.properties → ..._CHUID/c50-printed-information.properties
@@ -1,5 +1,5 @@
-contentFile=file=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/11 - Printed Information
-securityObjectFile=file=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/2 - Security Object
+contentFile=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/11 - Printed Information
+securityObjectFile=cards/ICAM_Card_Objects/50_FIPS_201-2_Facial_Image_CBEFF_Expires_before_CHUID/2 - Security Object
 updateSecurityObject=Y
 fascnOid=2.16.840.1.101.3.6.6
 fascn=D13810D828AF2C1084350DA1685828AF021086A184E739C3EB

diff --git a/cards/ICAM_Card_Objects/51_FIPS_201-2_Fingerprint_CBEFF_Expired/10 - Face Object b/cards/ICAM_Card_Objects/51_FIPS_201-2_Fingerprint_CBEFF_Expired/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/51_FIPS_201-2_Fingerprint_CBEFF_Expired/2 - Security Object b/cards/ICAM_Card_Objects/51_FIPS_201-2_Fingerprint_CBEFF_Expired/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/51_FIPS_201-2_Fingerprint_CBEFF_Expired/8 - CHUID Object b/cards/ICAM_Card_Objects/51_FIPS_201-2_Fingerprint_CBEFF_Expired/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/51_FIPS_201-2_Fingerprint_CBEFF_Expired/9 - Fingerprints b/cards/ICAM_Card_Objects/51_FIPS_201-2_Fingerprint_CBEFF_Expired/9 - Fingerprints
diff --git a/config/c51-chuid.properties → ...rprint_CBEFF_Expired/c51-chuid.properties b/config/c51-chuid.properties → ...rprint_CBEFF_Expired/c51-chuid.properties
diff --git a/config/c51-facial-image.properties → ...CBEFF_Expired/c51-facial-image.properties b/config/c51-facial-image.properties → ...CBEFF_Expired/c51-facial-image.properties
diff --git a/config/c51-fingerprints.properties → ...CBEFF_Expired/c51-fingerprints.properties b/config/c51-fingerprints.properties → ...CBEFF_Expired/c51-fingerprints.properties
diff --git a/config/c51-printed-information.properties → ...xpired/c51-printed-information.properties b/config/c51-printed-information.properties → ...xpired/c51-printed-information.properties
diff --git a/...s/ICAM_Card_Objects/52_FIPS_201-2_Fingerprint_CBEFF_Expires_before_CHUID/10 - Face Object b/...s/ICAM_Card_Objects/52_FIPS_201-2_Fingerprint_CBEFF_Expires_before_CHUID/10 - Face Object
diff --git a/...CAM_Card_Objects/52_FIPS_201-2_Fingerprint_CBEFF_Expires_before_CHUID/2 - Security Object b/...CAM_Card_Objects/52_FIPS_201-2_Fingerprint_CBEFF_Expires_before_CHUID/2 - Security Object
diff --git a/...s/ICAM_Card_Objects/52_FIPS_201-2_Fingerprint_CBEFF_Expires_before_CHUID/8 - CHUID Object b/...s/ICAM_Card_Objects/52_FIPS_201-2_Fingerprint_CBEFF_Expires_before_CHUID/8 - CHUID Object
diff --git a/...s/ICAM_Card_Objects/52_FIPS_201-2_Fingerprint_CBEFF_Expires_before_CHUID/9 - Fingerprints b/...s/ICAM_Card_Objects/52_FIPS_201-2_Fingerprint_CBEFF_Expires_before_CHUID/9 - Fingerprints
diff --git a/config/c52-chuid.properties → ...Expires_before_CHUID/c52-chuid.properties b/config/c52-chuid.properties → ...Expires_before_CHUID/c52-chuid.properties
diff --git a/config/c52-facial-image.properties → ..._before_CHUID/c52-facial-image.properties b/config/c52-facial-image.properties → ..._before_CHUID/c52-facial-image.properties
diff --git a/config/c52-fingerprint.properties → ...s_before_CHUID/c52-fingerprint.properties b/config/c52-fingerprint.properties → ...s_before_CHUID/c52-fingerprint.properties
diff --git a/config/c52-printed-information.properties → ..._CHUID/c52-printed-information.properties b/config/c52-printed-information.properties → ..._CHUID/c52-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/53_FIPS_201-2_Large_Card_Auth_Cert/10 - Face Object b/cards/ICAM_Card_Objects/53_FIPS_201-2_Large_Card_Auth_Cert/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/53_FIPS_201-2_Large_Card_Auth_Cert/2 - Security Object b/cards/ICAM_Card_Objects/53_FIPS_201-2_Large_Card_Auth_Cert/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/53_FIPS_201-2_Large_Card_Auth_Cert/8 - CHUID Object b/cards/ICAM_Card_Objects/53_FIPS_201-2_Large_Card_Auth_Cert/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/53_FIPS_201-2_Large_Card_Auth_Cert/9 - Fingerprints b/cards/ICAM_Card_Objects/53_FIPS_201-2_Large_Card_Auth_Cert/9 - Fingerprints
diff --git a/config/c53-chuid.properties → ...Large_Card_Auth_Cert/c53-chuid.properties b/config/c53-chuid.properties → ...Large_Card_Auth_Cert/c53-chuid.properties
diff --git a/config/c53-facial-image.properties → ...ard_Auth_Cert/c53-facial-image.properties b/config/c53-facial-image.properties → ...ard_Auth_Cert/c53-facial-image.properties
diff --git a/config/c53-fingerprints.properties → ...ard_Auth_Cert/c53-fingerprints.properties b/config/c53-fingerprints.properties → ...ard_Auth_Cert/c53-fingerprints.properties
diff --git a/config/c53-printed-information.properties → ...h_Cert/c53-printed-information.properties b/config/c53-printed-information.properties → ...h_Cert/c53-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/54_Golden_FIPS_201-2_NFI_PIV-I/10 - Face Object b/cards/ICAM_Card_Objects/54_Golden_FIPS_201-2_NFI_PIV-I/10 - Face Object
diff --git a/cards/ICAM_Card_Objects/54_Golden_FIPS_201-2_NFI_PIV-I/2 - Security Object b/cards/ICAM_Card_Objects/54_Golden_FIPS_201-2_NFI_PIV-I/2 - Security Object
diff --git a/cards/ICAM_Card_Objects/54_Golden_FIPS_201-2_NFI_PIV-I/8 - CHUID Object b/cards/ICAM_Card_Objects/54_Golden_FIPS_201-2_NFI_PIV-I/8 - CHUID Object
diff --git a/cards/ICAM_Card_Objects/54_Golden_FIPS_201-2_NFI_PIV-I/9 - Fingerprints b/cards/ICAM_Card_Objects/54_Golden_FIPS_201-2_NFI_PIV-I/9 - Fingerprints
diff --git a/config/c54-chuid.properties → ...FIPS_201-2_NFI_PIV-I/c54-chuid.properties b/config/c54-chuid.properties → ...FIPS_201-2_NFI_PIV-I/c54-chuid.properties
diff --git a/config/c54-facial-image.properties → ...1-2_NFI_PIV-I/c54-facial-image.properties b/config/c54-facial-image.properties → ...1-2_NFI_PIV-I/c54-facial-image.properties
diff --git a/config/c54-fingerprints.properties → ...1-2_NFI_PIV-I/c54-fingerprints.properties b/config/c54-fingerprints.properties → ...1-2_NFI_PIV-I/c54-fingerprints.properties
diff --git a/config/c54-printed-information.properties → ..._PIV-I/c54-printed-information.properties b/config/c54-printed-information.properties → ..._PIV-I/c54-printed-information.properties
diff --git a/cards/ICAM_Card_Objects/ICAM_CA_and_Signer/ICAM_Test_Card_PIV_Content_Signer_-_gold_gen3.crt b/cards/ICAM_Card_Objects/ICAM_CA_and_Signer/ICAM_Test_Card_PIV_Content_Signer_-_gold_gen3.crt
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFWjCCA8KgAwIBAgIKWFPM4lIYAUEnIzANBgkqhkiG9w0BAQsFADBlMQswCQYD
+MIIFWjCCA8KgAwIBAgIKWFPM4lIYAUEnKTANBgkqhkiG9w0BAQsFADBlMQswCQYD
 VQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MRgwFgYDVQQLEw9JQ0FN
 IFRlc3QgQ2FyZHMxIjAgBgNVBAMTGUlDQU0gVGVzdCBDYXJkIFNpZ25pbmcgQ0Ew
 IhgPMjAxNzExMTgwMDAwMDBaGA8yMDMyMTIzMDIzNTk1OVowZDELMAkGA1UEBhMC
 VVMxGDAWBgNVBAoMD1UuUy4gR292ZXJubWVudDEYMBYGA1UECwwPSUNBTSBUZXN0
 IENhcmRzMSEwHwYDVQQDDBhJQ0FNIENvbnRlbnQgU2lnbmVyIEdlbjMwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfrRywCV9/xba1TWngZsk4aaUUL3Bz
-6fOQH4Xb/8m5LjlgfBsjT4tKbuDZOLh7rAchU0NpmVLcI/Ea1XHjJN5ogdMqfk6C
-ZrLnMSLDgp94PQZiuSqPx53/qxcFcVwMbQKT4JqlrG5eyVAZ29DqvInWZcNCm3GR
-ssvKeXQlLci1IYcC7b5k1hVS9ZSMeQgBshfbEW5N3gg36vKS2LzAcUW3e3AT+Fbj
-537a0cyW/zYn+2tHObdvj3RdUEXRtFhS4k/ainKRhVxOBOwVEVuaDIaVtVP1uunH
-Tf4uK3Vp2eMYeZdpJ19PSHK6iA6H23JA8dGxM15koBuI4Y0lvytekL7nAgMBAAGj
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDR6yxaAwde+Mh6C2KOo1FB5dohVADX
+L2UIMg2Lt6KsZfqx+1Y8t/vnn5o+HDQubfy6XzUn1o/9pLA4gaAJlKrqO8ctrk9W
+nhMQDJwck0DixnRSdiNT8mvFPlon8DdqFV/rSTBvlP52O57dBHvAGZvdpA63E34x
+uyErYmFmM9kegAgkANq8oCzWBeWgwT7akRr6+QqYjwckegGYvkgG7duVu4hUYa8s
+npaBS0ruhTXUj8THkIzpYByM1r4ZAS3AhHSb7Zs260ocq6AgizTVFI/mg3CP9eeE
+r1N7pkl8rNQLurDbviXJ5gxaiwtC+XF8EicJIA00hKXvaPGJXvpQsvwzAgMBAAGj
 ggGHMIIBgzAfBgNVHSMEGDAWgBQMcDu1Rg8bdD0HYvMK0JCseuM+hDAdBgNVHQ4E
-FgQUzWzjUQAxyZ3vSkIaotW7uG/MsQYwFgYDVR0lAQH/BAwwCgYIYIZIAWUDBgcw
+FgQU0YKyiQGbuxLniTJ85CzJCnXi0mYwFgYDVR0lAQH/BAwwCgYIYIZIAWUDBgcw
 DgYDVR0PAQH/BAQDAgeAMIGjBggrBgEFBQcBAQSBljCBkzBdBggrBgEFBQcwAoZR
 aHR0cDovL2h0dHAuYXBsLXRlc3QuY2l0ZS5mcGtpLWxhYi5nb3YvYWlhL2NlcnRz
 SXNzdWVkVG9JQ0FNVGVzdENhcmRTaWduaW5nQ0EucDdjMDIGCCsGAQUFBzABhiZo
 dHRwOi8vb2NzcC5hcGwtdGVzdC5jaXRlLmZwa2ktbGFiLmdvdjBaBgNVHR8EUzBR
 ME+gTaBLhklodHRwOi8vaHR0cC5hcGwtdGVzdC5jaXRlLmZwa2ktbGFiLmdvdi9j
 cmxzL0lDQU1UZXN0Q2FyZEdlbjNTaWduaW5nQ0EuY3JsMBcGA1UdIAQQMA4wDAYK
-YIZIAWUDAgEwVjANBgkqhkiG9w0BAQsFAAOCAYEAccXc9b08eADCFDYs0W59+HOE
-NM/Nn3tVZEroLL7iy8oJlweVluqu0KMDtyxy1BhuIbYj3mShrLcbp4G97uO5zffS
-VW1m0C4dKXQdN1rADrGI/qvgTb8UGzW79mQAeO8lErezX3eIi+m44QK04X7GH0Of
-OUvUdLXdkcTYFVjhKxiTta9GuWICUVuUQ+fCj9Qzg+NUXREv4U6Pi71Ku6/PzA6s
-JK9j0m6nAFtgZK6mVrBhn6NPir228gOo8t+qeDhIuCdRHuBgIZeN0JgRLGj9XnUu
-6MfpWeufjNuDetnr7jktTiw3PWwN+YbKYrWyCoOzRLOlr5Ep+VpA/9x48Vn7Yewv
-4d+deOSoYxDTcfhg/B/n5i3cS/VuWNYR8nz23GnQFvRzqMGA3lUa7ZCD6dFU71bT
-DxZBwYyJcDJuEBqyITQJ2MzaQPnMt+9ItY/tDfyQ+pOWtcoKJWPdGNrYegLv4l1F
-MyhMjv10xaa/YdAKBnzvZD146GagSAzR2s7utUrJ
+YIZIAWUDAgEwVjANBgkqhkiG9w0BAQsFAAOCAYEAnW4rNTq54OuOf4Yrfc3QheqX
+z9gWzg8VDbN2wuskTD5ngcM3hB3ylRU1vYekwtJO2qiuMgMSZIXOXZVhNwiMlACx
+L8AMEj94FYVHCh09y0OODpDL+TjOrZyRX/IRimA7LY+wVmC56fjzObeXJxPMwLyb
+z3veT/K8IuqpxGinj2umVvJCdkNUtF7toDHvtcdBTbyfl2tScDfqbqrY+pj3DdZP
+CwAybKjzeqVwBj3VN78bgXfKPWwANjbrQgtOgBfdRApiGkrHTfMGqX6hz7c84w8q
+QETiO6NFI9bIB4o10So5QrK9uqaqDRBYtCnAuVeUvOJTtkUsK32T8TADfuVY0Qrc
+YTQUtDMnHdTk289EazbHJRosldTHh0aPyv9p4+WFD0bLW/5T7tXUglzDRcvQ3Fx0
+4ElWkIOzEmrKFgE4ml2HPr4IRwyNHW9YMS8PVlvx1+f0ObwYDjpxJUvdnXbtesRQ
+Hl2jwnVBS99PYHoE7uhFt9E19Z527CbP5NVUoBq5
 -----END CERTIFICATE-----
diff --git a/cards/ICAM_Card_Objects/ICAM_CA_and_Signer/ICAM_Test_Card_PIV_Content_Signer_-_gold_gen3.p12 b/cards/ICAM_Card_Objects/ICAM_CA_and_Signer/ICAM_Test_Card_PIV_Content_Signer_-_gold_gen3.p12
diff --git a/...ard_Objects/ICAM_CA_and_Signer/ICAM_Test_Card_PIV_Intermediate_CVC_Signer_-_gold_gen3.crt b/...ard_Objects/ICAM_CA_and_Signer/ICAM_Test_Card_PIV_Intermediate_CVC_Signer_-_gold_gen3.crt
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFWjCCA8KgAwIBAgIKWFPM4lIYAUEnJDANBgkqhkiG9w0BAQsFADBlMQswCQYD
+MIIFWjCCA8KgAwIBAgIKWFPM4lIYAUEnKjANBgkqhkiG9w0BAQsFADBlMQswCQYD
 VQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MRgwFgYDVQQLEw9JQ0FN
 IFRlc3QgQ2FyZHMxIjAgBgNVBAMTGUlDQU0gVGVzdCBDYXJkIFNpZ25pbmcgQ0Ew
 IhgPMjAxNzExMTgwMDAwMDBaGA8yMDMyMTIzMDIzNTk1OVowZDELMAkGA1UEBhMC
 VVMxGDAWBgNVBAoMD1UuUy4gR292ZXJubWVudDEYMBYGA1UECwwPSUNBTSBUZXN0
 IENhcmRzMSEwHwYDVQQDDBhJQ0FNIENvbnRlbnQgU2lnbmVyIEdlbjMwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/f/CH108W4Ahn6T9fTNLWA0eUu6pB
-ypE/eGm/zrwTcsD/nrSl94FNk92waZws4Ipm/QYVoAf3Q9KV+w2ru1jJiSaSFjzT
-ChO3Xr9heQFx08UkPPPMpWOXoexDpoBtbp6C01AEF0ZIWdu7oSfkT9peW5emZk1L
-+DM1V2qFagOLs6yLO+lKlfov11vFpgMVN5s0ijM6n8E6uSobZHWzn/iFiKunu/a9
-X1AFZzf/kWwlRzLTo4HpygKDFF24ZSzR/SjHRqNSbwNdZ2TmMCGHACtcUfee0p7y
-zprzL8Rg1PzKWaYIKZBgbEpcX+37905iUUmGo2LLOur+tm7MIOCcR/f1AgMBAAGj
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs2dhyHdCSrSDMlbMI/S+DJRmnm5/D
+Fdzfk8pgk4bYTOrzmjH8fiTYh5AHcj7ylPU51drQr9oYBbQI/I1RoHk/fW7gNk7u
+m6V+PWDv2RaqZ7yX5800EKnYlL/QLn3vPAZaLvy6ZZo2Wsn9Gqe9AnheQqdLvCbT
+zxS36o5tUUEAicuMicDeoBtnqFWE3gBsseO2Lq8GbmEuTIvc9j13WC/ECHgPQnVq
+8tjbVV/v4rB+vrr89tJ1waTlv7ExRINIFK4ZZvDnhxfGJyJvHOES31SOQzPx7RrE
+yhJB2t+vnzEHk5VOb3fc67u9nRoAx9P3TmOlE6IdpQapwPZsCKjKjJyVAgMBAAGj
 ggGHMIIBgzAfBgNVHSMEGDAWgBQMcDu1Rg8bdD0HYvMK0JCseuM+hDAdBgNVHQ4E
-FgQUPiV5eoRkP04DQy5OIi035jc7ghAwFgYDVR0lAQH/BAwwCgYIYIZIAWUDBgcw
+FgQUa/IHPXbYt9GBoeF2Mmyn5DfJbUIwFgYDVR0lAQH/BAwwCgYIYIZIAWUDBgcw
 DgYDVR0PAQH/BAQDAgeAMIGjBggrBgEFBQcBAQSBljCBkzBdBggrBgEFBQcwAoZR
 aHR0cDovL2h0dHAuYXBsLXRlc3QuY2l0ZS5mcGtpLWxhYi5nb3YvYWlhL2NlcnRz
 SXNzdWVkVG9JQ0FNVGVzdENhcmRTaWduaW5nQ0EucDdjMDIGCCsGAQUFBzABhiZo
 dHRwOi8vb2NzcC5hcGwtdGVzdC5jaXRlLmZwa2ktbGFiLmdvdjBaBgNVHR8EUzBR
 ME+gTaBLhklodHRwOi8vaHR0cC5hcGwtdGVzdC5jaXRlLmZwa2ktbGFiLmdvdi9j
 cmxzL0lDQU1UZXN0Q2FyZEdlbjNTaWduaW5nQ0EuY3JsMBcGA1UdIAQQMA4wDAYK
-YIZIAWUDAgEwVjANBgkqhkiG9w0BAQsFAAOCAYEAfesYkcHKWcG5d4pkEKL5CTW5
-F7SwuLsiJ+X5so6g7BzZrXggiM+VeQxqNon9ESyhQUp/I1KMpnwB2dSl+o2IhthW
-2+MVfgS2djn7H/JlAERmx0MVcA8hQQDLL1MSOoUy0y5t0AumpkVJ8P41l8Cdwcn7
-iOaXiYnSrgOnAKAQSORfgmbbLofh8p7R4dGzx/F0lmju5klbD7sDBKjp7VcdzDtr
-cApl/pW2v7hYLZy4am+bMoX3oI9aziSZ1FdeiIRywPUNbvFl+Ku5iu9T1rIAFdip
-jf+5JqSvikj1g6Nz0UiAbeBHULSXkjT3zK4i4Ren7DNPPSs8OmrCs2PChCyyEI1b
-AT6llo42rn5KpYtoWgH1YkAVrF0BHWDnPUaHhjc52PuAdWszsVl97dnsh79yz148
-hR0wGb29cNpdHCmZQfPKFSESf79qSFQuv7NB2Ve7JUslX/scS2XwegX1S/UrxXU1
-bEDUTvOP+FheDIK4LLIghV2FHV9ijS0FGyVs18l3
+YIZIAWUDAgEwVjANBgkqhkiG9w0BAQsFAAOCAYEAqPGHn/lhlPja3VUx4XlosBam
+isL+aqMTDayq+R3mP6sow+QccGM/3tM6Kw0IYPGryQ2CX22LGOEaW5+vXu00ObRK
++NS3fIbuGn+s20rKcQmrHUpNDaYK5lFH86x8iQ1S+3hEC2AVybF1jCGuLlw4pwtt
+ouKzJNZe2iD8Fv3SHCQa6HFXbKOglmrcjL5MjOVlypazj6W4BhnNWL6TBFzjPNdh
+EgOwkvBG5e/u6WsvFAgYQs5R39l01MRZKpeRfVsHx8/wBhYJ4pyRPa579THtmJd+
+oZSsnIPRRuydWLu133744uPTGST7d2HA7D41kbI2V6xKJtgC0rxYweWiCX2S2yXZ
+K8kQ8wRPBtrJsyQCSKbRiF4C22sj5Qvf+giXwwCxDyGsfSecSwS2qb1640BVIxuI
+EjfpO2ebfolq9hGyEyNNzLcJwtmp0Zrxa3u/iISPE7dtRm/4R0xFJMJrYI5gXMQP
+cdx75/LpvTUABQ6P4jYSI49IkxHhcGEu19+Ij6rT
 -----END CERTIFICATE-----
diff --git a/...ard_Objects/ICAM_CA_and_Signer/ICAM_Test_Card_PIV_Intermediate_CVC_Signer_-_gold_gen3.p12 b/...ard_Objects/ICAM_CA_and_Signer/ICAM_Test_Card_PIV_Intermediate_CVC_Signer_-_gold_gen3.p12
diff --git a/certutils/data/database/index.txt b/certutils/data/database/index.txt
@@ -1846,3 +1846,9 @@ V	20321201235959Z		5853CCE2521801412722	unknown	/C=US/O=U.S. Government/OU=ICAM
 V	20321230235959Z		5853CCE2521801412723	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM Content Signer Gen3
 V	20321230235959Z		5853CCE2521801412724	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM Content Signer Gen3
 V	20321230235959Z		5853CCE2521801412725	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM Content Signer Gen3
+V	20321230235959Z		5853CCE2521801412726	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM Content Signer Gen3
+V	20321230235959Z		5853CCE2521801412727	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM Content Signer Gen3
+V	20321230235959Z		5853CCE2521801412728	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM Content Signer Gen3
+V	20321230235959Z		5853CCE2521801412729	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM Content Signer Gen3
+V	20321230235959Z		5853CCE252180141272A	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM Content Signer Gen3
+V	20321230235959Z		5853CCE252180141272B	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM Content Signer Gen3
diff --git a/certutils/data/database/serial b/certutils/data/database/serial
@@ -1 +1 @@
-5853CCE2521801412726
+5853CCE252180141272C
diff --git a/certutils/mkcert.sh b/certutils/mkcert.sh
@@ -321,7 +321,7 @@ cat \
 
 chmod 644 pem/$(basename $EE_P12 .p12).pem
 
-NAME=pem/$(basename $EE_P12 .p12 | sed 's/[&_]/ /g')
+NAME=$(basename $EE_P12 .p12 | sed 's/[&_]/ /g')
 
 if [ $WIN32 = 1 ]; then
 	openssl pkcs12 \

diff --git a/certutils/mkone.sh b/certutils/mkone.sh
@@ -108,3 +108,21 @@
 #cp data/ICAM_NFI_PIV-I*SP_800-73-4.p12 "$DEST"
 #cp data/pem/ICAM_NFI_PIV-I*SP_800-73-4.crt "$DEST"
 #renameIn "$DEST"
+
+## Content signer
+sh mkcert.sh -b -s ICAM_Test_Card_PIV_Content_Signer_-_gold_gen3 -i ICAM_Test_Card_PIV_Signing_CA_-_gold_gen3 -t piv-content-signer-gen3 || exit $?
+DEST="../cards/ICAM_Card_Objects/ICAM_CA_and_Signer"
+cp -p data/ICAM_Test_Card_PIV_Content_Signer_-_gold_gen3.p12 "$DEST"
+cp -p data/pem/ICAM_Test_Card_PIV_Content_Signer_-_gold_gen3.crt "$DEST"
+
+## CVC Certificate signer
+sh mkcert.sh -b -s ICAM_Test_Card_PIV_Intermediate_CVC_Signer_-_gold_gen3 -i ICAM_Test_Card_PIV_Signing_CA_-_gold_gen3 -t piv-content-signer-gen3 || exit $?
+DEST="../cards/ICAM_Card_Objects/ICAM_CA_and_Signer"
+cp -p data/ICAM_Test_Card_PIV_Intermediate_CVC_Signer_-_gold_gen3.p12 "$DEST"
+cp -p data/pem/ICAM_Test_Card_PIV_Intermediate_CVC_Signer_-_gold_gen3.crt "$DEST"
+
+## RSA-signed P-256 SMCS
+sh mkcert.sh -b -s ICAM_Test_Card_PIV_RSA_issued_P-256_Secure_Messaging_Certificate_Signer_1 -i ICAM_Test_Card_PIV_Signing_CA_-_gold_gen3 -t piv-content-signer-gen3 || exit $?
+DEST="../cards/ICAM_Card_Objects/ICAM_CA_and_Signer"
+cp -p data/ICAM_Test_Card_PIV_RSA_issued_P-256_Secure_Messaging_Certificate_Signer_1.p12 "$DEST"
+cp -p data/pem/ICAM_Test_Card_PIV_RSA_issued_P-256_Secure_Messaging_Certificate_Signer_1.crt "$DEST"
diff --git a/src/gov/gsa/icamcardbuilder/app/ContentSignerTool.java b/src/gov/gsa/icamcardbuilder/app/ContentSignerTool.java
@@ -680,7 +680,7 @@ private byte[] dgMapToBytes(HashMap<Short, Byte> dgMap) {
 	 * 
 	 * @param properties
 	 *            Hashtable of application properties from Gui
-	 * @throw NoSuchPropertyException
+	 * @throws NoSuchPropertyException if a property doesn't exist or is misspelled
 	 */
 	private void getProperties(Hashtable<String, String> properties) throws NoSuchPropertyException {
 		try {
@@ -712,7 +712,7 @@ private void getProperties(Hashtable<String, String> properties) throws NoSuchPr
 	 *            bytes from content file
 	 * @return a Hashtable of CCC tags (keys) and values
 	 */
-	private LinkedHashMap<Byte, byte[]> getCccContents(byte[] contentFileBytes2) {
+	private LinkedHashMap<Byte, byte[]> getCccContents(byte[] contentFileBytes) {
 		LinkedHashMap<Byte, byte[]> tagsValues = new LinkedHashMap<Byte, byte[]>();
 		int tagPosArray[] = new int[1];
 		tagPosArray[0] = 0;
@@ -860,30 +860,38 @@ private byte[] getSecurityObject(byte[] fileBytes) {
 	/**
 	 * Loads the a private key from a .p12 file and populates a class field.
 	 * 
-	 * @param keyFile
+	 * @param keyFilePath
 	 *            the .p12 file
 	 * @param passcode
 	 *            the passcode to the .p12 file
 	 * @return X509 certificate for the public key in the .p12 file
 	 * @throws
 	 *            KeystoreException if a problem occurs while trying to access the keystore
 	 */
-	private X509Certificate loadPrivateKeyAndCert(String keyFile, char[] passcode) throws KeystoreException {
+	private X509Certificate loadPrivateKeyAndCert(String keyFilePath, char[] passcode) throws KeystoreException {
 		KeyStore ks = null;
-		Exception e = null;
 		X509Certificate signingCert = null;
-		try {
-			ks = KeyStore.getInstance("PKCS12");
-			ks.load(new FileInputStream(signingKeyFile), passcode);
-			signingCert = (X509Certificate) ks.getCertificate(keyAlias);
-			this.privateKey = (PrivateKey) ks.getKey(keyAlias, passcode);
-			if (signingCert == null || privateKey == null) {
-				e = new KeystoreException ("Error accessing keystore '" + keyFile + "'", ContentSignerTool.class.getName());
+		File file = new File(keyFilePath);
+
+		if(file.exists() && !file.isDirectory()) { 
+			try {
+				ks = KeyStore.getInstance("PKCS12", bc);
+				FileInputStream fis = new FileInputStream(keyFilePath);
+				ks.load(fis, passcode);
+				if ((signingCert = (X509Certificate) ks.getCertificate(keyAlias)) != null) {	
+					if ((this.privateKey = (PrivateKey) ks.getKey(keyAlias, passcode)) == null) {
+						throw new KeystoreException ("Cannot load private key from '" + keyFilePath + "'", ContentSignerTool.class.getName());
+					}
+				} else {
+					throw new KeystoreException ("Cannot load certificate from '" + keyFilePath + "'", ContentSignerTool.class.getName());
+				}
+			} catch (Exception x) {
+				if (!(x instanceof KeystoreException))
+					throw new KeystoreException (x.getMessage(), ContentSignerTool.class.getName());
 			}
-		} catch (Exception x) {
-			if (e != null)
-				throw new KeystoreException (x.getMessage(), ContentSignerTool.class.getName());
-			return null;
+		}
+		else {
+			throw new KeystoreException ("Cannot open '" + keyFilePath + "'", ContentSignerTool.class.getName());
 		}
 		return signingCert;
 	}

diff --git a/src/gov/gsa/icamcardbuilder/app/Gui.java b/src/gov/gsa/icamcardbuilder/app/Gui.java
@@ -69,7 +69,7 @@
 public class Gui extends JPanel {
 
 	private static final long serialVersionUID = 1L;
-	protected final static String version = "1.8.15";
+	protected final static String version = "1.8.16";
 	protected static boolean debug = true;
 	protected static Logger logger;
 	protected static String decodedPath;
@@ -274,6 +274,8 @@ public void actionPerformed(ActionEvent e) {
 				progress.setValue(0);
 				if (signingCount > 0)
 					status.append("***************************************************************************\n");
+				status.append(dateFormat.format(new Date()) + " - ");
+				status.append("Config: " + propertiesFile.getName() + "\n");
 				status.append(dateFormat.format(new Date()) + " - Applying signature (" + ++signingCount + ").\n");
 				checkRevocation = revocationCheckBoxMenuItem.isSelected();
 				progress.setValue(8);
@@ -766,9 +768,9 @@ private void securityObjectFileBrowseButtonActionPerformed(java.awt.event.Action
 	}
 
 	private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {
-		File dir = new File(currentDirectory + File.pathSeparator + "config");
+		File dir = new File(currentDirectory + "cards" + File.separator + "ICAM_Card_Objects");
 		if (dir.exists()) {
-			currentDirectory += File.pathSeparator + "config";
+			currentDirectory += "cards" + File.separator + "ICAM_Card_Objects";
 		}
 
 		contentFileChooser.setCurrentDirectory(new File(currentDirectory));
@@ -805,13 +807,13 @@ public static String pathFixup(String inPath) {
 	private void openPropertiesFileActionPerformed(java.awt.event.ActionEvent evt) {
 
 		if (!located) {
-			File dir = new File(currentDirectory + File.separator + "config");
+			File dir = new File(currentDirectory + "cards" + File.separator + "ICAM_Card_Objects");
 			if (dir.exists()) {
-				currentDirectory += "config\\";
+				currentDirectory +=  "cards" + File.separator + "ICAM_Card_Objects";
 				located = true;
 			}
 		}
-			
+		propertiesFileChooser.setPreferredSize(new Dimension(840, 500));
 		propertiesFileChooser.setFileFilter(new FileNameExtensionFilter("Properties Files", new String[] { "properties" }));
 		propertiesFileChooser.setCurrentDirectory(new File(currentDirectory));
 		int returnVal = propertiesFileChooser.showOpenDialog(frame);

diff --git a/src/gov/gsa/icamcardbuilder/app/Utils.java b/src/gov/gsa/icamcardbuilder/app/Utils.java
@@ -148,7 +148,7 @@ public static short toShortFromBytes(byte a, byte b) {
 	 * @param s
 	 *            the string to be converted
 	 * @return a byte array containing bytes as represented by argument s
-	 * @throws InvalidDataFormatException
+	 * @throws InvalidDataFormatException if an bad date format is encountered
 	 */
 	public static byte[] hexStringToByteArray(String s) throws InvalidDataFormatException {
 		int len = s.length();
@@ -169,6 +169,7 @@ public static byte[] hexStringToByteArray(String s) throws InvalidDataFormatExce
 	 * @param singleByte
 	 *            the byte to be converted
 	 * @return string of length two bytes representing the byte singleByte
+	 * @throws InvalidDataFormatException if a byte can't be converted 
 	 */
 	public static String byteToHex(byte singleByte) throws InvalidDataFormatException {
 		char[] hexChars = new char[2];