Corrected script so that Card 46 PIV Auth cert gets built.

cards/ICAM_Card_Objects/46_Golden_FIPS_201-2_PIV/3 - ICAM_PIV_Auth_SP_800-73-4.crt

@@ -1,33 +1,34 @@
 -----BEGIN CERTIFICATE-----
-MIIFsDCCBBigAwIBAgIKWFPM4lIYAUEkITANBgkqhkiG9w0BAQsFADBlMQswCQYD
+MIIF6jCCBFKgAwIBAgIKWFPM4lIYAUEkaDANBgkqhkiG9w0BAQsFADBlMQswCQYD
 VQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MRgwFgYDVQQLEw9JQ0FN
 IFRlc3QgQ2FyZHMxIjAgBgNVBAMTGUlDQU0gVGVzdCBDYXJkIFNpZ25pbmcgQ0Ew
-HhcNMTcxMDE5MTEwMzQ1WhcNMzIxMjAxMTEwMzQ1WjBlMQswCQYDVQQGEwJVUzEY
+HhcNMTcxMDIzMTMyMjQxWhcNMzIxMjAxMTMyMjQxWjBlMQswCQYDVQQGEwJVUzEY
 MBYGA1UECgwPVS5TLiBHb3Zlcm5tZW50MRgwFgYDVQQLDA9JQ0FNIFRlc3QgQ2Fy
 ZHMxIjAgBgNVBAMMGUlDQU0gUElWIEF1dGggU1AgODAwLTczLTQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAnxeHGM00NzM1b6axoL0ysAtOVTb6sCKK
