#535 Enable adding non-root NOC(ICA) certificates

Signed-off-by: Abdulbois <abdulbois.tursunov@dsr-corporation.com>
Signed-off-by: Abdulbois <abdulbois123@gmail.com>

docker-compose.yml

@@ -122,4 +122,4 @@ networks:
     ipam:
       driver: default
       config:
-        - subnet: 192.167.10.0/16
+        - subnet: 192.167.10.0/24

integration_tests/cli/pki-noc-certs.sh

@@ -2,23 +2,33 @@ set -euo pipefail
 source integration_tests/cli/common.sh
 
 noc_root_cert_1_path="integration_tests/constants/noc_root_cert_1"
-noc_root_cert_1_subject="MFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDjAMBgNVBAMMBU5PQy0x"
+noc_root_cert_1_subject="MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
 noc_root_cert_1_subject_key_id="44:EB:4C:62:6B:25:48:CD:A2:B3:1C:87:41:5A:08:E7:2B:B9:83:26"
-noc_root_cert_1_serial_number="217369606639495620450806539821422258966012867792"
-noc_root_cert_1_subject_as_text="CN=NOC-1,O=Internet Widgits Pty Ltd,ST=Some-State,C=AU"
+noc_root_cert_1_serial_number="1"
+noc_root_cert_1_subject_as_text="CN=www.example.com,OU=Testing Division,O=Example Company,L=New York,ST=New York,C=US"
 
 noc_root_cert_2_path="integration_tests/constants/noc_root_cert_2"
-noc_root_cert_2_subject="MFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDjAMBgNVBAMMBU5PQy0y"
+noc_root_cert_2_subject="MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
 noc_root_cert_2_subject_key_id="CF:E6:DD:37:2B:4C:B2:B9:A9:F2:75:30:1C:AA:B1:37:1B:11:7F:1B"
-noc_root_cert_2_serial_number="720401643293243343104681760462974770802745092176"
-noc_root_cert_2_subject_as_text="CN=NOC-2,O=Internet Widgits Pty Ltd,ST=Some-State,C=AU"
+noc_root_cert_2_serial_number="2"
+noc_root_cert_2_subject_as_text="CN=www.example.com,OU=Testing Division,O=Example Company,L=New York,ST=New York,C=US"
 
 noc_root_cert_3_path="integration_tests/constants/noc_root_cert_3"
 noc_root_cert_3_subject="MFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDjAMBgNVBAMMBU5PQy0z"
 noc_root_cert_3_subject_key_id="88:0D:06:D9:64:22:29:34:78:7F:8C:3B:AE:F5:08:93:86:8F:0D:20"
 noc_root_cert_3_serial_number="38457288443253426021793906708335409501754677187"
 noc_root_cert_3_subject_as_text="CN=NOC-3,O=Internet Widgits Pty Ltd,ST=Some-State,C=AU"
 
+noc_cert_1_path="integration_tests/constants/noc_cert_1"
+noc_cert_1_subject="MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
+noc_cert_1_subject_key_id="02:72:6E:BC:BB:EF:D6:BD:8D:9B:42:AE:D4:3C:C0:55:5F:66:3A:B3"
+noc_cert_1_serial_number="3"
+
+noc_cert_2_path="integration_tests/constants/noc_cert_2"
+noc_cert_2_subject="MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
+noc_cert_2_subject_key_id="87:48:A2:33:12:1F:51:5C:93:E6:90:40:4A:2C:AB:9E:D6:19:E5:AD"
+noc_cert_2_serial_number="4"
+
 trustee_account="jack"
 second_trustee_account="alice"
 
@@ -92,7 +102,7 @@ echo $result | jq
 
 test_divider
 
-echo "Try to add inermidiate cert using add-noc-x509-root-cert command"
+echo "Try to add intermediate cert using add-noc-x509-root-cert command"
 intermediate_path="integration_tests/constants/intermediate_cert"
 result=$(echo "$passphrase" | dcld tx pki add-noc-x509-root-cert --certificate="$intermediate_path" --from $vendor_account --yes)
 check_response "$result" "\"code\": 414"
