aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2008-04-22 18:48:01 +0000
committerRob Austein <sra@hactrn.net>2008-04-22 18:48:01 +0000
commite60bef02fe78721c32f142a11c2023ca50838beb (patch)
tree5bb9e5779d19e4c3e8673351a26c25f88c632d3b
parent05c897f3331f2392455fa772606c6985ad8a7e0d (diff)
Add flag support to CMS.sign.
svn path=/pow/POW-0.7/POW.c; revision=1691
-rw-r--r--pow/POW-0.7/POW.c91
-rw-r--r--rpkid/biz-certs-setup.sh10
-rw-r--r--rpkid/biz-certs/Alice-CA.cer18
-rw-r--r--rpkid/biz-certs/Alice-CA.cnf2
-rw-r--r--rpkid/biz-certs/Alice-CA.req12
-rw-r--r--rpkid/biz-certs/Alice-CA.srl2
-rw-r--r--rpkid/biz-certs/Alice-EE.cer18
-rw-r--r--rpkid/biz-certs/Alice-EE.cnf2
-rw-r--r--rpkid/biz-certs/Alice-EE.req12
-rw-r--r--rpkid/biz-certs/Alice-Root.cer18
-rw-r--r--rpkid/biz-certs/Alice-Root.cnf2
-rw-r--r--rpkid/biz-certs/Alice-Root.req12
-rw-r--r--rpkid/biz-certs/Alice-Root.srl2
-rw-r--r--rpkid/biz-certs/Bob-CA.cer18
-rw-r--r--rpkid/biz-certs/Bob-CA.cnf2
-rw-r--r--rpkid/biz-certs/Bob-CA.req12
-rw-r--r--rpkid/biz-certs/Bob-CA.srl2
-rw-r--r--rpkid/biz-certs/Bob-EE.cer18
-rw-r--r--rpkid/biz-certs/Bob-EE.cnf2
-rw-r--r--rpkid/biz-certs/Bob-EE.req12
-rw-r--r--rpkid/biz-certs/Bob-Root.cer18
-rw-r--r--rpkid/biz-certs/Bob-Root.cnf2
-rw-r--r--rpkid/biz-certs/Bob-Root.req12
-rw-r--r--rpkid/biz-certs/Bob-Root.srl2
-rw-r--r--rpkid/biz-certs/Carol-CA.cer18
-rw-r--r--rpkid/biz-certs/Carol-CA.cnf2
-rw-r--r--rpkid/biz-certs/Carol-CA.req12
-rw-r--r--rpkid/biz-certs/Carol-CA.srl2
-rw-r--r--rpkid/biz-certs/Carol-EE.cer18
-rw-r--r--rpkid/biz-certs/Carol-EE.cnf2
-rw-r--r--rpkid/biz-certs/Carol-EE.req12
-rw-r--r--rpkid/biz-certs/Carol-Root.cer18
-rw-r--r--rpkid/biz-certs/Carol-Root.cnf2
-rw-r--r--rpkid/biz-certs/Carol-Root.req12
-rw-r--r--rpkid/biz-certs/Carol-Root.srl2
-rw-r--r--rpkid/biz-certs/Dave-CA.cer18
-rw-r--r--rpkid/biz-certs/Dave-CA.cnf2
-rw-r--r--rpkid/biz-certs/Dave-CA.req12
-rw-r--r--rpkid/biz-certs/Dave-CA.srl2
-rw-r--r--rpkid/biz-certs/Dave-EE.cer18
-rw-r--r--rpkid/biz-certs/Dave-EE.cnf2
-rw-r--r--rpkid/biz-certs/Dave-EE.req12
-rw-r--r--rpkid/biz-certs/Dave-Root.cer18
-rw-r--r--rpkid/biz-certs/Dave-Root.cnf2
-rw-r--r--rpkid/biz-certs/Dave-Root.req12
-rw-r--r--rpkid/biz-certs/Dave-Root.srl2
-rw-r--r--rpkid/biz-certs/Elena-CA.cer18
-rw-r--r--rpkid/biz-certs/Elena-CA.cnf2
-rw-r--r--rpkid/biz-certs/Elena-CA.req12
-rw-r--r--rpkid/biz-certs/Elena-CA.srl2
-rw-r--r--rpkid/biz-certs/Elena-EE.cer18
-rw-r--r--rpkid/biz-certs/Elena-EE.cnf2
-rw-r--r--rpkid/biz-certs/Elena-EE.req12
-rw-r--r--rpkid/biz-certs/Elena-Root.cer18
-rw-r--r--rpkid/biz-certs/Elena-Root.cnf2
-rw-r--r--rpkid/biz-certs/Elena-Root.req12
-rw-r--r--rpkid/biz-certs/Elena-Root.srl2
-rw-r--r--rpkid/biz-certs/Frank-CA.cer18
-rw-r--r--rpkid/biz-certs/Frank-CA.cnf2
-rw-r--r--rpkid/biz-certs/Frank-CA.req12
-rw-r--r--rpkid/biz-certs/Frank-CA.srl2
-rw-r--r--rpkid/biz-certs/Frank-EE.cer18
-rw-r--r--rpkid/biz-certs/Frank-EE.cnf2
-rw-r--r--rpkid/biz-certs/Frank-EE.req12
-rw-r--r--rpkid/biz-certs/Frank-Root.cer18
-rw-r--r--rpkid/biz-certs/Frank-Root.cnf2
-rw-r--r--rpkid/biz-certs/Frank-Root.req12
-rw-r--r--rpkid/biz-certs/Frank-Root.srl2
-rw-r--r--rpkid/biz-certs/Ginny-CA.cer18
-rw-r--r--rpkid/biz-certs/Ginny-CA.cnf2
-rw-r--r--rpkid/biz-certs/Ginny-CA.req12
-rw-r--r--rpkid/biz-certs/Ginny-CA.srl2
-rw-r--r--rpkid/biz-certs/Ginny-EE.cer18
-rw-r--r--rpkid/biz-certs/Ginny-EE.cnf2
-rw-r--r--rpkid/biz-certs/Ginny-EE.req12
-rw-r--r--rpkid/biz-certs/Ginny-Root.cer18
-rw-r--r--rpkid/biz-certs/Ginny-Root.cnf2
-rw-r--r--rpkid/biz-certs/Ginny-Root.req12
-rw-r--r--rpkid/biz-certs/Ginny-Root.srl2
-rw-r--r--rpkid/biz-certs/Harry-CA.cer18
-rw-r--r--rpkid/biz-certs/Harry-CA.cnf2
-rw-r--r--rpkid/biz-certs/Harry-CA.req12
-rw-r--r--rpkid/biz-certs/Harry-CA.srl2
-rw-r--r--rpkid/biz-certs/Harry-EE.cer18
-rw-r--r--rpkid/biz-certs/Harry-EE.cnf2
-rw-r--r--rpkid/biz-certs/Harry-EE.req12
-rw-r--r--rpkid/biz-certs/Harry-Root.cer18
-rw-r--r--rpkid/biz-certs/Harry-Root.cnf2
-rw-r--r--rpkid/biz-certs/Harry-Root.req12
-rw-r--r--rpkid/biz-certs/Harry-Root.srl2
-rw-r--r--rpkid/test-pow-cms.py19
91 files changed, 470 insertions, 450 deletions
diff --git a/pow/POW-0.7/POW.c b/pow/POW-0.7/POW.c
index d612ce84..c240ac9b 100644
--- a/pow/POW-0.7/POW.c
+++ b/pow/POW-0.7/POW.c
@@ -120,7 +120,7 @@
#define X509_CERTIFICATE 7
#define X_X509_CRL 8 //X509_CRL already used by OpenSSL library
#define PKCS7_MESSAGE 9
-#define CMS_MESSAGE 10
+#define CMS_MESSAGE 10
// Asymmetric ciphers
#define RSA_CIPHER 1
@@ -148,17 +148,17 @@
#define DER_FORMAT 2
// Object check functions
-#define X_X509_Check(op) ((op)->ob_type == &x509type)
-#define X_X509_store_Check(op) ((op)->ob_type == &x509_storetype)
-#define X_X509_crl_Check(op) ((op)->ob_type == &x509_crltype)
+#define X_X509_Check(op) ((op)->ob_type == &x509type)
+#define X_X509_store_Check(op) ((op)->ob_type == &x509_storetype)
+#define X_X509_crl_Check(op) ((op)->ob_type == &x509_crltype)
#define X_X509_revoked_Check(op) ((op)->ob_type == &x509_revokedtype)
-#define X_asymmetric_Check(op) ((op)->ob_type == &asymmetrictype)
-#define X_symmetric_Check(op) ((op)->ob_type == &symmetrictype)
-#define X_digest_Check(op) ((op)->ob_type == &digesttype)
-#define X_hmac_Check(op) ((op)->ob_type == &hmactype)
-#define X_ssl_Check(op) ((op)->ob_type == &ssltype)
-#define X_pkcs7_Check(op) ((op)->ob_type == &pkcs7type)
-#define X_cms_Check(op) ((op)->ob_type == &cmstype)
+#define X_asymmetric_Check(op) ((op)->ob_type == &asymmetrictype)
+#define X_symmetric_Check(op) ((op)->ob_type == &symmetrictype)
+#define X_digest_Check(op) ((op)->ob_type == &digesttype)
+#define X_hmac_Check(op) ((op)->ob_type == &hmactype)
+#define X_ssl_Check(op) ((op)->ob_type == &ssltype)
+#define X_pkcs7_Check(op) ((op)->ob_type == &pkcs7type)
+#define X_cms_Check(op) ((op)->ob_type == &cmstype)
static char pow_module__doc__ [] =
"<moduleDescription>\n"
@@ -609,16 +609,16 @@ x509_helper_sequence_to_stack(PyObject *x509_sequence)
for (i=0; i < size; i++)
{
- if ( !( tmpX509 = (x509_object*)PySequence_GetItem( x509_sequence, i ) ) )
- goto error;
+ if ( !( tmpX509 = (x509_object*)PySequence_GetItem( x509_sequence, i ) ) )
+ goto error;
- if ( !X_X509_Check( tmpX509 ) )
- { PyErr_SetString( PyExc_TypeError, "inapropriate type" ); goto error; }
+ if ( !X_X509_Check( tmpX509 ) )
+ { PyErr_SetString( PyExc_TypeError, "inapropriate type" ); goto error; }
- if (!sk_X509_push( x509_stack, tmpX509->x509 ) )
- { PyErr_SetString( SSLErrorObject, "could not add x509 to stack" ); goto error; }
- Py_DECREF(tmpX509);
- tmpX509 = NULL;
+ if (!sk_X509_push( x509_stack, tmpX509->x509 ) )
+ { PyErr_SetString( SSLErrorObject, "could not add x509 to stack" ); goto error; }
+ Py_DECREF(tmpX509);
+ tmpX509 = NULL;
}
}
@@ -6366,11 +6366,11 @@ PKCS7_object_sign(pkcs7_object *self, PyObject *args)
PyObject *no_certs = Py_False;
if (!PyArg_ParseTuple(args, "O!O!Os#|O!",
- &x509type, &signcert,
- &asymmetrictype, &signkey,
- &x509_sequence,
- &buf, &len,
- &PyBool_Type, &no_certs))
+ &x509type, &signcert,
+ &asymmetrictype, &signkey,
+ &x509_sequence,
+ &buf, &len,
+ &PyBool_Type, &no_certs))
goto error;
if (signkey->key_type != RSA_PRIVATE_KEY)
@@ -6728,11 +6728,15 @@ static char CMS_object_sign__doc__[] =
" <parameter>key</parameter>\n"
" <parameter>certs</parameter>\n"
" <parameter>data</parameter>\n"
-" <optional><parameter>no_certs</parameter></optional>\n"
+" <optional>\n"
+" <parameter>eContentType</parameter>\n"
+" <parameter>flags</parameter>\n"
+" </optional>\n"
" </header>\n"
" <body>\n"
" <para>\n"
" This method signs a message with a private key.\n"
+" Supported flags: CMS_NOCERTS, CMS_NOATTR.\n"
" </para>\n"
" </body>\n"
"</method>\n"
@@ -6743,24 +6747,27 @@ CMS_object_sign(cms_object *self, PyObject *args)
{
asymmetric_object *signkey = NULL;
x509_object *signcert = NULL;
- PyObject *x509_sequence = NULL, *no_certs = Py_False;
+ PyObject *x509_sequence = NULL;
STACK_OF(X509) *x509_stack = NULL;
EVP_PKEY *pkey = NULL;
char *buf = NULL, *oid = NULL;
- int i, len, flags = CMS_BINARY | CMS_NOSMIMECAP | CMS_PARTIAL;
+ int i, len, flags = 0;
BIO *bio = NULL;
CMS_ContentInfo *cms = NULL;
ASN1_OBJECT *econtent_type = NULL;
- if (!PyArg_ParseTuple(args, "O!O!Os#|sO!",
- &x509type, &signcert,
- &asymmetrictype, &signkey,
- &x509_sequence,
- &buf, &len,
- &oid,
- &PyBool_Type, &no_certs))
+ if (!PyArg_ParseTuple(args, "O!O!Os#|si",
+ &x509type, &signcert,
+ &asymmetrictype, &signkey,
+ &x509_sequence,
+ &buf, &len,
+ &oid,
+ &flags))
goto error;
+ flags &= CMS_NOCERTS | CMS_NOATTR;
+ flags |= CMS_BINARY | CMS_NOSMIMECAP | CMS_PARTIAL | CMS_USE_KEYID;
+
if (signkey->key_type != RSA_PRIVATE_KEY)
{ PyErr_SetString( SSLErrorObject, "unsupported key type" ); goto error; }
@@ -6779,15 +6786,12 @@ CMS_object_sign(cms_object *self, PyObject *args)
if ( oid && (econtent_type = OBJ_txt2obj(oid, 0)) == NULL )
{ set_openssl_pyerror( "could not parse OID" ); goto error; }
- if ( no_certs == Py_True )
- flags |= CMS_NOCERTS;
-
if ( !(cms = CMS_sign(NULL, NULL, NULL, bio, flags)))
{ set_openssl_pyerror( "could not create CMS message" ); goto error; }
for ( i = 0; i < sk_X509_num(x509_stack); i++ )
if ( !CMS_add1_cert(cms, sk_X509_value(x509_stack, i)))
- { set_openssl_pyerror( "could not add cert to CMS message" ); goto error; }
+ { set_openssl_pyerror( "could not add cert to CMS message" ); goto error; }
if (econtent_type)
CMS_set1_eContentType(cms, econtent_type);
@@ -8222,6 +8226,15 @@ init_POW(void)
install_int_const( d, "GEN_IPADD", GEN_IPADD );
install_int_const( d, "GEN_RID", GEN_RID );
+ // CMS flags
+ install_int_const( d, "CMS_NOCERTS", CMS_NOCERTS );
+ install_int_const( d, "CMS_NOATTR", CMS_NOATTR );
+ install_int_const( d, "CMS_NOINTERN", CMS_NOINTERN );
+ install_int_const( d, "CMS_NOCRL", CMS_NOCRL );
+ install_int_const( d, "CMS_NO_SIGNER_CERT_VERIFY", CMS_NO_SIGNER_CERT_VERIFY );
+ install_int_const( d, "CMS_NO_ATTR_VERIFY", CMS_NO_ATTR_VERIFY );
+ install_int_const( d, "CMS_NO_CONTENT_VERIFY", CMS_NO_CONTENT_VERIFY );
+
// initialise library
SSL_library_init();
OpenSSL_add_all_algorithms();
@@ -8238,6 +8251,6 @@ init_POW(void)
/*
* Local Variables:
- * indent-tab-mode: nil
+ * indent-tabs-mode: nil
* End:
*/
diff --git a/rpkid/biz-certs-setup.sh b/rpkid/biz-certs-setup.sh
index 26164496..64ebd7d8 100644
--- a/rpkid/biz-certs-setup.sh
+++ b/rpkid/biz-certs-setup.sh
@@ -62,14 +62,14 @@ do
EOF
- test -r $i-$j.key -a -r $i-$j.req ||
- openssl req -new -newkey rsa:2048 -nodes -keyout $i-$j.key -out $i-$j.req -config $i-$j.cnf
+ test -r $i-$j.key || openssl genrsa -out $i-$j.key 2048
+ test -r $i-$j.req || openssl req -new -sha256 -key $i-$j.key -out $i-$j.req -config $i-$j.cnf
done
- test -r $i-Root.cer || openssl x509 -req -in $i-Root.req -out $i-Root.cer -extfile $i-Root.cnf -extensions req_x509_ext -signkey $i-Root.key -days 60
- test -r $i-CA.cer || openssl x509 -req -in $i-CA.req -out $i-CA.cer -extfile $i-CA.cnf -extensions req_x509_ext -CA $i-Root.cer -CAkey $i-Root.key -CAcreateserial
- test -r $i-EE.cer || openssl x509 -req -in $i-EE.req -out $i-EE.cer -extfile $i-EE.cnf -extensions req_x509_ext -CA $i-CA.cer -CAkey $i-CA.key -CAcreateserial
+ test -r $i-Root.cer || openssl x509 -sha256 -req -in $i-Root.req -out $i-Root.cer -extfile $i-Root.cnf -extensions req_x509_ext -signkey $i-Root.key -days 60
+ test -r $i-CA.cer || openssl x509 -sha256 -req -in $i-CA.req -out $i-CA.cer -extfile $i-CA.cnf -extensions req_x509_ext -CA $i-Root.cer -CAkey $i-Root.key -CAcreateserial
+ test -r $i-EE.cer || openssl x509 -sha256 -req -in $i-EE.req -out $i-EE.cer -extfile $i-EE.cnf -extensions req_x509_ext -CA $i-CA.cer -CAkey $i-CA.key -CAcreateserial
done
diff --git a/rpkid/biz-certs/Alice-CA.cer b/rpkid/biz-certs/Alice-CA.cer
index b011f964..0cddaa07 100644
--- a/rpkid/biz-certs/Alice-CA.cer
+++ b/rpkid/biz-certs/Alice-CA.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHTCCAgWgAwIBAgIJAJOnBwhQWiIDMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgQWxpY2UgUm9vdDAeFw0wODA0MTcyMTIzMzla
-Fw0wODA1MTcyMTIzMzlaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgQWxp
+MIIDHTCCAgWgAwIBAgIJAJOnBwhQWiIJMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgQWxpY2UgUm9vdDAeFw0wODA0MjIxODMzNDVa
+Fw0wODA1MjIxODMzNDVaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgQWxp
Y2UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD468em/gEH9CFH
NJoqVteNF7T5Uuuuuh8BXqLyvHGKAbiW+QjRqa1iOCR5ePIBF+GZvp0gqMCAsVYT
BUjEsZGZz9HNoC5oSCB6B3qVOPM4m0KKzkI2oJ7QvxiI4gAd8+aLh5Bw9+GmvuBn
@@ -10,10 +10,10 @@ YSOPLcTkXqka+zPvE5b2RRAnC4822rI5eBPoRxw+T9roijVzpJwaxo2Io+zJVryl
bNpekca6jzPMwXu5WXiDOP+sVUYsR7knHyLQuHGIZVwp74SYeEggQZEb3CXfFCE0
SJDEzj1VAgMBAAGjUDBOMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFF9NTjS860sH
rK3H0DUkwFkAPwjiMB8GA1UdIwQYMBaAFNYW2u1P4EplGEwsRN5mU9TrozdtMA0G
-CSqGSIb3DQEBBQUAA4IBAQB/4u4J/YHsAUpQeTVH/3IJJSvoWhEn4hFslLx7GiZn
-q4WG4VPMpNUtkDcV4sASHHi1QTDEIDVsFeTbyu7ExMh5C3WdJXbNP8svSHJkWSNo
-9OPZ7f6Fj0uc/WR5TSuCI3ALIzwySPDPKEdksSskLilXGZu/1POh3qdsrUQH26u7
-caSC3TtEKx90gSg7cidmoF/dIgHFx7bmHEYl5tOrUnEfCp3upe/xCNhJx5LeK+tG
-kUKnYZ2/QgBzCjZY4FCUO7wcBxlNfRtQxXwVkp5IcXyCmHHGOgSaHXCHyW5jmtN9
-JrCJ4eOHiEszrvWlt3HN4V7IY10Vv2DYKWoI5B5qInwv
+CSqGSIb3DQEBCwUAA4IBAQA9+rxv8K8TXmPGVR9f7gxf72AqhcR1rK0W0dzaQ6ir
+sAAVnuPwOEWHDXKBqNkEcwx8vNg7QURU3ni1IZNkA20i9DkNygcS5zToGFW6RfYR
+3bMj9SEY//ncNZbZ94gTag/w2sB39nubNVpbhJ4/EAXorJsDHTRT/894GVFVsvoT
+ZG0yNVMdFFW8245jQ3+1rdpn5V8LG6AGN7OkCn847zs1Sz/+rSALyPYd6orgwY/t
+CuKWkFsZojvDAUyrfagF8SuHKM8h2muMk1bXrIaNhALOI5uxO6pG8JcBA/8tXKEI
+2ohjVmYDFakqOtTItlGvV3678yyY2WMJwTyclRx9Wq5Y
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Alice-CA.cnf b/rpkid/biz-certs/Alice-CA.cnf
index b6e1971e..5abe8b6e 100644
--- a/rpkid/biz-certs/Alice-CA.cnf
+++ b/rpkid/biz-certs/Alice-CA.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Alice CA
diff --git a/rpkid/biz-certs/Alice-CA.req b/rpkid/biz-certs/Alice-CA.req
index 1d6a39e1..0c05472c 100644
--- a/rpkid/biz-certs/Alice-CA.req
+++ b/rpkid/biz-certs/Alice-CA.req
@@ -6,10 +6,10 @@ kZnP0c2gLmhIIHoHepU48zibQorOQjagntC/GIjiAB3z5ouHkHD34aa+4GcLmopz
bc7tXHnNypGhPywQNG4RBWQuRfV4V07iJRWdgokYaa94Qy4KjQfARCY5OuVhI48t
xOReqRr7M+8TlvZFECcLjzbasjl4E+hHHD5P2uiKNXOknBrGjYij7MlWvKVs2l6R
xrqPM8zBe7lZeIM4/6xVRixHuScfItC4cYhlXCnvhJh4SCBBkRvcJd8UITRIkMTO
-PVUCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQC/XNBkANITakpqRmw/50DnMXEx
-9bIlgXNME3UmxbWusltwerI4NlhecI5QFJoMcu1dYNvbohHJiXhQKA+OeraX9Szl
-e4/6h5fHR+o/xwq4VlTKPFz1wlw3lDZTAHG5B3tjC4eQQ8DJYXkJGKL9qj975WLQ
-o6FfgBv7JsUc7eC/wIzqa+EXgHGneBf8+Mg860pbeUHV/W5QQqDu+euKIJ5IweAa
-MFS5ATRhjv+IDI9FyTxLQ7UqK+rmC75IhdgIOS2wPo+1vPWufmVvWJDZG/GfajEJ
-OFfKheiAhkbk8iwsW7o0HYTb5iZduVatTp5iGyxzdo5iHg/duSLqCEVzm/pV
+PVUCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQDTD0KmDOGQayI5WOshALnVhpTR
+zAdYSLTuD5oKR3I5NJSRxX+Ncc2JOl43c9odeyrsq3hWoGjFQ8aR4zSOxV6incsr
+DJAkxPEkKUbrx5qkdyWMhFjR3S0dTI/dSrpTsPF5QyBCoW+0asQb7iMUsH8tlAGh
+KsKzJRMSK3Lv2SIp5jNMSVF/ozAhcUOu3taAXSWvJTJ8/xPT+BHqOZ+Pcx4FVZxt
+mdBEXhI5KlA27PY26sKcxyDGtoYBlxag7RFDFG/Zs2tFZI2oV53IBjHsYbFpYO+z
+GmfHanYm+7xIAb/VdDu7GtQtopw8YqAXQisqLvPS2fWTGLsWJNZyO8WgzG/w
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Alice-CA.srl b/rpkid/biz-certs/Alice-CA.srl
index 296ac7c5..8136e7f9 100644
--- a/rpkid/biz-certs/Alice-CA.srl
+++ b/rpkid/biz-certs/Alice-CA.srl
@@ -1 +1 @@
-9B985E838A1A1B15
+9B985E838A1A1B1B
diff --git a/rpkid/biz-certs/Alice-EE.cer b/rpkid/biz-certs/Alice-EE.cer
index e2db75f1..daab1215 100644
--- a/rpkid/biz-certs/Alice-EE.cer
+++ b/rpkid/biz-certs/Alice-EE.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDGDCCAgCgAwIBAgIJAJuYXoOKGhsVMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGVRlc3QgQ2VydGlmaWNhdGUgQWxpY2UgQ0EwHhcNMDgwNDE3MjEyMzM5WhcN
-MDgwNTE3MjEyMzM5WjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEFsaWNl
+MIIDGDCCAgCgAwIBAgIJAJuYXoOKGhsbMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGVRlc3QgQ2VydGlmaWNhdGUgQWxpY2UgQ0EwHhcNMDgwNDIyMTgzMzQ1WhcN
+MDgwNTIyMTgzMzQ1WjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEFsaWNl
IEVFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwInHWCqaezl1ZC2X
16mmWXSBVrOvIQMKq1HxbijymfjZYWR5JqTDicWG1yJDiwecOQzxV6rlzLPQmFwj
F/f3PJ0EZNooJigVU8McOlKWtT1c+CQKsUGETSrn7wbDWj8aPCLNHpCP3dWQ4Rxj
@@ -10,10 +10,10 @@ cAP3LUhg3edFRjTu8SVIjccHVkZydFajKN6trsn2G4bvM3g2vBAdV9TFd6xQkIyO
CX3XA7MsTqbcA5PVZIBL54HSYk65EGzy0cfObZvoaHFnNYmOXfZyBt7O8owy9HG3
7ye3rQIDAQABo00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQT21/Yztl10qmJjFV+
m8RFKQN17jAfBgNVHSMEGDAWgBRfTU40vOtLB6ytx9A1JMBZAD8I4jANBgkqhkiG
-9w0BAQUFAAOCAQEABL3q9jtVSk5255TOQSS6Vk+fPePMwLoqdIuuJxi2xMlQOcps
-KuyXEg9I+QsZ5sTBPOgqDeLGt6RLFZpb2JDsyYI8Uxf1WiuQhca/NrpZVmUE9D5Z
-SaA14aaRFW6zfpFtd6WocyULBSJ/9AIGWwkzevxzr6TX3CDKZFUFHYsGhOD9JL3V
-bSOTa5H+XuirZELnQFSRf0l0k5CwiG9ExK3GUeaXZ3HeC0OPRB8pxRZ6Fy5QQeSc
-2ImDBP8EZju0zA/Lwz0CxlrmRjjMXWen4eG/EHxjFW0mfNNLUOWDYzOA9Y5ZRoTe
-GG3ECv9mXuLQmALqiDesDX7xJYqajqK2oLrPgw==
+9w0BAQsFAAOCAQEAIWC5e4Mg0wNE5pVPkYYnEQyIq2WOcR+mGB+VzpAvbt01csQK
+drZrhVBv9RKwFra9oHGHn2wseUdr1bq9slLs5Cd4iEOFrpdeygN6Oi9PdHsqHLwp
+/6R7fkhLc6ZuMqPGiSOA4eQEgdlUDl6M+yz7I1loO9mTFP/4XOLanr5SjUpP/NK9
+7UJL8nsOyA5CMRLnRXhCK1KNwy+hDdKjh95l5kANhOww9juqr5oGznOwUMTUQ4qr
+aBvcfr5zMf3YH0TImofJq6doOHvKGrHGHY3K8lrFr+Uwkf0DIiSnSgi01yijbkuN
+W0tDpcxiX4XpfiYLMcjS9H4l1Dc+Gdi/xOowTg==
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Alice-EE.cnf b/rpkid/biz-certs/Alice-EE.cnf
index bd9c175c..2437773c 100644
--- a/rpkid/biz-certs/Alice-EE.cnf
+++ b/rpkid/biz-certs/Alice-EE.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Alice EE
diff --git a/rpkid/biz-certs/Alice-EE.req b/rpkid/biz-certs/Alice-EE.req
index 9d7388b7..43e0789f 100644
--- a/rpkid/biz-certs/Alice-EE.req
+++ b/rpkid/biz-certs/Alice-EE.req
@@ -6,10 +6,10 @@ pll0gVazryEDCqtR8W4o8pn42WFkeSakw4nFhtciQ4sHnDkM8Veq5cyz0JhcIxf3
d8boQdb8cZzT2sVffUgSR8ycF3jYlT0pfKTqn3auFxhu/LBDP9AbfjKp4D4VAnAD
9y1IYN3nRUY07vElSI3HB1ZGcnRWoyjera7J9huG7zN4NrwQHVfUxXesUJCMjgl9
1wOzLE6m3AOT1WSAS+eB0mJOuRBs8tHHzm2b6GhxZzWJjl32cgbezvKMMvRxt+8n
-t60CAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQBgf6fyu5ZkZViSYEQ6aVkOmvoM
-+f0700E3T6TTq3bnjNXZL/uMGzHK8sXH9hbUq6m4LA1C2Sw5HKSYYRhbUD8MDdLk
-jCNQjFKnQPdhbknO7Rb6VABQLJ4rOSjv1i01Jnbu0soIyGMoUrb7i3bUY3KGRqmX
-ZxY30SBDu7kFcA7qKVH93sQm/QeNO7lLUtPJ0lLwrR0DcZ/GNsIx1FrRSWtMOqnL
-+ORzjGir0IZVGigpp/6AxuITJoNb40McptcqRzuDHlU8pFG9dKL2uHWDCSsG9V1w
-yA8ESECBg4J1RkpJEOk6E1b8xsMUIyBPtmKKj0JlCMd7GfoVIlknZ58OfLRl
+t60CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQBhQ88kwMNKbOtFpU1VckoB6/UO
+X92EoXX26Qp1zJUjZj0ckHTCE6sDwY+mKFiht+xblf1lrYyPNUPmoDKwpj4iEReF
+EluBtXYdMVwwrxprScu/MlbFP5YmCca+luBdbNKjrYJm4OtMHXi0ii1n2x8/xXva
+Th7yfWpkY1K7z2ePou5Il8wjmQJ7yKD9arBl/t1OyM2OjsZAoBqGQLT9/aoQ5ASb
+0jtAEhk84BvNDBWAR1Qrk2+sS1bZqbWiDgohcoWGOnvXkjOu/lA34II27A6IVILJ
+NXAK0oLR04YA9Vy3G8rRhV+yjr5lvCDe+t2mgQNYWATBPYy5/J/eoRt6y4h6
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Alice-Root.cer b/rpkid/biz-certs/Alice-Root.cer
index 0f43db66..3ac7fd7c 100644
--- a/rpkid/biz-certs/Alice-Root.cer
+++ b/rpkid/biz-certs/Alice-Root.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHzCCAgegAwIBAgIJAK5peKxphci/MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgQWxpY2UgUm9vdDAeFw0wODA0MTcyMTIzMzla
-Fw0wODA2MTYyMTIzMzlaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgQWxp
+MIIDHzCCAgegAwIBAgIJAMaaNUbH2Aj2MA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgQWxpY2UgUm9vdDAeFw0wODA0MjIxODMzNDVa
+Fw0wODA2MjExODMzNDVaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgQWxp
Y2UgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKUzjQ7dObY7
fUKAxi/7znJ60Mi/s1rByfHs4Onduc27dw+7tS6D0r0k+zgCFpkNPl98XRR6LvJJ
ckRMVIjPvSIoe3EN683Bwajq24VUAayZ1Nn2muy4yN4XHtRep7Wi51aRWVSR3mTk
@@ -10,10 +10,10 @@ NUn+a7dEtWlONtHANbbBcob8/Ufe4L+jO9PkNOWEtIJMjcxZsq4Zq1QXvKGNZbPh
oUXrbWgfxSeis2augNKQ2NvEmIqS2Njau/5x4WD5qyTGqj5CrTOCNZfa21G+dshn
cj11ksaax6ECAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQU1hba7U/g
SmUYTCxE3mZT1OujN20wHwYDVR0jBBgwFoAU1hba7U/gSmUYTCxE3mZT1OujN20w
-DQYJKoZIhvcNAQEFBQADggEBAKCBoj7+PDoQKBK3DeKAkNPWwq7LuNdtv/KETQQT
-CsdAUWK2ej6I4Q2HKnqykajJixbmsBQqSxWyrjyH4FUUArkNNwDWbXLGq76IPIVA
-DLuR0Y3X0RfRP6b6RoxGsDUf5p4YjRiD4Jns68YW+rbBiXZM797tv7mHu3degMse
-+YRXcmMrfiKbuzP5vJZQQHLNgT/9fAo/PD/ZArYaexyWGyFIyV7bJzCiFOsW9oLT
-9caqvnguma5dxHq9XumCeUw7dlXPwdC2TtMH4E8IKSbOqxuc8hYqBYZuYyJ8Gmeb
-IG70h5GYdc7PLebMI+xouUyyeghtHHgEntp5TFiKr8sBiJY=
+DQYJKoZIhvcNAQELBQADggEBAE7sYZq2oA+dRI9fXNY4ghs8Hz/7VXsbDpjdlSpr
+v3JEplVhiLygsiwD96FU07WHQtYjXsSPqXVfJ+TPOtdY6dG6SzygsKgW8EGD9C3E
+A+8QbaUrJnx6vuVPPiPQ7t2FgwgijI3jLfSgvMr8LmEkjJu33g1BnxxGX8WcslcR
+VPleiujGEC780MH61jhNUA1RhouFlkIC13miyw6TXB28K5/bYXi9ANAWr/i70+7V
+25BuswyRxq37UOqMM7Sc0pIaZw0AsY+wJPGEi7idUNj2MAhV00Iql6PHcVG4BH0u
+aAqlQoarzUTC3aMEz8yZSx6NVWbsEJooJT6y+NVF/JReOMo=
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Alice-Root.cnf b/rpkid/biz-certs/Alice-Root.cnf
index 78089bba..03bc395b 100644
--- a/rpkid/biz-certs/Alice-Root.cnf
+++ b/rpkid/biz-certs/Alice-Root.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Alice Root
diff --git a/rpkid/biz-certs/Alice-Root.req b/rpkid/biz-certs/Alice-Root.req
index ba90a1b6..ca1560f9 100644
--- a/rpkid/biz-certs/Alice-Root.req
+++ b/rpkid/biz-certs/Alice-Root.req
@@ -6,10 +6,10 @@ iM+9Iih7cQ3rzcHBqOrbhVQBrJnU2faa7LjI3hce1F6ntaLnVpFZVJHeZOQ1Sf5r
t0S1aU420cA1tsFyhvz9R97gv6M70+Q05YS0gkyNzFmyrhmrVBe8oY1ls+H866zu
isqx1UI6nmYSO4ukJh5/hxOVnGTurYIi2TiFEOLpsbsFoxyaWbVGd7xhO+6hRett
aB/FJ6KzZq6A0pDY28SYipLY2Nq7/nHhYPmrJMaqPkKtM4I1l9rbUb52yGdyPXWS
-xprHoQIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBAJ8l9c/L8ksoqCPClE2Qmzuk
-E/MeAcpMMM+m0mMOTNFL66luwRqaCj3X9jF1ZKfpGRhXh1u+FUzo/zIIgUvGtvYZ
-vhhl9CJJeN3eweRJzyqDCWHSlwVvZlr1Hgeapwcaf4qxOb1ZLlYgvMKCaPsZ6Q/e
-wOdjBHQy7j0FEuvcd/AZGWI4aGfsXWptMnHVgR3FT0KrQhsCgqgJLfvv17R3vrkm
-FhqRImwIq2HXNSEHKaCIK+05K2Ke6KRhDI1ry4HJUZQrbg/me5+xlA9NlLWkRjwY
-xS94d6Cx0Is+3dYRDTK0SEpbT9/QcOOisBsKNEN8NSHIoRJG4OFEx9olUBGFe2g=
+xprHoQIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBABL2QC3F6SB7z9ea60EthZuI
+QXRxxEKoGQ18nbQhFjWRxqGYTE4eE57jRNbe4RfZNXTfb60ygMJa4oyWXEw6XoQT
+e48ogc3xaoWNKeiRQIGmpZM+QLUqQz+Raj0lit+WP4udaO5/1l5JHTs76zOFRRxv
+dW/IVuIAI7QXPRoeolDaWuBKcgl0UIMobqO9sdYb9XZ+Ix3DSqo7U+UJSXVZEXfI
+zwLrBx52TWLPnK5qaAo3vWLiAEmDOlehLizrer5v+Ik2i+WlAxu5TCumare3pxMD
+BS40M5zBygCsU5qsG5/Wdbev8Sexu6g6wR7bM2+dplZIBGvHQ4oNG9FpDvJSzc0=
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Alice-Root.srl b/rpkid/biz-certs/Alice-Root.srl
index cda020cf..2b277fe6 100644
--- a/rpkid/biz-certs/Alice-Root.srl
+++ b/rpkid/biz-certs/Alice-Root.srl
@@ -1 +1 @@
-93A70708505A2203
+93A70708505A2209
diff --git a/rpkid/biz-certs/Bob-CA.cer b/rpkid/biz-certs/Bob-CA.cer
index c533e664..be1ef601 100644
--- a/rpkid/biz-certs/Bob-CA.cer
+++ b/rpkid/biz-certs/Bob-CA.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDGTCCAgGgAwIBAgIJAJMWVNPEHXn0MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDgwNDE3MjEyMzM5WhcN
-MDgwNTE3MjEyMzM5WjAiMSAwHgYDVQQDExdUZXN0IENlcnRpZmljYXRlIEJvYiBD
+MIIDGTCCAgGgAwIBAgIJAJMWVNPEHXn6MA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDgwNDIyMTgzMzQ1WhcN
+MDgwNTIyMTgzMzQ1WjAiMSAwHgYDVQQDExdUZXN0IENlcnRpZmljYXRlIEJvYiBD
QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANs7D3bWU8rxiAn+Mhap
INpgBhMWazoSWDramC5xIInJj7cwa3zisJ487q5dUqsWyGOS3MNTNJg/NTGz2zEG
HI1GmBh4jGAhZYQCwqdEk6wm5aWPvICLZFIGKHtugPk0V8eN4QxdNm/0Yo6j2ne+
@@ -10,10 +10,10 @@ dVSBHwl10osBxzeK6W90ofeX2PJ12U4uMO2vBAMIiosmQ8QPtUICohPdJ3zM6b2G
q5/NpG/0cH8Yd6HI/VrgXeP1g78VHw3oTnui2w04PTT07a+0GKzos4ssH/CmqD3k
m3UCAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUu8ac0kfdNo5qjTPZ
mvBg0urCTkgwHwYDVR0jBBgwFoAUJUQ5+BR+Qt1BwUU7/P+fVgkRe/cwDQYJKoZI
-hvcNAQEFBQADggEBAJzWQ+L/UKioTpuOSXJPX2sQqdpdQlwPuZBUkoaaRfSz+5Gj
-opCGhyIRl/2pNP4zwMf2o8x/FyNozd5C5EObn8mxiO147v2dPx/9bJBMC23/C7vd
-LOBQzBDzYhhy0WIPvHe2kbGpN/EuhrcWdxrTfkZ7VB/WUSquodY4DxY4LWEDkqdY
-vnapzibqrOfiE7BnT+lhfdcR0zCtU1yILiOnNWKXh4IADcTgsGx4NHHvLWByAugH
-Vwe9DthwRV3k62F9AiAhIPGNPu/L4LBUcz/r+wqS7Prw41BiM57nURPAl+noBXcV
-MvxuDh79ly7PU9aPkIs1iUk/9P9QzTBDwu6bq3Q=
+hvcNAQELBQADggEBAKlNp7PWspkt5VFPe2Xm39rjN1ZTdiKnww7IE5dt0RR9H2Q9
+2kriOt6zauJa5fnWCdU5nLffdJBD73k9C+/K7LqyTY+/sXs7Hw1sW9cvfW/qCxmV
+c8xhANjpwwrbGrmpj5mEGemjMICsND45cglsn6OxMogK/dmGoUhFUI/Sd3QlLuZj
+MkCSLartXuLs6UVnSZoLQrHnS/i5G6X9wO2+w5fZr1qLAIXpse+eomsR8gdhPdW9
+EkOpqRhae71lpwciMI+IWXPVlq6K/Z5DxcVQiweyT+zUzpzyh+AsKej5c/qrpMPC
+h4LoKmBaYVkB62GIyxwdnux3NgpTQ25s2ILOBOk=
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Bob-CA.cnf b/rpkid/biz-certs/Bob-CA.cnf
index 91dbff0c..8e3e80b6 100644
--- a/rpkid/biz-certs/Bob-CA.cnf
+++ b/rpkid/biz-certs/Bob-CA.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Bob CA
diff --git a/rpkid/biz-certs/Bob-CA.req b/rpkid/biz-certs/Bob-CA.req
index ec8cb2b2..97cf31f4 100644
--- a/rpkid/biz-certs/Bob-CA.req
+++ b/rpkid/biz-certs/Bob-CA.req
@@ -6,10 +6,10 @@ RpgYeIxgIWWEAsKnRJOsJuWlj7yAi2RSBih7boD5NFfHjeEMXTZv9GKOo9p3vtVx
y9wUtqrik5UxhOGxHJ3h9t/e0SRY4FktiSjBV15ToOlsBxLxVZfH4hR6cbnlkHVU
gR8JddKLAcc3iulvdKH3l9jyddlOLjDtrwQDCIqLJkPED7VCAqIT3Sd8zOm9hquf
zaRv9HB/GHehyP1a4F3j9YO/FR8N6E57otsNOD009O2vtBis6LOLLB/wpqg95Jt1
-AgMBAAGgADANBgkqhkiG9w0BAQUFAAOCAQEAqTkkoDoNpJ0j4E5FKEWTRA2jTKXh
-Ij4W7WUYs0XSqyHaBgT59+WXEXq4VQfxRAWyfZxMzt08/7wJQJaa7FgE1meQA/dT
-0/0ObBL8ebLACAuLGNnRhfF9q1uO5qRMLEPyl6SeRdbTEo6pjzE2sIA9OYtV1AK2
-UeXVTL60KRL3IA9tyLEPBKpmVN6IeIUbpbeDa8DWA6zWJd8A4i9UukjUqO/Of5ZZ
-c2pXR5MF2PXDzwerbrSQQ8qIDB6PDuiqPFG7RhYpo7zeOiJBATUBzeO9EWt3Ij7H
-zGOtqwFd1jhFS4pTYKPGS86SFEk0xyDFR5fivkYhLK5aNDm0KJaWlNxZHg==
+AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAyBFrothS4q0MxROfMIxE9Okq0Qrn
+f0l2SBAjoulrz6LueU90S1wCmQVeku7msJ05pHwNDIiDxnt9cOJy4X4kR64XPd+s
+AYgQ9jEzGXo5WM+afxnGdYlnmSH0+MyGwkOXeckLtk/lN12b+E8fCfd0+vZqtppo
+4rr1LVw7N/p1y8jYKitZziQnDcVCAzcpzevyKgyimrSKiD5Khu+QwpME+VgqMI/n
+duCx+49uWzzGs4evNoqR090qTh313cRtZbj36/f85t1MMg/zp9SgWb9zG+wa2sgQ
+Cmi61Ii02VZ3oKul1yAOpxrqy9W02qllmg2GP3iiEct7vTKce9zDII1ecA==
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Bob-CA.srl b/rpkid/biz-certs/Bob-CA.srl
index b4e91558..a20e2ccd 100644
--- a/rpkid/biz-certs/Bob-CA.srl
+++ b/rpkid/biz-certs/Bob-CA.srl
@@ -1 +1 @@
-90801F1ED1945564
+90801F1ED194556A
diff --git a/rpkid/biz-certs/Bob-EE.cer b/rpkid/biz-certs/Bob-EE.cer
index 0775d5e0..43939903 100644
--- a/rpkid/biz-certs/Bob-EE.cer
+++ b/rpkid/biz-certs/Bob-EE.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDFDCCAfygAwIBAgIJAJCAHx7RlFVkMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF1Rlc3QgQ2VydGlmaWNhdGUgQm9iIENBMB4XDTA4MDQxNzIxMjMzOVoXDTA4
-MDUxNzIxMjMzOVowIjEgMB4GA1UEAxMXVGVzdCBDZXJ0aWZpY2F0ZSBCb2IgRUUw
+MIIDFDCCAfygAwIBAgIJAJCAHx7RlFVqMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+BAMTF1Rlc3QgQ2VydGlmaWNhdGUgQm9iIENBMB4XDTA4MDQyMjE4MzM0NVoXDTA4
+MDUyMjE4MzM0NVowIjEgMB4GA1UEAxMXVGVzdCBDZXJ0aWZpY2F0ZSBCb2IgRUUw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCn/+Kvikpx8u3PIhKhfNdJ
B4rdyQ6ixHJAItlSyI1CmWZLp1j1f7tDC39B3uLMLWHuSQDeDwSR84vGuFxMKtCf
E0uuUpkxR49ADsz1vFTM8SxVkqKAerM1zaQOC/RD4CkZxaIrfOcfZnqShUEUrJAR
@@ -10,10 +10,10 @@ yaQ7Gw/m9QjStm0SUDs4duxE9XLS1eZpYLdLpnf1UDQKOmW+PHFDyVEmPuE0y/b2
b3aFYEpegdxa97wTNm5vsFE2ESSZ4lrIHFAHwsK9H9rZkdGIgm0Zg6JEiiUdyw5J
AgMBAAGjTTBLMAkGA1UdEwQCMAAwHQYDVR0OBBYEFK8qXFH8u10Oq2Oid5YHUqOd
OFNuMB8GA1UdIwQYMBaAFLvGnNJH3TaOao0z2ZrwYNLqwk5IMA0GCSqGSIb3DQEB
-BQUAA4IBAQDCWghngwSYvr6ZcFAx/2RTilmJhCgE5Yy7jH0naD+LzmEhumXf8Bjo
-JSI4GggNdPVOY+8RFtq/WfRGASCt7eQZ1ZIwO8+MCHsuSqyuGpfNNcODccp/JiUj
-fo2D2DM/IlmweqgDUbJ5BxZdo7sG3shce5ZmgVzoae1AKAGMpp/aXw5Bo8g5Rniq
-fqxrVe4StU/vQGLfTAy0LtWl315otMBE5rum0iAGeYY/ackMerXdQ9wdUEg/l0gE
-K2Z+PVedUCtpkDi5iWUO5i8MLxgqeZes6CSH3YcCNjC6EG30Zce/N6IRWrc4+v0s
-VgcBArZUiNXXx36dO6PW6Mt4fm8RubSR
+CwUAA4IBAQCQv7sj1Q4Wl4sW/zUL6yWrLfRiXD6FIDnZAUFhlE7bBtjgSrW4MOyn
+Bk1lhSvsDptsomx9/GqpYlYWp7JbrzncZDPsr/gZ3Gk7oxSD4jYhIi25sAWv75he
+8iwHyzmAb0DMi7DM7l9a1+dhYFn5YfUe8B3INJxNqophohBdUKPegbbiu+rP0W4u
+EXm2VGKEGEdZ6BCDqaj001NLIm/2diI0kNkBojnXjBV9Th3hoKNKjzq61jCyKRSi
+hVmPCYw1EPLr62e76tJA7zLBin7P5YH1qFoQGne2MtMVjojkNNjRRxmjdpjUzgWg
+QHsQU30r7/SYKYCLmSpPunK24gmYD341
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Bob-EE.cnf b/rpkid/biz-certs/Bob-EE.cnf
index 03a517ec..30075411 100644
--- a/rpkid/biz-certs/Bob-EE.cnf
+++ b/rpkid/biz-certs/Bob-EE.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Bob EE
diff --git a/rpkid/biz-certs/Bob-EE.req b/rpkid/biz-certs/Bob-EE.req
index 497f54be..e832fd64 100644
--- a/rpkid/biz-certs/Bob-EE.req
+++ b/rpkid/biz-certs/Bob-EE.req
@@ -6,10 +6,10 @@ E0uuUpkxR49ADsz1vFTM8SxVkqKAerM1zaQOC/RD4CkZxaIrfOcfZnqShUEUrJAR
MAb/zPfLZ2wiS7RlsUipfx+/LforuNfft+SoNDQmZIU8buhTUFgwhdTtE4Nbj+dJ
yaQ7Gw/m9QjStm0SUDs4duxE9XLS1eZpYLdLpnf1UDQKOmW+PHFDyVEmPuE0y/b2
b3aFYEpegdxa97wTNm5vsFE2ESSZ4lrIHFAHwsK9H9rZkdGIgm0Zg6JEiiUdyw5J
-AgMBAAGgADANBgkqhkiG9w0BAQUFAAOCAQEAXJT1EVOwOaGyjCMepYaDwsk7U11G
-7uEmGwX6I1Ry1kZwyxiItnaIDhlB4fj3kKKUgXHk61IoFzYiLAU++di40dYNuULT
-Y+/HJ/CDiYIOweGSj+c43otItX2ak0fTmS57KySlrk+Q0MLYdhsGfkgH+suKa0WT
-KEMM7p7pnnzXVDS6EakdOnp+1LOtHz1n5wu9NzKNL1FKBmMiR3sSRobw3mCiNgPx
-0kHXONEq5nsTjmAOMeqxmuguJObMmXAU0ZLrTqdi9bxRkfKHhKRjDgeSqEKVSmpN
-Lw3gKB3Rk48hvxVP3rp/sRJ65Ja0bbwVAJ1DnNagzyPxNH/HAr17qt6mmg==
+AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAmTMkm6j17cnyPnivGZQ0ydfcChLD
+YAZfW987Tn6gSsYJjvh6LiDH2ap/Dm66KfdcyMQBgAtCtXEsU+kmfU9owPpMbr/n
+51VmKVyGq9c/7bkrXrXXr7w007wtXfS7vvt0130bdo9jxpHpRlIttensYANIslGe
+yqe3bF97JqzA5SkUg0dnfHloebQskPx+JF8gWjjfIx0iEJDHIFcXV41GYTMc/Lsb
+GfTUc9oJpyjcWYZSi6220zQm6AvzOy5iwuzpcc6o78E8HTOlPq0xgHzEuzVwefHz
+4hhnDFUycgX2Ohbupr5KaarLxCcfmrRGM7kQPfSJgeIRzAuBfcFhyRQ3zA==
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Bob-Root.cer b/rpkid/biz-certs/Bob-Root.cer
index 73c6b61c..3328831f 100644
--- a/rpkid/biz-certs/Bob-Root.cer
+++ b/rpkid/biz-certs/Bob-Root.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDGzCCAgOgAwIBAgIJAIwULdjZPNl7MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDgwNDE3MjEyMzM5WhcN
-MDgwNjE2MjEyMzM5WjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEJvYiBS
+MIIDGzCCAgOgAwIBAgIJAJN3+0kOYWF5MA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDgwNDIyMTgzMzQ1WhcN
+MDgwNjIxMTgzMzQ1WjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEJvYiBS
b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5EdHnAvefaawcNq9
jBUnfB927TeborbiIst1bZmYLid1RMz5JjFWr/pUqKU/wsLKxJK2h8bBW+K21ePD
mJZrhyBDj6zNnlJUzyVysLER/jQ6hoHIhqZv/OR8q6D7eeXIFZGm4fsQLM0RsyYx
@@ -10,10 +10,10 @@ Dc2rQWPtOqYo6jhRn3Cj+uY++pJVuL0IgHaofEu7n//t+f52BC31+qW5UlKjhkg+
S+dlPxqwSf6Bml+wxN0y37fFuTGdL5IK9HMfC104b7fInsytrVAVjkMHAp8d5XSu
pbfctwIDAQABo1AwTjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBQlRDn4FH5C3UHB
RTv8/59WCRF79zAfBgNVHSMEGDAWgBQlRDn4FH5C3UHBRTv8/59WCRF79zANBgkq
-hkiG9w0BAQUFAAOCAQEAC55STffH6sPGpvWPP/4uqq+uNQzQEp+8KhZj5LGMWQdh
-Xd587BGqUaXvvUjCro+VJoWpVGLAyW8E0Zkf+I6NqZUX8fpfZ9cdAMYalLx5xyi1
-tZROB+RmOJnm1z8rmveD0/6RzbplH2MWha48fBcvx9Ieny4r/r+5ZgToCAcpNoQb
-yxzCUlEA8RohlWQfFg95MIU9Bz144nWfh7rdL5KvJ1+IOWHEp+bwqclc0ekIdhk2
-XRwwJdWFVWUEtug/bnKIYdyFylLl+HqB9eme5opA0z/h22uTIw8wLgJfqasGY4eH
-crFHCFaV2FOUVUq3y7xwh+9L/0dqB9vAZkIptFYSnA==
+hkiG9w0BAQsFAAOCAQEApN2pAGpO1SNkercFPS08wKP3Hb8PZiWLTqSzBU0UqlyF
+VK/dJze2mbqrvX1Uw4cf7FgQbCH50HnPt14Afa+iXuvMxNPof0Go64iKfgDZVEcw
+BHKhWVh0AEf6UE14nxZFb3gYIM/EbNKMkoujEXmcX3YMCY2I2ASdzbLuPRuyt36w
+fApv/no0dx6mtBTGxpOPD2U+XJYMw64iYX9CCVK4qFbWr6L4DUCm5C2wah398io9
+WllW+5GRuEeF3FiU2g8cgmAdbaJYKA1ldhCQh6VmzEgqElMmfmb/t+/A/TI/uVre
+3rN2wKU2Na5ollpu23btf/KagyzxDsQiMWKT4taOCw==
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Bob-Root.cnf b/rpkid/biz-certs/Bob-Root.cnf
index d90595fd..1505abbc 100644
--- a/rpkid/biz-certs/Bob-Root.cnf
+++ b/rpkid/biz-certs/Bob-Root.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Bob Root
diff --git a/rpkid/biz-certs/Bob-Root.req b/rpkid/biz-certs/Bob-Root.req
index 265ed9ef..62ad1cea 100644
--- a/rpkid/biz-certs/Bob-Root.req
+++ b/rpkid/biz-certs/Bob-Root.req
@@ -6,10 +6,10 @@ a4cgQ4+szZ5SVM8lcrCxEf40OoaByIamb/zkfKug+3nlyBWRpuH7ECzNEbMmMenR
dCciNrgaUVRG78mVIbMY5nxsH+6MoL2jaeXNpFn7bfWAA7NVZwcuhyE1L8lDwQ3N
q0Fj7TqmKOo4UZ9wo/rmPvqSVbi9CIB2qHxLu5//7fn+dgQt9fqluVJSo4ZIPkvn
ZT8asEn+gZpfsMTdMt+3xbkxnS+SCvRzHwtdOG+3yJ7Mra1QFY5DBwKfHeV0rqW3
-3LcCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQCBo0gMFf/fCHsdXAwmaHUSvIRt
-aJ1dLazv2CywkLnubjCpFj6Ih5rbvYa4ugCJK+qpCA75Lbjl2pA3BaX05ehwROAx
-RF5lAagMLzrPI69gQNCI496SCpa3E0FOQgCebIPAnLpsx60KRcd1zIWF50MB6lKq
-Sh9NgNrtTNuzRnSiDSBvsdaFl3jK0zckwit3Kj4VhIMlVAKn3FfToxXN/LxFuX6q
-fEguUfIqcdlTvqLV7F1eY3o4IgpCeeK/o+CLIqCFl2HT5m9pVFw8td8SzG52mnCa
-P4acOFkYn05s5ST6kJnbLBiMTl0Y5xQs3SyB5Qdro6sdP+GxH49fLUvr/ySW
+3LcCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQDf73u3eDpiPUZvXdJ1O6REdIJr
+kTsWWD09g9fkXpEIW+RgArgMvE3zcFJf07UBLA7y/kkciZPRb6VGbYKHXNxibGmh
+h+3bJJaVokMOLGb1cSiUpU410rRgZFV/VA0Qmm6+YTO6sa9jV3yyucWHQOhpIk5W
+Ltcyz9EEsGIPnrQ3Mu/vFR6HEfEXmUyDwps8FK1GAXBxzMWHwIy/RcRoavcXdSF+
+eCbZS3JvTBNsKVS5rx+ycE/7WTpttodn+iVjezm3u0UCOQkd8kdqmJdyN7BUDK5Z
+GITdWMj22VE3l2toeXlRW3QYtW9BTHIQmgplHWlxQ/WqH0ri5K/Wwlx8kQTq
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Bob-Root.srl b/rpkid/biz-certs/Bob-Root.srl
index c3dd8296..47c05e26 100644
--- a/rpkid/biz-certs/Bob-Root.srl
+++ b/rpkid/biz-certs/Bob-Root.srl
@@ -1 +1 @@
-931654D3C41D79F4
+931654D3C41D79FA
diff --git a/rpkid/biz-certs/Carol-CA.cer b/rpkid/biz-certs/Carol-CA.cer
index 77c0b3b1..4a4e5acb 100644
--- a/rpkid/biz-certs/Carol-CA.cer
+++ b/rpkid/biz-certs/Carol-CA.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHTCCAgWgAwIBAgIJAP1coEG/CqK8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgQ2Fyb2wgUm9vdDAeFw0wODA0MTcyMTIzMzla
-Fw0wODA1MTcyMTIzMzlaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgQ2Fy
+MIIDHTCCAgWgAwIBAgIJAP1coEG/CqLCMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgQ2Fyb2wgUm9vdDAeFw0wODA0MjIxODMzNDZa
+Fw0wODA1MjIxODMzNDZaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgQ2Fy
b2wgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8vLVEG2FuAwas
1Q03hc7BHPGCBEUwP1h+/i+hEh6r0AllAhJJieTmYo3Pfj1whxGSxalM48H6yPe4
ENIaQpTmi4I6xg+SHjrTWU31xQlGkdXDQU87jYlrk28OoGtXa1uE+6P9F6IXdhSJ
@@ -10,10 +10,10 @@ Dki4OPT50vZLJXLgtKmbtEKixvrUU9ezlB4hugZOU0ECNw3YOLfMw1Nkcxl3jusT
ldi+Z4CviGmdr8dlc/+ouQGUN5u/MgkQJimAf0XCrHh5kf9s+EpZ3kDpwBFELzw1
h0qiwyLNAgMBAAGjUDBOMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFJoijL2BTU8B
LXzcJFxiZaUmoBYlMB8GA1UdIwQYMBaAFE8lYk6YRDutZ5nlTe3KdSUPSqMtMA0G
-CSqGSIb3DQEBBQUAA4IBAQB7qJkCZahslsVHubLxDMJYPSurGbFFwy1j9RJdscna
-K0DOEtXe/zGbxGFrTcKZBycWET5bJkMgvO5pfYEPtbv2giRoGj1BzWEnPSlLvjvL
-qICo+D4Fkmdb7pgFtT3IOjox5OxaJ3aNqpEy044/Lshy5quBtaHsc0/rUQA+KpES
-FVZ1czAJcP/Tu+qwXLfhyYb6uHhcRw09D4mE6WVLy/+ZFgEfJUfDvL0AM1XNEgG6
-fHZwqt1vUnHuAVkWADy4nD2CEdugfby3u85WFzpSLuSQM9WYv6TZNIU63SoPYAwL
-HnKTCL0He1ZoW6PgxW38BMlryHjR/bCEbe8YSe08uFt7
+CSqGSIb3DQEBCwUAA4IBAQBpYYqolCdMyrY18TLxBAian28peI6J0db4R8k72UTX
+7P6/9l4ooS+1RfNXVWMMJYvJ6XM5aaP4YjGMLyRWZZ1xq3GmPRS5JtHuP6QBOZQB
+q+P3hLqIPIUoIIhx7g9hzT9ldz+6AU0t7cyqEKPimAe4yt/E+JAE5tdMwWnPnMcY
+X8MbS8692IoLqMdwywr/Twy20JDd/pYOqLHPtUNf/Zv0E05VyOgDqaEKXA1kIfH8
+KpmadJUO520ztXPan1eOUhxCHF2W1zZ5JkHU+y+RzkUGkzKRdFtyFyox8kn4X8FC
+IgstlbIhT4yR2Dk8lqjsAgSZ/UsywH5ZaknmIHgVlnJz
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Carol-CA.cnf b/rpkid/biz-certs/Carol-CA.cnf
index 2247466d..8bea44c8 100644
--- a/rpkid/biz-certs/Carol-CA.cnf
+++ b/rpkid/biz-certs/Carol-CA.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Carol CA
diff --git a/rpkid/biz-certs/Carol-CA.req b/rpkid/biz-certs/Carol-CA.req
index 8e9a99bb..8760f182 100644
--- a/rpkid/biz-certs/Carol-CA.req
+++ b/rpkid/biz-certs/Carol-CA.req
@@ -6,10 +6,10 @@ lOaLgjrGD5IeOtNZTfXFCUaR1cNBTzuNiWuTbw6ga1drW4T7o/0Xohd2FInXeqEJ
KAM0OOufa19YIrM+8xw799X5Y+tscQHO1vHO5Oal4/7dd1+QRDtY2ZSCBKUOSLg4
9PnS9kslcuC0qZu0QqLG+tRT17OUHiG6Bk5TQQI3Ddg4t8zDU2RzGXeO6xOV2L5n
gK+IaZ2vx2Vz/6i5AZQ3m78yCRAmKYB/RcKseHmR/2z4SlneQOnAEUQvPDWHSqLD
-Is0CAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQAJmEoGPDnwNGguSCE9wp1/eH0r
-W/vwQ6HOPEOYtrwvLiaRDgn3n1rRZ2gvElA1v10K6dccAVBldnPjZ04ciNWcYF6Q
-fVN9MNJ+iRc3zNBsoz1D8eoDX9g+YdB0GW9RDjSzeGh3jyH7eC4RfsolMLCtjS7r
-gUOLHEiQXEh0XKRAuTV86Pgj30Fnj++LNb/VXtlXu7T9wgf5mr3O5Fz8aLc4tLPL
-0rGq8oZ5PWKzZmvf3UhhSEKNo3cWQeqQ4sdjZjM8fozLcokXQsuKrbBm4loO951M
-TmSRWCNAAy1lz4n8c/I8TW7/POplhNDTn6ayu7fjSLlSoaBltsQ41sxEUeEe
+Is0CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQBB0+tkHEBlG/YeZosPXknmVMbm
+ThzV2TFQ32NR0yiqytZLK69sbVHHeS14YuAHn2ZP+Yr0MMPeOTmK0OsLwpUXMOI7
+35fXsEL4kCF+yuElCyMn3KNZ641kCwsngvdfeosddRSMg1IxtmbfNSmfSe3WEpV+
+CfBwonU8NsRI/crDoi88tXj9E631XsYbq43C/CrW5CVCCE8p9an6HSjH4y5hlYOD
+bfHnQJSE2dGIlZBthGwIcqpdgt5UvT6VGGGdKxLNaaMfHCEGgAu7dA4pm6QQ9rLE
+TYLNqybYl1v1sjxjZ5xoPRM/aKqe13uzWn8E1HJZWQZ4KEutHLMw02GKxDe8
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Carol-CA.srl b/rpkid/biz-certs/Carol-CA.srl
index 844d9499..8db881dc 100644
--- a/rpkid/biz-certs/Carol-CA.srl
+++ b/rpkid/biz-certs/Carol-CA.srl
@@ -1 +1 @@
-FB70BD504214F1E4
+FB70BD504214F1EA
diff --git a/rpkid/biz-certs/Carol-EE.cer b/rpkid/biz-certs/Carol-EE.cer
index 6f36b103..5373757b 100644
--- a/rpkid/biz-certs/Carol-EE.cer
+++ b/rpkid/biz-certs/Carol-EE.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDGDCCAgCgAwIBAgIJAPtwvVBCFPHkMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGVRlc3QgQ2VydGlmaWNhdGUgQ2Fyb2wgQ0EwHhcNMDgwNDE3MjEyMzM5WhcN
-MDgwNTE3MjEyMzM5WjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIENhcm9s
+MIIDGDCCAgCgAwIBAgIJAPtwvVBCFPHqMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGVRlc3QgQ2VydGlmaWNhdGUgQ2Fyb2wgQ0EwHhcNMDgwNDIyMTgzMzQ2WhcN
+MDgwNTIyMTgzMzQ2WjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIENhcm9s
IEVFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwWzpaQT9wW8xme1w
QD9hPghfFQoQBLWu5qFWyZu9aPTiSs/qiQMNQARlUst6eBhnCz3TedQnXAdfJA2+
Nahl2Vqj6Eqzn9HFA5h79+ScZsgHSl0l8qeyKbvlkS5F1l9UdgNdGv6BsATHUVri
@@ -10,10 +10,10 @@ XygOZkh+cq2twqKlSkS0/55ME16OqmvSz1fNKi3pDikbVZUml6ye3RN2TIhCQta3
pOe0vMajqBYKkph8D/ZW9t6BsCQyOD1z7xVnwHmh/7T0d3HObJvZcMC6tcHauaTj
39m1VwIDAQABo00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBRA/hhf5DbmnlikPnO6
L9K8BJXDjzAfBgNVHSMEGDAWgBSaIoy9gU1PAS183CRcYmWlJqAWJTANBgkqhkiG
-9w0BAQUFAAOCAQEAowP42DImCmkAitBnu9PYZd9kWvU4hpZO7p1eBfLbTlrfVDv5
-CpqwJgmbQtXKGUw6uqRpVa8pZkKpkqBGB5Dp2kVhp87jbsw+v8KPbdmuBtiWR8Jt
-KQN08JEPwa9NenMz6ihYdP9pnHxYG9o/qHKEk/dmeELiH4oxbqqaaJYnjng7XTaU
-wcJq3JeD/nlyD2SeCXqF2OFFbj1nNdmvm7G+dW0ZlM5c+SxhWO8Cj01qle+10692
-Xjb6Tfn4UPubaqhroitG/KmQlQA+NzKh6LpMQhymPD+CgVirBb56SJbij5UtOrsP
-6dO0yTzXX/JOYFwJToqgLvt7+jKmXdOn+8JReg==
+9w0BAQsFAAOCAQEAdzFrIfAGps7SIMhw9vEH4dEAwJRGwID9mdsAp+SkbafSl3lw
+Aa+g5wvAxyaxdlj2oGgm0tKvi6uQsB71t0Yqev0PkVSQ+fzTgL3fgrOTKY8hs/hV
+til+YVwKazQSyQzvc2/JUPG7UiF7iFhDtICCDf9ZyLWLQHTsoh7KWJ9LSBf5DNQO
+sEs1+me1PmtzsZqFyDXjNyTMn40woQHXTwkHxk3DP5pF+vSV7U62LfO3+lTblEPv
+O52mghhcKGB3BTV649V2EOh798ejp3l3iHch5uflpB2aaYAUuraeBB2dXCxPNO5l
+ICtbKvo9cbVRhMbyzNNEhiq13XsPdhJUTsybNw==
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Carol-EE.cnf b/rpkid/biz-certs/Carol-EE.cnf
index 4febbc99..532ba746 100644
--- a/rpkid/biz-certs/Carol-EE.cnf
+++ b/rpkid/biz-certs/Carol-EE.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Carol EE
diff --git a/rpkid/biz-certs/Carol-EE.req b/rpkid/biz-certs/Carol-EE.req
index 5d9fa36d..007f0325 100644
--- a/rpkid/biz-certs/Carol-EE.req
+++ b/rpkid/biz-certs/Carol-EE.req
@@ -6,10 +6,10 @@ Zdlao+hKs5/RxQOYe/fknGbIB0pdJfKnsim75ZEuRdZfVHYDXRr+gbAEx1Fa4g1J
YRka/HQcnWLpJtdbKcXiY/PtypWNIn/5UCXUjy/Z+GrkG+UblqnJAWx29QVKx18o
DmZIfnKtrcKipUpEtP+eTBNejqpr0s9XzSot6Q4pG1WVJpesnt0TdkyIQkLWt6Tn
tLzGo6gWCpKYfA/2VvbegbAkMjg9c+8VZ8B5of+09Hdxzmyb2XDAurXB2rmk49/Z
-tVcCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQAUmZ8fO3IXtSIqKQOQu8rpHz6A
-RcaPg3alGV2bG/3SewfgTMv7GupACytmPogLbkhrWMe3UpY9vj8xuTTEnOAddkdk
-rSWrwHfk6uwqJM4kor390+aCe9ZZ6yNo9JEv8hMgoCY3HHw+CEX34IJpC35H122a
-Mpy62SG0j2tRZJv/DQG6fi6ecMjcjYAPyYhKA2v+xf5Q3N6D5zQ1mUmJRAhPpSti
-o79XRy2Zwu7raO6nxetmBoms8UjdxmpqyxV5VhJ5fOMvdLBUEOF/D+9NUPSXpf2/
-SxKOA3BytSMrw4OLp3Dqxhf37Ri8q1+apTW1kOGd4zHrzjd81eA/p505AlTf
+tVcCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQDAFEgnnFQ7ed2rcYSnkJFfZKA+
+NACknjcO1GUMMOL7iXl9eRMfj7PAmfUZQZwYXimrzFlyA5EWSk3vXOHZeg5q6Edx
+UZlPvBWg955kfL1knDuJ97y2ZX43oZ97i9nD56U7oP2w/AMdkgOWkyjLuwze4T1x
+2aOWKupsjU7UwpaFjBLfOo6A2qmp9UvZauBL3MOT7wP590lHRsVmZmKUwUvuN0mj
+dmH8TUN/5rFe7pybo4UhEYxG/BMC2+IUGcNtyIpj/pwldHVDFW0mwHzenUZ5XyeX
+WmkRzRpkVHlWuqR2gqTQl5f/8kUMMRLWzKdusC53rLAXFbAaJAJzYPBVCxCj
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Carol-Root.cer b/rpkid/biz-certs/Carol-Root.cer
index 1a7bf374..c4dfa744 100644
--- a/rpkid/biz-certs/Carol-Root.cer
+++ b/rpkid/biz-certs/Carol-Root.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHzCCAgegAwIBAgIJAI7MO8wUHh/4MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgQ2Fyb2wgUm9vdDAeFw0wODA0MTcyMTIzMzla
-Fw0wODA2MTYyMTIzMzlaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgQ2Fy
+MIIDHzCCAgegAwIBAgIJAJ5XBN/XcY/QMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgQ2Fyb2wgUm9vdDAeFw0wODA0MjIxODMzNDZa
+Fw0wODA2MjExODMzNDZaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgQ2Fy
b2wgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALkgdmWcufSC
w/WjWc5NvUEerHF3gtP4LB9OHsHe4lHUKIl7llZes9JDFWdweZaGgabsFsB9Lhxh
YjqCbeLnbBgf8gdPHQdmwtQBeZpzJNfNcoc/ucvUmvc2thZFBxj8SOtQUOZH3Tqn
@@ -10,10 +10,10 @@ o88A1zOHftU/WFrgF/lFv97v3ahLNc0UfgPr1iEQonqC1ff1oAg3iOB7T5rujW1r
mbinqag/Fiv8c3r9GgLahsmCtz4UkirVqu0o+9/HMUoghWJukOUTYOi7d/S6IqYP
v8/PBwcgW1kCAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUTyViTphE
O61nmeVN7cp1JQ9Koy0wHwYDVR0jBBgwFoAUTyViTphEO61nmeVN7cp1JQ9Koy0w
-DQYJKoZIhvcNAQEFBQADggEBAATy0ErWb4J7jo3aXHJwuSun5ujvKxjhYGTkSWYO
-IAazIrB+9BUsNlpKd9lYTQ3FG4rC2NCB+mh4YOezzWLmSvU2Da9IAJgLX5jW/BUU
-TkMNUPD6hbv+AaEL4jHb/Mwe3sKhNFPLGYo2bUSHJNApct+E6d/8wer/BBLd66dD
-J9iWKekG5GO3t4X7MkaIwt7DbMlG9MDBI/wFanTa7RrOuFAf57OUIwMDjLcNv8pZ
-Z3H74x1gpbMlTU0Q9o+ML0M6p0N9RbKRdj3Y4cSQEzuCR/bfwDMzDGl5n/Mnn1dB
-3DM1apclyMZc9VIvkvUEbOxx/8r0NBT+bSIW7XxosRe4fEE=
+DQYJKoZIhvcNAQELBQADggEBAC3kIhKXuneGgUQ9AbkLAK62eZXdYFD2Jz9JnnFI
+ChuIEk9iVHuxA8VDYyt4qS1UJ0fYEBhbKnAPNXF5hv7wThEkzzFrfkq2INWJY89c
+VJlLS6zaU3TskcVXhn/gbjxPixq2h08oFWnGk3RbNKQQBMoEImBbJbZuzNCcYbqv
+o5wVMlNLroOijcQsNBZ/SnhbJ+3CwMi8FOkf53nSI1Odu15d3fNX7uaS7RQNGsma
+Z/Fe2R5IqQodp57XFQLtYcyiyPJUmaGm4pPeaO1OCLuolSbqDl+3cKGeSQDJBnUH
+4JyTslBizHmsmkcqzWYQYy3zzdwo9xRdBexS8nIhUm3KTnA=
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Carol-Root.cnf b/rpkid/biz-certs/Carol-Root.cnf
index 01190973..169a8503 100644
--- a/rpkid/biz-certs/Carol-Root.cnf
+++ b/rpkid/biz-certs/Carol-Root.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Carol Root
diff --git a/rpkid/biz-certs/Carol-Root.req b/rpkid/biz-certs/Carol-Root.req
index 1d911e4d..7a28e895 100644
--- a/rpkid/biz-certs/Carol-Root.req
+++ b/rpkid/biz-certs/Carol-Root.req
@@ -6,10 +6,10 @@ zk29QR6scXeC0/gsH04ewd7iUdQoiXuWVl6z0kMVZ3B5loaBpuwWwH0uHGFiOoJt
M4d+1T9YWuAX+UW/3u/dqEs1zRR+A+vWIRCieoLV9/WgCDeI4HtPmu6NbWvxx3y3
egMqONtfFmq3mfmqGgdGxC74RyiImFsRGRcdB0mXVRFwlAJmijWtEy2qn0WZuKep
qD8WK/xzev0aAtqGyYK3PhSSKtWq7Sj738cxSiCFYm6Q5RNg6Lt39Loipg+/z88H
-ByBbWQIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBAAgScY6PIPSSy9Mrm6SF3bMB
-EB574vIbu7oEIXdS6j3n92ONXFO/m5npd+ygbbCc9P7JIpyuqYdSpq/wihIb+n6R
-qtn9psfU38eR3nVvdK+SHkeHTZnXvOMRZ/2ZOD7t/m8QpR8BZ8FiDqp/ka9izjdc
-Y1jGVRuJO2VLBk48nDoci8PbvC+Zn78pbywVybrBiNNDl3Th354luXTCOyMc+Pfe
-Zc0YffB5Xv+5C3zJtpvOtvybKQotEhbRpcuTDf2RP1UoUXnfq46KM6qq1YgJNB1r
-UXjErbXpA1BOHMPSXhLn62+UAZ9k+GTXz/808+MlRHREqM9OZoLvKQlAOCFOYIA=
+ByBbWQIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBACwCBZJhrfcvjCqNho3sSYnl
+7tN+d68qtOj7NHU8w3BJmqZFWmnX7HT3Ka9yYAdX1WrMpxeo59ME1U1eg465zru+
+VnFQHFehINx5hjFCt1qfmvZd3fRv5OqNNui1vDZmiRX80zWorZFKWTKZTlJhXKHr
+YQ6a25PgvFa74QXavQFTpwq6mH1t7CurXrUs52nOnm0VUxnMT4alqnNPTetFRlnx
+E2NPsTuYy6YDaMH+JML6zVnaCNVu6cY2QAAcyyzORCcda/HkgTJ5hBpNvrR+3sqY
+sKJQHzUO0PHTqHVJu5FGJr2kflfMBmuB5SN/eK95nhSkyPz0o8x3ERWvzWfx6yo=
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Carol-Root.srl b/rpkid/biz-certs/Carol-Root.srl
index 6c45a0cc..c75ed246 100644
--- a/rpkid/biz-certs/Carol-Root.srl
+++ b/rpkid/biz-certs/Carol-Root.srl
@@ -1 +1 @@
-FD5CA041BF0AA2BC
+FD5CA041BF0AA2C2
diff --git a/rpkid/biz-certs/Dave-CA.cer b/rpkid/biz-certs/Dave-CA.cer
index 95341c03..52c649f4 100644
--- a/rpkid/biz-certs/Dave-CA.cer
+++ b/rpkid/biz-certs/Dave-CA.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDGzCCAgOgAwIBAgIJAJWglEInirfWMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGlRlc3QgQ2VydGlmaWNhdGUgRGF2ZSBSb290MB4XDTA4MDQxNzIxMjMzOVoX
-DTA4MDUxNzIxMjMzOVowIzEhMB8GA1UEAxMYVGVzdCBDZXJ0aWZpY2F0ZSBEYXZl
+MIIDGzCCAgOgAwIBAgIJAJWglEInirfcMA0GCSqGSIb3DQEBCwUAMCUxIzAhBgNV
+BAMTGlRlc3QgQ2VydGlmaWNhdGUgRGF2ZSBSb290MB4XDTA4MDQyMjE4MzM0NloX
+DTA4MDUyMjE4MzM0NlowIzEhMB8GA1UEAxMYVGVzdCBDZXJ0aWZpY2F0ZSBEYXZl
IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuDg+csO4ExCO887N
7aI5vpKa5bo+wPEi+6Jrvb+FVC27eI+UAA8hOHilAeYI/P+xK35Bjmg24H/OWPzz
erkSvSPp2XB69GR4ffT4ZxMoQ/FNgp1iiYr2QE1EWphrhXnO9FwEZ7s/ry7ISUvs
@@ -10,10 +10,10 @@ gE4KJhrQ11JNsIH2AZ3hL+C6NQmbkNQjaNOxjbZT/Whbg87kemtQgo4/t+cTaALP
qknVRrMrkCCVL0I3DRmYV70IEyzjEfHaB1LXt9RJX6uYjD9YmNjY7Hp0liX9czRn
+IsauwIDAQABo1AwTjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRvYR0qliEj7ExH
JxCipJca7R0GWTAfBgNVHSMEGDAWgBS0fUwRgGNdBaom9pc0oe6+LSgY7jANBgkq
-hkiG9w0BAQUFAAOCAQEAUWZVdgXU5qCNnftNmJwhm7TDOS/QmiT8v/RcKXG1TtwY
-F+8AOnIpZ/93ZRx5n+iKzDWvsyOXCV78rfU0mWt+xrrnBiFQD0O2iycOpJ6XdwLO
-1ZAMZ+GX8lmKHiBZzG1s68kwddQgMQtIAQGG9Lw81lwmOc54fAy19YoqdjjNM1qu
-bgOwBiFbym1rHxzBCBzvCNI9xkH8KAp4FZrrdzrMUf40ZuNjXdo5d0RkcpcSOhrt
-8NJTKMb2hRuzrRfnakM4XQFpvW/opOR5+H4QZtKm8e9yQJOFOYUq/sih+LdxFdQ4
-Off5HEiR0fZEt1/5N0ntSq+50Oo9UiiBuHNuGChEUA==
+hkiG9w0BAQsFAAOCAQEAPZ46m0OgA24ZjU8F1vUWdK609EMOA3njoDpRj8B3RZid
+e9NU+2BO59cN23vCkVPpvb6UER4JFRC8isgy1yaia2/gv9hB6YZ7R6D87yLyo2ol
+JjCv8HTExCK/OjAHNjTlm9dGy2pS/KntgywkShfXZUR0yAjwhn3pGWN29gYfyJFC
+RnovB1vr0jmStXCOwbpyyus1IOM/JjeYpRkH1BovA8PVbQnThq1VEM7P8QU10rfr
+1AiyX8OHCnSwPyUP5o5IwTt5U7oL58qC9nbdeSxbq8vNZ0ZXJc2TF2vz4Gopw3j+
+w/6b8zXrObrd8KA1mjxv8MhXF3wvTIC7ACMiyT1zAQ==
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Dave-CA.cnf b/rpkid/biz-certs/Dave-CA.cnf
index 47717a0a..47725a24 100644
--- a/rpkid/biz-certs/Dave-CA.cnf
+++ b/rpkid/biz-certs/Dave-CA.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Dave CA
diff --git a/rpkid/biz-certs/Dave-CA.req b/rpkid/biz-certs/Dave-CA.req
index 8ce0b3ba..40979783 100644
--- a/rpkid/biz-certs/Dave-CA.req
+++ b/rpkid/biz-certs/Dave-CA.req
@@ -6,10 +6,10 @@ vSPp2XB69GR4ffT4ZxMoQ/FNgp1iiYr2QE1EWphrhXnO9FwEZ7s/ry7ISUvsKuDn
un7ymoLtRFTIO+F5B64yTrNYg/6YQ6rSKN/SpfWYwOLB9fRylAmYBPguP/3WgE4K
JhrQ11JNsIH2AZ3hL+C6NQmbkNQjaNOxjbZT/Whbg87kemtQgo4/t+cTaALPqknV
RrMrkCCVL0I3DRmYV70IEyzjEfHaB1LXt9RJX6uYjD9YmNjY7Hp0liX9czRn+Isa
-uwIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBAHA4Da1BJ6hY8MsyJJtK+Kbe0Ywd
-3muBq179Dl+HmYc9hZLRLLliXaRiyVofR67VK47D9KmHrbNhjhbcq6s9zEwr+VQc
-WmOpVNGwZJzeqxYCSUvvBC2wMWaHfgmzE/eHgf+P990xo0P3nnw5+sYl6tWaaz4g
-X1lfXjXHQmpzprCDBM5TJ2S5B9HxBwzRitCOvMCFFXJ9abiXZOg3zJIMJ+Gb/71c
-Aw/pqSFsT2xuDkP35/VyVUGM1htXwap+JwdPOVHPjjHiYtLTZmhNmHsIUTlZGp9o
-g9j2IrDsQ84kJqQRLH2iMrEO/kxlm/vj83arSXvtjAn5+89yZbZ1VcswwxM=
+uwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAD3OlqKrMaOTQgt/SKUiBWbP2uYe
+uoL7PhM56jwJS1vygArPOjYqZlPi1Lbr9I/34zHUIGxmBFfDhB0lD4jHEpa394iB
+Pz7GPk3U8D+i11974tulOana0g8lqQsGeFt8oPCJydM6Jjj5noQm9z4boYOATYdE
+UmVEqMSNloiyh02ADXlLGHyexoft3uVruVHkty4oU9tptpnXUKbsUtw+Gwk+S0Cw
+ziXlIdGIUQoGXo41daNA6K3upBzMF3d4XIrEyhN5jlvZrdk8DGjzu7Dxwnk+/vE5
+8FJewZbMQi7IvBjH6Ri5Cenm4tczsPLbSjVDVGPxm3Chq658KpAcxn7AlV4=
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Dave-CA.srl b/rpkid/biz-certs/Dave-CA.srl
index abad9d4b..2fa6581e 100644
--- a/rpkid/biz-certs/Dave-CA.srl
+++ b/rpkid/biz-certs/Dave-CA.srl
@@ -1 +1 @@
-BE6923005A133A91
+BE6923005A133A97
diff --git a/rpkid/biz-certs/Dave-EE.cer b/rpkid/biz-certs/Dave-EE.cer
index dbc7674a..f7352ada 100644
--- a/rpkid/biz-certs/Dave-EE.cer
+++ b/rpkid/biz-certs/Dave-EE.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDFjCCAf6gAwIBAgIJAL5pIwBaEzqRMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGFRlc3QgQ2VydGlmaWNhdGUgRGF2ZSBDQTAeFw0wODA0MTcyMTIzMzlaFw0w
-ODA1MTcyMTIzMzlaMCMxITAfBgNVBAMTGFRlc3QgQ2VydGlmaWNhdGUgRGF2ZSBF
+MIIDFjCCAf6gAwIBAgIJAL5pIwBaEzqXMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
+BAMTGFRlc3QgQ2VydGlmaWNhdGUgRGF2ZSBDQTAeFw0wODA0MjIxODMzNDZaFw0w
+ODA1MjIxODMzNDZaMCMxITAfBgNVBAMTGFRlc3QgQ2VydGlmaWNhdGUgRGF2ZSBF
RTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKUtdgOQpUQqXYOEukxx
nQ4KfvoGFaFP+kJb0vpaxX4HlIwUiD8NjTePpAxS1cixiPmHn9pcz0zmopUsonZ9
OD6FGYyDTQm+LNF4qPN8xUhKlHLE1A+V+Ajtb2lCbZAGnPh5Z4vmQnoNHvP2TVz4
@@ -10,10 +10,10 @@ jly78lK+tuemn98sSYfzxxA6v8fmivs1k4u/M+vhquwfvQ7xhfyofFIytXFFHaBa
TADyVQLKpDHsMI+6PTLlmKe4fcUny/qQKAFe7g2v8zFUb49ohqfW1UyU6+/kx1Rm
6C8CAwEAAaNNMEswCQYDVR0TBAIwADAdBgNVHQ4EFgQUgm42L3S3iA3yv/JkQYwF
ZKe3zhYwHwYDVR0jBBgwFoAUb2EdKpYhI+xMRycQoqSXGu0dBlkwDQYJKoZIhvcN
-AQEFBQADggEBAG+oJAAv/m6XsHhyXjF2uID2KM8XEpcSIivDqws/XExpSrmGaB3z
-q2uR2BNtuq1BTaAtH8p65GEKGdNlr/UWv6NxBKBM824rgQZO9sVUFE04thNSi/59
-Q6e8bTKsl6xdQvoJMvdKIEMI01OClqRXq0jtVzD7+TvyDgkdl3kTPFeKumrDG/U/
-DNQrCoayouFRgBHfTKgUiwYw9se5+D/evo4oqZ3DQku3j46CPdif2LOSUYomOhdB
-ktmxY/+fx1tRvDSRhBFv19lkUOHu7lnPmp5CjPj2uzrMsojApGBaFlBmKE/VSdJT
-C37D3tH928GPJ6Wru/6ATdTMkIpH+PcOlpw=
+AQELBQADggEBAHLPjmtZYfQTaWc2HufQNwItoWUzLEXsFuSSyKVH4Qu6CESu4v2p
+wt+NIrI0eGK2p+Q296/6iK1R0YbwiTRbPzLMrWAuUO+uzCwexb7pCHtQhTsTBEpz
+GVZxQCaOqQ6tAh3uuQOzzaoll7omPdSarJsw+v4B/PgmXF+JXvGZJwKryEgr5yH4
+n0pFFvfzVoxvPHW+7Fp0s83rJjg/UiLC2HWhn7MTH9UGT+AmXEO1ORWYIE05QLiD
+OL6u5wzatOHgMzG7GeLh3nVokjr/csiSuYVb988m1SVZ0L/aFlfiA/yj5CyyZQ60
+xdXEJeJSAjn+y2q4HA6mfCdpR9iGyfSjLf0=
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Dave-EE.cnf b/rpkid/biz-certs/Dave-EE.cnf
index 13517fdb..073a1585 100644
--- a/rpkid/biz-certs/Dave-EE.cnf
+++ b/rpkid/biz-certs/Dave-EE.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Dave EE
diff --git a/rpkid/biz-certs/Dave-EE.req b/rpkid/biz-certs/Dave-EE.req
index f989d254..cda158ec 100644
--- a/rpkid/biz-certs/Dave-EE.req
+++ b/rpkid/biz-certs/Dave-EE.req
@@ -6,10 +6,10 @@ PoUZjINNCb4s0Xio83zFSEqUcsTUD5X4CO1vaUJtkAac+Hlni+ZCeg0e8/ZNXPiO
XLvyUr6256af3yxJh/PHEDq/x+aK+zWTi78z6+Gq7B+9DvGF/Kh8UjK1cUUdoFrS
8djUYT3AC59Dq4Qreww0sEXqJm6u5bpVW5fY1t4eo6BwAXgdzxwpGZVnFOSQhSJM
APJVAsqkMewwj7o9MuWYp7h9xSfL+pAoAV7uDa/zMVRvj2iGp9bVTJTr7+THVGbo
-LwIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBAG6UNnBSYglSYCTsg/g7FVBh6ROG
-QYIiVrAdiJgZf7elUEtpmzAZ8YDVbwYbN6SYrVId4jvPStHkScf6/LC76tFbRp37
-7pGEf7Ijou0xCXmk4LIm3xeQT/AjvPiOtoWNr1H+OdYUYQeyXoqNcgxZ4j3yal10
-etp1ZMR2lHgGd0ZvulYJJw7E4s7c3f9mB0+qTaAz6Wcu49e6THo27gPq+ZZ4YMGZ
-TfWldXk4IBqDuLauaiwWeWYMfkRC9aEMq6lVlIAvmjeKHOfUttQz0ievG7yJ7/En
-wRoGBSQM8/Pzc0MFiTSyFcpYyyNqIQ8uHivKH/dZtXTOjkd9/wPajglNeyU=
+LwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAACImjAn+1Tg268r4lVQ/pW9MT6+
+k2R/KSN8bkdu05dbX7z7Bz5naTVe2QQBzeCXcCoWtMxkgDvK04aVf7Vk7LSFfpr0
+UydsAQdtECrLU022uvPqGvAc0HMC18WDXVQ8ZGSP8VVtuLwnXVBAWnth3AgdFcmq
+x1AO0vrtOQQw2698JlxN6BefKHVLDR6axidmHMBnMq99mTEAhDiwlEgyC0Uhc/WT
+sSxNMTeoGopwtQuT1dlbbOT1eVuKAGPrsMVOJtjYNpbQrc8qAAteCPBLg+bHKb91
+fb0ITSZBew/rAffj0knCB4/f2Qj0M8NgJNwJScHmv2E01Sc4c0f7vs8ad6s=
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Dave-Root.cer b/rpkid/biz-certs/Dave-Root.cer
index dcf5bd02..88d3de61 100644
--- a/rpkid/biz-certs/Dave-Root.cer
+++ b/rpkid/biz-certs/Dave-Root.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHTCCAgWgAwIBAgIJAL2A8OXxe0ltMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGlRlc3QgQ2VydGlmaWNhdGUgRGF2ZSBSb290MB4XDTA4MDQxNzIxMjMzOVoX
-DTA4MDYxNjIxMjMzOVowJTEjMCEGA1UEAxMaVGVzdCBDZXJ0aWZpY2F0ZSBEYXZl
+MIIDHTCCAgWgAwIBAgIJAJDXMKHpGnn7MA0GCSqGSIb3DQEBCwUAMCUxIzAhBgNV
+BAMTGlRlc3QgQ2VydGlmaWNhdGUgRGF2ZSBSb290MB4XDTA4MDQyMjE4MzM0NloX
+DTA4MDYyMTE4MzM0NlowJTEjMCEGA1UEAxMaVGVzdCBDZXJ0aWZpY2F0ZSBEYXZl
IFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzOScJlBkVwfoN
KP5/0qIM/ZisBYicqHXErDE7WCtBXh05bwRKzGYtn3dARnJa1EoLKnVFzPxZ/mvx
Ntmqax3/B3+Je6KzCCEtmgNfIoSwxY1Ms+/vEo/SLpVYrk33K7mpx3rDXqpUSiZ9
@@ -10,10 +10,10 @@ KhoYliCfUoX7Yxc8XlDO14uS4wiaU2n929B/va+pZSp+00A+Vj13gbNW0rcdG3A/
vc6Xb5B07d9Q3g7VyoI922bU7e59+TqZdYvdfqqijROVkZTCYEL6Vc2ooK7/hYzf
JnVAtojbAgMBAAGjUDBOMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFLR9TBGAY10F
qib2lzSh7r4tKBjuMB8GA1UdIwQYMBaAFLR9TBGAY10Fqib2lzSh7r4tKBjuMA0G
-CSqGSIb3DQEBBQUAA4IBAQA2DlrT/1rTRQ11zNJSGAiJT0S5m044IPfonx3WNYso
-wvvm6EkXC41SlAQrweYxFldULL7bvOO7vRRNjCrEe6fW+AzgcjatRmk5X2/FXu6c
-0pE/D1Nl+P3zO31iRuN6EjnWJYlaGCrxkRhGZ+WxgeL8xXAEAhriMKRkM7gGpL3R
-BnLZhIQSAyW6xRI7IpBqORT6vocVQG8BJcSuWjfEeWzfLrukOaXJjOPG4WmwN7Vq
-s+sMtQYtMQBqWg63EXz5rRCUs+689ru+CGkaGOKmcRTs7nKo3m2vH8Avy+JHSH32
-9s4cCexgYg941WlrIU7lo8CfdtIKe9LyYtNyw0Ipve5z
+CSqGSIb3DQEBCwUAA4IBAQAEEKeBHZjHBOIybw+Fr69WUDLjHZ3RMelKBrQesKbo
+qD6a+e2R5gP0FewVDZCUaKGAxuC+hFXHxDe3wN3lG07xHOdlgijpm/MWy67rMZvJ
+/h+j/1RpptesIawDA5HmtBhk3S0ig4CZg5xzaDmz1RpGhLncOEAn8T0I3h2N32v1
+PsBHSfbXsaSlff07HnDXODeFcxP58MUpWjvGdCcT9FykeceG1l5bFZqgsXLuWKoh
+Cjj3pi0aPv/OOqN1HnTJfC5++jhO3ScVgE/Q2Zo//As3WLDrSBcpWWgK8qRZ0cU9
+LTSZUvHL9bAah2VCA0qtw8GjqRPd7r2UPFwh/Wd1BKDR
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Dave-Root.cnf b/rpkid/biz-certs/Dave-Root.cnf
index 58df8105..84840989 100644
--- a/rpkid/biz-certs/Dave-Root.cnf
+++ b/rpkid/biz-certs/Dave-Root.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Dave Root
diff --git a/rpkid/biz-certs/Dave-Root.req b/rpkid/biz-certs/Dave-Root.req
index e9905363..5c16b134 100644
--- a/rpkid/biz-certs/Dave-Root.req
+++ b/rpkid/biz-certs/Dave-Root.req
@@ -6,10 +6,10 @@ ax3/B3+Je6KzCCEtmgNfIoSwxY1Ms+/vEo/SLpVYrk33K7mpx3rDXqpUSiZ9BAXZ
AlK4slB8A/Di8H3hdsR7H927JS1LlbfFBKvpv/uYvmJhBdDKIW+k4DtQe7j0KhoY
liCfUoX7Yxc8XlDO14uS4wiaU2n929B/va+pZSp+00A+Vj13gbNW0rcdG3A/vc6X
b5B07d9Q3g7VyoI922bU7e59+TqZdYvdfqqijROVkZTCYEL6Vc2ooK7/hYzfJnVA
-tojbAgMBAAGgADANBgkqhkiG9w0BAQUFAAOCAQEAGYgH9IJSKNqJTysTIfjaHNRM
-cZbKu+tjQF7e97CwygG0dnAB+3XdjEIxb4NCVCNOfUPeb4lfYmhwerggJ9O4pZnU
-RYjL8alNDcmHB5PG+tPCePRmGV7Ao+Gj5p5TMnUrfjaVTCCN/39NOql0jbvwCl5t
-cKA19olB/YeMcwyr17DgJm197n07iuQFk/+ieQJ7znyViMV76MMmXv5d80jBkRb9
-OhcLdDPXLJ7Yz/XRJcK8GC8uD5rO53bfIe+XJMgT/K2QvJ+FB2eiwyP49wxLb3bs
-4GoVL0HKdYm0cJUSjTho9Ro8KOh9eJIauW3UI0S44gV1lPsOr64BE8f+7jU7EQ==
+tojbAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAla5o/AXTlkCA6WHPRRTyjFWb
+5CUn2Ccd71bP7KN0a7FhQThl9gwzCQT69Iq7SKt2EIunXXQB1JxRIuOOPTkni8zl
+h5s81Mmg5HlY/8QOE+7wa53dwuVDNzhCVfooYOuVtBDm1b4JsvRihuP1kc3muAqL
+J4fFuBSykt/khDzatj6nFVf0S/CLZpUV+67TIr5OC+3b5uu5x2ehzLaC9kA1bhqd
+KU5hHYGmYHKnZn2kWYzlYG9w50CMcXp5+UAa0RKQODpyshfG7T5sdAA4uCuqaIFT
+F5JrSpngaFWbPnN68aSWn9h7eMMVFdAeWcI5CIEniaJtHca5/i4eXCYPVn/Iew==
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Dave-Root.srl b/rpkid/biz-certs/Dave-Root.srl
index d6d39e5e..0c32cf7f 100644
--- a/rpkid/biz-certs/Dave-Root.srl
+++ b/rpkid/biz-certs/Dave-Root.srl
@@ -1 +1 @@
-95A09442278AB7D6
+95A09442278AB7DC
diff --git a/rpkid/biz-certs/Elena-CA.cer b/rpkid/biz-certs/Elena-CA.cer
index 04d93925..41d6b730 100644
--- a/rpkid/biz-certs/Elena-CA.cer
+++ b/rpkid/biz-certs/Elena-CA.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHTCCAgWgAwIBAgIJANw51pG5UQL1MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgRWxlbmEgUm9vdDAeFw0wODA0MTcyMTIzMzla
-Fw0wODA1MTcyMTIzMzlaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgRWxl
+MIIDHTCCAgWgAwIBAgIJANw51pG5UQL7MA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgRWxlbmEgUm9vdDAeFw0wODA0MjIxODMzNDZa
+Fw0wODA1MjIxODMzNDZaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgRWxl
bmEgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDheo8bzzgwGwVP
tGIl6jTTe/WMy7nKUHG0AJZLBMEZv62JVxBauroeADfhEzYIkLxhnclA1Ij61u2J
SxHpmLf+mD5xJyhJwiOA9dtcnqMpUq4nql9zg5oOID7XMlPZrNmNEDqs7f28BfT6
@@ -10,10 +10,10 @@ oW9o4aBHO/GNR1uC+I76Bpl1vWSAcSatHB8xNsF74JhQNq36j6SGPSEiDxHXgX2V
GchwltTfDvYB8Fwc6w4/bvQXfXGdE9KoSVsh4BTFrV4TX58CAiPdkHBLQVU0cvl+
2/gxLPCvAgMBAAGjUDBOMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFDUkefOGghlI
UfR+9vX1DOe0MwbZMB8GA1UdIwQYMBaAFH0pngEFpjbgE0OUC7c5ARkAkJ4OMA0G
-CSqGSIb3DQEBBQUAA4IBAQB6lftJN9kSqORGNCDh6FeJTJylDVKc8Lc6PlykPDju
-NGsIHHQBjIS0BSfuI8hwoDXPEoYikjWtiMnTprfEz4XUwY1KdDvFUcf8YNcC+XRK
-AOMQPv/DRswNdkqv6D95kgAOHIzmfCl72g+0QvpX7UoKakei20PdWlFAMbjvwtJU
-/4Leaq86qcDBU9ySBOWHHcecfsyXYT+Ce0e9qwfsmMbiIcLzx8DRJ9cH3WMHsR3I
-ihdWfv6CQmkE4X2knVv7LxXdMsFdLW5A2i8z0QB8vmQdW1DoGbY4FNtow4yhz2vD
-r+w8+AIpCMEmSd+nwRVDeSSd7+QFpmHLEDaqh3o4JesV
+CSqGSIb3DQEBCwUAA4IBAQCVSn9AiMa5Jmeb85b70UEarjqLm3aCI+5urKauDIgq
+w8ltQs+IhFH9C2blJXSxIWJYVhlWGWZuoG965CfOtv0SJlbKnQ2msB3BK++erDH9
+xuRB80uZGVWoIXIE7qvsYcBl550lCfmDxkIT5FfN0IpCOns9uy/wB7NvJ8mC9Nz1
+cNDoPf1dySeW7deEx0WsMr1b8UCMQbNdqjf/ZI0FI4uzUE+444tMpA60fqD30gFr
+VS8O3ItmUB54zyMi4C/J/+Jlq3QTVYqE6tnD1YbQDgmzxV/pOb1ZM2GK+cG1XVnC
+SMGuuL2NWF+Wt0SDK17BUfne4DPBszrBqDS5DEhseW20
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Elena-CA.cnf b/rpkid/biz-certs/Elena-CA.cnf
index bd8d7d1c..e440fbbe 100644
--- a/rpkid/biz-certs/Elena-CA.cnf
+++ b/rpkid/biz-certs/Elena-CA.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Elena CA
diff --git a/rpkid/biz-certs/Elena-CA.req b/rpkid/biz-certs/Elena-CA.req
index 743fd18d..5912de56 100644
--- a/rpkid/biz-certs/Elena-CA.req
+++ b/rpkid/biz-certs/Elena-CA.req
@@ -6,10 +6,10 @@ t/6YPnEnKEnCI4D121yeoylSrieqX3ODmg4gPtcyU9ms2Y0QOqzt/bwF9Prtx0wL
YiJ87qQ8koZqZ4ROtoSB2uuijrOBSEMkNhqoweJ1T8nedNMiWDD6HwRAF5ehb2jh
oEc78Y1HW4L4jvoGmXW9ZIBxJq0cHzE2wXvgmFA2rfqPpIY9ISIPEdeBfZUZyHCW
1N8O9gHwXBzrDj9u9Bd9cZ0T0qhJWyHgFMWtXhNfnwICI92QcEtBVTRy+X7b+DEs
-8K8CAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQDfMOoML7luTIWr5gGWeph0EnpY
-Cl5foKYn34FuMZSw0ZPU1WOt819G1YVZ9hND0M8d5rQzcsc91DjQ6sVtJIUtuSvj
-5i95s1tn5UZHuEuwdq+4phMjAbfgtidxZs5y4aJzp0+kL+NhrRlnKT3S0GAxQyJ2
-6AiVHO7IEJDjAe7U8hkKIJ3i1hQ16Tz+vSDr+KBlt3gUOLTgGW+jkJQ32jOEWhOu
-lFM61uag904sm6P5gx3bjVHHjwTb3FHYQFnQ5biWZklAC21Al74BDB4Cec9xKBHb
-Bp9UwJXXYTI2K1zr5Tlowl+p+yh6pQDMMUcDnxS2ADQk96IkQr7aZEEOHKlE
+8K8CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQCUr4N7J1XzAEtt42nZ3YwtFdNT
+ZXmQYcXbNLimdp1A7nlLWZljrA9qNTkajiwQxQy5DK/49r9OiBfyTnIl5/qZTS6H
+cfF9LkCpfy7d8Ugllony5Z/xPNJNPyrSvCSH2kZnKHOUbnDvwgr6vCnPB5nF6tll
+gM0uNxR7fDEKbpy4FBAx6pxM271ecFJ1PrKc5P5SAoh0sb2JItW1eeERWTG4SwwK
+c27MUeATRPnp9YcM35nV1vj3aqnQmVI0PVyyPuyhqXCPfopoBycjRSjrZCK5mFPX
+uEfhidaquj6rz/EYuwBMw6i+Awl6leUKu33UBO2zdKLYPHzW0dfn/opZFEQh
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Elena-CA.srl b/rpkid/biz-certs/Elena-CA.srl
index 22eff03e..dc63ea69 100644
--- a/rpkid/biz-certs/Elena-CA.srl
+++ b/rpkid/biz-certs/Elena-CA.srl
@@ -1 +1 @@
-BE5ADAEC3C739078
+BE5ADAEC3C73907E
diff --git a/rpkid/biz-certs/Elena-EE.cer b/rpkid/biz-certs/Elena-EE.cer
index d59a2184..f61b509f 100644
--- a/rpkid/biz-certs/Elena-EE.cer
+++ b/rpkid/biz-certs/Elena-EE.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDGDCCAgCgAwIBAgIJAL5a2uw8c5B4MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGVRlc3QgQ2VydGlmaWNhdGUgRWxlbmEgQ0EwHhcNMDgwNDE3MjEyMzQwWhcN
-MDgwNTE3MjEyMzQwWjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEVsZW5h
+MIIDGDCCAgCgAwIBAgIJAL5a2uw8c5B+MA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGVRlc3QgQ2VydGlmaWNhdGUgRWxlbmEgQ0EwHhcNMDgwNDIyMTgzMzQ2WhcN
+MDgwNTIyMTgzMzQ2WjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEVsZW5h
IEVFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA20zGWcQ9LkKL87A0
bPHIX4oDZplZHuC44zT/eWuWACyktqjqjWK+ZvbwceNOfamccCGko1FSFNRXs1OH
1B3MkOHY7OqjthjrvWoMuWDl6k2dMUmZiIASXJJPDXpXklA6YVmDXnYReYe3cc3M
@@ -10,10 +10,10 @@ dhTT7fEG70FMJF5M/bUyN4AfXATfE0IC7bRhfcsLs6VX1rzzhLk4FbgE6W/+d/xV
nrCVimWwH6xO/DxskV1GSYaASsyDzIbzjwQLMRgyPqfAc9PzQX0hAFFu2EmPRBvd
3NQjbQIDAQABo00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBRC+sYdSXpKjNo/7+e7
rcktSMpxSzAfBgNVHSMEGDAWgBQ1JHnzhoIZSFH0fvb19QzntDMG2TANBgkqhkiG
-9w0BAQUFAAOCAQEAoukhZnAB5Hs6JskgYVl1nfDdRZpGQB9iO7Tpv8iGOvWAKVap
-oo8XQAuL3hrytq2grIG6wR97xw6m5CPuqgfqONdEXp6fIKxlFSqL8gJNDFi5Nk+g
-qIR3ZoOPvxen2jvW2KOWvptuSDkISXGFn3C7rEoIvqgOZyj7Ubf+QLoJnOe3aQkL
-v/O1tkq4UXXCXEa8LkBD7vkfk+AmQA7xWs+MInq3DBRQ8D+5fc3FgvtIexbgIVQC
-4Hba5zu00YQkg8si4XTOUIAq81EajjgecNkgHwqogRMqJdI7JwnaM0+fbQ30Jm6w
-6R6bMdK+k3mD5uE5Wkzjvb5jaeyy3Xk1qsz5Cw==
+9w0BAQsFAAOCAQEAjhx+z0uZQV8wSi8Sa3YfmKwXu1BVg9qS7Y0L6P9SV8pH6XAD
+6Zz4vRtZldRlroQ3fIZymlCR8fHBU5KTscdl2kHWRuV3kV/p7YGSaRNSBfyFOXwm
+8rKWdRpfqy/xTBjp/iIeykdKIArICupZYdNczd2pYj4HKiI2n6g45cada1dLq3Vs
+0n2wTytCHvogOqjMu7x5D0y7qYkazOzgieb9HaBzVohxiNsOUvp/suxVKFGPEqsV
+D/FE335P1BXMVaAISk2uBWqGz2WDitCmVahlG7glicmtWAOddam5qCdlXSSjp4gm
+W28Ra+ack73b2wGQEJa+lfM5ntkGjKB971Lf4Q==
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Elena-EE.cnf b/rpkid/biz-certs/Elena-EE.cnf
index 126031e9..dd343585 100644
--- a/rpkid/biz-certs/Elena-EE.cnf
+++ b/rpkid/biz-certs/Elena-EE.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Elena EE
diff --git a/rpkid/biz-certs/Elena-EE.req b/rpkid/biz-certs/Elena-EE.req
index 69b845ec..b6f095a8 100644
--- a/rpkid/biz-certs/Elena-EE.req
+++ b/rpkid/biz-certs/Elena-EE.req
@@ -6,10 +6,10 @@ zJDh2Ozqo7YY671qDLlg5epNnTFJmYiAElySTw16V5JQOmFZg152EXmHt3HNzPXD
ygfpwbXEUGfWaaZwvwiLDQKK3RHppDTJPx9xD3IK7AD2pGH7h+SfnuQWsB4KV3YU
0+3xBu9BTCReTP21MjeAH1wE3xNCAu20YX3LC7OlV9a884S5OBW4BOlv/nf8VZ6w
lYplsB+sTvw8bJFdRkmGgErMg8yG848ECzEYMj6nwHPT80F9IQBRbthJj0Qb3dzU
-I20CAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQAlRnvSyz3kmqYWx06NF/pAksHg
-SjUiL7rxnl9/9kOwAUCZV24L4M4bUtcM9W99AP6snTB/xLhAfWcAUa0F5s+sLC8s
-WVMMitm7ykjRX4ebP0PvTk1eM3SkzhE2nq12493n2pmhmfH+MoHhE8QMBZN1C3t0
-VE5lpo75Avl+zvH96hPJGwKbDko8zaaDFODctq23O6mTeZsUC/mrDw/uq08L/czG
-JJU2A7k7/AAZ+0gAiaBIC0sb5rvT8EkswvOZ1wwT9HGSKHM4lS1BQtK8m9olH5MI
-ul4C7nmpK/3eCHBdZR81Ecibb8mU831B4pp60uiJZgmyQihCN3YyDb5+QKFG
+I20CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQAk+mqJXKC5mVZ4qDblAH0P+qlH
+FQnx7D5z2xZPffJQCYeibO2b44Y8Cu3PBnpFDHN2ErK2bNlHqHdzuimYfnY9Y3hK
+cYaOv/lsduqKFFh1u8MJHujlv6cxPuRWnXicryD02ZxQ7od5hYs0jyoe+EDtkqpk
+KMNB2rT6wdD54bwoYjg6uVdIIEoEpts/3pIun9dSWWJFW1m97uhzjyIYyhY5dFko
+twlsfdG/cGe0JqqZVqyAyncPDPMlXYIsFOdtnoWTSnBawrNtUiDTKtSVu4gli/FD
+tw1Ir+CDu4RGY9oz7w307Z893EUbycb3aSS716OPw2EsX/H1B3IBTwjECN+f
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Elena-Root.cer b/rpkid/biz-certs/Elena-Root.cer
index 64e03a4c..9cce6c19 100644
--- a/rpkid/biz-certs/Elena-Root.cer
+++ b/rpkid/biz-certs/Elena-Root.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHzCCAgegAwIBAgIJAMvOQF1cAaikMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgRWxlbmEgUm9vdDAeFw0wODA0MTcyMTIzMzla
-Fw0wODA2MTYyMTIzMzlaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgRWxl
+MIIDHzCCAgegAwIBAgIJAIQo2n+cKhh6MA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgRWxlbmEgUm9vdDAeFw0wODA0MjIxODMzNDZa
+Fw0wODA2MjExODMzNDZaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgRWxl
bmEgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANfp5CkWcw3a
9iz8WT3x/A0NZQERIIziGApTWEmVhXxBz2whxF0JnAp1vkUOkeF8kOK4AQu2s5TP
jwc0dIlZ9pJk6X7jsuVry+uGNe0DJdYBuxFTYyzZK29M79qXZF17yU0ENAE/9eMA
@@ -10,10 +10,10 @@ NB2dqjdkJRr8wGN3fksS58JcGo4S1BgRqpIGdaAPogI3/Rp66xEDYmoWUhB1jvPl
uqQ+w0dj1h9eNEBigDwO5gyjyAs+lljOwj2GCzhffaTvsM190oSbCrU5uvGX02bU
493dsxFZbfsCAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUfSmeAQWm
NuATQ5QLtzkBGQCQng4wHwYDVR0jBBgwFoAUfSmeAQWmNuATQ5QLtzkBGQCQng4w
-DQYJKoZIhvcNAQEFBQADggEBACdjl9v+dHtb3VgkczedDBZXcWni53Jg/UekKz46
-OTB+8jnvf2bQQYVX1MkhPlOCCSuf9CNKNqLTri/cCF3s/yCv52WEvKz6c/c53b91
-uqMfWtGbijLsRQ9Oq/HlMlKPy8Ny34BXLDxZecLgMkK7ICdsBdOhGNiEw+RC084H
-eHTKDmL/V3bdFgfSfXwfXqsKQP1iY1tZxOljOIpVxeamks8jbdlo5U+j95Yng/9m
-8f7ZlIGiIAtavtxryiORWTE6PlPV4Lq60KA0+WCekEojWLF+FreL/EI8enFJqVKU
-5JYtXOnPw8AcQYuU6aAz2krPBR+f5gAyEmQVqEpoREIiR10=
+DQYJKoZIhvcNAQELBQADggEBAKB2NQ6sXC2pzeztL3w47Ys0lWmYiSzUtQ4zOmhL
+cwVtIm3bqopHceaiJMtYBahljvz/CRvyKziS5OgLXXlWyCSGMe/JQ7MJysyHKNoy
+PE8FcDormlTmu227OMaz+vssmwIVCKskBxtc/nB0veN7nyhpOPZFrBsV15R8Uh/O
+075+wRj/CEX1F5u5IASqC/hQlEO5nbINFd93/Sh6bZT0xXJ9qm1LFhITBig1sQaQ
+ARhlnMYK1hyp+x1vh+Mylw0HX2OP5EgTDGyKT3+wbaFQ68kzUXPs7CZSGYh0FeCz
+2uOYb/C9r+VwjLG/Os3V17pTpaQcS2PvjcyUznpZ9N8Mikw=
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Elena-Root.cnf b/rpkid/biz-certs/Elena-Root.cnf
index 920e7c7d..9123fb90 100644
--- a/rpkid/biz-certs/Elena-Root.cnf
+++ b/rpkid/biz-certs/Elena-Root.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Elena Root
diff --git a/rpkid/biz-certs/Elena-Root.req b/rpkid/biz-certs/Elena-Root.req
index 6797e57d..2ed96975 100644
--- a/rpkid/biz-certs/Elena-Root.req
+++ b/rpkid/biz-certs/Elena-Root.req
@@ -6,10 +6,10 @@ iVn2kmTpfuOy5WvL64Y17QMl1gG7EVNjLNkrb0zv2pdkXXvJTQQ0AT/14wCR0eIH
QIAlek6MruyOEvZ4LZ9yH1S1YwPTPmXRpapbyKPUp5tc0X2KFpmKP59j+nE0HZ2q
N2QlGvzAY3d+SxLnwlwajhLUGBGqkgZ1oA+iAjf9GnrrEQNiahZSEHWO8+W6pD7D
R2PWH140QGKAPA7mDKPICz6WWM7CPYYLOF99pO+wzX3ShJsKtTm68ZfTZtTj3d2z
-EVlt+wIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBABYl3Zj1P04ONOYjQrKZ/BR5
-u2IBr0S6NgwNK2MC5kyCUjEkunaIO6qSJOfcbuo/EI9GAkNJQxvk1zXfoPAAs9o7
-te39oCtHb/hUnc/jaoFQmrpTC9CmUSzotcgasoc5NdVE5pjDwD1ba/RecQZh4PMd
-ndC3COKH2ssCZnEdqZmgUUsd0s94Gt1/1FP6YuA6FabBIsMK0RkAaMswpia6/I0g
-7Gjarc+eml+NoO0BPNdjUItFyen6piS60W1N+XcIM2Y0+cXM3JvkoyCBCKPev9j3
-ogVRXIczSPzRcb6jol43qnhKKFkfSDdovY005lspruxlJowTdy3cR7JEkwELxnI=
+EVlt+wIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAL6+70RrmPjEz6l68X4p2DLi
+PQSpmnTkD8hkPirfE3CYPIbOF5hk6HyjD2eOedBv9jCZkr5L0MFsht7Ob16A/v7Y
+FfNU7JMXyxTjQpOjipGdlUXmt/aXWaP2racg5HdvYlGXriWsCYdwMyMKLmV/is5h
+0YrKvzKd8jB5zcXwoaIIhOavbokpNDaXb7430IE4q0LhYC8d8CEZJJlZHYttkxZR
+SO2PpzeKyuyTKRxAOQDx3mX5Is3ktTtUaMKWMkkSDFmUrvRUXjHzmQQGhejpCzQc
+ZyQZSxmgWgCdKi7KbAiqlA4MSfCSNy3LEUnqY964/TeNjxbIDWShmd5uEpHSX1Y=
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Elena-Root.srl b/rpkid/biz-certs/Elena-Root.srl
index de32a173..4c685441 100644
--- a/rpkid/biz-certs/Elena-Root.srl
+++ b/rpkid/biz-certs/Elena-Root.srl
@@ -1 +1 @@
-DC39D691B95102F5
+DC39D691B95102FB
diff --git a/rpkid/biz-certs/Frank-CA.cer b/rpkid/biz-certs/Frank-CA.cer
index a9663f0c..278af020 100644
--- a/rpkid/biz-certs/Frank-CA.cer
+++ b/rpkid/biz-certs/Frank-CA.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHTCCAgWgAwIBAgIJAMqO64hXw9BGMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgRnJhbmsgUm9vdDAeFw0wODA0MTcyMTIzNDBa
-Fw0wODA1MTcyMTIzNDBaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgRnJh
+MIIDHTCCAgWgAwIBAgIJAMqO64hXw9BMMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgRnJhbmsgUm9vdDAeFw0wODA0MjIxODMzNDZa
+Fw0wODA1MjIxODMzNDZaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgRnJh
bmsgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJIEuqlgIImsHj
L64vwnEuQf1LEoj0N5OzZ8bXB0/kg6cCIZHpp8mxN75/SXRvQbgEGSt5oeb1F8cU
4sVl6YJ4/1dETDUgR38Txw017vrXgUTusWXEw+i8lBwtlnK5XNUfGJPOoQR3C0Wn
@@ -10,10 +10,10 @@ njpXNz70pc/2P0BA05f/rH4qjVafpiTYq/FeINdDWT69ohUEblOrAuM9Y1WO7uGU
XGanWyEDlhHU6NwiTfwXdnPQ3YRRxuCz0f3MJL98GFYbWAkF45aERUGkZ1OlRNEM
3SdA8ezzAgMBAAGjUDBOMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFMGFt7dtC5NJ
e0d/9mIHY3wsSBxEMB8GA1UdIwQYMBaAFOUmkyh0+BWywAg8nf1Gl2JtpGJoMA0G
-CSqGSIb3DQEBBQUAA4IBAQB5NOZ+2fbNs0SMnBGHjLvKl2Z+/Mxnw6n6dHUE18Ra
-rQffsean6erppszodZ9I5Xpd2C3RpI+MTVi8x3ZMH5VaDVxU9i3lfzKWGwfGKoCT
-48Jt/WA+QsUqvPKgEgIH0ryvQJAjBw9eAQ9n1rmxaoibOrBe9mF9CP6ZZWEA/IYh
-S/K5nFiKDIg6vxPtC14oHwSqZvNOMUXG4V+L865xNA8jL1+alyqNxN7GXv32n2V9
-7V5bKRblXTi4BombRV/L/spM41dFztPD3Y4iOqqu7aS9EPs0ZKwHCaE6HxA9ZnDq
-OWPXMXGVtocjGKtz9qyHsAfLEzmwvdjsBxNQqfj+m5wB
+CSqGSIb3DQEBCwUAA4IBAQB6kfYmqhft2aC1lVRTf5GExpAkzm1Z19AQAs1l8APf
++KuSBV6x/SDefBf95dY+23rGNPu2IxFzOoM18Zsl5fS5ztvjIlFjchaoOxOfE7SQ
+yGnbo8M7t78QyecbBdkS6HT9Z2Ob9RyvAZXWojTUQWcSLkm8clIiZzbKWDyoAXhF
+3RpNkSl0LDilQhxiK+aS2WEKaVwGjQoNCXxBo3jGFJluS/ceSgYUsurhjOBeDg7m
+aKwryteNDg7fI5cfGEbp5Fh1P1spCJVlwQrV8aWSb65uO41kvyQxzgmIc/3iarp5
+NTU0OoeKyBAwYphXtu4b9T1njiiRLAWATp9bXxXfxD6x
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Frank-CA.cnf b/rpkid/biz-certs/Frank-CA.cnf
index 97703886..25208816 100644
--- a/rpkid/biz-certs/Frank-CA.cnf
+++ b/rpkid/biz-certs/Frank-CA.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Frank CA
diff --git a/rpkid/biz-certs/Frank-CA.req b/rpkid/biz-certs/Frank-CA.req
index 6946aea2..a4a5a41a 100644
--- a/rpkid/biz-certs/Frank-CA.req
+++ b/rpkid/biz-certs/Frank-CA.req
@@ -6,10 +6,10 @@ gnj/V0RMNSBHfxPHDTXu+teBRO6xZcTD6LyUHC2Wcrlc1R8Yk86hBHcLRadrQzll
cuZpe4qAotxZp1au6hex8ICo9pu2MIV8lvHaZsFczJaA4aa/X0U75FLcHUqeOlc3
PvSlz/Y/QEDTl/+sfiqNVp+mJNir8V4g10NZPr2iFQRuU6sC4z1jVY7u4ZRcZqdb
IQOWEdTo3CJN/Bd2c9DdhFHG4LPR/cwkv3wYVhtYCQXjloRFQaRnU6VE0QzdJ0Dx
-7PMCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQBcEtGyCsZojfSMMtSjE0pKSBhx
-j2WE6QNlGsWVrzDrBn+yPf8YhYWtTmJcf5pANcyODuNLMxP6EO8pfGiZlijgk1gp
-C9fUBr6iVorkUQcsjRKmS/LqrEHC/V54pfeaLU7k8o3EgveWMHUiXFjBaUzBK74V
-6sPOMLAziCq2TPOiN9CSgTlDTfyugPzRvqRFNTm88wPT2YcgWr/ZO7R2rSafZFX2
-oD96AfqPsnWWAPOeqtyOWiF6eNks90r3PoKYWxpZZ5A2ijVPrZSYtYUIeyJqE/9f
-FPeLadoTEFdJ7/sPvtVTnj9O7oF5EERSHbxaWC6TCT79NF3SLxfyK+ANxawc
+7PMCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQC9cUvGjH78jEI4DkDFHFS6bzou
+/rUD9tvrWwDPwtUTRm72dZNUrJj/tjxJjmVmtjUN1SNLmdsDt3qkMtaJ9HO/xy9B
+y3moD2EFqvANFBwzn6s6Kj1XASve3d/Vx4HvEbWXsUOOw25xIg7rePNZ/C8qPh+D
+hGu3S4w9prxwI4JnrhprDSleA0FOV0krlptTKvIV0B44K6N9A4JTCmRJTln94d3V
+imO6H9+itHCEGoO6TZDNAGxD9w18utFvriD+CsPiPSRNKL5OwC6UIoq59qduVoEz
+LV+Rmxx1LA4qvObhUrUmj9Ss85ZNbZWXn63QX66Zt7yW2yNyFNkNNFrBuI2e
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Frank-CA.srl b/rpkid/biz-certs/Frank-CA.srl
index d41b34e4..2aacfb2b 100644
--- a/rpkid/biz-certs/Frank-CA.srl
+++ b/rpkid/biz-certs/Frank-CA.srl
@@ -1 +1 @@
-B05767B1F50A040D
+B05767B1F50A0413
diff --git a/rpkid/biz-certs/Frank-EE.cer b/rpkid/biz-certs/Frank-EE.cer
index 76c2f0f7..8b77940b 100644
--- a/rpkid/biz-certs/Frank-EE.cer
+++ b/rpkid/biz-certs/Frank-EE.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDGDCCAgCgAwIBAgIJALBXZ7H1CgQNMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGVRlc3QgQ2VydGlmaWNhdGUgRnJhbmsgQ0EwHhcNMDgwNDE3MjEyMzQwWhcN
-MDgwNTE3MjEyMzQwWjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEZyYW5r
+MIIDGDCCAgCgAwIBAgIJALBXZ7H1CgQTMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGVRlc3QgQ2VydGlmaWNhdGUgRnJhbmsgQ0EwHhcNMDgwNDIyMTgzMzQ2WhcN
+MDgwNTIyMTgzMzQ2WjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEZyYW5r
IEVFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3W1VWDmwozts2rpm
4vU3U/SJvaNRYUISNDiNsdj7rEekcoTR8J+MdgDjV/PEXv7xRleKUf/H+HRrG25h
XL+xJSMTowWvSEuNaGB/gCFOhbFKLHAjKwvV1eMsstpF0oYSARjPpefF6BMhTHmq
@@ -10,10 +10,10 @@ bu3hcnr2ubBscGZIG6PynmP+xLnkSQs2b9gMaksBdgvRFSYJ5g1mcxr3zR4igZI9
I4mSxqMbQowmJJSuWZzHIzyxteuD04RIPAjJvwA55/5LLrdVs3VqMlRpsUCetPXx
fckxGwIDAQABo00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQIHkroA9j7gpwYBb2N
or9xU9cpfTAfBgNVHSMEGDAWgBTBhbe3bQuTSXtHf/ZiB2N8LEgcRDANBgkqhkiG
-9w0BAQUFAAOCAQEAYLQHkUcPITkSzeysIP8uMOTQTZbUeS6MsBdePunQcRMEV/ib
-aLs81f+p2pVOQGObpCFe1Ftl7V89KEhnr62C5HhkE3J8OF5yqJlDuoX7oXzFgLLi
-MwibbXw/WfgU4broJgLiVmV3g9Z2469+pl44Xc/Q6uSB6eOZQ6pzwtmUO5+v8zxN
-uW/+2+noVGHSILkfMUg9RbtD52duCD9xJmVXm62loC6psqCFNCn667SMMmbzqtWd
-l1tWdUBQ50Pi84SKn4FRIi3UhhadsJYT7vr1R46LOE9dsL6Vkc7HeocDth6BySK7
-35ayTl7R1AC5pP9JmePN4RHYRkKG7Ecjd3WmRA==
+9w0BAQsFAAOCAQEAmvd3MSWW/+at+7aSRzl/792QX4uJk2sFn9Iog8XI9VeHYx7S
+EPP6WOyLEoafPRO6DVsszj1J/0Zw2A5Gs7rj7h62wTiio9tnsm2j4DI2Vz263+8/
+BDjN8ZgJG9xbr5fpbWtYkTGv5hc7JrCQvkoFrxUfsbTpkS5SK/iQGQERDrlMR2Wg
+4X+VuTd8c6ZZa0CUFbKwsJ0KBfXktkyn439yIaG+zfzbtOT6Jh6mNOpU1j8Ln2OJ
+L0ool8Iz3pUyfdHzq1brDzoTiyfZrtbmq+/Acn6eYjxm9geE3B4OC7+SfRVfK3Km
+FVdVAEx5kquh4wsTSn7Sn7tFH1kpnUYpy6GMwg==
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Frank-EE.cnf b/rpkid/biz-certs/Frank-EE.cnf
index 68f62d38..4fa64261 100644
--- a/rpkid/biz-certs/Frank-EE.cnf
+++ b/rpkid/biz-certs/Frank-EE.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Frank EE
diff --git a/rpkid/biz-certs/Frank-EE.req b/rpkid/biz-certs/Frank-EE.req
index b7731a9d..0c2466c0 100644
--- a/rpkid/biz-certs/Frank-EE.req
+++ b/rpkid/biz-certs/Frank-EE.req
@@ -6,10 +6,10 @@ sSUjE6MFr0hLjWhgf4AhToWxSixwIysL1dXjLLLaRdKGEgEYz6XnxegTIUx5qkpn
k9c8qjxT9LzosmKUW508tvCH5M8XLBfmeRLzLo6p74y3D+QFzmFUgwu69Gc6UW7t
4XJ69rmwbHBmSBuj8p5j/sS55EkLNm/YDGpLAXYL0RUmCeYNZnMa980eIoGSPSOJ
ksajG0KMJiSUrlmcxyM8sbXrg9OESDwIyb8AOef+Sy63VbN1ajJUabFAnrT18X3J
-MRsCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQAS4EWFkN0KI0PkZyTKOYJ6S9q4
-UyEjMi7fgTJuRSMPpKiMDv1l3suirbPhnW3+yRau++h/Wxa3xE2cgHmFdFSGsp9Q
-GpGiw0xy9/UHmaxuian+Xgwo5iYBsAXks+HnrXjpj+PulLPHtX2DqYTjOLk/T9aZ
-ue8OKClukL4G+jmYptY4ILaufmnqJHqPv+JBdZUJT97LFEGVLdv0TD5pzsuSQu+A
-eJJ5SNAUyt1PF6zhC8ZJAjL1ZIa33y0dI0iKbx9G4cnnL2cm/3SWiHGtXTzRGunh
-4HwhKMr+Y9A6VKR/LT3Gbkuvih9G3mnVDenKgjKXb7HGhfkWtE47DZwjBlYd
+MRsCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQCYUJd1QhqIZnNayZkb64fs1Zae
+10S80FKLSNbbqYrRwrIMvpEV3YUeamG0hCSs2lLC17m6NsRhEt48i9Hbag9yTxE6
+CFFxK8iQ8DM3Dnu9cUtJHnjkM1PYyCR0fMMBSciOyGLUSqJ/W3aSRY4R0ZgMlBnm
+9GLWxDAf+PBc3WWLRehwa7XnVcxg4u9b2gODn/b1on87icf6NvBPZGcJ34UD/qTt
+lkpHTdSNRzRxXngsyZaibzxCOBxCYszog5T+FHTQKG8SkKWM8XEtKg2mnF+1SkCF
+hWRvEE/H0NoJ+f3BU/wCpWeVAbY3nGz7ouzm0QKPFQ1rEGU1uIlrJueC+niL
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Frank-Root.cer b/rpkid/biz-certs/Frank-Root.cer
index 1d9a66aa..53f858ce 100644
--- a/rpkid/biz-certs/Frank-Root.cer
+++ b/rpkid/biz-certs/Frank-Root.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHzCCAgegAwIBAgIJAKcxLsup7/Q2MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgRnJhbmsgUm9vdDAeFw0wODA0MTcyMTIzNDBa
-Fw0wODA2MTYyMTIzNDBaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgRnJh
+MIIDHzCCAgegAwIBAgIJAJQ+3g5G47QhMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgRnJhbmsgUm9vdDAeFw0wODA0MjIxODMzNDZa
+Fw0wODA2MjExODMzNDZaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgRnJh
bmsgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOy5GeJ8pCtu
S2QhidJecLQ8gpeDxUS6z075A8VIowtNOiywceeZLWNCcSG0YSYnHCyQCkCAtEb7
mpTWHPPId8cd7CcbHqIKZNw7mhzmRVPy6+ZS1GQm9AXK3p7yUj2Gl+yxtfFXWCxz
@@ -10,10 +10,10 @@ qjrP/1HDmjIRgBrzwibRcPhlGPx79k/GQwxQYWB1bjfQiuZYsVKoWMhMaHTcWUKa
o4ZJNpBDZM7Gc62bYGuwlLITSr1MJtwgNZKmTAslunHx8SBf6fp56iVjZhqzB3eP
szbwC/HL4EMCAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQU5SaTKHT4
FbLACDyd/UaXYm2kYmgwHwYDVR0jBBgwFoAU5SaTKHT4FbLACDyd/UaXYm2kYmgw
-DQYJKoZIhvcNAQEFBQADggEBAD4UBQ900fJ5Gtfbmy+JnOXdNtBGVOzlXVZ3DyTy
-xlEZpjKfkfyHsEaVeZkhKK0JeLiCQ7wUsn/VZJ6CxRBXlyPsBsOy4mpG98lsAOaE
-c1aIi/hQi3pQISDzn0aIEGvHe62uHK6N0rLlOrxyYzEhFsf8utqkL0zPYvGgw55Q
-QMVuKwDX7STjO+a5/fq76VYN2eRF5dUHIXCC9GjiWJMSNVxcdHIBPu7NbMBj5TI7
-mkMKdkVOTnw6T48J09pg7j7Xu1qg3FzEOcaPsNctbN4+FVhuTV3G8EKQIPlCn1l+
-ADO5rSvMYncq7w8yF3RPEllgOGZnHeiUz8HGCXasIX7UqEU=
+DQYJKoZIhvcNAQELBQADggEBAI9S71UWpRbYuugjxjl217BTfOHuzayDEstEs/Bd
+0t9GoJZfj9zIiUWy8rJCSKyNP2uCdmvFPDrrXCRqFMoDcE6slqo2bm5gjxla0u7A
+ENdGW6xQg9fDC9wnDcFGGnTPciERfXeabv0nfeA+vVzNCOXkrfFdm9qo3P/WtKKg
+UTdug2CLRkZ3huILDzPANkwRCr7yJafD7QhTtFzca7VKtfttRDpd1ZAEmUNsgYET
+4hq3wrqLPlyFMWIYPDqbO9gwPn2bGjk+QzWVYtfksoq3++zcn4rxJeTQfafYqTXu
+11o9rTDgNBFcTOeM790LH+lYyFlyb2kPVIJj7R4x4hhl8RE=
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Frank-Root.cnf b/rpkid/biz-certs/Frank-Root.cnf
index 8993417b..56021ed7 100644
--- a/rpkid/biz-certs/Frank-Root.cnf
+++ b/rpkid/biz-certs/Frank-Root.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Frank Root
diff --git a/rpkid/biz-certs/Frank-Root.req b/rpkid/biz-certs/Frank-Root.req
index 6dd4cbdd..2fe82ab6 100644
--- a/rpkid/biz-certs/Frank-Root.req
+++ b/rpkid/biz-certs/Frank-Root.req
@@ -6,10 +6,10 @@ b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7LkZ4nykK25LZCGJ
I5I3t7K+SMseY5GoG/9QDX0z6Iuc8yMsppC6DLgn/pmO7S/Yuqk9LxfOHu2qOs//
UcOaMhGAGvPCJtFw+GUY/Hv2T8ZDDFBhYHVuN9CK5lixUqhYyExodNxZQpqjhkk2
kENkzsZzrZtga7CUshNKvUwm3CA1kqZMCyW6cfHxIF/p+nnqJWNmGrMHd4+zNvAL
-8cvgQwIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBABf2mSgwPJc8lymCczXp6AtP
-38P+hNRD0UV3zirySIE6XptwHoPxkOoCMHQyDULEH2CLQ2JTJ7New7FRYf2OFPLS
-CTpVhi+3qS7k+zlfc1vH0rdlDlVm9Lt3Qi3yGzhreoxDaq9kE4SnCKG4q8vsWl2h
-Djicil/CoiyH7+Mk7RzUNGs37UyoifZF/uA6is3xCg8wflgabDRXqebDrmIFn7rZ
-ox4jiDL1Ym1SBhJRBCh7+ULCZQXtk5005KwrYETt2wbb4PzwxnAiTpkHjfy9qzEk
-NOhc9y2Urpk15/UtN3rhFTyK1mLbyeGU4foCzjArRvKGL4ueC89NpMe94X8F1b4=
+8cvgQwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBACAdnNeB2hfa6g7miAISjqwC
+QYJegS1b2hqrtN0GjJ13Owcf5r6unlWT8X22G3RSZAO4TSFFlTGd3EC2RxQRjCw0
+RIF0QYl632mGDjmXQ/BVDOdqXL7FbAvs36Y0IxeBGN8D5kcwkQjIfrLijFAsAWny
+MOZqZylOklAqclGNhTjTNareiKszIcqq6tOQ//RHZga1mv3/z4XqVzZ8BXXtQg0E
+Eo73jsL2ilT+PxyRCEvpGxsfJU4xr4r3msSkLxDTlxDY2w5f0hx4oGWZ0qKwX2+9
++4rZDs8aNKKpFC31f76uc5GpIwf3TzP7HNYx0W7znfocIBpz8rjdwV5xiX+bMBA=
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Frank-Root.srl b/rpkid/biz-certs/Frank-Root.srl
index f190ed2d..478b2e55 100644
--- a/rpkid/biz-certs/Frank-Root.srl
+++ b/rpkid/biz-certs/Frank-Root.srl
@@ -1 +1 @@
-CA8EEB8857C3D046
+CA8EEB8857C3D04C
diff --git a/rpkid/biz-certs/Ginny-CA.cer b/rpkid/biz-certs/Ginny-CA.cer
index f8a298d2..2fc5b926 100644
--- a/rpkid/biz-certs/Ginny-CA.cer
+++ b/rpkid/biz-certs/Ginny-CA.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHTCCAgWgAwIBAgIJALTKl8dxTDdFMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgR2lubnkgUm9vdDAeFw0wODA0MTcyMTIzNDBa
-Fw0wODA1MTcyMTIzNDBaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgR2lu
+MIIDHTCCAgWgAwIBAgIJALTKl8dxTDdLMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgR2lubnkgUm9vdDAeFw0wODA0MjIxODMzNDZa
+Fw0wODA1MjIxODMzNDZaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgR2lu
bnkgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDueidWFU++2YuK
aT8Lp+y67Miy1FgO1UNxyCevP880EoJ6tqDVRAczLh3uDJKhZ5pt92+/m6PPqpUq
QtJQahjk55SRQQisnqC7dhkCnF7pXQPR/qPFzimtgkLXielt8GhvZSrqdxDdDnnL
@@ -10,10 +10,10 @@ TM30wQ5AGdjQE2IRHk7M5uG7KqDmVdMX+pG5fmma/ir9jSeKXGUV2BPWmsh5sQhn
DTrZ/qy00q48uzPBCKiOnm1Rd6ygNAohDcZYeJGZ3naqEeCPpowxTg2p7IocXHEO
LmBo543RAgMBAAGjUDBOMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFAi99B5feyZ8
vA50GqPZAVnvFT2NMB8GA1UdIwQYMBaAFGMacgDTvnPGawQ5u/vXgL9dHca6MA0G
-CSqGSIb3DQEBBQUAA4IBAQC7YpdtG8IvR9WywStxRAEtwi3Ojvjsq82tWuAPIYPB
-Tm58TBY74l1Z70nItllyTX5kL28W+TZLIoWDfd+7zV8cLGjTA4QbYWvPqfGgk5s0
-3MJJHGWAcnd4VmN5hxOCJCxIyZIHu6mYV6NfzD7X2vNJk1wbDEru0/ASuVra2PMt
-GNNFUAbkntYRxXm11V15iumjN5aObSZy5acE1PP4f4C5YMuUrbotnafBDyteWPgC
-PHn5rkCR61fnPutZhEihVSeCd6WXOIs7jW6ooEzS8mOZcFgyc4UlP7KZ1ym6bQ7h
-1X+EAVjNSqv1oFuxsKGfdBX8tI+0F4q5x0VdoU0Re8Tz
+CSqGSIb3DQEBCwUAA4IBAQCwjs/inhO/Mbl95K6OdHySbRwYw+oRXWQk8JLV9Pgo
+uOnNobwDw36mIi4p0HUv1pXEq2JXK7rENhSYNvzh+Bz2+kSdUJVY0tdo8NdFrr35
+L0qyvXe4X9qQWhqwzce1NKnCzG90qVPXvIwHetUeZau4TX2vzyV8li17fPJL+Y/g
+vD2rc6Sw4FP3AUtOnsPVbsNHdRLSAEBSfVHakMp+fcfpzG11Yb86kOa5q9mM7Ufn
+rBv1IGtznggV7igt6+jPSrskvPNFHrTBzyqjojLWdVHF9JSBebXYtuJSaOWRud1j
+1vMXnhYzpgoWujdiZN/8PfKdCXBfk9nGMgg1DctG43rH
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Ginny-CA.cnf b/rpkid/biz-certs/Ginny-CA.cnf
index d1846a6c..af1e067c 100644
--- a/rpkid/biz-certs/Ginny-CA.cnf
+++ b/rpkid/biz-certs/Ginny-CA.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Ginny CA
diff --git a/rpkid/biz-certs/Ginny-CA.req b/rpkid/biz-certs/Ginny-CA.req
index 11b558f3..a88f0853 100644
--- a/rpkid/biz-certs/Ginny-CA.req
+++ b/rpkid/biz-certs/Ginny-CA.req
@@ -6,10 +6,10 @@ GOTnlJFBCKyeoLt2GQKcXuldA9H+o8XOKa2CQteJ6W3waG9lKup3EN0OecvEbNbn
OuDFbr4qEtGX2OArzUTUQivyHZjEj4tVsLLhjNzAtYeaBeVjRwhlOIOlHWlMzfTB
DkAZ2NATYhEeTszm4bsqoOZV0xf6kbl+aZr+Kv2NJ4pcZRXYE9aayHmxCGcNOtn+
rLTSrjy7M8EIqI6ebVF3rKA0CiENxlh4kZnedqoR4I+mjDFODansihxccQ4uYGjn
-jdECAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQCrxvWZm8ayOBmWic8G2Q2mTxRy
-n9oMtV3Iuqn+bGR1Xjd4HG1QfRlHNP7ekKh2z6jLiZ7KChwpnCeK1CnS48aw7GuJ
-s4KTzECrHWGBbV/eVJubnU1eDg+6tP/ZdVKVqv1frNKQIREaFMp8ndOUJ5FlXJ9+
-mNNQZzlcZxqRkxW0XaHoiMWETNMQYo7U9v++WZix9SuxpxKimG1OERAacwVYMHYJ
-NIBwLADzrOMxndjt2WVioyKmeicSM6POp9JjoG9RNgmZ7ALKP72zXObCS0Q94m0w
-Ky93o7iF/BWbM/M3pTMngGXLu4IFNmsp7X2bxGAeX5UsJuVxR4mlVhi3A8nH
+jdECAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQADAZr7YcKH2zPAr9gSU0tUTQCK
+fnOJwgFNJDFuQpwA4PMQhZSRss1BB8vElnrVACCWipPyvkiJF3pu28JCveoVf7Pt
+6RyY2dtvMuyyBWDWXiaqVWd1SqflK8sUwf3+Rw9ZtJgX8IxAI7RTCKqSsBzCtXmu
+LnixCXknTdVeyBhaCR7w6o/Azwpktxq3s3Yx54Q3EhLfzcdqXxt56G1/oZ37q2h5
+JlFRXqnd4qH9q3YWuUlC72ncWzGO9HPyn5NXXVBMDTsEB8jUz52FPFAeE75AF/x/
+PQNNH7sOeU8y8B/QFxLoJIR1mfv1xrAD8aYOgzOGuv0hv60yQ8ed6m70MxpE
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Ginny-CA.srl b/rpkid/biz-certs/Ginny-CA.srl
index a9e116e7..81c8c803 100644
--- a/rpkid/biz-certs/Ginny-CA.srl
+++ b/rpkid/biz-certs/Ginny-CA.srl
@@ -1 +1 @@
-BF28F27B89252DAD
+BF28F27B89252DB3
diff --git a/rpkid/biz-certs/Ginny-EE.cer b/rpkid/biz-certs/Ginny-EE.cer
index 121e7c2c..914b2380 100644
--- a/rpkid/biz-certs/Ginny-EE.cer
+++ b/rpkid/biz-certs/Ginny-EE.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDGDCCAgCgAwIBAgIJAL8o8nuJJS2tMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGVRlc3QgQ2VydGlmaWNhdGUgR2lubnkgQ0EwHhcNMDgwNDE3MjEyMzQwWhcN
-MDgwNTE3MjEyMzQwWjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEdpbm55
+MIIDGDCCAgCgAwIBAgIJAL8o8nuJJS2zMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGVRlc3QgQ2VydGlmaWNhdGUgR2lubnkgQ0EwHhcNMDgwNDIyMTgzMzQ3WhcN
+MDgwNTIyMTgzMzQ3WjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEdpbm55
IEVFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo373ejcZ6WwnTj37
FRnRx1+MJzfCQmslMRveBP2WjbiGP9Oq4O5+snORuDG6uIL60lsEOW48o8ONGtgO
k0URC/iWlI6+dP1NOcfq25Vn3FSD/HiRj2SoaBmZa13wGxzDtOiXwH6R6kYrQOqs
@@ -10,10 +10,10 @@ jkCQF7zjdPlnnxt/cKbow+JrCIX+B1B16Qmuk6PF3z2zdoTDyyUrn4ETLohzCnHg
5pv8EOU9NhzUZHUIloZI6NhE25a865fAoxMh+zmkqv2SG+/mU65Ry4nuoVRqyFbi
pOSanQIDAQABo00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBSAT1qp1gd5Bg2yTEdL
pA6OcdMKhTAfBgNVHSMEGDAWgBQIvfQeX3smfLwOdBqj2QFZ7xU9jTANBgkqhkiG
-9w0BAQUFAAOCAQEAtYinlwDeSmOTNoku12LjoLRyiTcMGPRsi+12hSEOrMm3NK3T
-6jzCRZ436h6tjDXCZwV5+5MqnvWgieT4ahWo7q82dYxV/+q/vmV3x6IaStW0bR9S
-0hCmZ/Y1Ned8AIDbisBP+aE1RjPUJqvPYkwwkNlFnUgnJCHtIt5xzY76iSx12WYm
-0AeBsUPFT2TxuY3NHuxO938wgUGBwyYWcDCkm1mCOvV6Sre8T8v/PtmWdPqAg+Kp
-JN25MHNWYmcnD+o1VALidukSslkLfRcWilHSF9/b8iS5BqNYwn6xY55kdhQpF5vM
-1kuL7B9RCMF6sZHHjVymHfXLMdiVbIzelKHhIA==
+9w0BAQsFAAOCAQEAPL5k5dPyAK+484jhNuruSowr7/c3mzFKROnMhWrlxVopnYlt
+0hUoYxgmZBjts2o/VtoTkou4Gh1nvb6lb+ByNwLVwTFVFp/ryKLggdlIS1zxB2L/
+m2xlQ3DFcetzNXp1HdG7bsvPNJiulHNpnqJWyOHepYnoaxsAcacOFJtcv33oNeyw
+62TL356k6UbehuIxrqLZrdAAormuxwCQP54lOSceO2hzbbNfjua/WUIEtes/7dXw
+O/NuQmtXyCPXkKXOm/W64kRqXd66a/HNNdIAVkWs9zAragYhlRJEefTACi/IulUW
+KVXwBlcpAa2uj1bXOQNRGpPDq6K17U1St9R/qg==
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Ginny-EE.cnf b/rpkid/biz-certs/Ginny-EE.cnf
index 949907cb..00b14052 100644
--- a/rpkid/biz-certs/Ginny-EE.cnf
+++ b/rpkid/biz-certs/Ginny-EE.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Ginny EE
diff --git a/rpkid/biz-certs/Ginny-EE.req b/rpkid/biz-certs/Ginny-EE.req
index 30a62a71..68a07f53 100644
--- a/rpkid/biz-certs/Ginny-EE.req
+++ b/rpkid/biz-certs/Ginny-EE.req
@@ -6,10 +6,10 @@ EQv4lpSOvnT9TTnH6tuVZ9xUg/x4kY9kqGgZmWtd8Bscw7Tol8B+kepGK0DqrB1q
ixxqJOTp6YRM1Vcx+Lq51weWVg1e59sjkNkz4gbCbmIDSwkJ97AFUnqZvDnHOY5A
kBe843T5Z58bf3Cm6MPiawiF/gdQdekJrpOjxd89s3aEw8slK5+BEy6Icwpx4Oab
/BDlPTYc1GR1CJaGSOjYRNuWvOuXwKMTIfs5pKr9khvv5lOuUcuJ7qFUashW4qTk
-mp0CAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQBPOqtrZca7xe5jFy5kHg9SAV3E
-2485qGK7GvtkcAfJifLXYiasb4FRkyNC/JS9x6ExLSIRKUFCD0XINyrePRqGe1Pr
-P7RThK9sI7UrRNE8NKvEhdw4gC1qIT0ox6tTUFbvfB87oRWIG6uEcW1NgaJ0SVlJ
-D0zJtjzgx+Uj368BS8SZuXaurXtcMGhVn+b3GzNFSiH2/CdZnisesthLmx3ZF6KE
-2ZRDjkpprOVq9+yr/8ZARsavPH4OIu1VbskaihjgdmBzl9dGna5VpLLU62gYi7ll
-AadWHJUfKvldEgCoWnde2lMjBnXo8FlevW5TAUYvtrGVL41gttEIwZ+Lx7JF
+mp0CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQBhD/m/iQVsTr7ehYHe+dnCiCRo
+cSqwS+gTqgXmDf3iKAu3uK/PHMH9K5sKo6PRkTxsqFLeWzcBnLnClgwpIBavTgcG
+Z7kSwq7JWUbmL+ZamVUMOrIdbsIX5NyDFGjBfi/W3ueFeh6n462vkedq/2D9fnaJ
+O0tD7NQDDKVkZEWEfk1bbw/Ic6VLF9zZpk3ONy6b1QDYL7t3pD1KMASTynbsIsHX
+K/G7E8faFVQH6XmUi942NCoZSK8x/O80WrZNfP4lFYJCaw1FmuEBZxQ7BOBIXlM6
+aXIzvNMxvu8TJvSJYyAwO8inXAcX/AzKTjrtjqW6U1iZC/0AmvMIrXGa0nOD
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Ginny-Root.cer b/rpkid/biz-certs/Ginny-Root.cer
index 440a569a..1ff8ce43 100644
--- a/rpkid/biz-certs/Ginny-Root.cer
+++ b/rpkid/biz-certs/Ginny-Root.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHzCCAgegAwIBAgIJAOi8wo1Y0PfCMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgR2lubnkgUm9vdDAeFw0wODA0MTcyMTIzNDBa
-Fw0wODA2MTYyMTIzNDBaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgR2lu
+MIIDHzCCAgegAwIBAgIJAMsaa4Hrxa8ZMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgR2lubnkgUm9vdDAeFw0wODA0MjIxODMzNDZa
+Fw0wODA2MjExODMzNDZaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgR2lu
bnkgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO1GzDMYa/xv
byra6dpjKYtfajaNEdUZWkJhlu4HcqiuDflutby82+C3FPwHKmfoXOHgvcmac7kO
49D+DDoWE4p72dAhCKuWb3h6rh1r9Xpl7HaHxoH4KsYT74dOKMu/DhMR7pZl9Tkr
@@ -10,10 +10,10 @@ RaebLNe0mwsw62TW7zqUjMq/7+Xb9ZWJLPN26nTfq2pyLgFVx+xpMowhaqdEOXKj
VEaCT35cZGydvWIvad4xL/vuY6L0dNMAhTOOE2DzLw6amae4wkvNTwL5krJrtoJD
HpLoFYKZ9vUCAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUYxpyANO+
c8ZrBDm7+9eAv10dxrowHwYDVR0jBBgwFoAUYxpyANO+c8ZrBDm7+9eAv10dxrow
-DQYJKoZIhvcNAQEFBQADggEBAEYldDyAa5irWmpp0U213Ug3ta1MUfYseSnqLhZj
-eCZtCqHxxzCcZcG2STwQOwtndKiBMJZZ1LWOzXDdh7u2r/mjlssife0Q5S+p/TUU
-eO2oNHuPR0tOi0cWVTztG/iaggqZxpog2WYAWBUizMXmrB//yDwz0lbwDZffmsMx
-pHmnpFqoeRoHolOlgdeBzTNgTuvDspCFDxZggvmDDbr+FFfP9Eh/COvJh02HTp9M
-Q6InQgd4grOZi+HCEdtp9OmKszyOpg4jMW486wUFOhdVQ5rM4dZnvt+JVuEc4HoW
-KfwjBwbzzlmU19QnccYkLC7Gu4J/JA0OAjyzTJoeH0Yt/0c=
+DQYJKoZIhvcNAQELBQADggEBAEZs2CkY+8xGs+p37vmdkBehiE2u82tz7JgrYv+2
+fddeUykzAkOpK+RCi7GHp+VvE0BGk6vbP04OdpzSq9edGMwq+brGcV5cakJdryfT
+RtCfXaUqj3MhU3OirNlVOMS6xIM0QeGCOCr8i7jrr70v5BePRjCeBkHQ+NzVCARS
+xIEoyxUEmbz51OZ9gPqjOi3Y13+UyyvT5nkBBz+joUElA8vbEt5Rzn7n/PB28TTI
+nq6O0V5sJdNJuzLmQPegbNi6lMgn70buownGtCGhDkPtE/h/0cM/yMRTxdS+G5P4
+YQrWFgxlEtezn3wNd/k0bdAi9MctbGSBflRLJxARjXWN4p8=
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Ginny-Root.cnf b/rpkid/biz-certs/Ginny-Root.cnf
index 63b600d6..b82a758c 100644
--- a/rpkid/biz-certs/Ginny-Root.cnf
+++ b/rpkid/biz-certs/Ginny-Root.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Ginny Root
diff --git a/rpkid/biz-certs/Ginny-Root.req b/rpkid/biz-certs/Ginny-Root.req
index 60d14eca..a7da99d4 100644
--- a/rpkid/biz-certs/Ginny-Root.req
+++ b/rpkid/biz-certs/Ginny-Root.req
@@ -6,10 +6,10 @@ OhYTinvZ0CEIq5ZveHquHWv1emXsdofGgfgqxhPvh04oy78OExHulmX1OSsE1hMA
QT+pMwUZRDUkK7Bn5oZFSDMMiJUncMG4rSdccFs6zsZ3+Nqz/X6U1KyHeWBFp5ss
17SbCzDrZNbvOpSMyr/v5dv1lYks83bqdN+ranIuAVXH7GkyjCFqp0Q5cqNURoJP
flxkbJ29Yi9p3jEv++5jovR00wCFM44TYPMvDpqZp7jCS81PAvmSsmu2gkMekugV
-gpn29QIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBAFLF9itaImaKZ8a5sRM0jJ9A
-V3kiR7qjepCHK6qDkEZUSY4oHYJr0h7RGU2zKe9YegZEBtfDdw16eMoJa4BPSx6O
-9UWmR1fLqzZmop7od4rywXFEFLv3xQdhSZsd8+zjwX8baPNlobGnuuLEUKEwjfXI
-FiUmlUr9pj7rA4mJjvZ9barYxNh3mlbA5eSijJ4MVjnUMJNNwouau/ZQM2VIzRuv
-xpyRkohyLW4Z3hXDcc9tf6AsYDrhC9SzuciXjG5K1ZA5zJLXFyFQJZ4Tc1RXSlPU
-Dsp3qvfjklc6aYvc2lwvTGWEyUWhoSj5d/MhRZWhSgmCc+aAbLwyxjSB7D4VqAA=
+gpn29QIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAJSgC0WFchzuVGRYfsZuf2tR
+weEZUFO+cyRIqi9nkjVDNZHmkla5PcM6/1GumpvIxNOBur9HYwVqnmImXrgG4cMG
+rlB2KXa4d545o/83uix8u3V+DDHcWGWumptr1N620kqCFdcs52S6/0+eqSh+OVNY
+FdPDN9t06ou+Bp2N8Wz78kDnkukMXFLLNIvLHkp+REkUOlQmqt+XB+NdZWjVu3ET
+LstFkYDkXMV3A9J8hufkMC7USRGj2hv2McMv2Qh0t1W/6gPfaFyr2EVgbrRME6/C
+97x+ZRbM/MwcCJbXR+57Lh5FFopsxeT0NwddSApBdAo1ESPIrCyc3JFxi5j1wlA=
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Ginny-Root.srl b/rpkid/biz-certs/Ginny-Root.srl
index 0aa46dbe..fe0bafc3 100644
--- a/rpkid/biz-certs/Ginny-Root.srl
+++ b/rpkid/biz-certs/Ginny-Root.srl
@@ -1 +1 @@
-B4CA97C7714C3745
+B4CA97C7714C374B
diff --git a/rpkid/biz-certs/Harry-CA.cer b/rpkid/biz-certs/Harry-CA.cer
index cbd43579..de4ab580 100644
--- a/rpkid/biz-certs/Harry-CA.cer
+++ b/rpkid/biz-certs/Harry-CA.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHTCCAgWgAwIBAgIJAPg07MgChQ7qMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgSGFycnkgUm9vdDAeFw0wODA0MTcyMTIzNDBa
-Fw0wODA1MTcyMTIzNDBaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgSGFy
+MIIDHTCCAgWgAwIBAgIJAPg07MgChQ7wMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgSGFycnkgUm9vdDAeFw0wODA0MjIxODMzNDda
+Fw0wODA1MjIxODMzNDdaMCQxIjAgBgNVBAMTGVRlc3QgQ2VydGlmaWNhdGUgSGFy
cnkgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC94Wvpn36QVBts
pOtt6gva7Zd4CP+b8cEsM4LGW7AEt+jSSic0xDI/WrQI5Rjtam0j6G5039bmtV6A
Xyio9jK7QHnzgMmg82b4TDa4ary0XR5IZNPWK4pSOqzJ7aZlLxm52Nm+NfSd/5/e
@@ -10,10 +10,10 @@ jYKcig7Y0xvjGhGK5s1EhjJXiVB0vpoOjmv5LIjYypsQjkgqNxM+nKzCs44W5m8S
Z3M3/ILcn64UW36uBSCLInqHKEI8rJx3Se60/xBJnbNpD62nWhz2vz+egwQIXKOG
tTVlGPelAgMBAAGjUDBOMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFNGU/Ua48bNX
Sn5MzBo+LIsg4Cu7MB8GA1UdIwQYMBaAFG2UphsbenSKgdNpEONxXczUln1cMA0G
-CSqGSIb3DQEBBQUAA4IBAQAfmGYAHGXpHnIeJd5tqs3GkRW4z+HS77OeyVLMLSDU
-XwOHcLLQN7GkaUbB8AfPFudjFkZOyfxakBtGn7ZsRlE8bdRw1/MFtR+ZLshOIqrb
-yGdiorU7rWbE4J7Ae1juL3xZUxCZFgolDP5TtNMjcaQIhn2Y6jI6bPGgsghxCBXI
-5ncZ8KqqWkjaHOQF7+7LcojzD4T0NnHAaYARJS7sm8zW21UPM++Z55jp9bdGL1yC
-t0NJznGv4rYu67JntyJzq8h83PyaeYmmDmjHZ7QxsJ6Xsja1xi/UsdBUSXclBYwk
-59pUl+0wz1VfPEMB6WP0PxxItQqV7Z9GgUA5R5I/69Hf
+CSqGSIb3DQEBCwUAA4IBAQATDPW1fUAsul8bCI3jiX47HXP+FulnfNZfq2JF0gV8
+Xalo3BHDP0GKsW5xYMQV20gsICrv1DL86RIdm0d1ZMHQa748DWrtVNBM08FzliMR
+Lg6hM9+p3zjAzlMVesyvDRnaWx4cWUlaTxIqQXJ39lpye65xh0b3aBDdc16u8S6f
+0pGELejeNVhiZ0tc7/t/xmVOQ3VlnfpT3P2cjqkMgxMo7m59SXE50AFyg7Mb4+oM
+CpjUQZgPCO7hdrfFwX59YXsEsPMWkHQiz6J3mQUkV6oWCd2ljFbz7C/fzi1QcYng
+eWNnM/U62EfDSBLDmjm6B7JSZch0/caNgYLjLxXIMV6X
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Harry-CA.cnf b/rpkid/biz-certs/Harry-CA.cnf
index b6002949..903a9172 100644
--- a/rpkid/biz-certs/Harry-CA.cnf
+++ b/rpkid/biz-certs/Harry-CA.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Harry CA
diff --git a/rpkid/biz-certs/Harry-CA.req b/rpkid/biz-certs/Harry-CA.req
index 01dfc3bc..2a52ffd2 100644
--- a/rpkid/biz-certs/Harry-CA.req
+++ b/rpkid/biz-certs/Harry-CA.req
@@ -6,10 +6,10 @@ MrtAefOAyaDzZvhMNrhqvLRdHkhk09YrilI6rMntpmUvGbnY2b419J3/n97vkaLd
0+JP6JxAfWhH+hFB46cT+sFcGa+JE3kmUh7x7UTR9MH69c6l3ujmD2w91P6NgpyK
DtjTG+MaEYrmzUSGMleJUHS+mg6Oa/ksiNjKmxCOSCo3Ez6crMKzjhbmbxJnczf8
gtyfrhRbfq4FIIsieocoQjysnHdJ7rT/EEmds2kPradaHPa/P56DBAhco4a1NWUY
-96UCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQBdLyMhmwe7p3xrIfrVnm+CFk0k
-YW6jhV3jzlThgNOK3nStQyvs4zcVX3S7XmGYHFNoLu7LhyW8xXCuQpaf9JjF62TA
-87qbsjl7asMSGtndOP1B8jJYnBTX+qsQfVZT9Ypmr8pnfrYTBylEPoAzPdqje3gu
-gN2+/BCV/FW00jSeIhmkQ1YLiwRkY/uv2FsENcUuRO715phNNcHMgiQqnjGN/Iju
-do1DMHPsKDO/dIgl6y7TkkRlLATSO2qalOpsF8RDW1J3iCfcPvMQqXkgDVzNMXo3
-GWLe9C1R5xAfZVcDwuuZUhd+ZYGKNA56CqsD1e7n3aU5ieL8bXxa8g93GWfS
+96UCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQAGP0tg1uUr8FrQSENAYH793LGj
+VPN4pz5cYm5Ztfjlv8/3tH1n0ybVeR/xenr9NLjVRPwPhyvJwIBtDkNvdynV2Yq+
+hiaBT0Yim0+32IC/UV8P3zNlnpFrPJtHo6e4G87F+vV409+CC64IbT3yZU+EGMzI
+WtwAVATr33Wl5VEMgZi3xQ/RTNFMHRAKpZ1MRxhUDR6UGGW/PsfxbV1mP1TPzEEr
+G/C+65QhMcakPZ22cIrlglbIkRDByHjZQQdU5u9QvF7TEiHcxu2syFl80SR9AYe+
+QRoXdRWa25DLe3OVRPocFJCcjzSj0/mlh0nEg1FxXfrTxj6ZQJWm7oBdlb/0
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Harry-CA.srl b/rpkid/biz-certs/Harry-CA.srl
index 3c3639fa..619637e0 100644
--- a/rpkid/biz-certs/Harry-CA.srl
+++ b/rpkid/biz-certs/Harry-CA.srl
@@ -1 +1 @@
-F26FDD5DC0623AAE
+F26FDD5DC0623AB4
diff --git a/rpkid/biz-certs/Harry-EE.cer b/rpkid/biz-certs/Harry-EE.cer
index 69e2ab2b..5af56a72 100644
--- a/rpkid/biz-certs/Harry-EE.cer
+++ b/rpkid/biz-certs/Harry-EE.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDGDCCAgCgAwIBAgIJAPJv3V3AYjquMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGVRlc3QgQ2VydGlmaWNhdGUgSGFycnkgQ0EwHhcNMDgwNDE3MjEyMzQwWhcN
-MDgwNTE3MjEyMzQwWjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEhhcnJ5
+MIIDGDCCAgCgAwIBAgIJAPJv3V3AYjq0MA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGVRlc3QgQ2VydGlmaWNhdGUgSGFycnkgQ0EwHhcNMDgwNDIyMTgzMzQ3WhcN
+MDgwNTIyMTgzMzQ3WjAkMSIwIAYDVQQDExlUZXN0IENlcnRpZmljYXRlIEhhcnJ5
IEVFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA240oiLNTwXq/uTlP
vdSr4BnBQRWiFLIRUPhGKiCxmc+dnc2G5JLj4Of6wTcdyUOsAWSdl/yA59XvSp5z
lXQrAc0wtubHHlwLrWbiqX8MXi6ch3XJsZk99fOW+k6snNnQmscOGVFBuaZFntMd
@@ -10,10 +10,10 @@ bPsL5LhinwyEVDwdTXR4OV77aEyMNpyRdLoiKB+NrNznuKmlQIG44jCrZrIqzB5p
LKTDn/fHyZH2coTDSaZXYTW1FYJH/DL3byBgGuz1gFykB5/GSiIdnWYg0eF1mXV8
Wjd5uQIDAQABo00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQ0eEAX0TOVTDsAUZCo
Ihn8IfbKlTAfBgNVHSMEGDAWgBTRlP1GuPGzV0p+TMwaPiyLIOAruzANBgkqhkiG
-9w0BAQUFAAOCAQEAjXhApQxSE4LY7/9s+ykIgqGVowmqeVgLj1AOTlvN3EOC6Okp
-B76B5dYw6jwvjc+xWaVO4V4/KVMJHY1B1r/b/KTM+CB833iMGZGadU9iqoqnFYvB
-gV9O/CdHNd9nTqFhwsi8U9524ATY3f+W6zZVqeGGk8/hqOOrf4/+IQcDBuZ5N69B
-UyqkZ45sq6vYn+L/jMhzRagHIbZTWKcaVJDTX7GmTY37wn35Hbzltpt2sX0j3Mu3
-/lUzZXvZty61zMVuL/mzcwg8M9R8zXZVNa5VngbHnXkpcQ/P7SteDdoKcJh1lEK9
-DlcEN5c0ck6d2Swbw6XAFy3I6V0U6mEO499jeg==
+9w0BAQsFAAOCAQEAYHk/vIfGjG9E5eOkb8N2dclZMjbzgnrUoOHg/HJ3UDFhONqs
+CgdJpTzmIFT7AskH4xT+KtvX0GysGn0qwaT1uAEVYLOQZ09ozy6t+sBHdG4MVdpr
+4yTmIVxEtLdAp7iEb4M0NTPD2ZrZqVT7/Ux9qDFNABuqqqXKZ3o79q1Nn2pfLsj3
+rdh/YmaT4HKZe/aFvx8aZirlAaZCLcDNROWWBuzvCthfnCI+3OtilDtMABaunT0G
+Ov/8FxuuSO4vtgU1h7INIf0yoZAlv8d5NIqi4CRwZHkX+4cQJp7DXrUyHCXt07dt
+PJO1AxjTpSDllIuMYZn3littmoTebVAB48UGsw==
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Harry-EE.cnf b/rpkid/biz-certs/Harry-EE.cnf
index cbfe45c4..974915cc 100644
--- a/rpkid/biz-certs/Harry-EE.cnf
+++ b/rpkid/biz-certs/Harry-EE.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Harry EE
diff --git a/rpkid/biz-certs/Harry-EE.req b/rpkid/biz-certs/Harry-EE.req
index 2d122147..23111969 100644
--- a/rpkid/biz-certs/Harry-EE.req
+++ b/rpkid/biz-certs/Harry-EE.req
@@ -6,10 +6,10 @@ KwHNMLbmxx5cC61m4ql/DF4unId1ybGZPfXzlvpOrJzZ0JrHDhlRQbmmRZ7THV6Z
UU7RDumqPwlxG+jZe3Pt9ABYZEdP6qjzHD4L72WY32+2QKrTDa+Wc+RlGwri4Gz7
C+S4Yp8MhFQ8HU10eDle+2hMjDackXS6Iigfjazc57ippUCBuOIwq2ayKsweaSyk
w5/3x8mR9nKEw0mmV2E1tRWCR/wy928gYBrs9YBcpAefxkoiHZ1mINHhdZl1fFo3
-ebkCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQA9cvHRmvyZbP6YKBgSiir/bo6k
-+GEt9Pc8ksqkhC9sNKgMAPripw65I7BVjmZXovig/AsumidJnqvcpdjeimWjFm2N
-ASPkrBnjN9Aiw4tzLdTzGE0Una6psCNkCLOOdDl6RaCf3f04YcaOpMvqrkO1/bLE
-Faql3kDFDBo5F5EUz7RIjdxqsN0AjkV0fJowDF6vmY0BNROmNWooqwkXSZuaD1nN
-5LUnFIlkVwpeyjbY3G5lG0rmppJCgda5mGfxAs5GDK5aJG6zOp5PQKAXN/wpK6eT
-A4hjT54C+wRkbY+d6tS18V8vOsllUVLKBwoisjogSl0ae9cQHKx7YO+X0Viu
+ebkCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQA82wCAKcV0quByQazXrWc1cOgM
+vZgpt+k4UNVbdXMbC6M7IFgqXi/+i9how2JaARzExFeysmDzfUVVkO83vXk2Lzyz
+RhnfFDIEWNt6aYPmJI9uqNzoxrcAwxLrLvYyoyzP+CJNJBFp5nx+xefX5Od8yfu1
+gQCdRD8DXLtu4zlILKMEP70xFN5Qd66t14L6VM3lIzXFDnCTawajABXuJ/MuQIUO
+Ceh7uOEfpD7MWKGL50zvjCCUS/NRrejugnXo+O3RsSbl2o0PsUcPhEattSOWkTF5
+s1z2ylqjdsZSbpOlbcn6WTk4wZ9GM5W5sSOkNcLlMmVag0JcRcoQqrLNXX2p
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Harry-Root.cer b/rpkid/biz-certs/Harry-Root.cer
index 62baa3b4..acf611ac 100644
--- a/rpkid/biz-certs/Harry-Root.cer
+++ b/rpkid/biz-certs/Harry-Root.cer
@@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
-MIIDHzCCAgegAwIBAgIJAKSvI+TtH5aqMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG1Rlc3QgQ2VydGlmaWNhdGUgSGFycnkgUm9vdDAeFw0wODA0MTcyMTIzNDBa
-Fw0wODA2MTYyMTIzNDBaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgSGFy
+MIIDHzCCAgegAwIBAgIJAKl9uBeogyHBMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG1Rlc3QgQ2VydGlmaWNhdGUgSGFycnkgUm9vdDAeFw0wODA0MjIxODMzNDda
+Fw0wODA2MjExODMzNDdaMCYxJDAiBgNVBAMTG1Rlc3QgQ2VydGlmaWNhdGUgSGFy
cnkgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMap178VPa/q
0U9YN//4nCiwkwC4Rng3bJdcRwgFVpAda94rpSbheCkGGi9wl02wAHKLh1sJmsh7
2xHtnCBi1E8TuZswEj0fAjy61RgKsJuTkx/FS8SpnmDjGrmdhXiixA3Wk0FUcH3R
@@ -10,10 +10,10 @@ wGE0dEuetCBgIbyTvlA3AKa6P2LU/NQkOlRaSdarjisehsfVN/pHTkLIPfXIzYJU
1KPMeLz1q6UarRXBtzUaEkzk+MJ9igW1gcVwpM7HkXRfXfXgJcexIQiSmrTF0yaS
wXGgKUPYq2kCAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUbZSmGxt6
dIqB02kQ43FdzNSWfVwwHwYDVR0jBBgwFoAUbZSmGxt6dIqB02kQ43FdzNSWfVww
-DQYJKoZIhvcNAQEFBQADggEBACM8E0KGgtPdAHk7v73bdfm8O17Fn26GnHNW7JFe
-nAMzhMpzWzzg5r4KgxpI+oZbZvTlnGIsfFCV2OyfdwGZOIwr7td6WuposT5fxs3s
-/kOORsywt18Ct5TJ0ziNarsGZzkkN7T84riERcIBUT/hU1Ip40rMueQq+tB0C5rI
-54YPlba8tkQ6uUGdBfUPXotIuupyXyloNfyIAMY6TL6dQEA3o3pNb9/q60Aqs50I
-KnMJ9NaDHTFfTl3Rfan86rACBQWGhSLu/uihP6g/bpbiCxyXOnyKz8zRg3c/Qq27
-ZDFfdJQoSfXl1RpH1+CfLaNBWWvyu05URwl5IP1x66ei8b4=
+DQYJKoZIhvcNAQELBQADggEBAJm6UkX6G+OZ7pCjz4y5rfTUGbfvYyOwWhEHj53g
+ZmzRQLcJvxgv89NRyT/zy3Khh2SGT2xChgzhUwkuXNWug2VoQ1DgQPKaBdJ1+xxh
+65fKQA7X0zzPrpG4eddEFhDq7DIhSufXitxeEMvoh2Vzrb8N1ILZIT0GB1cOwDCo
+/pob5+6l7Lbh6aP0RG18petLBTO7ZzP/cyPO7O0Yf7rU8oKwgUFe3kBcqWgFMyPP
+XV2iqMF8qdzxCbHnoEdXxrqFGQ2CyEj2tZLcz96Ta4o/jEU+GiGycb2FzFpxJbQP
+KSae8HwzYr+YQfmby6O0MPcVNhzf7Cw+wQvVlDIrQaicTy0=
-----END CERTIFICATE-----
diff --git a/rpkid/biz-certs/Harry-Root.cnf b/rpkid/biz-certs/Harry-Root.cnf
index d6ef8a30..2cb2cf3e 100644
--- a/rpkid/biz-certs/Harry-Root.cnf
+++ b/rpkid/biz-certs/Harry-Root.cnf
@@ -3,7 +3,7 @@
distinguished_name = req_dn
x509_extensions = req_x509_ext
prompt = no
-default_md = sha1
+default_md = sha256
[ req_dn ]
CN = Test Certificate Harry Root
diff --git a/rpkid/biz-certs/Harry-Root.req b/rpkid/biz-certs/Harry-Root.req
index 4dcf75a8..405f097e 100644
--- a/rpkid/biz-certs/Harry-Root.req
+++ b/rpkid/biz-certs/Harry-Root.req
@@ -6,10 +6,10 @@ IGLUTxO5mzASPR8CPLrVGAqwm5OTH8VLxKmeYOMauZ2FeKLEDdaTQVRwfdHeOjWn
xzacBNs2zNKV/n+futswLtGy/gEP516sV6AyAO+5hGF1wHpGxfplEcHxwwnAYTR0
S560IGAhvJO+UDcApro/YtT81CQ6VFpJ1quOKx6Gx9U3+kdOQsg99cjNglTUo8x4
vPWrpRqtFcG3NRoSTOT4wn2KBbWBxXCkzseRdF9d9eAlx7EhCJKatMXTJpLBcaAp
-Q9iraQIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBALvG7y4lFsRzbBup+RyjrxIU
-WaEXREGI9U0+s14g6f7DWpnNo/VKZv++iQbg/1oXAsTshwXtRsrKmZ2jFGR38aet
-JvQxtn0/3CUXczL0bA0ot7L8iwzPt2bOXFyVQBhVk2YuonL3nm0O4XtooElxNRUL
-36P9gbflah4wNqSSxpAF++lccCvtmMkS6Z95fBMo5xnDhlUbJ84jM/b7RbuX4k1Z
-nEYfy3gfFH7IeZM9lOq0SP3NgSm98tGQXknPeHLZXmdgxGc9JVxa7FnEhiuokwqJ
-kUDWhLwo5GGKHB6lPtigHnC1beP22/hYG8/JaCmQsSoCrK+/RWvgB9xZQPI/d+0=
+Q9iraQIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAIPsJIul3/pvQwGO43A2S/Jg
+I3hoEV5PfxwcEBDXbBb/wHm+yllCJOu4l1O3E8kMkHYdzGJtTblCTXtkFuFGRscf
+mL0p5VrOWsau1qrodjKoQodFMM1fa0isPEHcKOKvXlzJe7yGBMsFMsyVR//QsjXk
+cSU3u9K5UiSmpQlPljUvHnR7qEOd0XjnFtqpQxhaTJGuXaYswtQZKu7oXkocJNzs
+os49Lw2yOlMlxmEciv4eZErpNvTnmBOxzOQ2HOeRHGSdL2AZNFcInkt2TZBT25tv
+2/CL7rbOtDenJbFyTtU+/iy3f2e9zQnf6wnlHyLihlbVleH2cOb2SCk0ttGZrY4=
-----END CERTIFICATE REQUEST-----
diff --git a/rpkid/biz-certs/Harry-Root.srl b/rpkid/biz-certs/Harry-Root.srl
index f85994c8..181c23b0 100644
--- a/rpkid/biz-certs/Harry-Root.srl
+++ b/rpkid/biz-certs/Harry-Root.srl
@@ -1 +1 @@
-F834ECC802850EEA
+F834ECC802850EF0
diff --git a/rpkid/test-pow-cms.py b/rpkid/test-pow-cms.py
index 2dbc0d6a..12f73971 100644
--- a/rpkid/test-pow-cms.py
+++ b/rpkid/test-pow-cms.py
@@ -42,24 +42,31 @@ oid = "1.2.840.113549.1.9.16.1.24"
plaintext = "Wombats Are Us"
for args in ((ee, key, [ca], plaintext, oid),
- (ee, key, [ca], plaintext, oid, True),
- (ee, key, [ca], plaintext, oid, False),
+ (ee, key, [ca], plaintext, oid, POW.CMS_NOATTR),
+ (ee, key, [ca], plaintext, oid, POW.CMS_NOCERTS),
(ee, key, [], plaintext, oid),
- (ee, key, [], plaintext, oid, True),
- (ee, key, [], plaintext, oid, False)):
+ (ee, key, [], plaintext, oid, POW.CMS_NOATTR),
+ (ee, key, [], plaintext, oid, POW.CMS_NOCERTS)):
print "Testing", repr(args)
cms = POW.CMS()
cms.sign(*args)
- if False:
+ if True:
f = open("test-pow-cms.der", "w")
f.write(cms.derWrite())
f.close()
- if False:
+ if True:
f = os.popen("dumpasn1 2>&1 -a test-pow-cms.der")
print "\n".join(x for x in f.read().splitlines() if x.startswith(" "))
f.close()
+ if True:
+ os.unlink("test-pow-cms.der")
+ if True:
+ f = os.popen("../openssl/openssl/apps/openssl cms -print -cmsout -inform DER", "w")
+ f.write(cms.derWrite())
+ f.close()
+
cms.verify(store, [ee])