-bqlsbKJVWCpXDoMHkPVoIL4ClDr1RmpX+tEsOy+mDnffRe/uD11MM7mbdxqirnEC
-BKZ7Xrcaj69Hj5W0i5yaznY8hRZ8AhF99rnZgcaYfgGgRtkVUh600+yxt+gLPm9I
-q4zAGYyM9xWaTsqF9yL4u4SPXeWsL5UfkFCJioXo5FBm60bOf+R8osptOdR3EqZB
-yDrMjfjA3Fu0oUkCWATdk+4NXZz66013ap4n9IQuHdp8MjElTSG6t7w1gVmE+E8g
-tfhkLjQyAlFbi+zShcpADt8NIvTEDIHzXt43gBZuJ3AFVrZKKMQ1AgMBAAGjggHg
-MIIB3DAfBgNVHSMEGDAWgBQMcDu1Rg8bdD0HYvMK0JCseuM+hDAdBgNVHQ4EFgQU
-uUk4J4q4VV77v00ceGghWmBDRd0wDgYDVR0PAQH/BAQDAgeAMIGjBggrBgEFBQcB
-AQSBljCBkzBdBggrBgEFBQcwAoZRaHR0cDovL2h0dHAuYXBsLXRlc3QuY2l0ZS5m
-cGtpLWxhYi5nb3YvYWlhL2NlcnRzSXNzdWVkVG9JQ0FNVGVzdENhcmRTaWduaW5n
-Q0EucDdjMDIGCCsGAQUFBzABhiZodHRwOi8vb2NzcC5hcGwtdGVzdC5jaXRlLmZw
-a2ktbGFiLmdvdjBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vaHR0cC5hcGwtdGVz
-dC5jaXRlLmZwa2ktbGFiLmdvdi9jcmxzL0lDQU1UZXN0Q2FyZFNpZ25pbmdDQS5j
-cmwwEAYJYIZIAWUDBgkBBAMBAQAwFwYDVR0gBBAwDjAMBgpghkgBZQMCATALMGEG
-A1UdEQRaMFigJwYIYIZIAWUDBgagGwQZ0TgQ2CivLBCEJG2haFgorwIQhI2E5znD
-64YtdXJuOnV1aWQ6OTRlMjhjNjgtODRkYi00NGRiLThhMGUtZjUwMmQ2Njg5YjE0
-MA0GCSqGSIb3DQEBCwUAA4IBgQCG1BblIlJQZFcEcNAQ7wXLWp1LEvbl+vk9Jzq9
-Rsi9z/3q0irMWx1x8ipxIWp1CC49wODSSx9qjVQ0vNOfZrGLOZs8ZEY+ybNYDX3r
-jTc3MlP9GDueuEX8HSKOgfzpSve8D7yQ+t8tIxEd+b4BfACG2qbNCyFyNMjL0Mea
-j062Vp/x8HUtnqzeRwmCpvcO2gkHUgqIpieyE3RVKj48VzGAHnAKPyG6HraoiZCu
-RuxSVD7yQw0W6fHm20LbZ4S+tB2gELuszdUKRrsViCx69yETtHGo4otfL3o7OixC
-DeKAsHEIg3z8I9rhCEIV0F8unTF9oIdUc7zbEzaFG5CIVdUEkua3tZR4m/h8yviZ
-yOyd+bYpVR3Foi1bkQfnChMKj7N9xx+g6sFfvfjcShvdbeF1LXyDGQ+BkHKa0QJB
-DnZpoiCUblqrnOPIXqwtdLItoLOwZu4bMb65zoKaDlyIvt00nPAyAZ2T5D2INi7U
-yxEaaORN7xIa7snK3VaZgSkyGsw=
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOin7uVMaWPmhfd+/cjfeXHbKgcLEY5dA2
+0wmWSdkXclR5GIENn8n06eViaFVDNH+Qq0ctFqYVcvn0ZIhy1j/t26TnE1fxak0Q
+lcXX+FlRfkdUevluHeRV5OZwAWocvpFlEBfvr0oHnMPhnGjI4ZeFUuRMPtcHL+v/
+D55NNgvr8gU9THN+D/zsKykf5OPXgnXhW1ndBKuP5FWPHX/R4/gp6o2F0wHeej2w
++0CfaHB0mo/X8YxsC7A69kkO8yO6dS2i9UqJx4d9rCdAu9fMK733eBAVkG+rcjEW
+oy+dZaNtLESecXGu6LIndZERVV2zJDvNz9c9bo/Dim4zKPvs7k8RAgMBAAGjggIa
+MIICFjAfBgNVHSMEGDAWgBQMcDu1Rg8bdD0HYvMK0JCseuM+hDAdBgNVHQ4EFgQU
+q2pwu5jDms94f/kXC2uTK+9xD8swDgYDVR0PAQH/BAQDAgeAMDgGA1UdJQQxMC8G
+CisGAQQBgjcUAgIGCCsGAQUFBwMCBgcrBgEFAgMEBggrBgEFBQcDFQYEVR0lADCB
+owYIKwYBBQUHAQEEgZYwgZMwXQYIKwYBBQUHMAKGUWh0dHA6Ly9odHRwLmFwbC10
+ZXN0LmNpdGUuZnBraS1sYWIuZ292L2FpYS9jZXJ0c0lzc3VlZFRvSUNBTVRlc3RD
+YXJkU2lnbmluZ0NBLnA3YzAyBggrBgEFBQcwAYYmaHR0cDovL29jc3AuYXBsLXRl
+c3QuY2l0ZS5mcGtpLWxhYi5nb3YwVgYDVR0fBE8wTTBLoEmgR4ZFaHR0cDovL2h0
+dHAuYXBsLXRlc3QuY2l0ZS5mcGtpLWxhYi5nb3YvY3Jscy9JQ0FNVGVzdENhcmRT
+aWduaW5nQ0EuY3JsMBAGCWCGSAFlAwYJAQQDAQEAMBcGA1UdIAQQMA4wDAYKYIZI
+AWUDAgEwCzBhBgNVHREEWjBYoCcGCGCGSAFlAwYGoBsEGdE4ENgorywQhCRtoWhY
+KK8CEISNhOc5w+uGLXVybjp1dWlkOjk0ZTI4YzY4LTg0ZGItNDRkYi04YTBlLWY1
+MDJkNjY4OWIxNDANBgkqhkiG9w0BAQsFAAOCAYEAA2J+Kax1ntgkz2IIaVMZR7HN
+UtwwjSvO2pscDhFihruPjp7pod1azyTHk81OiS4IIloGa0MARKFG6KCkHHkmisZu
+SWfT58zPm2ttCxAtz1s5Wr2NyS+DGZ4mrZ9M3O61B5oGaJ1jv21qZ+K3i/cRGw1w
+LDZA9jHk8cInZGyOdEXX7IqZdRbdX4mujfjeml8P5FdeOGqsOqowzoB5a86i/VZJ
+GYQ2MZJbO1jcI5sNS2q6nQtNhUgf0Tetgj8f8MbAqokXO8fB1Wd03mk3BRtRoPOr
+nsYa9chSHvp+zsSo9COBRfCY87n/X8d8uA5V7C9pDJzWijwjNii+7FRzLegbvT98
+hvY81hT0yZB9nMhiQ3/lZ1ENE5O45D+qss9Hpj8TI2qISygoaagaMzZUFVAB3FEY
+2P+ys6J4F3EXhAZcD59n83gbtsucxvlBTk2eDrV20I1bPMfSjlYbp37SGD9VQDLg
+wD1veD2a5CJ0i19e0j/f1KzcZH5a2qD4rUKwEvCg
 -----END CERTIFICATE-----