@@ -173,4 +183,58 @@ check_response "$result" "\"subjectKeyId\": \"$noc_root_cert_1_subject_key_id\""
 check_response "$result" "\"serialNumber\": \"$noc_root_cert_1_serial_number\""
 check_response "$result" "\"subjectAsText\": \"$noc_root_cert_1_subject_as_text\""
 
+echo "Add first NOC certificate by vendor with VID = $vid"
+result=$(echo "$passphrase" | dcld tx pki add-noc-x509-cert --certificate="$noc_cert_1_path" --from $vendor_account --yes)
+check_response "$result" "\"code\": 0"
+
+echo "Request NOC certificate by VID = $vid"
+result=$(dcld query pki noc-x509-certs --vid="$vid")
+echo $result | jq
+check_response "$result" "\"subject\": \"$noc_cert_1_subject\""
+check_response "$result" "\"subjectKeyId\": \"$noc_cert_1_subject_key_id\""
+check_response "$result" "\"serialNumber\": \"$noc_cert_1_serial_number\""
+check_response "$result" "\"vid\": $vid"
+
+test_divider
+
+echo "Request all child certificates by Subject and SubjectKeyID"
+result=$(dcld query pki all-child-x509-certs --subject="$noc_root_cert_1_subject" --subject-key-id="$noc_root_cert_1_subject_key_id")
+echo $result | jq
+check_response "$result" "\"subject\": \"$noc_cert_1_subject\""
+check_response "$result" "\"subjectKeyId\": \"$noc_cert_1_subject_key_id\""
+
+echo "Try to add intermediate with different VID = $vid_2"
+result=$(echo "$passphrase" | dcld tx pki add-noc-x509-root-cert --certificate="$noc_cert_2_path" --from $vendor_account_2 --yes)
+check_response "$result" "\"code\": 439"
+
+test_divider
+
+echo "Add second NOC certificate by vendor with VID = $vid"
+result=$(echo "$passphrase" | dcld tx pki add-noc-x509-cert --certificate="$noc_cert_2_path" --from $vendor_account --yes)
+check_response "$result" "\"code\": 0"
+
+echo "Request all NOC certificates"
+result=$(dcld query pki all-noc-x509-certs)
+echo $result | jq
+check_response "$result" "\"subject\": \"$noc_cert_1_subject\""
+check_response "$result" "\"subjectKeyId\": \"$noc_cert_1_subject_key_id\""
+check_response "$result" "\"serialNumber\": \"$noc_cert_1_serial_number\""
+check_response "$result" "\"subject\": \"$noc_cert_2_subject\""
+check_response "$result" "\"subjectKeyId\": \"$noc_cert_2_subject_key_id\""
+check_response "$result" "\"serialNumber\": \"$noc_cert_2_serial_number\""
+check_response "$result" "\"vid\": $vid"
+
+echo "Request all approved certificates"
+result=$(dcld query pki all-x509-certs)
+check_response "$result" "\"subject\": \"$noc_root_cert_1_subject\""
+check_response "$result" "\"subjectKeyId\": \"$noc_root_cert_1_subject_key_id\""
+check_response "$result" "\"serialNumber\": \"$noc_root_cert_1_serial_number\""
+check_response "$result" "\"subject\": \"$noc_cert_1_subject\""
+check_response "$result" "\"subjectKeyId\": \"$noc_cert_1_subject_key_id\""
+check_response "$result" "\"serialNumber\": \"$noc_cert_1_serial_number\""
+check_response "$result" "\"subject\": \"$noc_cert_2_subject\""
+check_response "$result" "\"subjectKeyId\": \"$noc_cert_2_subject_key_id\""
+check_response "$result" "\"serialNumber\": \"$noc_cert_2_serial_number\""
+echo $result | jq
+
 test_divider

