From 732fbb6eab472ae9623cc95219bd720ec625bdba Mon Sep 17 00:00:00 2001
From: Christian Heimes <cheimes@redhat.com>
Date: Tue, 28 Feb 2017 14:21:12 +0100
Subject: [PATCH] Renew test certs and increase life time to 4 years

Closes: #120
Signed-off-by: Christian Heimes <cheimes@redhat.com>
---
 tests/ca/custodia-ca.conf    |   2 +-
 tests/ca/custodia-ca.key     |  52 ++++++++---------
 tests/ca/custodia-ca.pem     | 108 +++++++++++++++++-----------------
 tests/ca/custodia-client.key |  52 ++++++++---------
 tests/ca/custodia-client.pem | 106 ++++++++++++++++-----------------
 tests/ca/custodia-server.key |  52 ++++++++---------
 tests/ca/custodia-server.pem | 110 +++++++++++++++++------------------
 7 files changed, 241 insertions(+), 241 deletions(-)

diff --git a/tests/ca/custodia-ca.conf b/tests/ca/custodia-ca.conf
index 9c994d2..03f80f9 100644
--- a/tests/ca/custodia-ca.conf
+++ b/tests/ca/custodia-ca.conf
@@ -33,7 +33,7 @@ serial = $tmpdir/$ca.crt.srl
 crlnumber = $tmpdir/$ca.crl.srl
 database = $tmpdir/$ca.db
 unique_subject = no
-default_days = 365
+default_days = 1461
 default_md = sha256
 policy = match_pol
 email_in_dn = no
diff --git a/tests/ca/custodia-ca.key b/tests/ca/custodia-ca.key
index 4e8c90c..c86fc73 100644
--- a/tests/ca/custodia-ca.key
+++ b/tests/ca/custodia-ca.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCrga/IxjQDRmD8
-vKfez3yye5Hq7ZfWULCWZDvd6QkiRhqTh1/3tN4ROXCUlESRSMN8CJDd3CzOj1n5
-uzMgMe3qB4ngV1940rtQY7TzwdqXizWmrHsYz6zmRps9Rn+b0JU1nsF/djXEGBBc
-vIUQnfF0ECvUR2aEt831Hp0CDuNlj11sN7sQ3dfX3IIjejvGI8PpaG3XweHYpTru
-PGkAQl67lu/FVDpuYCuNJ7CXoOs5b326Xk7pH9evxj3pBf7suaWBdwnBfJt2OAyD
-zeT+LgQGQzY/Hd51bkkfySUqN/2BRFPM9n1V+84yg2yEwKV5FMfyuPyoO0kTlGMX
-9aFXQeW7AgMBAAECggEAIEhY/kHQqI0m1GvubVJA9per77ypR/4IP0a+vhaPUZRA
-jGR++/Ffm35kYpNGFNLNeRtjqV84T+lL1mYWSYkcb2Db4w6POf7wo0EhXoCu1Lev
-caAly5XLxcyki/QpMPsiGuW3Jnbpx+9/pPUXVvlj6aThmyOVeIXgjrMkeq6yvvre
-ep0CxHwFp5kL4tOwG7mGPREkjtLS4TM5gYjLZDqatbpY+DY4Rt02qth82AEb4xpe
-pmkbUsT3dUYKbLwl62HVZfaU4VybDALHhp73BUZ+qFSUcu0UDNfRUlgyCLIIM8Ow
-c8S3e4hpnNTAcM6rl979eAqGDwY0bMsEmUFaLuJUgQKBgQDZjApIkGlJ485FtL61
-4EoeTxNux4Q386Qkli+Fe7dKOgqknxluYVeI4fI3ADlDEkNTLTQxIrqhr8YlelX1
-NXmLIBXcAehTQAyy6AlrsJL7/FR0ywiOYNLtQDisfWUI6QTmPYWQ5HSHQju5nPwX
-luWvy13ZQko/y4Xr8VI/pmO+FQKBgQDJ0lNakGsMDVE8L6eKOfzNT3h9ken0hOtI
-Yfa0wyx4xiyxsgimQmCtIG9r97zo0AyWHXB41qi77h9QKCjYFg1JCSQw52SLGqfK
-TkSwVUtC1WdaCM3HvV34YjBsCgq4Cze0IRkIVE+4Yt3V/F9bnDyY1oFcpHEhdTmZ
-7RKK28XYjwKBgBIq2L0AmlpaVOKLWpXTujzXu7a3oLoPdbi8dhF+qGrhd/wRcU0/
-gdDjlZe0RBPu1YJ/tukXjmBsTm7YzY7hvVm5/zlVS3KQWb8jE45Tu6KhiugKAJfr
-TBIWF+WHv0VEOG2F276i5XxaMqSokIDj0CCjKh43o/254GA40faQzamVAoGBAMly
-JX8FHcRW2pnvmxRukvY/d64m4dYOgmaqWbzN/2rBrETlxpplMOg9stma2zWqzJVd
-5zDGWn/Sy/CPVU1ynWokNLqXjJUIUyisfQVg7ZFVPybwGK5hRxWwtFJyp4ZStBQY
-4UqeFUCfdnurv2bKiPWpTlAxVzalMoyAxPxTJ6TjAoGBAMyMkWI9NxRArJIlbxGY
-0IO09ifrC7mWF8EQGs+EPrkq1nqjpbdQGqaw82q4Z/rRe7gJJQn9pqS3umbabAut
-/Z43/KmqPXtxPOj5FBLwao4W5fKRwmgCeZREnTWDDsRPxIYSM4hhbe8hxa7Y2FL2
-L4EZCRp4Po2FXT24hGr3V8+S
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDcRUBpp64S0t7l
+lVFXYE/ezJQbxo6KXInZ0xE4pJiZaXIwcy2j3xWMJxpTXajxuAX1108T6Qr9tSdk
+f586NOgznpbReaUG0Q4ctfr5lglY9Q6KuS04A5A/MDdbaD4TUMRCjAiCERepS8J7
+vCZUoTs6Yh+1fvOmfyhDj4MesqfnuJhU3Ivyn6bGUsIOL5HqtGvXqzh9N/SbpKdD
+TrYQ+/bd8ufVfW4WYPeGkmBXd2rK+PQu/t0x20U4dqBnZvep0zRM3d5RLinl4c8C
+s9tLTZynKlZDuRBGTKNmkbkfvVUlDlqBncyE5EqOMVkbQ9pnm7DLFdItFJ4YLmny
+mbv/eZP9AgMBAAECggEBAJG8nAaLs+eub12VMrFN/upZjvDlqW+wFGDzfmRsuq5e
+DvgxbJQMyLPnN0rLIDl12TO0FhUFTolYL00WB2K6mJt2pTDJfD+LV/v1B63U8DBU
+Sx/LrzhtWyYDn8yxpsie2otxHTv5VR9lCbNWZEIAPzC8tWAfM9QIM7qnnEhWSjNM
+O4Ek4TWaVjeHZAqL2LXzWxl8F8hdpvBLEm1um8aKJfMY6EAXmcOXWt9UGnfup+F7
+Hm9dhwt0tACkdTAkCezHI5Tkiw71QzIO8qi/tnE8AeEVJsDX4U4YWyoQxZBWcIxR
+N9Zi1lU11UrusDzE9Xagnl05tJYXNNFzyiFhl2DsdF0CgYEA+uEx5LqdYuUmeNZq
+3MilPR2V2TEISvjcWSeu2ErzRM2oc2d+Bzd1GraGobif1RLE+V3As0d396CvXNkP
+bz+B7WBSzEOI++eQCj801PmCJnU0/5dWzN50BbYxryI24ALD048F/D2kbpm5nJN9
+cUMSBtxrhFtLIEkt4QWvLJ4ibVcCgYEA4MQhAEtYzM3dE1tSjb5G1qi1BMakjXf0
+kAQuBpAaIgMq0czbW/cRU3u/84T4bG6/FqbIM3BO3e4RQLr8bdZArE/XMKmEyjKR
+esD9oJVbStqajg7gEC7ws9OA/bKdwU7L2IM9taa+knbco68YEQXxcWi3dYNEINXs
+fla11WROIMsCgYEAyAcXPdRgukIUW5Ix39kGjmTxXhtPDl+/aEJQkNmpfrkuzty8
+Skq4TtUrIPRQU5XEgUJz6z1XdJOkXjYerUeIc1gyi/Ro2tg1K0Zb/Fb3o2weFo92
+wJ+5B/jNQmLYN+Fce2h0kDohyaE9sY6THOQqElhaTUxw6MwQDXL3yW5H6r8CgYA5
+3GN+ducSOgCqZfz3fj8wLVgENbrQrEup81mB2QDRNq2EOs9RemXcbuP4JYfqKgxJ
+IYAyNbwnx4xrdHddMyWM9jS4Uzta7e+jgSEJgMlymJnm7g9iOyM9t7niFWQlCkrR
+nt947sbqX2znOkDgyP3hqwpnVvZn2Yo678l5eIvgRwKBgQCSWsjFm5+yCxbzNdfc
+HKI/c6+mUxbdxdoRNG5SfaZ6s/aIW8QAYae1cpuv8DaIjT7vSOvodh4istz73Lv0
+uNhJUcamsrHnUeMvsSct1bhtTWz9Axv+OHyIy0UGpj9LFk8DNEHFCDW/JUQz74gg
+KJ/wGgMel8seipuVpz16CvBUIg==
 -----END PRIVATE KEY-----
