[OOM-CERT-SERVICE] Fix expired certificates in cert-service

Issue-ID: OOM-2953
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: I176a475ad1af5c18a667cd18ac23e95cfe5b0138

diff --git a/certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java
index 23964ea..398b16d 100644 (file)
--- a/certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java
+++ b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java
@@ -261,7 +261,7 @@ class Cmpv2ClientTest {
         when(httpResponse.getEntity()).thenReturn(httpEntity);
 
         try (final InputStream is =
-                     this.getClass().getResourceAsStream("/ReturnedSuccessPKIMessageWithCertificateFile");
+                     this.getClass().getResourceAsStream("/ReturnedSuccessPKIMessageWithValidCertificateFile");
              BufferedInputStream bis = new BufferedInputStream(is)) {
 
             byte[] ba = IOUtils.toByteArray(bis);

diff --git a/certService/src/test/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelperTest.java b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelperTest.java
index 6686191..15fe103 100644 (file)
--- a/certService/src/test/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelperTest.java
+++ b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/impl/CmpResponseHelperTest.java
@@ -51,64 +51,64 @@ class CmpResponseHelperTest {
 
     private static final String EXPECTED_ERROR_MESSAGE = "Something was wrong with the supplied certificate";
 
-    private static final String TEST_1LAYER_ENTITY_CERT = ""
-            + "-----BEGIN CERTIFICATE-----\n"
-            + "MIIEqDCCAxCgAwIBAgIUFioEkVJsxfZGGDMEyCA8Rin3uhQwDQYJKoZIhvcNAQEL\n"
-            + "BQAwYTEjMCEGCgmSJomT8ixkAQEME2MtMDM1ZDk4NTAwYzhiN2JiMjIxFTATBgNV\n"
-            + "BAMMDE1hbmFnZW1lbnRDQTEjMCEGA1UECgwaRUpCQ0EgQ29udGFpbmVyIFF1aWNr\n"
-            + "c3RhcnQwHhcNMjAwMzI0MTEzNTU0WhcNMjIwMzI0MTEzNTU0WjCBljEgMB4GCSqG\n"
-            + "SIb3DQEJARYRQ29tbW9uTmFtZUBjbi5jb20xDjAMBgNVBAMMBUNsMTIzMQ0wCwYD\n"
-            + "VQQLDARPTkFQMRkwFwYDVQQKDBBMaW51eC1Gb3VuZGF0aW9uMRYwFAYDVQQHDA1T\n"
-            + "YW4tRnJhbmNpc2NvMRMwEQYDVQQIDApDYWxpZm9ybmlhMQswCQYDVQQGEwJVUzCC\n"
-            + "ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL94FcmRn/g9Y9ZrEL+jKiud\n"
-            + "xzDdtVLoF0ijZOGG0rnzyimzzwOjd8LA0jiZlYtpoDef95bbMeZJMKzE3bA8EMFp\n"
-            + "hynqUHs/KdsLBV+o3J6EzlpYHrwypX7kOriw9o4dmPAxvJHXTu3HC2SejJjHHArk\n"
-            + "FyahEJ03ypvCJx3iPvGXkLI9tZetobiVXslBJd5t0hQj+JQxzAlTwS0fV+xMowFT\n"
-            + "css2IlGXfQgd88cdhXBVOE0//qln1ko3G3KeH58iIWLqh9KG660SCeoTCop7bO1N\n"
-            + "abVrcXlgdE06hAvzTj3FoBxqO5KEWDPo2Dr11qRdq8bLP2T0EbTzAw4DPUwE+H8C\n"
-            + "AwEAAaOBoTCBnjAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFDPaBc+EX/hCLe5c\n"
-            + "d+oZIxcQZ1tHMB8GA1UdEQQYMBaCBUNsMTIzgg10ZXN0Lm9uYXAub3JnMB0GA1Ud\n"
-            + "JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDBDAdBgNVHQ4EFgQU4dP1HuV9O+sHInl+\n"
-            + "WuvdDJ63lp8wDgYDVR0PAQH/BAQDAgXgMA0GCSqGSIb3DQEBCwUAA4IBgQBWTF8C\n"
-            + "sH0ir4bj7rTlJMf5o7apkXFeQ/c7+zXnSLCfXqwM6ad0EDh3FixfTC8IpW5CaENt\n"
-            + "zTR7IGJr06ccwLgsigR7FxJKnEkxJiBxzkE3zFOEel3KAnV2b7KvOP7cJAzsCdcS\n"
-            + "iZU475XHOw4Ox3k8fHzhTJJa0Tzw5EjQ3GO99HTiUClGrjJuYDLfen1q7IQSNuTY\n"
-            + "FzxJZjyqzi34pkKeCNSPRj8Z8Q5aZiWqlmzSJmZRT83xzzeW/pQ1JwvIrWwrbEjR\n"
-            + "FPXBlUa1n2HztkDgeBQfRyMAj5ixFV+s1Jj+cEYl3pjbugnuHfgBdSJokXFGBo6N\n"
-            + "8PTd1CnMGWcWiMyhbTwNm2UiSr5KhQbjABjiUzDp4C7jFhIzmu/4/tm2uA+y0xPN\n"
-            + "342uEZC0ZSZmpCIbQMhPaBNjSHeHj8NaLHjnt5jppLkMxScayRqMvSW07eNew2+k\n"
-            + "VYJD6z6gfy4y+Y5MSLfvddq1JdPDU86TFprtD1ydcUBS5tduYQG2+1bLgpE="
-            + "\n-----END CERTIFICATE-----\n";
-
-    private static final String TEST_1LAYER_CA_CERT = ""
-            + "-----BEGIN CERTIFICATE-----\n"
-            + "MIIEszCCAxugAwIBAgIUEhkh+zJtXZN3K3kzQYcbp2smyIkwDQYJKoZIhvcNAQEL\n"
-            + "BQAwYTEjMCEGCgmSJomT8ixkAQEME2MtMDM1ZDk4NTAwYzhiN2JiMjIxFTATBgNV\n"
-            + "BAMMDE1hbmFnZW1lbnRDQTEjMCEGA1UECgwaRUpCQ0EgQ29udGFpbmVyIFF1aWNr\n"
-            + "c3RhcnQwHhcNMjAwMzI0MTAyODQyWhcNMzAwMzI0MTAyODQyWjBhMSMwIQYKCZIm\n"
-            + "iZPyLGQBAQwTYy0wMzVkOTg1MDBjOGI3YmIyMjEVMBMGA1UEAwwMTWFuYWdlbWVu\n"
-            + "dENBMSMwIQYDVQQKDBpFSkJDQSBDb250YWluZXIgUXVpY2tzdGFydDCCAaIwDQYJ\n"
-            + "KoZIhvcNAQEBBQADggGPADCCAYoCggGBAJyKZyKIRyW6cbga/I1YFJGCEEgs9JVU\n"
-            + "sV7MD5/yF4SIkJlZqFjJ9kfw8D5thg68zAx2vEWIpNTMroqb1eptIn/XsFoyM//6\n"
-            + "HzKrY3UUYWHx9sQMDZPenTL8LTRx+4szSen7rzrozH2pJat7kfX4EODEtQ6q7RQ2\n"
-            + "hmXoo7heeSgiHoeHsPGZixPGzcB27WBaY00Z/sP/n+f0CFaE04MKLw8WeQmq/RkC\n"
-            + "pj628+eBK0lGtEmUcT7z4CBy4x3hbhn9XHOb0+RlDk7rqFbsc09vHoZK2BfQ/r6e\n"
-            + "HguZjBQ5Ebqf6PiLF3HqkSW73toIdIy/olvQ2dLbOEyI4OnlObc+8xs/1AC7l9xX\n"
-            + "FkXY+NBv24KG1C2POXx14+ufHhWY0k2nIRUUlkUIJ7WGMWbuiNUXc1wSE1VrmY/c\n"
-            + "iXlhsJERqFc6bL/STlhOGuwmkdAD1/K8WS+o/QmIIX6cXlOR0U9bHMbD40F9fur6\n"
-            + "PV8wSKcQQNd0VHRLhmFwo4kkhZpDpuUp4QIDAQABo2MwYTAPBgNVHRMBAf8EBTAD\n"
-            + "AQH/MB8GA1UdIwQYMBaAFDPaBc+EX/hCLe5cd+oZIxcQZ1tHMB0GA1UdDgQWBBQz\n"
-            + "2gXPhF/4Qi3uXHfqGSMXEGdbRzAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL\n"
-            + "BQADggGBAFGsyu5nWycdk8iva+uY98QnPQe/M6uaUGUis0vGn9UYxoz5ddtpF3Z+\n"
-            + "MsHgbS51BH9iRYn4ZkQoRoukIjt1iO86d6sgpUS5AStCXsylL4DwAY5G/K5i/Qw5\n"
-            + "x0lP/tRYwqh2tUhmnx1xZLOWbRFZ63A0YHdguj3CqaXQ/cxafYZe0zcNhX3iH3gf\n"
-            + "5kHH8E682RT0x4ibb1JtPioQ48+pweyfMlOJkJ7WmZEfiVQitQSSNOnw1hRORiUz\n"
-            + "oFb0MlYHqe/9lIb9nmzD8QQ9q0H8J6RBCFsntx/Z6oUM8GHr80zAvNjqFfR14lOo\n"
-            + "jp05w2mr7wxIHFpM6h1HGY1QaeGp6W/fi+N7+gSL3nu1LzXVCYNCTcGkBDeasovB\n"
-            + "ma70KHGO4ZyRcEMKFCxxE8y4GZnw/EhMhDDevXAVsHEzr6XsBCJkC8e2l3iW5IKH\n"
-            + "4N/f/k06d4kS5pL290dJ450zx/mBxYGJm+pPHZfDszqVeKn1m1ZhGT80150OePGQ\n"
-            + "Cc2ir84HwQ=="
-            + "\n-----END CERTIFICATE-----\n";
+    //Sample Certificate (keystore.pem) received from client
+    private static final String TEST_1LAYER_ENTITY_CERT = "-----BEGIN CERTIFICATE-----\n"
+        + "MIIEtjCCAx6gAwIBAgIUeNg1jY0CV+zwcJ4CdQiDN2ihx0IwDQYJKoZIhvcNAQEL\n"
+        + "BQAwUzEVMBMGCgmSJomT8ixkAQEMBTEyMzQ1MRUwEwYDVQQDDAxNYW5hZ2VtZW50\n"
+        + "Q0ExIzAhBgNVBAoMGkVKQkNBIENvbnRhaW5lciBRdWlja3N0YXJ0MB4XDTIyMDUx\n"
+        + "ODE3MTYyOVoXDTMyMDUxNTE3MTAwOVowdzERMA8GA1UEAwwIb25hcC5vcmcxDTAL\n"
+        + "BgNVBAsMBE9OQVAxGTAXBgNVBAoMEExpbnV4LUZvdW5kYXRpb24xFjAUBgNVBAcM\n"
+        + "DVNhbi1GcmFuY2lzY28xEzARBgNVBAgMCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT\n"
+        + "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn7jV9kysrzF/LOAtiEs+\n"
+        + "DpmEY/10j92TyMLy4CUYqbWhj5KWNGHJ2L8GqfWivubxTTS3svbQPLyQEXrhc1fB\n"
+        + "TD1Q32q99mFaieUAnYoMIGzPZOCvsWP3A3fU1z0VsbALyJGabwA3YR9+aabcPK+D\n"
+        + "be54HsvyDzU3dj85J7Mbh6w+QncRVXCN/7IMceYpUY/H00TVa3KRPMqT1IFOAsT2\n"
+        + "JTcJwPkhmo6Grka7wz9QEcGKPq7MT+YFwPsvpq9/Ma8J1hVUJQEgNvOjIligPsp6\n"
+        + "CZxu33A9xW51yT8Hl2zyYM/dklithNvTFXAIuu99fyWu3edn6kH0WsqHIh3L9O6P\n"
+        + "gwIDAQABo4HdMIHaMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAU6ZNXe9TmP/rY\n"
+        + "K69j3+AQ3CSeVWEwUQYDVR0RBEowSIENb25hcEBvbmFwLm9yZ4ILZXhhbXBsZS5v\n"
+        + "cmeCDXRlc3Qub25hcC5vcmeGFW9uYXA6Ly9jbHVzdGVyLmxvY2FsL4cEfwAAATAn\n"
+        + "BgNVHSUEIDAeBggrBgEFBQcDAgYIKwYBBQUHAwQGCCsGAQUFBwMBMB0GA1UdDgQW\n"
+        + "BBQpQyXaSwlrBlTE3j8DEqWCHDJhKjAOBgNVHQ8BAf8EBAMCBeAwDQYJKoZIhvcN\n"
+        + "AQELBQADggGBAKp65hA59bX2TpfBBbdd9p8E1k1A+b8SszlIRkE755LmJOK1rEcS\n"
+        + "xuN2mOGx4/fhiycgNfuVUfVo9BMfjHct4nJ3EObK6N1tklgbNhLdwVG1BFSwDQgR\n"
+        + "guxjn+UUZRp6iUYVAjo2ju5Hgn3v4xrrKIUXgwleyG18e6leKOBmfEF8vpevSXNK\n"
+        + "v+OXUqJk0MFjkBG+HqFrmBY2Bwb8ZhDBc46ye5URxS1eZ8kpD5vtye3dQxI9Yi9G\n"
+        + "D2AsAckq13dLXSHpqBQYFeyKzHJyjXMxjYOIUUThtVhGPNVJt4Glt1FtIXllBCkR\n"
+        + "CNen6kXQjr1ocPlomx1fOj4ihVOseWxbK5WuWNFFWObA3YkwjdtmAMvb57Zm9M8S\n"
+        + "67myPUbMx9ZbU9WmBXtntKREGcrYxRgcwwk8ljDT0Z8FT+YFKmtZmDxCzvSK0Znz\n"
+        + "ysi80vDtXWH64OnyJ6wdugRRR6RKTuiiJh+xigN5HuveqIGu2gdzMAr5w5wh+LkW\n"
+        + "oTNRWh8PGkjPFA==\n"
+        + "-----END CERTIFICATE-----\n";
+
+    //ManagementCa.pem from EJBCA
+    private static final String TEST_1LAYER_CA_CERT = "-----BEGIN CERTIFICATE-----\n"
+        + "MIIElzCCAv+gAwIBAgIUUrxLMcvZmK8Y9qMrOXea8CfY/NswDQYJKoZIhvcNAQEL\n"
+        + "BQAwUzEVMBMGCgmSJomT8ixkAQEMBTEyMzQ1MRUwEwYDVQQDDAxNYW5hZ2VtZW50\n"
+        + "Q0ExIzAhBgNVBAoMGkVKQkNBIENvbnRhaW5lciBRdWlja3N0YXJ0MB4XDTIyMDUx\n"
+        + "ODE3MTYyOVoXDTMyMDUxNzE3MTYyOFowUzEVMBMGCgmSJomT8ixkAQEMBTEyMzQ1\n"
+        + "MRUwEwYDVQQDDAxNYW5hZ2VtZW50Q0ExIzAhBgNVBAoMGkVKQkNBIENvbnRhaW5l\n"
+        + "ciBRdWlja3N0YXJ0MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAs5TO\n"
+        + "bBiTf3pZ+b46KIVqIQKesB3HWHWp0TvvhhVUiRTxMMJXthUEg/NiSZ51G2cuzz9B\n"
+        + "eREbMkEmQYltlPrJ2OFIsFEMshePYm9O8MLDr8uWkN553l5bDfCNQcFdX/nwZcIa\n"
+        + "pNlPZ0f9KTMhzax/C9vXt6fUqBTTzSuIdmlx51y42viLWqVu31zHr2fMFGZLkk0G\n"
+        + "MMIHaEgY+SadySf6VfvoEkYXzrenrH9Lgk/7KXRHy5/AmqxmwMgqYNlJ+o5mwdA6\n"
+        + "DAERtyWDSOUFZNgeqRELY9nBn0HxHoCESIOAxIREyZL1oeXUpSHuxzdG9HuhrAJ8\n"
+        + "Kb5yjbTzn+sYweaWjARGVG2+xQS+ZIRlteOXDkOI9oseJuLOIVFYwj3bB72Za/MR\n"
+        + "b8cD7q9d2G8ZFt2mUOuK0JnsU3tv4okmPmMOcwLA0U1tgVaX/WCNuoHIbXoBQy9N\n"
+        + "GKIEfhMBkzrG4Q8oqTxbDRGzVRRq13kVP3aKgIrwbjwj0ztc1S4GH4K4Ata1AgMB\n"
+        + "AAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU6ZNXe9TmP/rYK69j\n"
+        + "3+AQ3CSeVWEwHQYDVR0OBBYEFOmTV3vU5j/62CuvY9/gENwknlVhMA4GA1UdDwEB\n"
+        + "/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAYEAAaTpoqWIpx65BVd+OllQ72k4/cv/\n"
+        + "PckS/lrvQNJtxCZxz3nfO9/VakoiQOxx1f8MfLJdfi+dB8ePd1BlpBJWzF9eyTAI\n"
+        + "lUyJkQAUHe0nMl477DUgPTooQwQmSbbO0ek0TBEBAhmjkfz3S6t+Dp3t2Q2sNP/H\n"
+        + "136xHgqFrODvEBRsjw18Kdc2326rWVHqF7joW6o1rug3kVbjVDPBIsUS833U6aD5\n"
+        + "mOCZP6nenPY1FBh8SAQmAoJ2Xr17Jj8gJpUhApU8Awc973OHBCcE4ao39XIqMzuh\n"
+        + "7Yl8I0Zy6q9Gq+UeRIN/VMeADuPxNkQA7NcUtHCXkhVI5+DlBQhPetCIHnCEyEG+\n"
+        + "tRGy9etWDW4adyJQL/hMKJTCyST0F2J1WOjr3+6kSH7oKcFsiQ+Xpg1MFo1LBdcg\n"
+        + "XtlCUMTyb0pHYsyenj3Bop2mJQCuqXNW4WzHkNjjZBE5HYsF46LPbJoDRgK1UExX\n"
+        + "YkBM+KWJQWV+eJDiZUR7Ag4mSCjEhVKh8Zw0\n"
+        + "-----END CERTIFICATE-----\n";
 
     private static final String TEST_2LAYER_ENTITY_CERT = ""
             + "-----BEGIN CERTIFICATE-----\n"

diff --git a/certService/src/test/resources/ReturnedSuccessPKIMessageWithValidCertificateFile b/certService/src/test/resources/ReturnedSuccessPKIMessageWithValidCertificateFile
new file mode 100644 (file)
index 0000000..0fa0f2b
Binary files /dev/null and b/certService/src/test/resources/ReturnedSuccessPKIMessageWithValidCertificateFile differ

diff --git a/certs/cacert.pem b/certs/cacert.pem
index 26c9b3e..92ace1e 100644 (file)
--- a/certs/cacert.pem
+++ b/certs/cacert.pem
@@ -6,35 +6,35 @@ subject=C = US, ST = California, L = San-Francisco, O = Linux-Foundation, OU = O
 issuer=C = US, ST = California, L = San-Francisco, O = Linux-Foundation, OU = ONAP, CN = onap.org
 
 -----BEGIN CERTIFICATE-----
-MIIFnjCCA4agAwIBAgIEGHBb6DANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV
+MIIFnjCCA4agAwIBAgIEJaHEjjANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV
 UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZyYW5jaXNjbzEZ
 MBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05BUDERMA8GA1UE
-AxMIb25hcC5vcmcwHhcNMjAxMDE2MDkwNjUyWhcNMzAxMDE0MDkwNjUyWjB3MQsw
+AxMIb25hcC5vcmcwHhcNMjIwNTE4MTIzNjQ3WhcNMzIwNTE1MTIzNjQ3WjB3MQsw
 CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZy
 YW5jaXNjbzEZMBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05B
 UDERMA8GA1UEAxMIb25hcC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQCDBR06SSPmxUiug54/XkZbTSve183eDb+rObAOWu1c3yQHBjBAAECa4Iuq
-TZGwNoK/vYXr2iryQ02Lpp77zBCypVCDrHGl15wHpkCYjNNoukoYHha+vCEstnlh
-TLBPyerQpdcerHsUTaHphjdkpfLklFrfFz6SCo1kvInghFAERljOaN3/iq271IAT
-epyAVDdTzQ+xzMBNQFgF3QUORh165IJ4Qd9ZVcXcjGwILGV9lw4AaISjVqIpkbLh
-pwjnA4PmLdZvHr7yzT5GMxPY7QV9/7NQfknOTOSZqFX2dpsqXd7mNv/G081zDbJZ
-bdyUHyAqPm4I7rZ+6frH78PoCHwAp1mOP5AzTKEYUen1PB+88lTqlmjxn8VXz8vN
-55fI4YCQH6tlRuwQjl1HQyIPDXjh8OJIIn4Ig9ay9FM9CS/Jw7HkObjImhAM2MnQ
-JnCAsOvXyn4jdbsGihZoXF387OgLtWCjzwZZMMBO8FnbncYgWecbnYpErr7NZxr1
-E3qB3JTsY5TAImN3NvrFIyuovf54dyrDWQhtle0cuneBBS57HSgXSeDjvVJ8Wr51
-pfRkdMBnA4ZYxJdZjkiW1ocTIexwWk1uPm0/wDUlW+ppysKHT5p290NktRUcB0bx
-P4c938IumCNeNYOWiPCApeCRif860Lnh1d3TqG/WP0bTcX2HAQIDAQABozIwMDAd
-BgNVHQ4EFgQUZA0N2+KNAehLqY7+CMl6Be3T9ywwDwYDVR0TAQH/BAUwAwEB/zAN
-BgkqhkiG9w0BAQwFAAOCAgEAM1QDhC6dJzwEe0sf8x6ip+c/LHAElOOWX7+N/QRu
-iZaccfgox6adu4BE+l9mUrqKxFBnpomzvoLfSrsOkjhj1G5uOjIuxARZnKrcwI4j
-c+WucSqBBnDqyzL7+7G1Unm5+yifl5AEs2x+7ftFzogUKWa93xsQ22aNgDOz0+B6
-FL+VPC0JSLH2QGTtHJVMKiLKAj1M1rAsiuISK5KKmk9CGFJl2HAgWK4LT4cbZPT8
-2BODLKaW2qFVRJRCRJUB9HZGDz+Fn9MxNXmQf0ox++HycJlgQMsIDOUJj6B8bygI
-eU0pD50RMKNC+tnaeHLRKLrGA1KaW9kku0UO/dINMdmIfi9FKGbUAoLh/2cR1bUF
-XQtiKeKsH/0HWQ/M2iUpHaSSgx+xzNx/4waOL8WdZatjeqVcbRHly/lk6mq+WE81
-38i9rMZMiHwVKhbzuwYmQ4GLuAdQ/RttrULM1/4FohMhUplvugvx+fajqYf85kNR
-okduFxOXt3Mc2rGdtjo/cCur1syKcjXnB+sYmzAbP2ZSkD0Lm+F7dpP2G46fL/aK
-TTLHRKqVSGzCizCukPMOdo/LjBxrOMUduBungSEnpqGOCGw8n/7djVIll7eDmi8d
-c4ond8czbqLhcMgaUkj6hU2IDxGTN/Hsxxx8q5MSw57pIAvuT6oHxECuGJH4tiU9
-QS4=
+AoICAQCw1Zf2z2XxB7yrw8yEuPYkWRhePbgyBoALSZl6rOurLwGYDLQlTw4j9+s3
+rdQmvct4K0e+x2Ak2+zJQkwlTZpAe07vd8MufKRenwkZdI0SrWxw7DXneG5w/7co
+8uEd9/1O/4KqkiNq3ts5cICXSkrX8kvEmbt0CaReqz8AK4ACxDnKUnLt8pzYW8xT
+2VOCvvviQbnEra+1eN7lTJ290GjzWGBEUpYCB6KPjqBc7r40iIyG+j7px7/t+dSc
+tbd0ZZoDrzQcQHCXB+7B2WYMj7YinVrNaB35y4WRgY5apcUmCGCpMLAG6swv15AK
+naoCZybGOwlaqTZd6mBCW2rSRmXQOFkaQJEmYb7VjBihnog7tfjDhQLHIQwaG0Iu
+35hgWGErU8urzLMXTej0jK9I8decLr2CM/YsWrGwAvJ5QUCzW5Q47G9rUudUM16N
+btKxbJ1CjdkYYJj3ZHN3iLZZmk+F+Zn0PXt0NRulH550zMf/ha6ewmLsSdlBtATb
+zsZTeO23SLbJEN8DViylQfQlbCBdJApNAA5zNeQLJtnIjggNTM4G7e3XWIdk01r5
+mRVtNM8vN7M9+HIhe14HkcfoWGprH8nLKxQGe/ou3oxHE3AzsWd/wkd8IEzwurKB
+bIxxoIdB0d4SrWHIDIYC9+qOwVSLnmLGXCoCNkovzR7EeDBu1QIDAQABozIwMDAd
+BgNVHQ4EFgQUL+YPhTW+ZBYPRI9Iw/NepMQSvVEwDwYDVR0TAQH/BAUwAwEB/zAN
+BgkqhkiG9w0BAQwFAAOCAgEAR4TVPKF3KYU8v8Stlnsy8n33qQZt/pP2AOuvuVyn
+RZFAJXfp/FZuLnCHhiXO0QHkYjybkdIZY7uQfJwXvRG9rYcA0B3omkqRJoj8VXcr
+fy99iRMS0KRFxsopTqTVPGNhgWtI6aROco7/1rmtyQCbMD2ALRnjN7SCHyGLZOGf
+npKNqdVLC3oBN7hOW16Lf0BGJGx2GyHt+no6vfueJitQTWkTitXeLdQxURKcSnvj
+/cMIjZFBqOk83pQYjNlATJgmfs3gY9Ra+7v+syKD3Enuk0woZElEooftzOBHMt2N
+GQGX7bAItyODmMKe98lAIKlB6osJ12Oe8KOsyEFzFm7Nc0jgPrOHMaJW9y5QQ1R7
+VpqYuBjM/XA/eqAdHyJUKLKUiPhQMun4egGXKp+ByWcUnQbClyvArNqAbc2HJ9mC
+7YqRLC+kCMwep13jQxx8T8wfwVdnivT9dQ9T73x/FacuHbTErvLOQgZjIPB/lFyu
+AC9fpHz/A90QLXElkiRIPd05nc4o92cpwDiptzdupvnikEjCbX3XA0zQ+SX8vWDQ
+YIrnYWrZ7+WIds1eAXTuKg6p+2GEVcd6kZk3/kTG0DNu2lP4YFe0stK6TDsfVZFh
+Ba97CvjEeaXp5oc6G4mwaD5rrHAwgAFwc0AXfI64gZnt3l0B5VLoqCH2BrnRxt1u
+e9I=
 -----END CERTIFICATE-----

diff --git a/certs/certServiceClient-keystore.jks b/certs/certServiceClient-keystore.jks
index 7c651d6..3e8a6aa 100644 (file)
Binary files a/certs/certServiceClient-keystore.jks and b/certs/certServiceClient-keystore.jks differ

diff --git a/certs/certServiceServer-keystore.jks b/certs/certServiceServer-keystore.jks
index 57a075a..73ddc65 100644 (file)
Binary files a/certs/certServiceServer-keystore.jks and b/certs/certServiceServer-keystore.jks differ

diff --git a/certs/certServiceServer-keystore.p12 b/certs/certServiceServer-keystore.p12
index b3bb494..7a57346 100644 (file)
Binary files a/certs/certServiceServer-keystore.p12 and b/certs/certServiceServer-keystore.p12 differ

diff --git a/certs/cmpv2Issuer-cert.pem b/certs/cmpv2Issuer-cert.pem
index 22f42d0..39603ae 100644 (file)
--- a/certs/cmpv2Issuer-cert.pem
+++ b/certs/cmpv2Issuer-cert.pem
@@ -1,38 +1,38 @@
 Bag Attributes
     friendlyName: oom-cert-service
-    localKeyID: 54 69 6D 65 20 31 36 30 32 38 33 39 32 32 30 37 39 35 
+    localKeyID: 54 69 6D 65 20 31 36 35 32 38 37 37 34 31 32 30 30 33 
 subject=C = US, ST = California, L = San-Francisco, O = Linux-Foundation, OU = ONAP, CN = onap.org
 
 issuer=C = US, ST = California, L = San-Francisco, O = Linux-Foundation, OU = ONAP, CN = onap.org
 
 -----BEGIN CERTIFICATE-----
-MIIFCzCCAvOgAwIBAgIEM8t7/jANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV
+MIIFCzCCAvOgAwIBAgIEfG5zkTANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV
 UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZyYW5jaXNjbzEZ
 MBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05BUDERMA8GA1UE
-AxMIb25hcC5vcmcwHhcNMjAxMDE2MDkwNjU5WhcNMjExMDE2MDkwNjU5WjB3MQsw
+AxMIb25hcC5vcmcwHhcNMjIwNTE4MTIzNjUxWhcNMjMwNTE4MTIzNjUxWjB3MQsw
 CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZy
 YW5jaXNjbzEZMBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05B
 UDERMA8GA1UEAxMIb25hcC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCr0qjRjcHoyMcmDBXjtern9WJXXyCAINDBzHUt0tzXQGniiIOTExetgXuI
-v++h4EkgnRjUJ6esJKE+7TvgwmUKXjsycczMYHG1A9nND7pYqp3cGIeJtzOqWxCU
-8u0Xm2tATb92nU4wtzZWxilBqkJrJj7i8OnuehM+GkVRfLP+qQbTQ5nxNww+e2ZL
-Mg2oH7L30m7am4qgXE/RtGUr54kwWfUOA3v1YswWZF1YnXpD4oFggtbYYdUSW9Bp
-SW6HNDFxQh2kiARrmOkZWLcbc7zFzR7GHG2erXB88Y7p7tUyenORYzFHg3CDth71
-ETl+Tf6HL6bzpjsa6RcIUrKXqKtnAgMBAAGjgZ4wgZswHQYDVR0OBBYEFDZ0R/yN
-JNMVm4PCGh5cgWSGVD19MCkGA1UdEQEB/wQfMB2CEG9vbS1jZXJ0LXNlcnZpY2WC
-CWxvY2FsaG9zdDAPBgNVHRMECDAGAQH/AgEAMB8GA1UdIwQYMBaAFGQNDdvijQHo
-S6mO/gjJegXt0/csMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkq
-hkiG9w0BAQwFAAOCAgEAOZCWY1t/PZFEcycxvOOcYojoFeqVatM50uq5RnKg8PmQ
-ALLcuHeHUR2KdHgFXj4AykzWRCSZpv6lzFwY+iUE1iav0CGqdy2izVLvjjoP1hDt
-AtUB85VpknRpvQobWp7K6MHN1teQiggHA68jAzuRS0/jTPdz17W4edtpk0t8BTZR
-BPok3UVkRAda3LIEXxtayZhjnIOvYsgdieSiakENh1s54jwpvmNJ+99YOuX7+Mm4
-V5RcFdbJDz4R2TiFDLBuwfWhRTz/FkS+a9ohIasyv2eG3D5vUFxCrg62ud6sngjH
-8TZfzIAqadInVB1qqvtx+DeY0h1EFTZFbXs6YZKW8n/zcCQDTDR9/ryW35QJuj3n
-qkVlNpgDbUFUnqq2IIttSkKmo1X6ArQfL/kEF5eybzstYgfB2fLufihl024bGcV7
-/IJCCDQ+yH9d2CZ2fMmnxZiDy2amAENgOu1FVKQMT81+N5JTVIXQjxAOnrKXaKcl
-AqnXtaPHyIEhSFa/dADLLwjdOlcgxi1KuP13Mu5sBPXB3UlvdF2as3NtchFNip3s
-1xa1p4Tz8VLU0iq6bims5es5lTYPwbfe0hNycpvu4XrMy70sgabw/SLMiGx5TTh4
-D6BH2kEp451Vu0fqrSLfSmZASZzpXgyRBiT3+4sa5BXphvBwZNxLiS5tdbN4wvA=
+AoIBAQC+y6YgHK4uTBt8+PyQMdPw8RK+VJSRb1vlJjy41k8za+PY37nbN0yWaBBP
+vw4LQuxWHUU8e+3wrRDTJFnWqdrKY4plWzPrMO635Bvd2rU3d0rpb3SJuB7aGnet
+rTUxRV7p79me/Wd7+wPzRqi0uof7D/udf83wKTwls+I5FK0DhgaN9i+bAnwHdiPo
+2H49t6HXTwbHeGXVrqGLaVizreybMGnm+7muP8U8O9RfSk7QkYm1iwxe2A+DO5ts
+JQ0TQiastzs2S2jSAAF6QG/3kgaUNk9h4ov6ZGBN3alA+p8QFnUpYk/DT4wcaUMz
+zhrMWdN1kG/2Cktt3+EVh1qJj0ptAgMBAAGjgZ4wgZswHQYDVR0OBBYEFBAIk3Z8
+KwY7KL2H/kJctURDKrAPMCkGA1UdEQEB/wQfMB2CEG9vbS1jZXJ0LXNlcnZpY2WC
+CWxvY2FsaG9zdDAPBgNVHRMECDAGAQH/AgEAMB8GA1UdIwQYMBaAFC/mD4U1vmQW
+D0SPSMPzXqTEEr1RMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkq
+hkiG9w0BAQwFAAOCAgEAb6Ruup1U4c2ZKvngu63/lxS5IRt5DJT0GDXRIJqWTwC0
+Gi56E7hIfxqfEtoeCqcbIpBrFLJF0hVSUama2SUJGXns1UXtET9PTF+HSQc3WH79
+Jr4/09zjco7Rd3zpqt3a5dLJ6s2ffC+tvfTQECL2UaVsi58blIsLzsezZ6skC3nn
+Yve3EIMj+iJ4AoP9soKIIgDHjaHuQFNgqx9TzD4V386LTkl/Hlcl/hLV9cTfQ0Rq
+jl0xQrpfkzZ2+qe/oSQoOCZzL19uyLX7uvS3Ddw6lTZ5GxPQ0sxDTt912+YFJAVf
+D9JJOPgQ20gmUfRasjr09mpzkmjdEWS1bfuUc5u79iTJPF6LkzujK0SwfqnU87Kg
+Fr48vJy3CL270LQX0BBFEUJ7Fv/CEB0uCoIJe4Qh5UFz78Z8YF/BO+EeAzr3nEnv
+HS5yjJEv85C8O0tH9OpUJ0vH3pCz5YtDSWSqEYEiCBXOPcJVOUQBSN20tuHayHBV
+rg9LRguCgNWK9ijOaQczQ0sV5uFZp85QXKMg9/bDJiaKowgjV9elpgBHr6O3qeHY
+1Qz5HuNRqjCtrf2+7IW2L62j1GHFlz8uqYgklxjS5MtbsGQL68OmUFWcToXGDz7z
+UIP/Fd6I6MmIB0VUMGsHGB3+m7lVzGWtBU0h3FH8Gbv7KNay/pcWHQbZ5k4cPSw=
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: CN=onap.org,OU=ONAP,O=Linux-Foundation,L=San-Francisco,ST=California,C=US
@@ -41,35 +41,35 @@ subject=C = US, ST = California, L = San-Francisco, O = Linux-Foundation, OU = O
 issuer=C = US, ST = California, L = San-Francisco, O = Linux-Foundation, OU = ONAP, CN = onap.org
 
 -----BEGIN CERTIFICATE-----
-MIIFnjCCA4agAwIBAgIEGHBb6DANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV
+MIIFnjCCA4agAwIBAgIEJaHEjjANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV
 UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZyYW5jaXNjbzEZ
 MBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05BUDERMA8GA1UE
-AxMIb25hcC5vcmcwHhcNMjAxMDE2MDkwNjUyWhcNMzAxMDE0MDkwNjUyWjB3MQsw
+AxMIb25hcC5vcmcwHhcNMjIwNTE4MTIzNjQ3WhcNMzIwNTE1MTIzNjQ3WjB3MQsw
 CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZy
 YW5jaXNjbzEZMBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05B
 UDERMA8GA1UEAxMIb25hcC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQCDBR06SSPmxUiug54/XkZbTSve183eDb+rObAOWu1c3yQHBjBAAECa4Iuq
-TZGwNoK/vYXr2iryQ02Lpp77zBCypVCDrHGl15wHpkCYjNNoukoYHha+vCEstnlh
-TLBPyerQpdcerHsUTaHphjdkpfLklFrfFz6SCo1kvInghFAERljOaN3/iq271IAT
-epyAVDdTzQ+xzMBNQFgF3QUORh165IJ4Qd9ZVcXcjGwILGV9lw4AaISjVqIpkbLh
-pwjnA4PmLdZvHr7yzT5GMxPY7QV9/7NQfknOTOSZqFX2dpsqXd7mNv/G081zDbJZ
-bdyUHyAqPm4I7rZ+6frH78PoCHwAp1mOP5AzTKEYUen1PB+88lTqlmjxn8VXz8vN
-55fI4YCQH6tlRuwQjl1HQyIPDXjh8OJIIn4Ig9ay9FM9CS/Jw7HkObjImhAM2MnQ
-JnCAsOvXyn4jdbsGihZoXF387OgLtWCjzwZZMMBO8FnbncYgWecbnYpErr7NZxr1
-E3qB3JTsY5TAImN3NvrFIyuovf54dyrDWQhtle0cuneBBS57HSgXSeDjvVJ8Wr51
-pfRkdMBnA4ZYxJdZjkiW1ocTIexwWk1uPm0/wDUlW+ppysKHT5p290NktRUcB0bx
-P4c938IumCNeNYOWiPCApeCRif860Lnh1d3TqG/WP0bTcX2HAQIDAQABozIwMDAd
-BgNVHQ4EFgQUZA0N2+KNAehLqY7+CMl6Be3T9ywwDwYDVR0TAQH/BAUwAwEB/zAN
-BgkqhkiG9w0BAQwFAAOCAgEAM1QDhC6dJzwEe0sf8x6ip+c/LHAElOOWX7+N/QRu
-iZaccfgox6adu4BE+l9mUrqKxFBnpomzvoLfSrsOkjhj1G5uOjIuxARZnKrcwI4j
-c+WucSqBBnDqyzL7+7G1Unm5+yifl5AEs2x+7ftFzogUKWa93xsQ22aNgDOz0+B6
-FL+VPC0JSLH2QGTtHJVMKiLKAj1M1rAsiuISK5KKmk9CGFJl2HAgWK4LT4cbZPT8
-2BODLKaW2qFVRJRCRJUB9HZGDz+Fn9MxNXmQf0ox++HycJlgQMsIDOUJj6B8bygI
-eU0pD50RMKNC+tnaeHLRKLrGA1KaW9kku0UO/dINMdmIfi9FKGbUAoLh/2cR1bUF
-XQtiKeKsH/0HWQ/M2iUpHaSSgx+xzNx/4waOL8WdZatjeqVcbRHly/lk6mq+WE81
-38i9rMZMiHwVKhbzuwYmQ4GLuAdQ/RttrULM1/4FohMhUplvugvx+fajqYf85kNR
-okduFxOXt3Mc2rGdtjo/cCur1syKcjXnB+sYmzAbP2ZSkD0Lm+F7dpP2G46fL/aK
-TTLHRKqVSGzCizCukPMOdo/LjBxrOMUduBungSEnpqGOCGw8n/7djVIll7eDmi8d
-c4ond8czbqLhcMgaUkj6hU2IDxGTN/Hsxxx8q5MSw57pIAvuT6oHxECuGJH4tiU9
-QS4=
+AoICAQCw1Zf2z2XxB7yrw8yEuPYkWRhePbgyBoALSZl6rOurLwGYDLQlTw4j9+s3
+rdQmvct4K0e+x2Ak2+zJQkwlTZpAe07vd8MufKRenwkZdI0SrWxw7DXneG5w/7co
+8uEd9/1O/4KqkiNq3ts5cICXSkrX8kvEmbt0CaReqz8AK4ACxDnKUnLt8pzYW8xT
+2VOCvvviQbnEra+1eN7lTJ290GjzWGBEUpYCB6KPjqBc7r40iIyG+j7px7/t+dSc
+tbd0ZZoDrzQcQHCXB+7B2WYMj7YinVrNaB35y4WRgY5apcUmCGCpMLAG6swv15AK
+naoCZybGOwlaqTZd6mBCW2rSRmXQOFkaQJEmYb7VjBihnog7tfjDhQLHIQwaG0Iu
+35hgWGErU8urzLMXTej0jK9I8decLr2CM/YsWrGwAvJ5QUCzW5Q47G9rUudUM16N
+btKxbJ1CjdkYYJj3ZHN3iLZZmk+F+Zn0PXt0NRulH550zMf/ha6ewmLsSdlBtATb
+zsZTeO23SLbJEN8DViylQfQlbCBdJApNAA5zNeQLJtnIjggNTM4G7e3XWIdk01r5
+mRVtNM8vN7M9+HIhe14HkcfoWGprH8nLKxQGe/ou3oxHE3AzsWd/wkd8IEzwurKB
+bIxxoIdB0d4SrWHIDIYC9+qOwVSLnmLGXCoCNkovzR7EeDBu1QIDAQABozIwMDAd
+BgNVHQ4EFgQUL+YPhTW+ZBYPRI9Iw/NepMQSvVEwDwYDVR0TAQH/BAUwAwEB/zAN
+BgkqhkiG9w0BAQwFAAOCAgEAR4TVPKF3KYU8v8Stlnsy8n33qQZt/pP2AOuvuVyn
+RZFAJXfp/FZuLnCHhiXO0QHkYjybkdIZY7uQfJwXvRG9rYcA0B3omkqRJoj8VXcr
+fy99iRMS0KRFxsopTqTVPGNhgWtI6aROco7/1rmtyQCbMD2ALRnjN7SCHyGLZOGf
+npKNqdVLC3oBN7hOW16Lf0BGJGx2GyHt+no6vfueJitQTWkTitXeLdQxURKcSnvj
+/cMIjZFBqOk83pQYjNlATJgmfs3gY9Ra+7v+syKD3Enuk0woZElEooftzOBHMt2N
+GQGX7bAItyODmMKe98lAIKlB6osJ12Oe8KOsyEFzFm7Nc0jgPrOHMaJW9y5QQ1R7
+VpqYuBjM/XA/eqAdHyJUKLKUiPhQMun4egGXKp+ByWcUnQbClyvArNqAbc2HJ9mC
+7YqRLC+kCMwep13jQxx8T8wfwVdnivT9dQ9T73x/FacuHbTErvLOQgZjIPB/lFyu
+AC9fpHz/A90QLXElkiRIPd05nc4o92cpwDiptzdupvnikEjCbX3XA0zQ+SX8vWDQ
+YIrnYWrZ7+WIds1eAXTuKg6p+2GEVcd6kZk3/kTG0DNu2lP4YFe0stK6TDsfVZFh
+Ba97CvjEeaXp5oc6G4mwaD5rrHAwgAFwc0AXfI64gZnt3l0B5VLoqCH2BrnRxt1u
+e9I=
 -----END CERTIFICATE-----

diff --git a/certs/cmpv2Issuer-key.pem b/certs/cmpv2Issuer-key.pem
index 8fdd959..5090cb4 100644 (file)
--- a/certs/cmpv2Issuer-key.pem
+++ b/certs/cmpv2Issuer-key.pem
@@ -1,32 +1,32 @@
 Bag Attributes
     friendlyName: oom-cert-service
-    localKeyID: 54 69 6D 65 20 31 36 30 32 38 33 39 32 32 30 37 39 35 
+    localKeyID: 54 69 6D 65 20 31 36 35 32 38 37 37 34 31 32 30 30 33 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCr0qjRjcHoyMcm
-DBXjtern9WJXXyCAINDBzHUt0tzXQGniiIOTExetgXuIv++h4EkgnRjUJ6esJKE+
-7TvgwmUKXjsycczMYHG1A9nND7pYqp3cGIeJtzOqWxCU8u0Xm2tATb92nU4wtzZW
-xilBqkJrJj7i8OnuehM+GkVRfLP+qQbTQ5nxNww+e2ZLMg2oH7L30m7am4qgXE/R
-tGUr54kwWfUOA3v1YswWZF1YnXpD4oFggtbYYdUSW9BpSW6HNDFxQh2kiARrmOkZ
-WLcbc7zFzR7GHG2erXB88Y7p7tUyenORYzFHg3CDth71ETl+Tf6HL6bzpjsa6RcI
-UrKXqKtnAgMBAAECggEANoW2RCiza2aqqwwSths32zsmZYsuCPpgw95ZIJ1Urokm
-EFg5SCY60TfRN2eQZtGA4vR2uHuM3TcSY6Fr6rpEzbFxH2S1E/VWn5YFOujOvOwH
-A5xVBgI4Rsp2zIz5ZxBOTC1foAfyk8rPV2GyHcAlK1MLiX/g+2eJS5+Sd3UWuKvq
-mMBrsyHXy6cGjwvilw0jaE39XK55MDOyoZMeJ8T4eFBAEyoBo9jfXZ8kmtD3NOeT
-92Xem+/ggzDZ1kSYEq8pddJCEoUgisVfueKJt4MzOEqKW9sUmJz66N+AgOhsl56U
-7uHit4FWO+VbmGBPChBK33GXI56ID6VjD26YkZSBwQKBgQD9jNY6qorZgWo8nrq2
-NU77QVcr9UswhmBS6PMsGMWXf/xX7qEZyIHo21O88NFxsiWk50g68PeSNt4Tdrgy
-LnQkz838VNOYv3eBFEXV6EqEPV6UKeee8D622+DObXiKjKKpyYjiz86dOqGKy2cx
-DNVFBtCXEbF1+pKfadm9MXy/OQKBgQCte6sD8OCNw+0K33+LaPh5NY2oGc5Vr6nr
-N16yUWINTAFVMJfAAR9I4ZCGeyEL5QSX8ZlF9R9ceUoSibR2gh8Uyt4+gFCSrAIo
-Q0kZHIxoAbzy0oAjrH4kp5WvADewVBCnZJlWxacqFLGctY6QamOjZVUupJUNChzS
-p3aLujYfnwKBgFjW5x1JMjuB1+qDp2I+jX0F6PhTC1RmUQvb6ZBy4ZDy3EUnLLVv
-Bu3DI7UZIBnZVM1R6IIWenh11xw0xdd3ZWScl00pn7Zup/3HT6zipnFtW11IzYpo
-HWFO65cIzmqlWj1pixgFvhxjNcT+/ho2p+d2utGj9m0jLgrDOPLMiywpAoGAE54f
-eaOckQtt28PoVWh6aKKAsVixt4jUyy+IuttvHhfRMsP69RBrbD9tq3dzBjhQq6n7
-bijI8hkZIj2GNbyDLUO/nAvAkMV4vPrW4ksTKZPAvSjGqsIPxa9Zwt9gbMUk2PkM
-Sf6x55VNfG4ff/834ztLRaoA3Oee2MdtJWHaSvsCgYEAyowbkfptaMIOolx9ckfK
-DSEM8Bm5DuIZj3VBXGQeKf2w/XpWzDyIdCw/Y80E5dR5iLdHVKPo9Rjy69njKy3k
-rmkjss31kgKi1XGAB3+S7lfPMlBqBk+yXuDOZV+vsdQVGNq3X0PUdGOpWH6UKsNo
-osNGN6HxtgCEh51vSoOkAcE=
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQC+y6YgHK4uTBt8
++PyQMdPw8RK+VJSRb1vlJjy41k8za+PY37nbN0yWaBBPvw4LQuxWHUU8e+3wrRDT
+JFnWqdrKY4plWzPrMO635Bvd2rU3d0rpb3SJuB7aGnetrTUxRV7p79me/Wd7+wPz
+Rqi0uof7D/udf83wKTwls+I5FK0DhgaN9i+bAnwHdiPo2H49t6HXTwbHeGXVrqGL
+aVizreybMGnm+7muP8U8O9RfSk7QkYm1iwxe2A+DO5tsJQ0TQiastzs2S2jSAAF6
+QG/3kgaUNk9h4ov6ZGBN3alA+p8QFnUpYk/DT4wcaUMzzhrMWdN1kG/2Cktt3+EV
+h1qJj0ptAgMBAAECggEBAIfOu6QV5iHMSLCvJk+ZOCxD3LyfxdSzuGymyAgle+C1
+RkykC04v0ZMp5Zpt+xgm/cTaNuMzr41mExjHwi7bXoI7UlKNFaqufO1mMDO9rsoZ
+XrhEfmZdKZDD0DZOmRNGNqY79OKHq3aDmS88N2/Val9Z5Bca1sLBBzArF7bbsb9U
+FwUqlrpJeFnLR8mye/aZ1vzRTpWmosdFQqnyG6bdyd0wcuz181ULcLZbQTZLC3/F
+7GLaJolxhmkA51o1KnyB8mD6SHiobikDel15xoIdwlc3+bnXHP34JiK0ClXEEmqy
+PDjKJPsLSK7i4CIMVzt4b78tybwi1r+axC1Se6YVRQECgYEA6idtuBUhI4EI7kzi
+vZmvyMC0fbgsbgUUI7eRhdZLG7OiztdalVP+a9q5xMZiY0cIhSHdr9QXuuH383OA
+PWLPGKhHc1CPlWQlHb9ruIaBvwmSLtgsliBH4+iTmX0DDbZAMBsM/rmCoq1Ke0rh
+Cm2epvSGcvgMFPBK5ZZu/cJu260CgYEA0JijhbRAQleNSbBtjYhQGj8pjO8yi9UD
+9M08rNAFU9Z9aR1KDJRYRHqgN/1rPnsRLLMID8O4P3SD3ekAMLARgodwBRTDvYOR
+FQmx+TPUT9VwIAXpT4AHRQCxDmZs6CAKnkVYq71N/eAKGlChuHN/r1tpanrBO69g
+F570Iz2gAcECgYEA4lcWshiKnf0/GsrraodC6nWMgvIi0H7MRvJNEuhgVfjA6dw1
+zZ8RkkQtyk5SENE7JSXlWu9TuOxxd70wOyZmNdmEp605/hh94FGG2Sn8BSRFUE7a
+Wov9sgrBkl7LMtf3GAkt+JRt+L41/xQUkLYB5DT+OegYFa1pWKCfzV/DNUkCgYEA
+hHSYSVt2/ml35xXnytqG+tOmv75X22ENHRKB974z09O8WNXnYmuETR+Mw2DhC5C8
+DCU29kOyqGCFJ5E/tKrow3jbEe7oiFuV8cTxRSu7ImKGy17VkszaUN+qjllNyGwo
+Me4Y6xzO/GmaILGYr3Zv2trx6lI+h3bKTtV5czM7ekECgYEArhswUUVteRj5ClfM
+bf0TdNN2uh6rglUKId1U03D5Bcb2fZE5uu0FhNqhjjlB/8NTqAuvy1edyAkXYwI0
+6FRT0jYdA1GjcoNBqpNmyhJAj3to//RDVzsjRqHA51WFDp6YB1D8FiUTSXRQhv6F
+bBuwsT3opQA08uUrWMs/QjKeLag=
 -----END PRIVATE KEY-----

diff --git a/certs/root.crt b/certs/root.crt
index 7d2bd04..ca04231 100644 (file)
--- a/certs/root.crt
+++ b/certs/root.crt
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIFnjCCA4agAwIBAgIEGHBb6DANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV\r
+MIIFnjCCA4agAwIBAgIEJaHEjjANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV\r
 UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZyYW5jaXNjbzEZ\r
 MBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05BUDERMA8GA1UE\r
-AxMIb25hcC5vcmcwHhcNMjAxMDE2MDkwNjUyWhcNMzAxMDE0MDkwNjUyWjB3MQsw\r
+AxMIb25hcC5vcmcwHhcNMjIwNTE4MTIzNjQ3WhcNMzIwNTE1MTIzNjQ3WjB3MQsw\r
 CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZy\r
 YW5jaXNjbzEZMBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05B\r
 UDERMA8GA1UEAxMIb25hcC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK\r
-AoICAQCDBR06SSPmxUiug54/XkZbTSve183eDb+rObAOWu1c3yQHBjBAAECa4Iuq\r
-TZGwNoK/vYXr2iryQ02Lpp77zBCypVCDrHGl15wHpkCYjNNoukoYHha+vCEstnlh\r
-TLBPyerQpdcerHsUTaHphjdkpfLklFrfFz6SCo1kvInghFAERljOaN3/iq271IAT\r
-epyAVDdTzQ+xzMBNQFgF3QUORh165IJ4Qd9ZVcXcjGwILGV9lw4AaISjVqIpkbLh\r
-pwjnA4PmLdZvHr7yzT5GMxPY7QV9/7NQfknOTOSZqFX2dpsqXd7mNv/G081zDbJZ\r
-bdyUHyAqPm4I7rZ+6frH78PoCHwAp1mOP5AzTKEYUen1PB+88lTqlmjxn8VXz8vN\r
-55fI4YCQH6tlRuwQjl1HQyIPDXjh8OJIIn4Ig9ay9FM9CS/Jw7HkObjImhAM2MnQ\r
-JnCAsOvXyn4jdbsGihZoXF387OgLtWCjzwZZMMBO8FnbncYgWecbnYpErr7NZxr1\r
-E3qB3JTsY5TAImN3NvrFIyuovf54dyrDWQhtle0cuneBBS57HSgXSeDjvVJ8Wr51\r
-pfRkdMBnA4ZYxJdZjkiW1ocTIexwWk1uPm0/wDUlW+ppysKHT5p290NktRUcB0bx\r
-P4c938IumCNeNYOWiPCApeCRif860Lnh1d3TqG/WP0bTcX2HAQIDAQABozIwMDAd\r
-BgNVHQ4EFgQUZA0N2+KNAehLqY7+CMl6Be3T9ywwDwYDVR0TAQH/BAUwAwEB/zAN\r
-BgkqhkiG9w0BAQwFAAOCAgEAM1QDhC6dJzwEe0sf8x6ip+c/LHAElOOWX7+N/QRu\r
-iZaccfgox6adu4BE+l9mUrqKxFBnpomzvoLfSrsOkjhj1G5uOjIuxARZnKrcwI4j\r
-c+WucSqBBnDqyzL7+7G1Unm5+yifl5AEs2x+7ftFzogUKWa93xsQ22aNgDOz0+B6\r
-FL+VPC0JSLH2QGTtHJVMKiLKAj1M1rAsiuISK5KKmk9CGFJl2HAgWK4LT4cbZPT8\r
-2BODLKaW2qFVRJRCRJUB9HZGDz+Fn9MxNXmQf0ox++HycJlgQMsIDOUJj6B8bygI\r
-eU0pD50RMKNC+tnaeHLRKLrGA1KaW9kku0UO/dINMdmIfi9FKGbUAoLh/2cR1bUF\r
-XQtiKeKsH/0HWQ/M2iUpHaSSgx+xzNx/4waOL8WdZatjeqVcbRHly/lk6mq+WE81\r
-38i9rMZMiHwVKhbzuwYmQ4GLuAdQ/RttrULM1/4FohMhUplvugvx+fajqYf85kNR\r
-okduFxOXt3Mc2rGdtjo/cCur1syKcjXnB+sYmzAbP2ZSkD0Lm+F7dpP2G46fL/aK\r
-TTLHRKqVSGzCizCukPMOdo/LjBxrOMUduBungSEnpqGOCGw8n/7djVIll7eDmi8d\r
-c4ond8czbqLhcMgaUkj6hU2IDxGTN/Hsxxx8q5MSw57pIAvuT6oHxECuGJH4tiU9\r
-QS4=
+AoICAQCw1Zf2z2XxB7yrw8yEuPYkWRhePbgyBoALSZl6rOurLwGYDLQlTw4j9+s3\r
+rdQmvct4K0e+x2Ak2+zJQkwlTZpAe07vd8MufKRenwkZdI0SrWxw7DXneG5w/7co\r
+8uEd9/1O/4KqkiNq3ts5cICXSkrX8kvEmbt0CaReqz8AK4ACxDnKUnLt8pzYW8xT\r
+2VOCvvviQbnEra+1eN7lTJ290GjzWGBEUpYCB6KPjqBc7r40iIyG+j7px7/t+dSc\r
+tbd0ZZoDrzQcQHCXB+7B2WYMj7YinVrNaB35y4WRgY5apcUmCGCpMLAG6swv15AK\r
+naoCZybGOwlaqTZd6mBCW2rSRmXQOFkaQJEmYb7VjBihnog7tfjDhQLHIQwaG0Iu\r
+35hgWGErU8urzLMXTej0jK9I8decLr2CM/YsWrGwAvJ5QUCzW5Q47G9rUudUM16N\r
+btKxbJ1CjdkYYJj3ZHN3iLZZmk+F+Zn0PXt0NRulH550zMf/ha6ewmLsSdlBtATb\r
+zsZTeO23SLbJEN8DViylQfQlbCBdJApNAA5zNeQLJtnIjggNTM4G7e3XWIdk01r5\r
+mRVtNM8vN7M9+HIhe14HkcfoWGprH8nLKxQGe/ou3oxHE3AzsWd/wkd8IEzwurKB\r
+bIxxoIdB0d4SrWHIDIYC9+qOwVSLnmLGXCoCNkovzR7EeDBu1QIDAQABozIwMDAd\r
+BgNVHQ4EFgQUL+YPhTW+ZBYPRI9Iw/NepMQSvVEwDwYDVR0TAQH/BAUwAwEB/zAN\r
+BgkqhkiG9w0BAQwFAAOCAgEAR4TVPKF3KYU8v8Stlnsy8n33qQZt/pP2AOuvuVyn\r
+RZFAJXfp/FZuLnCHhiXO0QHkYjybkdIZY7uQfJwXvRG9rYcA0B3omkqRJoj8VXcr\r
+fy99iRMS0KRFxsopTqTVPGNhgWtI6aROco7/1rmtyQCbMD2ALRnjN7SCHyGLZOGf\r
+npKNqdVLC3oBN7hOW16Lf0BGJGx2GyHt+no6vfueJitQTWkTitXeLdQxURKcSnvj\r
+/cMIjZFBqOk83pQYjNlATJgmfs3gY9Ra+7v+syKD3Enuk0woZElEooftzOBHMt2N\r
+GQGX7bAItyODmMKe98lAIKlB6osJ12Oe8KOsyEFzFm7Nc0jgPrOHMaJW9y5QQ1R7\r
+VpqYuBjM/XA/eqAdHyJUKLKUiPhQMun4egGXKp+ByWcUnQbClyvArNqAbc2HJ9mC\r
+7YqRLC+kCMwep13jQxx8T8wfwVdnivT9dQ9T73x/FacuHbTErvLOQgZjIPB/lFyu\r
+AC9fpHz/A90QLXElkiRIPd05nc4o92cpwDiptzdupvnikEjCbX3XA0zQ+SX8vWDQ\r
+YIrnYWrZ7+WIds1eAXTuKg6p+2GEVcd6kZk3/kTG0DNu2lP4YFe0stK6TDsfVZFh\r
+Ba97CvjEeaXp5oc6G4mwaD5rrHAwgAFwc0AXfI64gZnt3l0B5VLoqCH2BrnRxt1u\r
+e9I=
 -----END CERTIFICATE-----

diff --git a/certs/truststore.jks b/certs/truststore.jks
index a147877..0ccc5fe 100644 (file)
Binary files a/certs/truststore.jks and b/certs/truststore.jks differ