integration_tests/constants/noc_cert_1

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICOTCCAd+gAwIBAgIBAzAKBggqhkjOPQQDAjCBgjELMAkGA1UEBhMCVVMxETAP
+BgNVBAgMCE5ldyBZb3JrMREwDwYDVQQHDAhOZXcgWW9yazEYMBYGA1UECgwPRXhh
+bXBsZSBDb21wYW55MRkwFwYDVQQLDBBUZXN0aW5nIERpdmlzaW9uMRgwFgYDVQQD
+DA93d3cuZXhhbXBsZS5jb20wIBcNMjQwMzAxMDY0NDE4WhgPMzAyMzA3MDMwNjQ0
+MThaMIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcM
+CE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRl
+c3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbTBZMBMGByqG
+SM49AgEGCCqGSM49AwEHA0IABM49jq9u+/yejw1wh19r8xuQl6kWRRx85jKbSBqM
+vbKmHxr/CTRGliov4z4oniiNrvSgor+KAGYSK1EPhUHeZdCjQjBAMB0GA1UdDgQW
+BBQCcm68u+/WvY2bQq7UPMBVX2Y6szAfBgNVHSMEGDAWgBRE60xiayVIzaKzHIdB
+WgjnK7mDJjAKBggqhkjOPQQDAgNIADBFAiAE9y8XdiA4kxwtY2vDS4HVkdoj5wyS
+P3NimycxtXsj9AIhALjQsYWHp7+kr75SgNIKgav7Fr3fxEFvWca8oWMxM1PA
+-----END CERTIFICATE-----

integration_tests/constants/noc_cert_2

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICODCCAd+gAwIBAgIBBDAKBggqhkjOPQQDAjCBgjELMAkGA1UEBhMCVVMxETAP
+BgNVBAgMCE5ldyBZb3JrMREwDwYDVQQHDAhOZXcgWW9yazEYMBYGA1UECgwPRXhh
+bXBsZSBDb21wYW55MRkwFwYDVQQLDBBUZXN0aW5nIERpdmlzaW9uMRgwFgYDVQQD
+DA93d3cuZXhhbXBsZS5jb20wIBcNMjQwMzAxMDY0NTA4WhgPMzAyMzA3MDMwNjQ1
+MDhaMIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcM
+CE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRl
+c3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbTBZMBMGByqG
+SM49AgEGCCqGSM49AwEHA0IABPkfJY7a758L6ES/WRTObOP6WuhFM3pZk7K06vjf
+3A72cAAjHbQ+W8uzFtFmQsNnrXBcRIb26KZMLGdRMWWv2b2jQjBAMB0GA1UdDgQW
+BBSHSKIzEh9RXJPmkEBKLKue1hnlrTAfBgNVHSMEGDAWgBTP5t03K0yyuanydTAc
+qrE3GxF/GzAKBggqhkjOPQQDAgNHADBEAiA/fduC6XJ8RGH2FCk0V7YDjAQCC3Vg
+Cxv0F/nTvM9ZlAIgW5x5vOhKRXEb1ak8j7SsX8ZO9aBYyLqs91dmOnHM2XM=
+-----END CERTIFICATE-----

integration_tests/constants/noc_constants.go