diff --git a/tests/ca/custodia-ca.pem b/tests/ca/custodia-ca.pem
index ba26523..55d348d 100644
--- a/tests/ca/custodia-ca.pem
+++ b/tests/ca/custodia-ca.pem
@@ -5,31 +5,31 @@ Certificate:
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=DE, O=Red Hat IdM, OU=Custodia, CN=Custodia Test CA
         Validity
-            Not Before: Apr 29 18:01:24 2016 GMT
-            Not After : Apr 29 18:01:24 2017 GMT
+            Not Before: Feb 28 13:18:34 2017 GMT
+            Not After : Feb 28 13:18:34 2021 GMT
         Subject: C=DE, O=Red Hat IdM, OU=Custodia, CN=Custodia Test CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:ab:81:af:c8:c6:34:03:46:60:fc:bc:a7:de:cf:
-                    7c:b2:7b:91:ea:ed:97:d6:50:b0:96:64:3b:dd:e9:
-                    09:22:46:1a:93:87:5f:f7:b4:de:11:39:70:94:94:
-                    44:91:48:c3:7c:08:90:dd:dc:2c:ce:8f:59:f9:bb:
-                    33:20:31:ed:ea:07:89:e0:57:5f:78:d2:bb:50:63:
-                    b4:f3:c1:da:97:8b:35:a6:ac:7b:18:cf:ac:e6:46:
-                    9b:3d:46:7f:9b:d0:95:35:9e:c1:7f:76:35:c4:18:
-                    10:5c:bc:85:10:9d:f1:74:10:2b:d4:47:66:84:b7:
-                    cd:f5:1e:9d:02:0e:e3:65:8f:5d:6c:37:bb:10:dd:
-                    d7:d7:dc:82:23:7a:3b:c6:23:c3:e9:68:6d:d7:c1:
-                    e1:d8:a5:3a:ee:3c:69:00:42:5e:bb:96:ef:c5:54:
-                    3a:6e:60:2b:8d:27:b0:97:a0:eb:39:6f:7d:ba:5e:
-                    4e:e9:1f:d7:af:c6:3d:e9:05:fe:ec:b9:a5:81:77:
-                    09:c1:7c:9b:76:38:0c:83:cd:e4:fe:2e:04:06:43:
-                    36:3f:1d:de:75:6e:49:1f:c9:25:2a:37:fd:81:44:
-                    53:cc:f6:7d:55:fb:ce:32:83:6c:84:c0:a5:79:14:
-                    c7:f2:b8:fc:a8:3b:49:13:94:63:17:f5:a1:57:41:
-                    e5:bb
+                    00:dc:45:40:69:a7:ae:12:d2:de:e5:95:51:57:60:
+                    4f:de:cc:94:1b:c6:8e:8a:5c:89:d9:d3:11:38:a4:
+                    98:99:69:72:30:73:2d:a3:df:15:8c:27:1a:53:5d:
+                    a8:f1:b8:05:f5:d7:4f:13:e9:0a:fd:b5:27:64:7f:
+                    9f:3a:34:e8:33:9e:96:d1:79:a5:06:d1:0e:1c:b5:
+                    fa:f9:96:09:58:f5:0e:8a:b9:2d:38:03:90:3f:30:
+                    37:5b:68:3e:13:50:c4:42:8c:08:82:11:17:a9:4b:
+                    c2:7b:bc:26:54:a1:3b:3a:62:1f:b5:7e:f3:a6:7f:
+                    28:43:8f:83:1e:b2:a7:e7:b8:98:54:dc:8b:f2:9f:
+                    a6:c6:52:c2:0e:2f:91:ea:b4:6b:d7:ab:38:7d:37:
+                    f4:9b:a4:a7:43:4e:b6:10:fb:f6:dd:f2:e7:d5:7d:
+                    6e:16:60:f7:86:92:60:57:77:6a:ca:f8:f4:2e:fe:
+                    dd:31:db:45:38:76:a0:67:66:f7:a9:d3:34:4c:dd:
+                    de:51:2e:29:e5:e1:cf:02:b3:db:4b:4d:9c:a7:2a:
+                    56:43:b9:10:46:4c:a3:66:91:b9:1f:bd:55:25:0e:
+                    5a:81:9d:cc:84:e4:4a:8e:31:59:1b:43:da:67:9b:
+                    b0:cb:15:d2:2d:14:9e:18:2e:69:f2:99:bb:ff:79:
+                    93:fd
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
@@ -38,46 +38,46 @@ Certificate:
                 Certificate Sign, CRL Sign
             X509v3 Extended Key Usage: critical
                 TLS Web Server Authentication
-            X509v3 Subject Key Identifier:
-                96:B7:D6:4B:E0:FD:BA:FB:99:2A:A2:45:57:CF:A3:FD:BF:40:50:15
-            X509v3 Authority Key Identifier:
-                keyid:96:B7:D6:4B:E0:FD:BA:FB:99:2A:A2:45:57:CF:A3:FD:BF:40:50:15
+            X509v3 Subject Key Identifier: 
+                50:56:9F:AA:F7:7B:4D:A5:63:D5:B1:19:B7:26:AE:D3:56:17:F4:C1
+            X509v3 Authority Key Identifier: 
+                keyid:50:56:9F:AA:F7:7B:4D:A5:63:D5:B1:19:B7:26:AE:D3:56:17:F4:C1
 
     Signature Algorithm: sha256WithRSAEncryption