certutils/.gitignore

@@ -1,12 +1,3 @@
 /SDK Card 1/
 /SDK Card 2/
 /SDK Card 3/
-/data/csr/
-/data/csr/*
-/data/pem/
-/data/pem/*
-/data/der/
-/data/der/*
-/data/*pem
-/data/*.p12
-/database/*.old

certutils/data/.gitignore

@@ -1 +1,10 @@
+/csr/
+/csr/*
 /der/
+/der/*
+*.pem
+*.p12
+*.crt
+!ICAM_Test_Card_PIV_Signing_CA_-_gold_gen3.crt
+!ICAM_Test_Card_PIV_Signing_CA_-_gold_gen3.p12
+/database/*.old

certutils/data/ICAM_Test_Card_PIV_Signing_CA_-_gold_gen3.crt

@@ -0,0 +1,39 @@
+Bag Attributes
+    localKeyID: BC E6 98 A0 53 94 39 32 BF 70 5A AB A3 6B B6 BA 66 B8 A3 33 
+    friendlyName: ICAM Test Card PIV Signing CA - gold gen3
+subject=/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM Test Card Signing CA
+issuer=/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM Test Card Root CA
+-----BEGIN CERTIFICATE-----
+MIIF4TCCBEmgAwIBAgIIa3/4hwoWC4MwDQYJKoZIhvcNAQELBQAwYjELMAkGA1UE
+BhMCVVMxGDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEYMBYGA1UECxMPSUNBTSBU
+ZXN0IENhcmRzMR8wHQYDVQQDExZJQ0FNIFRlc3QgQ2FyZCBSb290IENBMB4XDTE3
+MDgxNDAwMDAwMFoXDTMyMTIzMTIzNTk1OVowZTELMAkGA1UEBhMCVVMxGDAWBgNV
+BAoTD1UuUy4gR292ZXJubWVudDEYMBYGA1UECxMPSUNBTSBUZXN0IENhcmRzMSIw
+IAYDVQQDExlJQ0FNIFRlc3QgQ2FyZCBTaWduaW5nIENBMIIBojANBgkqhkiG9w0B
+AQEFAAOCAY8AMIIBigKCAYEA+P173LEFoD4mdvruvr52vk/l7cYWBtFN7O6VXifr
+5TN1l/l2JwAWbOhrdUq4HacNUEI/EgN7dDH5OkIrQSGQU+WJB26+9qafD+qjhpc8
+HEDjAwlGyQJJXf5cfhUMfWrvz7ssSP0z2xlRaaRcCEtcR4sHdSErHxLZLhxOOlP8
+uRxUxjMUQDQ9zXofaVghVhiAiWZLLnpnVMKzoR914k9HOm6fIHgj9wRwx2u9fD1I
+7WWOiiNJVWafaD+XvRKUklOTUecoytceDDoswyGL/PfDWsKSDyX7gYvHgS5GeEPw
+o8q5opfPPtJaQCQneWvq0k9oA3W3wcHhNZkvI2U/q6QCU2xLHRlQF/W5T4hB/T0q
+ai/AWdbhvTF6g7zqcxXNmhcIuYbvKH5FSnpcHJUAswdCD2aLF376F0BOEZ6DyvJu
+vKDUu6rK+w3ffF1xaTPm0+LDOcuoa8sMCyufe3Hw9hqtrWmcOcWGGEzXK07u0qyK
+xB0Bi1DBC90UTdA9NRCC2wijAgMBAAGjggGWMIIBkjAfBgNVHSMEGDAWgBRne9W1
+0mnzKGZd2ZNoMm23moRaGTAdBgNVHQ4EFgQUDHA7tUYPG3Q9B2LzCtCQrHrjPoQw
+awYDVR0gBGQwYjAMBgpghkgBZQMCATAJMAwGCmCGSAFlAwIBMAswDAYKYIZIAWUD
+AgEwDTAMBgpghkgBZQMCATBOMAwGCmCGSAFlAwIBME8wDAYKYIZIAWUDAgEwUDAM
+BgpghkgBZQMCATBWMGoGCCsGAQUFBwEBBF4wXDBaBggrBgEFBQcwAoZOaHR0cDov
+L2h0dHAuYXBsLXRlc3QuY2l0ZS5mcGtpLWxhYi5nb3YvYWlhL2NlcnRzSXNzdWVk
+VG9JQ0FNVGVzdENhcmRSb290Q0EucDdjMFMGA1UdHwRMMEowSKBGoESGQmh0dHA6
+Ly9odHRwLmFwbC10ZXN0LmNpdGUuZnBraS1sYWIuZ292L2NybHMvSUNBTVRlc3RD
+YXJkUm9vdENBLmNybDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIB
+BjANBgkqhkiG9w0BAQsFAAOCAYEAlhKQvOAFg4pP7Ud93Vbonqg/P5bSmO5Qanxp
+esbCUYDa7IO0rPbNy6TfSuzMgg3bSqDOqSModiV8A7QUyNWpYf39wMq/VZEYefer
+U9LUWWt6wqPqNeEt7qf5NPnD7svmxlDvziYaQBaH1T5ajgupvMp0H2dbIR0mDrGb
+mgzT6pxSngeZZUF3CUK4qWslOowMtjiVIDpxpM+kf3m+Bcd7ZfGpDdGjD6MyFsWX
+bP5UXj/9U7Ru6DFKMtVSi48umhjN/0kw59pl//leVJt783ZkK+kI2qs4VEEubFSs
++7kS6/zI3uj5QSYhqu7TQhhhJRA0MgXmANj2trkb1PP26GInCAvSfbuGGVHaKWOh
+uavQys3JN+lcM3iDmmeSU6glRTX0h1WN/KewVqvvrxi1lBEhcVlGzPtAi2sOSKhT
+LbQ3dhKGi3s89dmvXRn6jocS0tY9KyD4miXezyYsHuQNtKr1ggWKOLyE3XfVLXCT
+083LVawO/jjQ/qjPxlWr2vvyST5e
+-----END CERTIFICATE-----

certutils/data/database/index.txt

@@ -1143,3 +1143,5 @@ V	321201112429Z		5853CCE2521801412463	unknown	/C=US/O=U.S. Government/OU=ICAM Te
 V	321201112431Z		5853CCE2521801412464	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM NFI PIV-I Auth SP 800-73-4
 V	321201114754Z		5853CCE2521801412465	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM PIV Auth SP 800-73-4 PPS
 V	321201114847Z		5853CCE2521801412466	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM PIV Auth SP 800-73-4 PPS
+V	321201132057Z		5853CCE2521801412467	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM PIV Auth SP 800-73-4
+V	321201132241Z		5853CCE2521801412468	unknown	/C=US/O=U.S. Government/OU=ICAM Test Cards/CN=ICAM PIV Auth SP 800-73-4

certutils/data/database/serial

@@ -1 +1 @@
-5853CCE2521801412467
+5853CCE2521801412469

certutils/data/pem/.gitignore

@@ -0,0 +1 @@
+/ICAM_Test_Card_PIV_Signing_CA_-_gold_gen3.crt

certutils/mkall.sh

@@ -85,7 +85,7 @@ sh mkcert.sh -w -b -s ICAM_PIV_Card_Auth_SP_800-73-4 -i ICAM_Test_Card_PIV_Signi
 DEST="../cards/ICAM_Card_Objects/46_Golden_FIPS_201-2_PIV"
 cp data/ICAM_PIV_*SP_800-73-4.p12 "$DEST"
 cp data/pem/ICAM_PIV_*SP_800-73-4.crt "$DEST"
-#renameIn "$DEST" #### echo "Not needed since this is the golden PIV and has no caveats
+renameIn "$DEST"  # Note that it will complain that the PIV Auth cert is the same file.  Let it go.
 # Card 47
 sh mkcert.sh -w -b -s ICAM_PIV_Auth_SP_800-73-4_SAN_Order -i ICAM_Test_Card_PIV_Signing_CA_-_gold_gen3 -n 47 -t piv-auth
 sh mkcert.sh -w -b -s ICAM_PIV_Dig_Sig_SP_800-73-4_SAN_Order -i ICAM_Test_Card_PIV_Signing_CA_-_gold_gen3 -n 47 -t piv-dig-sig