@@ -1,36 +1,38 @@
 package testconstants
 
 const (
-	NocRootCert1 = `
------BEGIN CERTIFICATE-----
-MIICATCCAaegAwIBAgIUJhMwtZzr6dGO6tqHmuDi4Bz/tNAwCgYIKoZIzj0EAwIw
-VTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGElu
-dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEOMAwGA1UEAwwFTk9DLTEwIBcNMjQwMjE0
-MTQ0NzI1WhgPMzAyMzA2MTcxNDQ3MjVaMFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQI
-DApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQx
-DjAMBgNVBAMMBU5PQy0xMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAECsW1A5xK
-Tv4qbfUsUp74bQNlkJV6GZL59b+PgqLyq7P1PMtJK3L7NmisUvdsT1dYr1sMzDEK
-6ZuajkpkIfeV3qNTMFEwHQYDVR0OBBYEFETrTGJrJUjNorMch0FaCOcruYMmMB8G
-A1UdIwQYMBaAFETrTGJrJUjNorMch0FaCOcruYMmMA8GA1UdEwEB/wQFMAMBAf8w
-CgYIKoZIzj0EAwIDSAAwRQIgS4gxVvmQghH93BbG3RRpJ07Re5+gTFAo5qfVTtDo
-teUCIQCQwlaPb8U8S0ee3Iz1gg4LOTxZ/IWyCzPpCteAEKcl+w==
------END CERTIFICATE-----
-	`
-	NocRootCert2 = `
------BEGIN CERTIFICATE-----
-MIICATCCAaegAwIBAgIUfi/tSwkm8n1SVPVYvpmRj7WDKFAwCgYIKoZIzj0EAwIw
-VTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGElu
-dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEOMAwGA1UEAwwFTk9DLTIwIBcNMjQwMjE0
-MTQ0NzQ1WhgPMzAyMzA2MTcxNDQ3NDVaMFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQI
-DApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQx
-DjAMBgNVBAMMBU5PQy0yMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdyZTx3lJ
-ZYUEazRXrDUgtut3EF1iXFXibKttwgvqIQqo/8Z/5uh402+AjqlsYRW7J2XhAaNl
-jd+mU2GZc9whuaNTMFEwHQYDVR0OBBYEFM/m3TcrTLK5qfJ1MByqsTcbEX8bMB8G
-A1UdIwQYMBaAFM/m3TcrTLK5qfJ1MByqsTcbEX8bMA8GA1UdEwEB/wQFMAMBAf8w
-CgYIKoZIzj0EAwIDSAAwRQIhAPxnWiN91np0FqsJ3wzxbBhUvb0L7tCCG8b78ug5
-M4e6AiAzKpDZ//MaM3khHSuiJhXBWhN+HR/veWVfeLLKtMhoKg==
------END CERTIFICATE-----
-	`
+	NocRootCert1 = `-----BEGIN CERTIFICATE-----
+MIICRzCCAe2gAwIBAgIBATAKBggqhkjOPQQDAjCBgjELMAkGA1UEBhMCVVMxETAP
+BgNVBAgMCE5ldyBZb3JrMREwDwYDVQQHDAhOZXcgWW9yazEYMBYGA1UECgwPRXhh
+bXBsZSBDb21wYW55MRkwFwYDVQQLDBBUZXN0aW5nIERpdmlzaW9uMRgwFgYDVQQD
+DA93d3cuZXhhbXBsZS5jb20wIBcNMjQwMzAxMDYzMjU3WhgPMzAyMzA3MDMwNjMy
+NTdaMIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcM
+CE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRl
+c3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbTBZMBMGByqG
+SM49AgEGCCqGSM49AwEHA0IABArFtQOcSk7+Km31LFKe+G0DZZCVehmS+fW/j4Ki
+8quz9TzLSSty+zZorFL3bE9XWK9bDMwxCumbmo5KZCH3ld6jUDBOMB0GA1UdDgQW
+BBRE60xiayVIzaKzHIdBWgjnK7mDJjAfBgNVHSMEGDAWgBRE60xiayVIzaKzHIdB
+WgjnK7mDJjAMBgNVHRMEBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIFKb9E9iOW4w
+Ikqs7/C6KvFxkVxRuTM6NixyEqsy4UeFAiEAhGo2Ei68up0oFFswgbMAKWOrmdV3
+2YICtSsNTZ73dbY=
+-----END CERTIFICATE-----`
+
+	NocRootCert2 = `-----BEGIN CERTIFICATE-----
+MIICRzCCAe2gAwIBAgIBAjAKBggqhkjOPQQDAjCBgjELMAkGA1UEBhMCVVMxETAP
+BgNVBAgMCE5ldyBZb3JrMREwDwYDVQQHDAhOZXcgWW9yazEYMBYGA1UECgwPRXhh
+bXBsZSBDb21wYW55MRkwFwYDVQQLDBBUZXN0aW5nIERpdmlzaW9uMRgwFgYDVQQD
+DA93d3cuZXhhbXBsZS5jb20wIBcNMjQwMzAxMDYzOTI3WhgPMzAyMzA3MDMwNjM5
+MjdaMIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcM
+CE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRl
+c3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbTBZMBMGByqG
+SM49AgEGCCqGSM49AwEHA0IABHcmU8d5SWWFBGs0V6w1ILbrdxBdYlxV4myrbcIL
+6iEKqP/Gf+boeNNvgI6pbGEVuydl4QGjZY3fplNhmXPcIbmjUDBOMB0GA1UdDgQW
+BBTP5t03K0yyuanydTAcqrE3GxF/GzAfBgNVHSMEGDAWgBTP5t03K0yyuanydTAc
+qrE3GxF/GzAMBgNVHRMEBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIA0VRYFLNitp
+0lffEXkPOwJ3RCJkxw4+TNiAZNhrs8QeAiEAh8124FgTDHwGCrQRFfYHVkCCayMK
+7C3/hnmN19Uan88=
+-----END CERTIFICATE-----`
+
 	NocRootCert3 = `
 -----BEGIN CERTIFICATE-----
 MIICAjCCAaegAwIBAgIUBrx8BUhP5Vi8W79pFDlqwkIw18MwCgYIKoZIzj0EAwIw
@@ -47,18 +49,58 @@ F5UqAiEAshHfXxUpdfxqiLoTjQjkNf0AHVYBFhLdB+iIFspwTyg=
 -----END CERTIFICATE-----
 	`
 
-	NocRootCert1Subject       = "MFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDjAMBgNVBAMMBU5PQy0x"
+	NocCert1 = `-----BEGIN CERTIFICATE-----
+MIICOTCCAd+gAwIBAgIBAzAKBggqhkjOPQQDAjCBgjELMAkGA1UEBhMCVVMxETAP
+BgNVBAgMCE5ldyBZb3JrMREwDwYDVQQHDAhOZXcgWW9yazEYMBYGA1UECgwPRXhh
+bXBsZSBDb21wYW55MRkwFwYDVQQLDBBUZXN0aW5nIERpdmlzaW9uMRgwFgYDVQQD
+DA93d3cuZXhhbXBsZS5jb20wIBcNMjQwMzAxMDY0NDE4WhgPMzAyMzA3MDMwNjQ0
+MThaMIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcM
+CE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRl
+c3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbTBZMBMGByqG
+SM49AgEGCCqGSM49AwEHA0IABM49jq9u+/yejw1wh19r8xuQl6kWRRx85jKbSBqM
+vbKmHxr/CTRGliov4z4oniiNrvSgor+KAGYSK1EPhUHeZdCjQjBAMB0GA1UdDgQW
+BBQCcm68u+/WvY2bQq7UPMBVX2Y6szAfBgNVHSMEGDAWgBRE60xiayVIzaKzHIdB
+WgjnK7mDJjAKBggqhkjOPQQDAgNIADBFAiAE9y8XdiA4kxwtY2vDS4HVkdoj5wyS
+P3NimycxtXsj9AIhALjQsYWHp7+kr75SgNIKgav7Fr3fxEFvWca8oWMxM1PA
+-----END CERTIFICATE-----`
+
+	NocCert2 = `-----BEGIN CERTIFICATE-----
+MIICODCCAd+gAwIBAgIBBDAKBggqhkjOPQQDAjCBgjELMAkGA1UEBhMCVVMxETAP
+BgNVBAgMCE5ldyBZb3JrMREwDwYDVQQHDAhOZXcgWW9yazEYMBYGA1UECgwPRXhh
+bXBsZSBDb21wYW55MRkwFwYDVQQLDBBUZXN0aW5nIERpdmlzaW9uMRgwFgYDVQQD
+DA93d3cuZXhhbXBsZS5jb20wIBcNMjQwMzAxMDY0NTA4WhgPMzAyMzA3MDMwNjQ1
+MDhaMIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcM
+CE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRl
+c3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbTBZMBMGByqG
+SM49AgEGCCqGSM49AwEHA0IABPkfJY7a758L6ES/WRTObOP6WuhFM3pZk7K06vjf
+3A72cAAjHbQ+W8uzFtFmQsNnrXBcRIb26KZMLGdRMWWv2b2jQjBAMB0GA1UdDgQW
+BBSHSKIzEh9RXJPmkEBKLKue1hnlrTAfBgNVHSMEGDAWgBTP5t03K0yyuanydTAc
+qrE3GxF/GzAKBggqhkjOPQQDAgNHADBEAiA/fduC6XJ8RGH2FCk0V7YDjAQCC3Vg
+Cxv0F/nTvM9ZlAIgW5x5vOhKRXEb1ak8j7SsX8ZO9aBYyLqs91dmOnHM2XM=
+-----END CERTIFICATE-----`
+
+	NocRootCert1Subject       = "MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
 	NocRootCert1SubjectKeyID  = "44:EB:4C:62:6B:25:48:CD:A2:B3:1C:87:41:5A:08:E7:2B:B9:83:26"
-	NocRootCert1SerialNumber  = "217369606639495620450806539821422258966012867792"
-	NocRootCert1SubjectAsText = "CN=NOC-1,O=Internet Widgits Pty Ltd,ST=Some-State,C=AU"
+	NocRootCert1SerialNumber  = "1"
+	NocRootCert1SubjectAsText = "CN=www.example.com,OU=Testing Division,O=Example Company,L=New York,ST=New York,C=US"
 
-	NocRootCert2Subject       = "MFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDjAMBgNVBAMMBU5PQy0y"
+	NocRootCert2Subject       = "MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
 	NocRootCert2SubjectKeyID  = "CF:E6:DD:37:2B:4C:B2:B9:A9:F2:75:30:1C:AA:B1:37:1B:11:7F:1B"
-	NocRootCert2SerialNumber  = "720401643293243343104681760462974770802745092176"
-	NocRootCert2SubjectAsText = "CN=NOC-2,O=Internet Widgits Pty Ltd,ST=Some-State,C=AU"
+	NocRootCert2SerialNumber  = "2"
+	NocRootCert2SubjectAsText = "CN=www.example.com,OU=Testing Division,O=Example Company,L=New York,ST=New York,C=US"
 
 	NocRootCert3Subject       = "MFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDjAMBgNVBAMMBU5PQy0z"
 	NocRootCert3SubjectKeyID  = "88:0D:06:D9:64:22:29:34:78:7F:8C:3B:AE:F5:08:93:86:8F:0D:20"
 	NocRootCert3SerialNumber  = "38457288443253426021793906708335409501754677187"
 	NocRootCert3SubjectAsText = "CN=NOC-3,O=Internet Widgits Pty Ltd,ST=Some-State,C=AU"
+
+	NocCert1Subject       = "MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
+	NocCert1SubjectKeyID  = "02:72:6E:BC:BB:EF:D6:BD:8D:9B:42:AE:D4:3C:C0:55:5F:66:3A:B3"
+	NocCert1SerialNumber  = "3"
+	NocCert1SubjectAsText = "CN=www.example.com,OU=Testing Division,O=Example Company,L=New York,ST=New York,C=US"
+
+	NocCert2Subject       = "MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
+	NocCert2SubjectKeyID  = "87:48:A2:33:12:1F:51:5C:93:E6:90:40:4A:2C:AB:9E:D6:19:E5:AD"
+	NocCert2SerialNumber  = "4"
+	NocCert2SubjectAsText = "CN=www.example.com,OU=Testing Division,O=Example Company,L=New York,ST=New York,C=US"
 )