-         7c:58:9f:4d:c2:c5:45:56:cd:39:7d:15:d4:83:55:03:0e:ec:
-         0f:83:8e:71:38:be:e7:d8:e8:f6:58:01:67:33:cd:1a:46:db:
-         6d:a1:ee:d7:2e:67:1f:00:c3:0a:fe:96:3b:73:5b:37:28:cc:
-         76:c7:15:22:43:16:3d:ab:29:af:7c:59:e9:3f:b3:60:36:a4:
-         e9:bc:73:8a:9d:81:0c:1f:4a:78:cd:fe:72:23:c2:70:c0:09:
-         91:4d:ee:b0:ad:cb:13:66:2c:57:82:c3:5b:8a:1a:ec:74:46:
-         01:90:5d:ad:b5:d7:ea:c0:78:12:9a:46:4e:24:b4:ec:cb:11:
-         1e:6b:25:b6:ff:97:66:19:31:c9:22:54:6f:54:fe:88:55:11:
-         ec:5f:0f:2d:68:40:b1:64:69:f5:fc:49:49:78:48:37:c2:b0:
-         93:8b:3c:73:a4:72:00:3c:cf:36:5a:01:69:f0:18:10:ec:4c:
-         0e:92:00:3c:a9:36:05:c7:3e:7b:94:d1:6f:e5:24:81:e1:88:
-         07:81:88:9d:7c:4b:27:6a:dd:cc:d1:31:46:1a:19:f9:08:3e:
-         0a:38:fc:fa:e7:24:6b:0b:d6:52:3e:02:7a:30:e0:e3:d1:b4:
-         e5:a9:2f:fc:9b:b5:bd:09:f1:d4:3a:c3:8a:c4:d5:0e:11:b3:
-         b1:0a:bf:df
+         51:ac:c0:39:1e:e2:7d:4e:f7:59:0e:75:79:2b:f5:ad:a7:bd:
+         e0:e0:22:74:09:fd:bc:f6:e0:a1:05:58:4c:4e:da:20:87:d4:
+         21:fc:7c:38:f1:f2:ca:79:61:8d:20:d5:db:0c:38:e7:7f:2f:
+         54:a4:f6:b1:e6:d6:63:57:c9:61:95:ed:34:4b:3f:dc:31:32:
+         72:70:4e:2e:0a:42:73:e0:af:61:b6:f4:2d:2c:97:83:95:66:
+         96:8d:0e:b9:30:72:8a:2b:24:f1:86:73:02:6b:cb:14:96:43:
+         20:c7:25:65:18:a0:ee:b6:6f:66:f7:3f:f4:30:37:42:66:99:
+         d2:70:46:ed:21:e3:bc:bf:07:59:c4:8c:62:f9:af:e7:e5:95:
+         01:9b:12:90:ce:26:c9:56:1d:5e:5b:4a:7d:10:0a:1d:42:1f:
+         34:94:77:a4:b0:58:61:1a:c4:98:85:6d:06:c5:3a:e1:51:bb:
+         ce:6e:ba:33:ef:d9:81:28:63:a7:33:ba:63:9c:45:2b:43:52:
+         70:6f:94:b0:02:e2:7d:87:48:79:61:7e:e7:d6:00:f8:9d:f4:
+         0d:20:fc:06:a4:e2:d9:60:0c:21:06:2f:dc:3f:39:97:70:a7:
+         1a:07:a7:14:65:16:2f:eb:b9:77:60:2a:59:79:9b:73:6a:62:
+         69:7f:5d:6d
 -----BEGIN CERTIFICATE-----
 MIIDmzCCAoOgAwIBAgIBATANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJERTEU
 MBIGA1UECgwLUmVkIEhhdCBJZE0xETAPBgNVBAsMCEN1c3RvZGlhMRkwFwYDVQQD
-DBBDdXN0b2RpYSBUZXN0IENBMB4XDTE2MDQyOTE4MDEyNFoXDTE3MDQyOTE4MDEy
+DBBDdXN0b2RpYSBUZXN0IENBMB4XDTE3MDIyODEzMTgzNFoXDTIxMDIyODEzMTgz
 NFowUTELMAkGA1UEBhMCREUxFDASBgNVBAoMC1JlZCBIYXQgSWRNMREwDwYDVQQL
 DAhDdXN0b2RpYTEZMBcGA1UEAwwQQ3VzdG9kaWEgVGVzdCBDQTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKuBr8jGNANGYPy8p97PfLJ7kertl9ZQsJZk
-O93pCSJGGpOHX/e03hE5cJSURJFIw3wIkN3cLM6PWfm7MyAx7eoHieBXX3jSu1Bj
-tPPB2peLNaasexjPrOZGmz1Gf5vQlTWewX92NcQYEFy8hRCd8XQQK9RHZoS3zfUe
-nQIO42WPXWw3uxDd19fcgiN6O8Yjw+lobdfB4dilOu48aQBCXruW78VUOm5gK40n
-sJeg6zlvfbpeTukf16/GPekF/uy5pYF3CcF8m3Y4DIPN5P4uBAZDNj8d3nVuSR/J
-JSo3/YFEU8z2fVX7zjKDbITApXkUx/K4/Kg7SROUYxf1oVdB5bsCAwEAAaN+MHww
+hvcNAQEBBQADggEPADCCAQoCggEBANxFQGmnrhLS3uWVUVdgT97MlBvGjopcidnT
+ETikmJlpcjBzLaPfFYwnGlNdqPG4BfXXTxPpCv21J2R/nzo06DOeltF5pQbRDhy1
++vmWCVj1Doq5LTgDkD8wN1toPhNQxEKMCIIRF6lLwnu8JlShOzpiH7V+86Z/KEOP
+gx6yp+e4mFTci/KfpsZSwg4vkeq0a9erOH039Jukp0NOthD79t3y59V9bhZg94aS
+YFd3asr49C7+3THbRTh2oGdm96nTNEzd3lEuKeXhzwKz20tNnKcqVkO5EEZMo2aR
+uR+9VSUOWoGdzITkSo4xWRtD2mebsMsV0i0UnhguafKZu/95k/0CAwEAAaN+MHww
 EgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0lAQH/BAww
-CgYIKwYBBQUHAwEwHQYDVR0OBBYEFJa31kvg/br7mSqiRVfPo/2/QFAVMB8GA1Ud
-IwQYMBaAFJa31kvg/br7mSqiRVfPo/2/QFAVMA0GCSqGSIb3DQEBCwUAA4IBAQB8
-WJ9NwsVFVs05fRXUg1UDDuwPg45xOL7n2Oj2WAFnM80aRtttoe7XLmcfAMMK/pY7
-c1s3KMx2xxUiQxY9qymvfFnpP7NgNqTpvHOKnYEMH0p4zf5yI8JwwAmRTe6wrcsT
-ZixXgsNbihrsdEYBkF2ttdfqwHgSmkZOJLTsyxEeayW2/5dmGTHJIlRvVP6IVRHs
-Xw8taECxZGn1/ElJeEg3wrCTizxzpHIAPM82WgFp8BgQ7EwOkgA8qTYFxz57lNFv
-5SSB4YgHgYidfEsnat3M0TFGGhn5CD4KOPz65yRrC9ZSPgJ6MODj0bTlqS/8m7W9
-CfHUOsOKxNUOEbOxCr/f
+CgYIKwYBBQUHAwEwHQYDVR0OBBYEFFBWn6r3e02lY9WxGbcmrtNWF/TBMB8GA1Ud
+IwQYMBaAFFBWn6r3e02lY9WxGbcmrtNWF/TBMA0GCSqGSIb3DQEBCwUAA4IBAQBR
+rMA5HuJ9TvdZDnV5K/Wtp73g4CJ0Cf289uChBVhMTtogh9Qh/Hw48fLKeWGNINXb
+DDjnfy9UpPax5tZjV8lhle00Sz/cMTJycE4uCkJz4K9htvQtLJeDlWaWjQ65MHKK
+KyTxhnMCa8sUlkMgxyVlGKDutm9m9z/0MDdCZpnScEbtIeO8vwdZxIxi+a/n5ZUB
+mxKQzibJVh1eW0p9EAodQh80lHeksFhhGsSYhW0GxTrhUbvObroz79mBKGOnM7pj
+nEUrQ1Jwb5SwAuJ9h0h5YX7n1gD4nfQNIPwGpOLZYAwhBi/cPzmXcKcaB6cUZRYv
+67l3YCpZeZtzamJpf11t
 -----END CERTIFICATE-----
diff --git a/tests/ca/custodia-client.key b/tests/ca/custodia-client.key
index c2e1570..a24bfde 100644
--- a/tests/ca/custodia-client.key
+++ b/tests/ca/custodia-client.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCjYXMxUVx+eWZ6
-GW06ez0dmEE5fWkWcXySvQIw8PI+g9XwomJTDtO6ZlOO8DkLTVm16kEFa+hcF6ZB
-YxxiBDgqAINf0Gw2VT20qdVjkWtR4u8DBYA5Zfk6yw4crOomY/LS1M4yQR26M/HM
-0Bdcl8OL74zkhh7Bz/01o6GMZoM+Nl2XEQjLfKJtDWs+G5PooOEbMppYOFIVhMxq
-BBWpIQNSf48r5TJZ8V0FhtPhyAvCuBmlHVO+upLjg8371ILRFhc3VcLF64X0nf4z
-+PyNor/c1pxH9ABhUFZt6UYK2p0zzat5iNzqdbbGMZvMqZkFmGAGtVeyPn8reACU
-h8Ywe/GBAgMBAAECggEAacQaSGD9WbrJhl2TgnppdBEumEMBls/c7zmAg6JXj/TU
-uLTGpjJBCrhXe38zzodCfiup8BKNF6EPteCtbR6CJV6zrYFFrF6+VYhkZdKsARTB
-2djjy0SidVciSZn+8t9dQPMWkR3qWrJp5EcJ+J0esCZhtUbF/n3g06qcWEG80LZj
-0mvMpZ+bCMxp/VBAkrpX0i3yKBNcJrNOoX9EBugUwHWbip3Fxivjy6xkGbEvOzFO
-FwxoGuwHSinyB+3hoaiiKpwbPtTsAKjoteN9seqzdQ0iR2onESoMFUDevsDjVwR3
-FvguLCZEkoGjxjUiN9Ldl9Q5dsk2dirHmLpKBiTM6QKBgQDZbg5XgWUJ9BrbVL11
-5+yY9TxKBiHpAMVwiU+5jYF6+9nqGbiQ2JKnvkQKhB9Mpgq2JrRfxzDpD28qWFlq
-F+LhdMaBUirDTqoAsPtApCPU5rRHg8BtuggrE92hyloysetWMtaDXCSm4mVOx4D3
-tpMIF722sVWd+3X71frtI/sjHwKBgQDAXOfPfLpwLLqZBk4wIpkQpOIrjJKEZAaj
-D/zkS4hjWLh4kx0e/U+iosWeL5A+JnxDjCcK0/K9It2Ydt2fenHItJVHTKzwhYI0
-SKo5ua3/x8bufHdbN4NFb2BGZp1kE12rDB9m7/sb4X3klX/bBkSbm2WiN2GBKmab
-ej7fGrn3XwKBgCZLuxzwfnJVW1GcSE53DfYW44qKL/jRGPVsSe19nfuiVkxkQVzJ
-uHLxERzlDno6mJJimMxx0gyKmmLT8tO750scfUYTydJijZDXmzlUb7c09zXNX9wz
-svKbaiLv+BkLu06QX7X9SbtXDs7kVrPKpXT8cX63F0RfIPW9R5fzCW2zAoGAfAaq
-06W404CTYvykxvZXuFqHFMsS4NdZTCOPy2ZD7sISVnOL8CIlCVhnkCFcoCXSMv8X
-YSzcskPbmmTxadTZri14njr6ui1qkOlVD9j/Lg6R3cxUbHSzZ75y1ZFt40t1Nkaf
-rJAIWKaftBUMFZzJ+YZNFjUc4doDxDUieljSFIMCgYBNe36gmRKgNysliEuDP++0
-gDnoVVBoxwZYNjO4pjtrAyoAh/gCFnVj9f25iGWBiO7E8OFd9m0c6c0pRxuCRfwU
-O/iP4wAu8THv0WZTtEnU30F8PIDSFxAii7MPmxYj28v8aji1nQ6af+X9/C2Xs7V2
-K7+RZm+oNnc5Sb31MGatkQ==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDShWhYe+0MBFIe
+Ke0x5rVd2rBZlFy9mmSAVw+F48P7Ou6hQIXmju7GeKK1jF9cLBqhePP9Tt1sjuhq
+0oo379cWqy6CPiVkfgy57dEPsvMSJ1RkA6qT2rf4NUvfQtfAiNJjXndi+/TxImJa
+iBYHxxmGOSDqqO8h53MpKzOc9ySVgF17nBg0bl34W0SX9hBSDqsBjyGH10bPCo7I
+zfLSDJY3qUfHmhdIEVqXXWn4z5nMfcCXOSQPBsc8tDhwRbAU/yBLdBHr4UOHwc7Q
+VNg4j/333mLur9LcpIXYGR9ms8LxhzEhNOK5D6CegdJRSZKUq83QMP7UYXVTGrkC
+iOGP47E7AgMBAAECggEBAJd18gfPSVHe/fHDumqvkQcwYrZgXoTvQqVvfbSXlRX4
+ZV1QncWuSi4y9uVlU+pttM89xVUW24nSG3dXeKgb/4TIrhJ4gdCWO7O9XS9NUUJb
+V4UJej0cHEYQmkDLx4w3JB7oBT8LBURDt71osWjxHvUJvxv1ZO7gpWMWOPESgpin
+zdQI9DNVCoJRkoZAZB+wf7pERJgbz5dsx0cvNasjzuCJH6FeP2zgVPaZsJtLrR2Q
+p5m3qpdbBPO/mvwbYcMZE07TBXlBGjrzBWjX2dAGYP71kRILPM3QDyi7hRsqS/6T
+6ehnJPIZ83nyDsBXulOwsvv7M5ZdGAZMAzPFb1fG9QkCgYEA/OkiLBPAfNI4jCCP
+sARawHxOKpiCh3eGS3G8w40lUX6c5gUfEYGtWqTSnjexbZBJnECpIb2KOHHbzBgg
+WH+m5vk4lkeTo6hMfZxXg3JUvU8OnE9GV5TCrmfiIQgN2u5tJh2Q/6hex9d5CElR
+htlLNYAVOCELKgx1OGo9b03+4kUCgYEA1Re4MMOeW5hx7jDg2u5EeH6IQL68bDu4
+wt2AQQQO0j+MzqMz4JVIiJPpBBhP2sx+6Kl2SdmegCEAP8KLC7Mw04QHWT1nG3jb
+smDr7S1jaz1271yBGaIlaQAxRZ75FrdYpt4r/mwkwraNpbvQZZ+pB6eXQjGdcDca
+HfBniCRbPX8CgYBn56wXacICRiffQh1mVlOmkytWCrRNzYhKBJ9lw95aHed+BQqf
+maRMAj1ZrU3i0o27eUFDUGiyCe0ga6UWVtOOP0PFUgDREvrh/FJj+Zvg7tL02wju
+QHq/RoS7x2BR2vTS3QDOWDEgb2EVS3IIMcvZXhbZqZG5o8ag99znlqap9QKBgQCS
+/JeK24SiPddoq8KOgYgtbWpi7q5eIhviHpPXRQtML5Xa+2xPX+n2e8BhmLuMez6X
+Ej2L11ajnx/i2zi6S1JEtG+1OMukgYtZ0c0rfwFy+aTOmwpaOiR/9ygFlBDRgIrg
+H6RNDR+WSAIQ7ipjzuvzYcDOYhbtTrTvLeLcX+en1QKBgD29Ma07yshBYIoqtDge
+NqMAl4JOE1PoYWM28Cva3xzI0mCPF8Gnf6hM+PEA+0rNm7kdDB0W5Noz7/e4hHku
+6FYBGFPgiPmTPa0ptPPX5kUtTTsy+UjzdntTgz4m9hFIieON6IoBrP4zlZ1lUCE0
+jNXul622grzsy25el/D4YtIe
 -----END PRIVATE KEY-----
diff --git a/tests/ca/custodia-client.pem b/tests/ca/custodia-client.pem
index 66e360a..3e65106 100644
--- a/tests/ca/custodia-client.pem
+++ b/tests/ca/custodia-client.pem
@@ -5,31 +5,31 @@ Certificate:
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=DE, O=Red Hat IdM, OU=Custodia, CN=Custodia Test CA
         Validity
-            Not Before: Apr 29 18:01:24 2016 GMT
-            Not After : Apr 29 18:01:24 2017 GMT
+            Not Before: Feb 28 13:18:34 2017 GMT
+            Not After : Feb 28 13:18:34 2021 GMT
         Subject: C=DE, O=Red Hat IdM, OU=Custodia, CN=client
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:a3:61:73:31:51:5c:7e:79:66:7a:19:6d:3a:7b:
-                    3d:1d:98:41:39:7d:69:16:71:7c:92:bd:02:30:f0:
-                    f2:3e:83:d5:f0:a2:62:53:0e:d3:ba:66:53:8e:f0:
-                    39:0b:4d:59:b5:ea:41:05:6b:e8:5c:17:a6:41:63:
-                    1c:62:04:38:2a:00:83:5f:d0:6c:36:55:3d:b4:a9:
-                    d5:63:91:6b:51:e2:ef:03:05:80:39:65:f9:3a:cb:
-                    0e:1c:ac:ea:26:63:f2:d2:d4:ce:32:41:1d:ba:33:
-                    f1:cc:d0:17:5c:97:c3:8b:ef:8c:e4:86:1e:c1:cf:
-                    fd:35:a3:a1:8c:66:83:3e:36:5d:97:11:08:cb:7c:
-                    a2:6d:0d:6b:3e:1b:93:e8:a0:e1:1b:32:9a:58:38:
-                    52:15:84:cc:6a:04:15:a9:21:03:52:7f:8f:2b:e5:
-                    32:59:f1:5d:05:86:d3:e1:c8:0b:c2:b8:19:a5:1d:
-                    53:be:ba:92:e3:83:cd:fb:d4:82:d1:16:17:37:55:
-                    c2:c5:eb:85:f4:9d:fe:33:f8:fc:8d:a2:bf:dc:d6:
-                    9c:47:f4:00:61:50:56:6d:e9:46:0a:da:9d:33:cd:
-                    ab:79:88:dc:ea:75:b6:c6:31:9b:cc:a9:99:05:98:
-                    60:06:b5:57:b2:3e:7f:2b:78:00:94:87:c6:30:7b:
-                    f1:81
+                    00:d2:85:68:58:7b:ed:0c:04:52:1e:29:ed:31:e6:
+                    b5:5d:da:b0:59:94:5c:bd:9a:64:80:57:0f:85:e3:
+                    c3:fb:3a:ee:a1:40:85:e6:8e:ee:c6:78:a2:b5:8c:
+                    5f:5c:2c:1a:a1:78:f3:fd:4e:dd:6c:8e:e8:6a:d2:
+                    8a:37:ef:d7:16:ab:2e:82:3e:25:64:7e:0c:b9:ed:
+                    d1:0f:b2:f3:12:27:54:64:03:aa:93:da:b7:f8:35:
+                    4b:df:42:d7:c0:88:d2:63:5e:77:62:fb:f4:f1:22:
+                    62:5a:88:16:07:c7:19:86:39:20:ea:a8:ef:21:e7:
+                    73:29:2b:33:9c:f7:24:95:80:5d:7b:9c:18:34:6e:
+                    5d:f8:5b:44:97:f6:10:52:0e:ab:01:8f:21:87:d7:
+                    46:cf:0a:8e:c8:cd:f2:d2:0c:96:37:a9:47:c7:9a:
+                    17:48:11:5a:97:5d:69:f8:cf:99:cc:7d:c0:97:39:
+                    24:0f:06:c7:3c:b4:38:70:45:b0:14:ff:20:4b:74:
+                    11:eb:e1:43:87:c1:ce:d0:54:d8:38:8f:fd:f7:de:
+                    62:ee:af:d2:dc:a4:85:d8:19:1f:66:b3:c2:f1:87:
+                    31:21:34:e2:b9:0f:a0:9e:81:d2:51:49:92:94:ab:
+                    cd:d0:30:fe:d4:61:75:53:1a:b9:02:88:e1:8f:e3:
+                    b1:3b
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
@@ -38,45 +38,45 @@ Certificate:
                 Digital Signature
             X509v3 Extended Key Usage: critical
                 TLS Web Client Authentication
-            X509v3 Subject Key Identifier:
-                C2:D8:C7:E8:67:B4:B8:6F:18:53:C8:2D:37:23:42:36:02:43:D3:58
-            X509v3 Authority Key Identifier:
-                keyid:96:B7:D6:4B:E0:FD:BA:FB:99:2A:A2:45:57:CF:A3:FD:BF:40:50:15
+            X509v3 Subject Key Identifier: 
+                8A:96:CB:7B:0C:FF:80:EE:04:01:CD:A6:6A:AE:EA:B6:A7:8E:E6:DF
+            X509v3 Authority Key Identifier: 
+                keyid:50:56:9F:AA:F7:7B:4D:A5:63:D5:B1:19:B7:26:AE:D3:56:17:F4:C1
 
     Signature Algorithm: sha256WithRSAEncryption
-         55:3f:11:c4:16:dc:01:e9:b1:d0:fc:e8:f5:bf:55:63:21:b9:
-         a7:2e:81:63:fd:56:0b:ac:1f:38:39:3c:fd:24:3d:08:39:29:
-         37:d0:79:f1:4f:71:4f:e3:10:35:f2:70:fe:78:a3:d9:31:7f:
-         cc:d5:46:49:13:80:8d:e6:2a:d0:15:08:88:9f:ff:8e:c3:b4:
-         d2:bd:b3:7e:b9:af:0a:3e:ba:36:0f:bb:59:3a:b1:35:b3:53:
-         c5:fb:46:30:be:e6:bc:89:af:66:01:99:67:df:cd:a0:53:17:
-         39:9e:29:b1:c1:ba:ce:2a:28:9b:7c:fd:d8:a1:31:94:54:d5:
-         c4:a8:80:38:0f:1a:f9:55:35:fc:05:9a:f6:ce:3c:78:47:1a:
-         4a:71:db:8f:f7:4b:35:f1:08:f2:0f:19:a4:20:09:39:c5:21:
-         11:a0:28:c0:c4:ed:b9:33:9d:45:ad:47:69:83:ca:64:77:77:
-         ba:de:9d:02:58:f9:c2:5c:f8:10:7b:aa:ce:38:04:0f:5e:cd:
-         38:f1:4b:e3:35:51:b3:c3:6e:bf:e6:1e:40:5f:de:d5:b4:f4:
-         6b:9a:ca:65:eb:3e:67:4b:ba:2c:26:16:c7:f9:ef:e4:6c:84:
-         f2:91:e1:9b:f4:b8:76:75:64:aa:13:95:39:80:28:d1:30:be:
-         7d:12:3d:08
+         39:5a:bc:d0:d1:bc:8b:c4:a2:50:a3:d9:7a:14:ca:fa:52:f2:
+         08:ec:1f:39:78:69:dd:88:15:15:be:91:7d:d8:20:ae:c1:62:
+         0b:71:09:9c:28:41:db:0d:a7:6e:2c:84:ac:4b:62:a8:d4:73:
+         11:a6:45:58:12:23:a4:db:ed:b9:4c:f4:95:a3:14:b3:28:d2:
+         8e:29:a0:f0:90:63:62:53:4d:85:99:13:2b:14:67:1c:30:69:
+         52:27:5a:9c:44:89:30:b3:d8:45:82:9a:76:24:65:08:38:2b:
+         37:af:9a:36:c3:d4:c4:30:8d:41:2f:16:a8:bb:d1:0a:69:a1:
+         44:32:a1:22:ea:6f:6a:58:bf:51:26:43:9d:a9:4f:f2:43:69:
+         d2:b5:55:1a:3c:18:99:20:8c:86:de:96:28:ed:58:7c:1f:19:
+         45:39:a0:c6:61:f2:04:6d:15:68:3a:2d:ff:2b:7f:7a:aa:0b:
+         6e:67:ef:1f:ac:ca:26:9d:1d:f9:de:3e:0c:16:8d:38:5e:19:
+         fe:03:38:ed:ff:ce:1f:af:ec:eb:3e:77:03:f2:d4:66:43:29:
+         b6:69:5e:0b:d8:5e:dc:7c:8c:c8:8b:54:7a:11:cc:c5:b2:c3:
+         d3:a6:f6:0f:8b:4c:3a:16:56:13:af:fb:87:97:6c:5e:25:58:
+         70:1f:f4:21
 -----BEGIN CERTIFICATE-----
 MIIDizCCAnOgAwIBAgIBAzANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJERTEU
 MBIGA1UECgwLUmVkIEhhdCBJZE0xETAPBgNVBAsMCEN1c3RvZGlhMRkwFwYDVQQD
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/tests/ca/custodia-server.key b/tests/ca/custodia-server.key
index c71a1df..f80a5a4 100644
--- a/tests/ca/custodia-server.key
+++ b/tests/ca/custodia-server.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDm9j/3bq+88Pwy
-Ixpl3m07zr9F1GjDVdzf6yJg6utNMZIJN6JCBLlFWz3eqsPAfX2DUcDIwyrOlR9/
-QBJMiMPaPNUXB18nnGZGq1tHEsTwoZvkOe5rH0v0V1ywiivLFkSe145YNkfpQ+5N
-DbzCL8l2p8gCYrlhHvXpxvhrgbjCtWiCKyyHs1ULlvAyVJvPEmAb1CIt70CAw+ju
-BlTtHKVh8d2R1HLvAEoDRjTp5BSkg8dMMGDi1I0KLBHMpVGkP2xqPkCTBtwSB8zP
-lUCGslmYHEiVfggjXCOIOqkRLFDFggpnicd9khO9Q1RmSmkrqYICtElI+o1r+/OS
-bmYlwp0dAgMBAAECggEBALWia2PXtHVOv8deO+BpMFacnWf5R/p2iCHA9WRq22n1
-1fdRvVVWCa41t05p1VCIYDDqFkbM1dlpBUA5zypJVF1JAfv+XCL2qKhjEoGujRsA
-vWya8plkH4OlQMvFnfM1K/oPY26UIbGdLseCSjQdCL8769uUcF2kz5huVeeWOQtF
-yNC3URV41R90FEEWlmgk7gx502mKbTpDsPNxVlrweauQv0gceXpjPzeBYmHn/Aif
-y/xnVisBDz9sv5RBropzZZHezyHY0zmubcZ0aFSj/WrXxlDknyQFUNA+3HCPinqM
-QaZlg5TgcfiA0uF9Lyc0HPzNwhKUuMX1tZvfAun78bECgYEA9mR8Cs/L4NIECULX
-L93dPa2xtdSuHtJKwON4B2+OlpDEAbBFYWwZ4T/YkL1sIoNEI83dyGxWEg+PTKeb
-g7HY+yJBqDp7JaN+UWh1zjKc2sAoMTaJhhVzjgkJ0N2Mc3Um4EEmnA1EQdWjIh6C
-m3txcFvFyDoFZJGGNye/LKAZj4MCgYEA7/e8RoKWrWxzMbF3s8BvTBs+2uC5wbch
-lPZWs/LcnPkP7Gg0uG23kn4V9EPw2myb5ySpU6XsR61diPWWTCsDt854w/kPX3oI
-TXamGTcJByoFxKMRb43RHZrtoKIwujJXfPJllXFbWxbMbP+3/Dy/3cCMPgWbFLvK
-iPhwpXXZ3t8CgYEAiL5z6TwyFm/4NXuXGcW0R8riWdvTVt+3BR45O0c6h22ImrdN
-iigIpO5eLtYx8WWQp55VfCpECnoAOba7pHdLyPTWI5txRQ5byKqE1w9X5j/HDqkJ
-4hR9sVJq1DRhAqL+FG+UEf965l6+zuzH56q25njIZ7trysjJCEtS2l1wUikCgYBb
-6Zm1sCMifd2JdR4SPWzjy7PBhj3gEtLMCaaf+i/B+Cu/MxKuaWfctmqWSsegAeWd
-HQ+2OGFN+vtOkDJnLjqYVn8vIOBgg49WjFGGauwMUG4xKPxuq/Uiz8qgsj7TsqCL
-/RQnr2l8dDkMrs270VD0EOImh2MlB+DFodMTrRYsJQKBgBbUR783ZDGLvKeKERTi
-tIloq9HcUwuTdQpjQRg4aT+8oqe/rTx+yXxDZfNF9b4RMWSyhvWd1b5W+Tx14N/U
-j7KH23pKT/lwQUZj9Xu3P2aVCcZZmzMp8ihb5JB69bkKlZUNpmKL4lIiMinCYGF7
-Fwat8RRGHw28LLiq0mIgx1u1
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDKVhGzmj3/+PU0
+xtaGRqZ19a8gfBk2g9lESow0HEvfScZvHlkV3l0ISqu20o/77sl0iCvx+s5d8aNO
+NNLWwp9d7jyHXCvq3z7oeE+TI0bVDm9H3LapCe0jYa7TpRLEXJQI43vvWyp7jUkS
+Klla7toHtgBeJDKxADjV/kfWZk3XOSLgOrzIR+MnZkxelr44cVgjSXOkASB/14YS
+vvELRbcTFHN65SZlxL4d+A2rjSexMAz7losGhz1tdfGMjjZHLSGwXebZt/QisJ/W
+tOpvmozLU19tLyOn2Pgmjw09mBc3Kc9d4Fxot27qiDX7+ra2VQtODxHNbiAytR6c
+we8thdkPAgMBAAECggEAD5A5Qlhd5n+O1OVqgN+UVER2mQgSpGfV4XPefu+iQmWZ
+Vti9v3ngLBAaTzC5FIbUhhsnTjCdiQpaJlzXzt8fhQkbLMpBMorDevwuGsI+44p9
+ssheYHg7/lm4Kd1rqSD53gkpckrP5LsEYNpTDzSKHse4FYWxRH4g4QzzF6G84Q4H
+4IOuIWLkQsWkhc24YaNS3Mdv+p41nbffMdwXUmALi4yIwY9prRGHU4KRhbBxUqE+
+QVqGPnGFC28tUOEmr2/cKKaOZKNmvVXYR3A3sJp0dZ1rera6QLQvb1Cvd975j4l7
+fdFtxjGTIe8xO6c2q2QuNwMotyQ2FUaV2OkS3YgqGQKBgQD5iVxEYiEY70eZNWA6
+nOUiKRI5OINwpWxoYTUo0PgdD6t2vzyrAB7Fa+hetvJwms/GBaeBoQGX2j2Wewh2
+agiSlDu85cVhwlbdxh4P8WUdtahC7hKTjfF57b8fwWYEnUZb4hANZA0zpGK3r7zg
+yOVg6x1DMftOls/3FtZVSOzrOwKBgQDPk7rwmbIbcHGdTSfHB65P3y8DeCBit3Rc
+7sTIjz7T4F2Lohr8qugfVwL8Yyl3mrB4ZMEzF23N80qZh4UPg25rOxM7NZ8DfBl8
+UxctVIIQKqXtNdIDqaZ7qEarsTDu+dED5ZmVrWasPdosPUna36F0Fs0Nt0gZMGc0
+cqBm7SCkPQKBgBj1ZzgjxIG09Sla0FwsczKefwcgIu1ybkxmZKXHePmXJqRC7nOA
+GJPQfjZy//7JTTzWNfHeQ8WHe5+AgNEvO9pFX1A+fyaPBJc8CKe5kk6Na9395/fA
+O8XhRLuNYYHWpUHtc4OTXUqsB3+t4StujJrMCWo+Jo+uv/BL5XY0TBYfAoGBALNT
+40p83XwLFnxY7aZqolLqc0lB/GiMKQEoXeUOq66LxQUe1MW4OLTqjO/SEz766r33
+/VjQQtKL/sTIaVHPsBL/hEvAtVFjYvkfJ4TH311sGtDlkDwN0oA+Dl/Bwo6ST9pX
+/ulqVqsy/Er/39AxJuCN2jShRK5OPLr41E5XSb3ZAoGAaa9fVGIXRT/5JE9cDC47
+B7YYGDOIXAHtR8Jw8KNaLGHvgVROwvRRB85v9STse4mu+XOhgLU7p43OJOERwwtP
+fITqPO3lgg2HlabQDuswr2ZFPZ/S8AYWe9G7b8AkpL9/fDOHPNEPDYnIB70vb545
+840/EGCn3gZlw8GOw8vdSYs=
 -----END PRIVATE KEY-----
diff --git a/tests/ca/custodia-server.pem b/tests/ca/custodia-server.pem
index 5a51810..fc59edd 100644
--- a/tests/ca/custodia-server.pem
+++ b/tests/ca/custodia-server.pem
@@ -5,31 +5,31 @@ Certificate:
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=DE, O=Red Hat IdM, OU=Custodia, CN=Custodia Test CA
         Validity
-            Not Before: Apr 29 18:01:24 2016 GMT
-            Not After : Apr 29 18:01:24 2017 GMT
+            Not Before: Feb 28 13:18:34 2017 GMT
+            Not After : Feb 28 13:18:34 2021 GMT
         Subject: C=DE, O=Red Hat IdM, OU=Custodia, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:e6:f6:3f:f7:6e:af:bc:f0:fc:32:23:1a:65:de:
-                    6d:3b:ce:bf:45:d4:68:c3:55:dc:df:eb:22:60:ea:
-                    eb:4d:31:92:09:37:a2:42:04:b9:45:5b:3d:de:aa:
-                    c3:c0:7d:7d:83:51:c0:c8:c3:2a:ce:95:1f:7f:40:
-                    12:4c:88:c3:da:3c:d5:17:07:5f:27:9c:66:46:ab:
-                    5b:47:12:c4:f0:a1:9b:e4:39:ee:6b:1f:4b:f4:57:
-                    5c:b0:8a:2b:cb:16:44:9e:d7:8e:58:36:47:e9:43:
-                    ee:4d:0d:bc:c2:2f:c9:76:a7:c8:02:62:b9:61:1e:
-                    f5:e9:c6:f8:6b:81:b8:c2:b5:68:82:2b:2c:87:b3:
-                    55:0b:96:f0:32:54:9b:cf:12:60:1b:d4:22:2d:ef:
-                    40:80:c3:e8:ee:06:54:ed:1c:a5:61:f1:dd:91:d4:
-                    72:ef:00:4a:03:46:34:e9:e4:14:a4:83:c7:4c:30:
-                    60:e2:d4:8d:0a:2c:11:cc:a5:51:a4:3f:6c:6a:3e:
-                    40:93:06:dc:12:07:cc:cf:95:40:86:b2:59:98:1c:
-                    48:95:7e:08:23:5c:23:88:3a:a9:11:2c:50:c5:82:
-                    0a:67:89:c7:7d:92:13:bd:43:54:66:4a:69:2b:a9:
-                    82:02:b4:49:48:fa:8d:6b:fb:f3:92:6e:66:25:c2:
-                    9d:1d
+                    00:ca:56:11:b3:9a:3d:ff:f8:f5:34:c6:d6:86:46:
+                    a6:75:f5:af:20:7c:19:36:83:d9:44:4a:8c:34:1c:
+                    4b:df:49:c6:6f:1e:59:15:de:5d:08:4a:ab:b6:d2:
+                    8f:fb:ee:c9:74:88:2b:f1:fa:ce:5d:f1:a3:4e:34:
+                    d2:d6:c2:9f:5d:ee:3c:87:5c:2b:ea:df:3e:e8:78:
+                    4f:93:23:46:d5:0e:6f:47:dc:b6:a9:09:ed:23:61:
+                    ae:d3:a5:12:c4:5c:94:08:e3:7b:ef:5b:2a:7b:8d:
+                    49:12:2a:59:5a:ee:da:07:b6:00:5e:24:32:b1:00:
+                    38:d5:fe:47:d6:66:4d:d7:39:22:e0:3a:bc:c8:47:
+                    e3:27:66:4c:5e:96:be:38:71:58:23:49:73:a4:01:
+                    20:7f:d7:86:12:be:f1:0b:45:b7:13:14:73:7a:e5:
+                    26:65:c4:be:1d:f8:0d:ab:8d:27:b1:30:0c:fb:96:
+                    8b:06:87:3d:6d:75:f1:8c:8e:36:47:2d:21:b0:5d:
+                    e6:d9:b7:f4:22:b0:9f:d6:b4:ea:6f:9a:8c:cb:53:
+                    5f:6d:2f:23:a7:d8:f8:26:8f:0d:3d:98:17:37:29:
+                    cf:5d:e0:5c:68:b7:6e:ea:88:35:fb:fa:b6:b6:55:
+                    0b:4e:0f:11:cd:6e:20:32:b5:1e:9c:c1:ef:2d:85:
+                    d9:0f
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
@@ -38,48 +38,48 @@ Certificate:
                 Digital Signature, Key Encipherment
             X509v3 Extended Key Usage: critical
                 TLS Web Server Authentication
-            X509v3 Subject Key Identifier:
-                32:65:58:7B:13:FB:C7:C3:EF:81:95:A2:3E:4D:8E:A0:C3:EF:A6:38
-            X509v3 Authority Key Identifier:
-                keyid:96:B7:D6:4B:E0:FD:BA:FB:99:2A:A2:45:57:CF:A3:FD:BF:40:50:15
+            X509v3 Subject Key Identifier: 
+                62:B1:D9:66:47:1F:63:7D:70:EF:2B:4B:C0:0A:5F:5A:7E:F6:80:84
+            X509v3 Authority Key Identifier: 
+                keyid:50:56:9F:AA:F7:7B:4D:A5:63:D5:B1:19:B7:26:AE:D3:56:17:F4:C1
 
-            X509v3 Subject Alternative Name:
+            X509v3 Subject Alternative Name: 
                 DNS:localhost, IP Address:127.0.0.1
     Signature Algorithm: sha256WithRSAEncryption
-         12:f8:f6:e4:e4:23:7c:82:86:aa:f1:c7:db:ff:35:97:e4:40:
-         5d:2b:d4:07:59:94:3b:65:dd:a3:ca:28:77:83:05:ee:70:a7:
-         3f:ae:08:0a:41:5d:e5:f5:35:e1:6f:c4:03:40:97:21:d6:35:
-         71:ae:50:e1:84:41:2e:95:77:df:32:0c:5b:77:3a:c5:8c:3e:
-         bb:d0:14:8d:34:6e:34:04:4b:57:cb:c8:e6:7e:a0:d2:c5:ba:
-         b1:00:e3:03:d0:71:5a:03:f6:3f:f7:f5:c0:91:31:cc:43:83:
-         ce:45:26:4f:bd:cf:c4:f9:b8:e7:4a:86:dd:e0:1e:d8:6f:15:
-         7c:06:cd:f5:04:d6:b3:3c:06:ff:80:ad:d3:16:93:44:59:93:
-         50:af:b6:d9:7d:51:c2:f3:4a:b0:42:d2:54:d7:f0:d0:b4:b7:
-         d7:0d:36:1e:04:76:f0:84:9a:97:ef:96:63:8f:bb:35:24:e2:
-         75:31:b5:56:72:e1:e5:be:93:41:7f:7a:bb:e6:bd:e3:6e:df:
-         b9:a4:3a:ac:09:b4:3a:76:35:1b:db:16:86:01:6a:63:9c:5d:
-         1c:79:ca:f5:13:0b:df:7f:0c:40:ed:06:13:54:65:54:ce:bf:
-         1d:06:1a:f3:c8:64:0d:d8:40:a0:38:d6:7d:51:41:15:d1:01:
-         c3:e7:1d:b2
+         43:e5:5c:69:8e:b7:55:63:15:40:11:c6:38:e4:ae:85:78:2c:
+         de:57:cc:b0:e6:d7:2f:8b:70:07:c0:21:c5:49:9c:bc:45:05:
+         a6:6d:9a:1a:c9:ef:22:51:9c:84:1a:1a:72:c9:89:71:b3:47:
+         0c:3c:46:65:45:0e:fe:52:bb:96:15:c7:63:88:26:5e:a4:74:
+         b4:6d:a1:8e:69:c3:dc:ad:7a:4b:47:5e:e2:51:82:b2:66:89:
+         fe:10:4d:02:83:49:63:cb:50:a3:af:ab:75:33:8c:f0:94:db:
+         46:d9:c1:ad:39:cf:29:26:e0:15:67:33:31:32:f2:da:85:c7:
+         5c:d9:ad:cf:1a:67:47:d2:bb:ae:e4:73:38:4a:73:a9:13:72:
+         e7:02:e0:5e:db:cd:9c:1b:a8:ad:65:81:82:ca:b6:f8:7c:4e:
+         91:5f:3c:15:66:db:c4:dc:72:15:cf:50:fb:1f:d3:51:25:47:
+         f1:9b:f3:ff:4c:bf:7e:d5:d1:60:89:16:7f:ef:4d:76:56:4d:
+         36:65:f4:b4:ee:e1:84:24:f3:bd:aa:8f:5d:b4:a9:eb:78:f1:
+         0f:42:cc:8a:7d:e0:07:d1:7e:ba:e2:38:c6:15:6b:8d:0b:9f:
+         49:7a:bc:0b:3e:d5:0c:31:f2:f0:66:38:81:b3:09:40:bc:c5:
+         63:72:34:97
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
+AAOCAQ8AMIIBCgKCAQEAylYRs5o9//j1NMbWhkamdfWvIHwZNoPZREqMNBxL30nG
+bx5ZFd5dCEqrttKP++7JdIgr8frOXfGjTjTS1sKfXe48h1wr6t8+6HhPkyNG1Q5v
+R9y2qQntI2Gu06USxFyUCON771sqe41JEipZWu7aB7YAXiQysQA41f5H1mZN1zki
+4Dq8yEfjJ2ZMXpa+OHFYI0lzpAEgf9eGEr7xC0W3ExRzeuUmZcS+HfgNq40nsTAM
++5aLBoc9bXXxjI42Ry0hsF3m2bf0IrCf1rTqb5qMy1NfbS8jp9j4Jo8NPZgXNynP
+XeBcaLdu6og1+/q2tlULTg8RzW4gMrUenMHvLYXZDwIDAQABo4GVMIGSMAwGA1Ud
 EwEB/wQCMAAwDgYDVR0PAQH/BAQDAgWgMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMB
-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
+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
 -----END CERTIFICATE-----