[openssl] master update
Matt Caswell
matt at openssl.org
Tue Jun 8 18:06:31 UTC 2021
The branch master has been updated
via 4bf696c1d05d19ad495995309981f91f265cdaf2 (commit)
via 1df8322ce0b54d171dea1a364a3c78a8a4980f65 (commit)
via 33fb6ed3ecee73fe2de9047e7bca0bdf2c39303f (commit)
via 15fd6c235ca5d7da7ffdb62b2a01c5815e284620 (commit)
via b2f1b36592806afcaae79289c33756fb0af5b4ca (commit)
via 237cb05d342338ac42852cfdec21b900458a537c (commit)
via 29bf83c889c44236f33004ea2a6126c6d92e8b7a (commit)
via f8da1d800580fb521b450b51f9e07ad1c3c1798d (commit)
via 2b049e933a8d017fa667e69b5b0ec4437eb8d68c (commit)
via 7834d50fa92c622e3a1b29a38abbbec2afd1290d (commit)
via eaf867011edfd9ec0d2ca6bc36b0d17812be7844 (commit)
from 92b835376a81ed310c9b365094ba670bc231f64c (commit)
- Log -----------------------------------------------------------------
commit 4bf696c1d05d19ad495995309981f91f265cdaf2
Author: Matt Caswell <matt at openssl.org>
Date: Mon Jun 7 14:54:24 2021 +0100
Correctly detect decode errors when checking if a key is supported
If we have an unsupported key type we may get a decode error and
therefore we should detect that.
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
commit 1df8322ce0b54d171dea1a364a3c78a8a4980f65
Author: Matt Caswell <matt at openssl.org>
Date: Fri Jun 4 14:16:42 2021 +0100
Simplify error reporting in X509_PUBKEY_get0()
The X509_PUBKEY_get0() was attempting to recreate any errors that might
have occurred from the earlier decode process when obtaining the EVP_PKEY.
This is brittle at best and the approach would only work with legacy keys.
We remove this and just report an error directly.
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
commit 33fb6ed3ecee73fe2de9047e7bca0bdf2c39303f
Author: Matt Caswell <matt at openssl.org>
Date: Fri May 28 14:03:25 2021 +0100
Use the fips-and-base.cnf config file in CMP tests
Two CMP tests were using the fips.cnf config file. However to
ensure that decoders are available the fips-and-base.cnf config
file needs to be used instead.
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
commit 15fd6c235ca5d7da7ffdb62b2a01c5815e284620
Author: Matt Caswell <matt at openssl.org>
Date: Fri May 28 13:39:17 2021 +0100
Mark some priv/public key paris as only available in the default provider
Now that we actually load public keys from providers we need to mark some
key paris in the evp tests as only available there. Otherwise we get test
failures when only the FIPS Provider is loaded.
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
commit b2f1b36592806afcaae79289c33756fb0af5b4ca
Author: Matt Caswell <matt at openssl.org>
Date: Fri May 28 11:07:24 2021 +0100
Actually use a legacy route in pem_read_bio_key_legacy()
The function pem_read_bio_key_legacy() is a fallback route if we
failed to load a key via a provider. We should be using the legacy
specific d2i functions to force legacy otherwise we end up using a
provider anyway
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
commit 237cb05d342338ac42852cfdec21b900458a537c
Author: Matt Caswell <matt at openssl.org>
Date: Thu May 27 18:00:07 2021 +0100
Just look for "Unable to load Public Key" if no SM2
The X509 test was looking for some specific errors when printing an SM2
X509 certificate when SM2 is disabled. In fact these errors appear in the
middle of the certificate printing which is quite odd. There is also a
separate error "Unable to load Public Key" which is more cleanly printed.
With the recent change to using provided keys in certs the old errors are
no longer output. However printing them in the middle of the cert is
probably not right anyway. So we just rely on the "Unable to load Public
Key" message.
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
commit 29bf83c889c44236f33004ea2a6126c6d92e8b7a
Author: Matt Caswell <matt at openssl.org>
Date: Thu May 27 16:48:37 2021 +0100
Only use the legacy route to decode a public key if we have to
We should use a provider to decode a SubjectPublicKeyInfo structure if
we can. We should only use the legacy route if we are forcing legacy, or
if an ENGINE is in use.
Fixes #15393
Fixes #15327
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
commit f8da1d800580fb521b450b51f9e07ad1c3c1798d
Author: Matt Caswell <matt at openssl.org>
Date: Thu May 27 16:47:14 2021 +0100
Ensure that we consume all the data when decoding an SPKI
If we are decoding a SubjectPublicKeyInfo structure then we must use all
of the data and must not have bytes "left over".
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
commit 2b049e933a8d017fa667e69b5b0ec4437eb8d68c
Author: Matt Caswell <matt at openssl.org>
Date: Thu May 27 16:24:00 2021 +0100
Use the right class/tag when decoding an embedded key
When a key (SubjectPublicKeyInfo) is embedded in some other structure
it may use an implicit tag. However the decoders can only handle the
universal class and don't know how to interpret the implicit tag.
Therefore we modify the data into a form the decoders can handle.
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
commit 7834d50fa92c622e3a1b29a38abbbec2afd1290d
Author: Matt Caswell <matt at openssl.org>
Date: Tue May 25 15:19:56 2021 +0100
Fix CTLOG_new_from_base64_ex()
Ensure that the libctx/propq are passed to d2i_PUBKEY_ex()
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
commit eaf867011edfd9ec0d2ca6bc36b0d17812be7844
Author: Matt Caswell <matt at openssl.org>
Date: Fri May 21 17:26:35 2021 +0100
Fix the expected output of printing certificates
Now that we are using provided keys when loading a certificate the pretty
printing formatting is cosmetically different. We need to adjust expected
test output accordingly.
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
-----------------------------------------------------------------------
Summary of changes:
crypto/asn1/d2i_pr.c | 10 +--
crypto/ct/ct_b64.c | 2 +-
crypto/pem/pem_pkey.c | 6 +-
crypto/x509/x_pubkey.c | 112 +++++++++++++++++---------
include/crypto/asn1.h | 4 +
include/crypto/x509.h | 2 +
test/certs/cyrillic.msb | 2 +-
test/certs/cyrillic.utf8 | 2 +-
test/evp_test.c | 1 +
test/recipes/25-test_x509.t | 2 +-
test/recipes/30-test_evp_data/evppkey_ecc.txt | 100 +++++++++++++++++++++++
test/recipes/65-test_cmp_server.t | 2 +-
test/recipes/65-test_cmp_vfy.t | 2 +-
13 files changed, 198 insertions(+), 49 deletions(-)
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 58b7646227..3b28460d4b 100644
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -74,9 +74,9 @@ err:
return NULL;
}
-static EVP_PKEY *
-d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a, const unsigned char **pp,
- long length, OSSL_LIB_CTX *libctx, const char *propq)
+EVP_PKEY *
+ossl_d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a, const unsigned char **pp,
+ long length, OSSL_LIB_CTX *libctx, const char *propq)
{
EVP_PKEY *ret;
const unsigned char *p = *pp;
@@ -149,7 +149,7 @@ EVP_PKEY *d2i_PrivateKey_ex(int keytype, EVP_PKEY **a, const unsigned char **pp,
ret = d2i_PrivateKey_decoder(keytype, a, pp, length, libctx, propq);
/* try the legacy path if the decoder failed */
if (ret == NULL)
- ret = d2i_PrivateKey_legacy(keytype, a, pp, length, libctx, propq);
+ ret = ossl_d2i_PrivateKey_legacy(keytype, a, pp, length, libctx, propq);
return ret;
}
@@ -208,7 +208,7 @@ static EVP_PKEY *d2i_AutoPrivateKey_legacy(EVP_PKEY **a,
keytype = EVP_PKEY_RSA;
}
sk_ASN1_TYPE_pop_free(inkey, ASN1_TYPE_free);
- return d2i_PrivateKey_legacy(keytype, a, pp, length, libctx, propq);
+ return ossl_d2i_PrivateKey_legacy(keytype, a, pp, length, libctx, propq);
}
/*
diff --git a/crypto/ct/ct_b64.c b/crypto/ct/ct_b64.c
index 8dd137096c..5dae44d5ef 100644
--- a/crypto/ct/ct_b64.c
+++ b/crypto/ct/ct_b64.c
@@ -153,7 +153,7 @@ int CTLOG_new_from_base64_ex(CTLOG **ct_log, const char *pkey_base64,
}
p = pkey_der;
- pkey = d2i_PUBKEY(NULL, &p, pkey_der_len);
+ pkey = d2i_PUBKEY_ex(NULL, &p, pkey_der_len, libctx, propq);
OPENSSL_free(pkey_der);
if (pkey == NULL) {
ERR_raise(ERR_LIB_CT, CT_R_LOG_CONF_INVALID_KEY);
diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index 01877057dc..ca6b2a2132 100644
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -23,6 +23,7 @@
#include <openssl/decoder.h>
#include <openssl/ui.h>
#include "crypto/asn1.h"
+#include "crypto/x509.h"
#include "crypto/evp.h"
#include "pem_local.h"
@@ -157,9 +158,10 @@ static EVP_PKEY *pem_read_bio_key_legacy(BIO *bp, EVP_PKEY **x,
ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen);
if (ameth == NULL || ameth->old_priv_decode == NULL)
goto p8err;
- ret = d2i_PrivateKey(ameth->pkey_id, x, &p, len);
+ ret = ossl_d2i_PrivateKey_legacy(ameth->pkey_id, x, &p, len, libctx,
+ propq);
} else if (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) {
- ret = d2i_PUBKEY(x, &p, len);
+ ret = ossl_d2i_PUBKEY_legacy(x, &p, len);
} else if ((slen = ossl_pem_check_suffix(nm, "PARAMETERS")) > 0) {
ret = EVP_PKEY_new();
if (ret == NULL)
diff --git a/crypto/x509/x_pubkey.c b/crypto/x509/x_pubkey.c
index 2fe5724743..3f447c4c12 100644
--- a/crypto/x509/x_pubkey.c
+++ b/crypto/x509/x_pubkey.c
@@ -17,6 +17,7 @@
#include "internal/cryptlib.h"
#include <openssl/asn1t.h>
#include <openssl/x509.h>
+#include <openssl/engine.h>
#include "crypto/asn1.h"
#include "crypto/evp.h"
#include "crypto/x509.h"
@@ -111,9 +112,11 @@ static int x509_pubkey_ex_d2i_ex(ASN1_VALUE **pval,
const char *propq)
{
const unsigned char *in_saved = *in;
+ size_t publen;
X509_PUBKEY *pubkey;
int ret;
OSSL_DECODER_CTX *dctx = NULL;
+ unsigned char *tmpbuf = NULL;
if (*pval == NULL && !x509_pubkey_ex_new_ex(pval, it, libctx, propq))
return 0;
@@ -128,6 +131,12 @@ static int x509_pubkey_ex_d2i_ex(ASN1_VALUE **pval,
tag, aclass, opt, ctx)) <= 0)
return ret;
+ publen = *in - in_saved;
+ if (!ossl_assert(publen > 0)) {
+ ERR_raise(ERR_LIB_ASN1, ERR_R_INTERNAL_ERROR);
+ return 0;
+ }
+
pubkey = (X509_PUBKEY *)*pval;
EVP_PKEY_free(pubkey->pkey);
pubkey->pkey = NULL;
@@ -151,8 +160,24 @@ static int x509_pubkey_ex_d2i_ex(ASN1_VALUE **pval,
/* Try to decode it into an EVP_PKEY with OSSL_DECODER */
if (ret <= 0 && !pubkey->flag_force_legacy) {
- const unsigned char *p = in_saved;
+ const unsigned char *p;
char txtoidname[OSSL_MAX_NAME_SIZE];
+ size_t slen = publen;
+
+ /*
+ * The decoders don't know how to handle anything other than Universal
+ * class so we modify the data accordingly.
+ */
+ if (aclass != V_ASN1_UNIVERSAL) {
+ tmpbuf = OPENSSL_memdup(in_saved, publen);
+ if (tmpbuf == NULL) {
+ ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
+ return 0;
+ }
+ in_saved = tmpbuf;
+ *tmpbuf = V_ASN1_CONSTRUCTED | V_ASN1_SEQUENCE;
+ }
+ p = in_saved;
if (OBJ_obj2txt(txtoidname, sizeof(txtoidname),
pubkey->algor->algorithm, 0) <= 0) {
@@ -167,15 +192,26 @@ static int x509_pubkey_ex_d2i_ex(ASN1_VALUE **pval,
pubkey->propq)) != NULL)
/*
* As said higher up, we're being opportunistic. In other words,
- * we don't care about what the return value signals.
+ * we don't care if we fail.
*/
- OSSL_DECODER_from_data(dctx, &p, NULL);
+ if (OSSL_DECODER_from_data(dctx, &p, &slen)) {
+ if (slen != 0) {
+ /*
+ * If we successfully decoded then we *must* consume all the
+ * bytes.
+ */
+ ERR_clear_last_mark();
+ ERR_raise(ERR_LIB_ASN1, EVP_R_DECODE_ERROR);
+ goto end;
+ }
+ }
}
ERR_pop_to_mark();
ret = 1;
end:
OSSL_DECODER_CTX_free(dctx);
+ OPENSSL_free(tmpbuf);
return ret;
}
@@ -327,14 +363,30 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
*/
static int x509_pubkey_decode(EVP_PKEY **ppkey, const X509_PUBKEY *key)
{
- EVP_PKEY *pkey = EVP_PKEY_new();
+ EVP_PKEY *pkey;
+ int nid;
+
+ nid = OBJ_obj2nid(key->algor->algorithm);
+ if (!key->flag_force_legacy) {
+#ifndef OPENSSL_NO_ENGINE
+ ENGINE *e = NULL;
+
+ e = ENGINE_get_pkey_meth_engine(nid);
+ if (e == NULL)
+ return 0;
+ ENGINE_finish(e);
+#else
+ return 0;
+#endif
+ }
+ pkey = EVP_PKEY_new();
if (pkey == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_MALLOC_FAILURE);
return -1;
}
- if (!EVP_PKEY_set_type(pkey, OBJ_obj2nid(key->algor->algorithm))) {
+ if (!EVP_PKEY_set_type(pkey, nid)) {
ERR_raise(ERR_LIB_X509, X509_R_UNSUPPORTED_ALGORITHM);
goto error;
}
@@ -362,30 +414,18 @@ static int x509_pubkey_decode(EVP_PKEY **ppkey, const X509_PUBKEY *key)
EVP_PKEY *X509_PUBKEY_get0(const X509_PUBKEY *key)
{
- EVP_PKEY *ret = NULL;
-
- if (key == NULL || key->public_key == NULL)
+ if (key == NULL) {
+ ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
return NULL;
+ }
- if (key->pkey != NULL)
- return key->pkey;
-
- /*
- * When the key ASN.1 is initially parsed an attempt is made to
- * decode the public key and cache the EVP_PKEY structure. If this
- * operation fails the cached value will be NULL. Parsing continues
- * to allow parsing of unknown key types or unsupported forms.
- * We repeat the decode operation so the appropriate errors are left
- * in the queue.
- */
- x509_pubkey_decode(&ret, key);
- /* If decode doesn't fail something bad happened */
- if (ret != NULL) {
- ERR_raise(ERR_LIB_X509, ERR_R_INTERNAL_ERROR);
- EVP_PKEY_free(ret);
+ if (key->pkey == NULL) {
+ /* We failed to decode the key when we loaded it, or it was never set */
+ ERR_raise(ERR_LIB_EVP, EVP_R_DECODE_ERROR);
+ return NULL;
}
- return NULL;
+ return key->pkey;
}
EVP_PKEY *X509_PUBKEY_get(const X509_PUBKEY *key)
@@ -453,8 +493,8 @@ static EVP_PKEY *d2i_PUBKEY_int(EVP_PKEY **a,
}
/* For the algorithm specific d2i functions further down */
-static EVP_PKEY *d2i_PUBKEY_legacy(EVP_PKEY **a,
- const unsigned char **pp, long length)
+EVP_PKEY *ossl_d2i_PUBKEY_legacy(EVP_PKEY **a, const unsigned char **pp,
+ long length)
{
return d2i_PUBKEY_int(a, pp, length, NULL, NULL, 1, d2i_X509_PUBKEY);
}
@@ -531,7 +571,7 @@ RSA *d2i_RSA_PUBKEY(RSA **a, const unsigned char **pp, long length)
const unsigned char *q;
q = *pp;
- pkey = d2i_PUBKEY_legacy(NULL, &q, length);
+ pkey = ossl_d2i_PUBKEY_legacy(NULL, &q, length);
if (pkey == NULL)
return NULL;
key = EVP_PKEY_get1_RSA(pkey);
@@ -572,7 +612,7 @@ DH *ossl_d2i_DH_PUBKEY(DH **a, const unsigned char **pp, long length)
const unsigned char *q;
q = *pp;
- pkey = d2i_PUBKEY_legacy(NULL, &q, length);
+ pkey = ossl_d2i_PUBKEY_legacy(NULL, &q, length);
if (pkey == NULL)
return NULL;
if (EVP_PKEY_get_id(pkey) == EVP_PKEY_DH)
@@ -613,7 +653,7 @@ DH *ossl_d2i_DHx_PUBKEY(DH **a, const unsigned char **pp, long length)
const unsigned char *q;
q = *pp;
- pkey = d2i_PUBKEY_legacy(NULL, &q, length);
+ pkey = ossl_d2i_PUBKEY_legacy(NULL, &q, length);
if (pkey == NULL)
return NULL;
if (EVP_PKEY_get_id(pkey) == EVP_PKEY_DHX)
@@ -656,7 +696,7 @@ DSA *d2i_DSA_PUBKEY(DSA **a, const unsigned char **pp, long length)
const unsigned char *q;
q = *pp;
- pkey = d2i_PUBKEY_legacy(NULL, &q, length);
+ pkey = ossl_d2i_PUBKEY_legacy(NULL, &q, length);
if (pkey == NULL)
return NULL;
key = EVP_PKEY_get1_DSA(pkey);
@@ -699,7 +739,7 @@ EC_KEY *d2i_EC_PUBKEY(EC_KEY **a, const unsigned char **pp, long length)
int type;
q = *pp;
- pkey = d2i_PUBKEY_legacy(NULL, &q, length);
+ pkey = ossl_d2i_PUBKEY_legacy(NULL, &q, length);
if (pkey == NULL)
return NULL;
type = EVP_PKEY_get_id(pkey);
@@ -742,7 +782,7 @@ ECX_KEY *ossl_d2i_ED25519_PUBKEY(ECX_KEY **a,
const unsigned char *q;
q = *pp;
- pkey = d2i_PUBKEY_legacy(NULL, &q, length);
+ pkey = ossl_d2i_PUBKEY_legacy(NULL, &q, length);
if (pkey == NULL)
return NULL;
key = ossl_evp_pkey_get1_ED25519(pkey);
@@ -783,7 +823,7 @@ ECX_KEY *ossl_d2i_ED448_PUBKEY(ECX_KEY **a,
const unsigned char *q;
q = *pp;
- pkey = d2i_PUBKEY_legacy(NULL, &q, length);
+ pkey = ossl_d2i_PUBKEY_legacy(NULL, &q, length);
if (pkey == NULL)
return NULL;
if (EVP_PKEY_get_id(pkey) == EVP_PKEY_ED448)
@@ -825,7 +865,7 @@ ECX_KEY *ossl_d2i_X25519_PUBKEY(ECX_KEY **a,
const unsigned char *q;
q = *pp;
- pkey = d2i_PUBKEY_legacy(NULL, &q, length);
+ pkey = ossl_d2i_PUBKEY_legacy(NULL, &q, length);
if (pkey == NULL)
return NULL;
if (EVP_PKEY_get_id(pkey) == EVP_PKEY_X25519)
@@ -867,7 +907,7 @@ ECX_KEY *ossl_d2i_X448_PUBKEY(ECX_KEY **a,
const unsigned char *q;
q = *pp;
- pkey = d2i_PUBKEY_legacy(NULL, &q, length);
+ pkey = ossl_d2i_PUBKEY_legacy(NULL, &q, length);
if (pkey == NULL)
return NULL;
if (EVP_PKEY_get_id(pkey) == EVP_PKEY_X448)
diff --git a/include/crypto/asn1.h b/include/crypto/asn1.h
index 829c5980d2..dd0b54aad6 100644
--- a/include/crypto/asn1.h
+++ b/include/crypto/asn1.h
@@ -142,4 +142,8 @@ X509_ALGOR *ossl_x509_algor_mgf1_decode(X509_ALGOR *alg);
int ossl_x509_algor_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md);
int ossl_asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm);
+EVP_PKEY * ossl_d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a,
+ const unsigned char **pp, long length,
+ OSSL_LIB_CTX *libctx, const char *propq);
+
#endif /* ndef OSSL_CRYPTO_ASN1_H */
diff --git a/include/crypto/x509.h b/include/crypto/x509.h
index 936ab790de..acb1d7b64a 100644
--- a/include/crypto/x509.h
+++ b/include/crypto/x509.h
@@ -354,4 +354,6 @@ ECX_KEY *ossl_d2i_X448_PUBKEY(ECX_KEY **a,
const unsigned char **pp, long length);
int ossl_i2d_X448_PUBKEY(const ECX_KEY *a, unsigned char **pp);
# endif
+EVP_PKEY *ossl_d2i_PUBKEY_legacy(EVP_PKEY **a, const unsigned char **pp,
+ long length);
#endif
diff --git a/test/certs/cyrillic.msb b/test/certs/cyrillic.msb
index 092c38aa0b..aeae813f45 100644
--- a/test/certs/cyrillic.msb
+++ b/test/certs/cyrillic.msb
@@ -10,7 +10,7 @@ Certificate:
Subject: C=RU, ST=\U041C\U043E\U0441\U043A\U0432\U0430, L=\U041C\U043E\U0441\U043A\U0432\U0430, O=\U0414\U043C\U0438\U0442\U0440\U0438\U0439 \U0411\U0435\U043B\U044F\U0432\U0441\U043A\U0438\U0439, OU=\U042F, CN=Dmitry Belyavskiy, emailAddress=beldmit at example.com
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
- RSA Public-Key: (2048 bit)
+ Public-Key: (2048 bit)
Modulus:
00:a4:57:96:36:55:6d:95:21:25:17:f8:85:87:53:
ba:bc:d5:9a:d6:dc:21:66:72:30:36:ca:94:43:3c:
diff --git a/test/certs/cyrillic.utf8 b/test/certs/cyrillic.utf8
index 243534e36d..b444f98e9d 100644
--- a/test/certs/cyrillic.utf8
+++ b/test/certs/cyrillic.utf8
@@ -10,7 +10,7 @@ Certificate:
Subject: C=RU, ST=Москва, L=Москва, O=Дмитрий Белявский, OU=Я, CN=Dmitry Belyavskiy, emailAddress=beldmit at example.com
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
- RSA Public-Key: (2048 bit)
+ Public-Key: (2048 bit)
Modulus:
00:a4:57:96:36:55:6d:95:21:25:17:f8:85:87:53:
ba:bc:d5:9a:d6:dc:21:66:72:30:36:ca:94:43:3c:
diff --git a/test/evp_test.c b/test/evp_test.c
index 059de1251f..6ba72b405b 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -3348,6 +3348,7 @@ static int key_unsupported(void)
long reason = ERR_GET_REASON(err);
if ((lib == ERR_LIB_EVP && reason == EVP_R_UNSUPPORTED_ALGORITHM)
+ || (lib == ERR_LIB_EVP && reason == EVP_R_DECODE_ERROR)
|| reason == ERR_R_UNSUPPORTED) {
ERR_clear_error();
return 1;
diff --git a/test/recipes/25-test_x509.t b/test/recipes/25-test_x509.t
index 1324f754e9..5b6f8279e7 100644
--- a/test/recipes/25-test_x509.t
+++ b/test/recipes/25-test_x509.t
@@ -127,6 +127,6 @@ ok(test_errors("RC2-40-CBC", "v3-certs-RC2.p12", '-passin', 'pass:v3-certs'),
SKIP: {
skip "sm2 not disabled", 1 if !disabled("sm2");
- ok(test_errors("unknown group|unsupported algorithm", "sm2.pem", '-text'),
+ ok(test_errors("Unable to load Public Key", "sm2.pem", '-text'),
"error loading unsupported sm2 cert");
}
diff --git a/test/recipes/30-test_evp_data/evppkey_ecc.txt b/test/recipes/30-test_evp_data/evppkey_ecc.txt
index 33bab64d28..ea61f7febe 100644
--- a/test/recipes/30-test_evp_data/evppkey_ecc.txt
+++ b/test/recipes/30-test_evp_data/evppkey_ecc.txt
@@ -24,6 +24,7 @@ MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAEDLAAEBXgoOgVlWTLQnrQZXgQuSBcIS3bQAlXQ+yJhS03B
4G8rKQXbrc0mvWsF
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2pnb163v1:ALICE_cf_c2pnb163v1_PUB
PrivateKey=BOB_cf_c2pnb163v1
@@ -37,6 +38,7 @@ MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAEDLAAEBn9J0jo39aFVZqhBsAKZ6bViAu6zBC8WaFGExnpZ
KuBh8tP8VSTHPCHF
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2pnb163v1:BOB_cf_c2pnb163v1_PUB
# ECDH Alice with Bob peer
@@ -100,6 +102,7 @@ MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAIDLAAEAVnlL7lMBaASwCIJaf9x2LgNPVmEAb43huHQlo3Q
4PzawHXQoYm/qgDd
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2pnb163v2:ALICE_cf_c2pnb163v2_PUB
PrivateKey=BOB_cf_c2pnb163v2
@@ -113,6 +116,7 @@ MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAIDLAAEAVWNIKn7/WMfzuNnd5ws9J0DI2CfBkEJizZHAFqy
kBF3juAQuARgxuT6
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2pnb163v2:BOB_cf_c2pnb163v2_PUB
# ECDH Alice with Bob peer
@@ -176,6 +180,7 @@ MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAMDLAAEBx1HRyjuBMjt+vlbWaQbKOpNvWKFAslzEbPv6MpK
YnObLnq34LRuWznb
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2pnb163v3:ALICE_cf_c2pnb163v3_PUB
PrivateKey=BOB_cf_c2pnb163v3
@@ -189,6 +194,7 @@ MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAMDLAAEAqXF7rsAZ40Z1PT4TeeC45RKTxP4AJBAdfuknJ/J
DZnBLhxBwtqnfUpA
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2pnb163v3:BOB_cf_c2pnb163v3_PUB
# ECDH Alice with Bob peer
@@ -252,6 +258,7 @@ MEUwEwYHKoZIzj0CAQYIKoZIzj0DAAQDLgAEPjME7IV6Tuz2P++wIT60hRxTkk0M0PNgvqYcUoCI
iw3girDLhNzOu3IQ8Ac=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2pnb176v1:ALICE_cf_c2pnb176v1_PUB
PrivateKey=BOB_cf_c2pnb176v1
@@ -265,6 +272,7 @@ MEUwEwYHKoZIzj0CAQYIKoZIzj0DAAQDLgAEpJn1IDmFj5LceLGfY2wlhI1VHq5vJ+qNIAOXVZhX
uMtp6pzy63rCEK53bgs=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2pnb176v1:BOB_cf_c2pnb176v1_PUB
# ECDH Alice with Bob peer
@@ -329,6 +337,7 @@ ME0wEwYHKoZIzj0CAQYIKoZIzj0DAAoDNgAEL+IHOL2IfeLRiE6Wqsc0Frqjq7t/JnBmhN1lMB9Y
Yj3+Btcne4CPWf8KvfGjAdMs6JKP4A==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2pnb208w1:ALICE_cf_c2pnb208w1_PUB
PrivateKey=BOB_cf_c2pnb208w1
@@ -343,6 +352,7 @@ ME0wEwYHKoZIzj0CAQYIKoZIzj0DAAoDNgAENBvdzCDOIvu9zo7reJq1ummhR+0jaDc+EoSlW984
cl9FTi/JJznwC+RNgwVfJ1WKJun1YA==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2pnb208w1:BOB_cf_c2pnb208w1_PUB
# ECDH Alice with Bob peer
@@ -407,6 +417,7 @@ MF0wEwYHKoZIzj0CAQYIKoZIzj0DABADRgAE0IH60bGi46FDzEprGZ8EBK5uMMcVke/txeBRNGHQ
DzG68r3EMLZkOfE1+g04MN7HgY7zt3jMYb8ImyLRmvqR2abjs6c=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2pnb272w1:ALICE_cf_c2pnb272w1_PUB
PrivateKey=BOB_cf_c2pnb272w1
@@ -421,6 +432,7 @@ MF0wEwYHKoZIzj0CAQYIKoZIzj0DABADRgAEIeIkcMHAuOgvHt2Wp52vVe0DYPNnUX79t/mLSx03
cUlDmcxL7vIXdx9hB4OmQBYbm+YLDNfTFGAIlDfr2tELpVVPWPo=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2pnb272w1:BOB_cf_c2pnb272w1_PUB
# ECDH Alice with Bob peer
@@ -485,6 +497,7 @@ MGUwEwYHKoZIzj0CAQYIKoZIzj0DABEDTgAEvoaqRX6qiNQiFH1BhgLCPTpYszoRhmlLirkvlw/Q
iXBlfQ7U4g+iRR/kmu2RlwwOHgNNL+mWcvLkFfS8Kr4jzv1EY1Ecx96n21l0YQ==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2pnb304w1:ALICE_cf_c2pnb304w1_PUB
PrivateKey=BOB_cf_c2pnb304w1
@@ -499,6 +512,7 @@ MGUwEwYHKoZIzj0CAQYIKoZIzj0DABEDTgAEYuAq/6Yw5HxMeMohlWmwl+ZK4ZQucfr1tWDKwhDb
kAOUO2P/Q/H+uelM3VVwxeu6A1kaX7K0UZpNa96NRBwI4aevc+vOxCgYkGt9BA==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2pnb304w1:BOB_cf_c2pnb304w1_PUB
# ECDH Alice with Bob peer
@@ -564,6 +578,7 @@ euvf3cpPXBvxUawJXfO9FwFRQabDRagGP99Walidd2JW8nWDWZgZMKj15Wh+4bp2dZHc2tPIIHHd
3makbwQ=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2pnb368w1:ALICE_cf_c2pnb368w1_PUB
PrivateKey=BOB_cf_c2pnb368w1
@@ -579,6 +594,7 @@ At+zYlpzGax1oJ1CW8fGA0Gu0RnvAfDeW9vgrtzshH1Vy/Ni6a7LPho99PtUP2nzUBnv+hfhFSra
gqfRaOs=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2pnb368w1:BOB_cf_c2pnb368w1_PUB
# ECDH Alice with Bob peer
@@ -644,6 +660,7 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAUDMgAEG9iuZmnhz2H/YQKmVUaO//fm7hvV+CP5c2iszpR3
7lRimqLWHPyvKgcP+PRCIUom
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2tnb191v1:ALICE_cf_c2tnb191v1_PUB
PrivateKey=BOB_cf_c2tnb191v1
@@ -658,6 +675,7 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAUDMgAEdO/4ii8gi8eQfBrv3XmsOETwIfT8OIpBW/kUoHD+
adqalcB6SIWOfoJReDLcpxAD
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2tnb191v1:BOB_cf_c2tnb191v1_PUB
# ECDH Alice with Bob peer
@@ -722,6 +740,7 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAYDMgAEAyQdwZYRIiv7O4/WRLDKJ249TM8dr2Y+Oz8rSxCI
UVvJT/Jv9m462J6Iz1XOohhP
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2tnb191v2:ALICE_cf_c2tnb191v2_PUB
PrivateKey=BOB_cf_c2tnb191v2
@@ -736,6 +755,7 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAYDMgAEBVkB4O6fFvGzMHv4BF51muFA0npOGKoOdKbIIMQY
JBIoz1RNNXTcgdpguLcrvcPJ
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2tnb191v2:BOB_cf_c2tnb191v2_PUB
# ECDH Alice with Bob peer
@@ -800,6 +820,7 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAcDMgAEL4NGEUX2CXY18MyoH1inKq5kde9RGr25ODm/0BEX
HWsGvDE2HC+6pL2BMl3MRCty
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2tnb191v3:ALICE_cf_c2tnb191v3_PUB
PrivateKey=BOB_cf_c2tnb191v3
@@ -814,6 +835,7 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAcDMgAEPKekNkT9mQ8KRCTR2RwCFkhNvsjL+/mLHYzbMrYe
QFIb5QwXAdbg2tEOl7yj9qkk
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2tnb191v3:BOB_cf_c2tnb191v3_PUB
# ECDH Alice with Bob peer
@@ -878,6 +900,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAsDPgAEUgG/uMWy4k0R/kbVJEapF6r5ik4Q9WPsDXAd0856
dVL8PvBXgixk2tKfyY1xUVebcEVlgdZP1pN1Xyvi
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2tnb239v1:ALICE_cf_c2tnb239v1_PUB
PrivateKey=BOB_cf_c2tnb239v1
@@ -892,6 +915,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAsDPgAEcwKt31cWaoFUd7QxYSdwgMDOqEhjPbD3Z9AfR3tc
G77/MY5z1oQegqImBog645vtPWI8lZd1zcl6QYRS
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2tnb239v1:BOB_cf_c2tnb239v1_PUB
# ECDH Alice with Bob peer
@@ -956,6 +980,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAwDPgAEKzpycflUrsyqVV/+fzvC2+AuX3r0b0Syn8acvn78
VnKA9mZKwPLWhnMJcLyzarIzc/6/UcfYGNmTyUlG
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2tnb239v2:ALICE_cf_c2tnb239v2_PUB
PrivateKey=BOB_cf_c2tnb239v2
@@ -970,6 +995,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAwDPgAETPSkhMs3JW3BG66FSfCov76JKdcRiBhMCW453Wku
N7yBxBmWjeclHhnXIzfc4qM4qf9n3KzMSXejPVYg
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2tnb239v2:BOB_cf_c2tnb239v2_PUB
# ECDH Alice with Bob peer
@@ -1034,6 +1060,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAA0DPgAEOu2HIAUX+r6IbRlrPUJUBDL814dR++maVAAkUIjD
H33ewqcI9ZLtpvuR8P8hgRNUTXlh1GWgrB6F21Eo
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2tnb239v3:ALICE_cf_c2tnb239v3_PUB
PrivateKey=BOB_cf_c2tnb239v3
@@ -1048,6 +1075,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAA0DPgAEVaEi76wyzlpzkkSElf4SmGZ7kf1ghHMP82HkGk7K
BC10zUyppoSOAr0eX4pHAkDUF1m/KGoJa7QcJJww
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2tnb239v3:BOB_cf_c2tnb239v3_PUB
# ECDH Alice with Bob peer
@@ -1113,6 +1141,7 @@ RLMN7C4rRmqiJakD11QtOforOgbPW5r/v7t4TUWIlq8jV7kapJNtxQtg/S87L0NQGgHBq/lnJL8x
fN3Y
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2tnb359v1:ALICE_cf_c2tnb359v1_PUB
PrivateKey=BOB_cf_c2tnb359v1
@@ -1128,6 +1157,7 @@ ZNX8SSS79Zf2HsQl+LWIZyzeYzoHobKXufChw9/H4ThS58VwV5/0hoE929PIgJ1MSEqr5LvJXi+b
R8fe
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2tnb359v1:BOB_cf_c2tnb359v1_PUB
# ECDH Alice with Bob peer
@@ -1194,6 +1224,7 @@ pGEMTh8B+YfkWuq+IDY5zSqNKtg7cRlAFX2dlHhRSvNxrN3DJCrhe/TQq8SIYawcqEQnM39F8hHM
7VQJLEsBpJ/WUonwMJXknjgfONP7GA==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_c2tnb431r1:ALICE_cf_c2tnb431r1_PUB
PrivateKey=BOB_cf_c2tnb431r1
@@ -1209,6 +1240,7 @@ fb9kEbBLU+QixSbYZOrqPasesDV9dApDXF+w6EfIeNyJEK5Lk+aXamrn7fRMUAQ2m7+Odp87GgA+
8Cg6YpgbK314SK5STziqoZwzEISJ9w==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_c2tnb431r1:BOB_cf_c2tnb431r1_PUB
# ECDH Alice with Bob peer
@@ -1274,6 +1306,7 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQIDMgAET6wOPoDU3BeU7VKozsGEvDeJs//9Z/aNEcbbLQ0d
g5IzsS/XMJzifjCJZgNsb7mi
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_prime192v2:ALICE_cf_prime192v2_PUB
PrivateKey=BOB_cf_prime192v2
@@ -1288,6 +1321,7 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQIDMgAEcgWNAOL4pZCmouZl+be+rC0yLAJkm2YuPWs+FX2u
Y6OU1aHkkspZTC1uUVWjchy5
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_prime192v2:BOB_cf_prime192v2_PUB
# ECDH Alice with Bob peer
@@ -1316,6 +1350,7 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQMDMgAE1+mLeiT/jjHO71IL/C/ZcnF6+yj9FV6eqfuPdHAi
MsDRFCB6/h8TcCUFuospu5l0
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_prime192v3:ALICE_cf_prime192v3_PUB
PrivateKey=BOB_cf_prime192v3
@@ -1330,6 +1365,7 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQMDMgAEv35bOz0xqLeJqpZdZ8LyiUgsJMBEtN2UMJm8blX2
vMWAgEeLhzar86BUlS7dZwS7
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_prime192v3:BOB_cf_prime192v3_PUB
# ECDH Alice with Bob peer
@@ -1358,6 +1394,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQQDPgAEMqQLCgDR9njkq9QELuOu+J/9YGcxJHULdvxHImLW
RXqBUM5Xea+Qk2SKIpWcogxr2zFeQyeLj2bQysuo
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_prime239v1:ALICE_cf_prime239v1_PUB
PrivateKey=BOB_cf_prime239v1
@@ -1372,6 +1409,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQQDPgAEBR5m/kllh025oO4GvqALkjRliVv7q4x8ro/tkYnT
L2U4hkT6xUeRu9QC4KOz7KUVH+nBbQASL4XQg/3C
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_prime239v1:BOB_cf_prime239v1_PUB
# ECDH Alice with Bob peer
@@ -1400,6 +1438,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQUDPgAETH77jXHBItV673gTNK/HTFldo4VxPiscbideUgKd
CWjdVsXebgAZbqQwf0h9QWcIgM7K7ODdW5kCuZ1G
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_prime239v2:ALICE_cf_prime239v2_PUB
PrivateKey=BOB_cf_prime239v2
@@ -1414,6 +1453,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQUDPgAELUQYo0UH8HbK/RMD2jVphBU+iB4OTOfvaaTlHq06
dcJ8a9a+mAQKhb1OZVEq1n4nQsgRiI1rPxugVERM
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_prime239v2:BOB_cf_prime239v2_PUB
# ECDH Alice with Bob peer
@@ -1442,6 +1482,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQYDPgAEZEN48pqgLF08Yjj/8BLM2Nr5ZhpYxyBurbzKRuBb
GLpzZLteJN9vZjN7ouNpMxLVUFQxTOwpsvUw86Lk
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_prime239v3:ALICE_cf_prime239v3_PUB
PrivateKey=BOB_cf_prime239v3
@@ -1456,6 +1497,7 @@ MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQYDPgAEQUWKqohAPAoIYEZOvc1QwSlcB+gW0febaNxGOy47
LaIWdsNM7GJVP9xpdSwm/L+Dip/oH4E59f3SiOAd
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_prime239v3:BOB_cf_prime239v3_PUB
# ECDH Alice with Bob peer
@@ -1482,6 +1524,7 @@ PublicKey=ALICE_cf_secp112r1_PUB
MDIwEAYHKoZIzj0CAQYFK4EEAAYDHgAEYIawfjH3qRrJJWwuG3Ys5ZhDJsmdWi34aHgKAA==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_secp112r1:ALICE_cf_secp112r1_PUB
PrivateKey=BOB_cf_secp112r1
@@ -1494,6 +1537,7 @@ PublicKey=BOB_cf_secp112r1_PUB
MDIwEAYHKoZIzj0CAQYFK4EEAAYDHgAEchh3iQdPN1rrzrpdZRQ95G6tvdwEBQ+gfu1tvA==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_secp112r1:BOB_cf_secp112r1_PUB
# ECDH Alice with Bob peer
@@ -1520,6 +1564,7 @@ PublicKey=ALICE_cf_secp112r2_PUB
MDIwEAYHKoZIzj0CAQYFK4EEAAcDHgAEHK9uNAILHBmPZdKKh79/nzYE0HbvC//rA7i0Xw==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_secp112r2:ALICE_cf_secp112r2_PUB
PrivateKey=BOB_cf_secp112r2
@@ -1532,6 +1577,7 @@ PublicKey=BOB_cf_secp112r2_PUB
MDIwEAYHKoZIzj0CAQYFK4EEAAcDHgAEUzBLNQupqUpGgmZl9JVjKBpwusl52rFg5OVFJA==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_secp112r2:BOB_cf_secp112r2_PUB
# ECDH Alice with Bob peer
@@ -1593,6 +1639,7 @@ PublicKey=ALICE_cf_secp128r1_PUB
MDYwEAYHKoZIzj0CAQYFK4EEABwDIgAEG0XMAdrAZOPUW6L9ADU8XK8sZr7dtIcDinSWU1zSV9s=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_secp128r1:ALICE_cf_secp128r1_PUB
PrivateKey=BOB_cf_secp128r1
@@ -1605,6 +1652,7 @@ PublicKey=BOB_cf_secp128r1_PUB
MDYwEAYHKoZIzj0CAQYFK4EEABwDIgAE82nknsOS+u8mybP0KJqQhvm83gbPNTZOcvm0ZDVR5sU=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_secp128r1:BOB_cf_secp128r1_PUB
# ECDH Alice with Bob peer
@@ -1631,6 +1679,7 @@ PublicKey=ALICE_cf_secp128r2_PUB
MDYwEAYHKoZIzj0CAQYFK4EEAB0DIgAEOKiPRGtZXwxmvTr35NmUkNsAGGk9RKNA4D5BE9ZrjZQ=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_secp128r2:ALICE_cf_secp128r2_PUB
PrivateKey=BOB_cf_secp128r2
@@ -1643,6 +1692,7 @@ PublicKey=BOB_cf_secp128r2_PUB
MDYwEAYHKoZIzj0CAQYFK4EEAB0DIgAELph7h27BYjIINC2EddcpIOxKbdz8Xe7h3Az1ZuR9bAI=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_secp128r2:BOB_cf_secp128r2_PUB
# ECDH Alice with Bob peer
@@ -1705,6 +1755,7 @@ MD4wEAYHKoZIzj0CAQYFK4EEAAkDKgAEcVWIjtPZn1cHckclpn5jKDCphQUVHxFN5tSeFG9wsJZT
EvqPyLS64w==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_secp160k1:ALICE_cf_secp160k1_PUB
PrivateKey=BOB_cf_secp160k1
@@ -1718,6 +1769,7 @@ MD4wEAYHKoZIzj0CAQYFK4EEAAkDKgAESGN41cAj8Fg4pAJM7FUKHiawbCR0b9unMpZWxqOKeW1/
bxT/CqEkyw==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_secp160k1:BOB_cf_secp160k1_PUB
# ECDH Alice with Bob peer
@@ -1745,6 +1797,7 @@ MD4wEAYHKoZIzj0CAQYFK4EEAAgDKgAEO78GZuBaCfJjHK97c9N21z+4mm37b5x7/Hr3Xc4pUbtb
OoNj/A+W9w==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_secp160r1:ALICE_cf_secp160r1_PUB
PrivateKey=BOB_cf_secp160r1
@@ -1758,6 +1811,7 @@ MD4wEAYHKoZIzj0CAQYFK4EEAAgDKgAEBKDbBSPTwmb00MFvMtJMxQ2YDmcPOZHE8YbVr5hp8s5J
Jwy17FaNNg==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_secp160r1:BOB_cf_secp160r1_PUB
# ECDH Alice with Bob peer
@@ -1785,6 +1839,7 @@ MD4wEAYHKoZIzj0CAQYFK4EEAB4DKgAE4V+25YCpVkKF6NF/UPc1SYxohYWcf3qT3JDoPRhnm/rj
mSqCCA6gUw==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_secp160r2:ALICE_cf_secp160r2_PUB
PrivateKey=BOB_cf_secp160r2
@@ -1798,6 +1853,7 @@ MD4wEAYHKoZIzj0CAQYFK4EEAB4DKgAEB7YVzBmzhnIdouvN/nb8VMXCqO8dkhmebyVzoD0oAzuH
nN+SfWr6aQ==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_secp160r2:BOB_cf_secp160r2_PUB
# ECDH Alice with Bob peer
@@ -1825,6 +1881,7 @@ MEYwEAYHKoZIzj0CAQYFK4EEAB8DMgAEyV4EzMZglBXtYdn38hNTrCGflAsJprMkxkOlw58chZ25
6EAu7gVvYDTpnRkymKyH
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_secp192k1:ALICE_cf_secp192k1_PUB
PrivateKey=BOB_cf_secp192k1
@@ -1838,6 +1895,7 @@ MEYwEAYHKoZIzj0CAQYFK4EEAB8DMgAE990Tnmh9QQQHVHuLpfrAsgjvB9R2MJXzhBZN1WvtxLqF
OZ2oFMP0Kfcr7HbI7a5j
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_secp192k1:BOB_cf_secp192k1_PUB
# ECDH Alice with Bob peer
@@ -1866,6 +1924,7 @@ ME4wEAYHKoZIzj0CAQYFK4EEACADOgAE4o7LGdJDixqJZ5imnqaX4IeE55NG4W0HEe72LVC7pmn2
e3m7uC92ZQhduF9lJli4dXD5en/1wkE=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_secp224k1:ALICE_cf_secp224k1_PUB
PrivateKey=BOB_cf_secp224k1
@@ -1880,6 +1939,7 @@ ME4wEAYHKoZIzj0CAQYFK4EEACADOgAEzp00m0DaADn1mGiDCT7K1LZnoj/vCxHPowUDC9yQd17K
KpJM5sGILrTkkgxqtt5pBeYE1NC1QUQ=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_secp224k1:BOB_cf_secp224k1_PUB
# ECDH Alice with Bob peer
@@ -1908,6 +1968,7 @@ MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAElytZZZHc9CelGzZkNGpzY2CHQ+3z6tUnfsQxUmtiZnUg
7oKfQC5BV8pZ5WYNPWnbT0RRg5kyBtzry9oQIhO5Lw==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_secp256k1:ALICE_cf_secp256k1_PUB
PrivateKey=BOB_cf_secp256k1
@@ -1922,6 +1983,7 @@ MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE2BQeSJOa7kJAQsAPUbLseHjHhMe3tUOAl3bqoDqtrfO+
2m2MP/IC/R9Kof2nmaiQ6DostdbS8kB+CnnprK375w==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_secp256k1:BOB_cf_secp256k1_PUB
# ECDH Alice with Bob peer
@@ -1948,6 +2010,7 @@ PublicKey=ALICE_cf_sect113r1_PUB
MDQwEAYHKoZIzj0CAQYFK4EEAAQDIAAEASO9jcamlg1pRE7JffrTAe9kyRZO2xrymHXoGdnA
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_sect113r1:ALICE_cf_sect113r1_PUB
PrivateKey=BOB_cf_sect113r1
@@ -1960,6 +2023,7 @@ PublicKey=BOB_cf_sect113r1_PUB
MDQwEAYHKoZIzj0CAQYFK4EEAAQDIAAEATykaf/cvJzLOUto1EbbAEz/3++nut6q0dcJOQeV
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_sect113r1:BOB_cf_sect113r1_PUB
# ECDH Alice with Bob peer
@@ -2021,6 +2085,7 @@ PublicKey=ALICE_cf_sect113r2_PUB
MDQwEAYHKoZIzj0CAQYFK4EEAAUDIAAEAFvQ4JgQTS8kjGeVfuITAS81qNcOQvt3PYa1HuCk
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_sect113r2:ALICE_cf_sect113r2_PUB
PrivateKey=BOB_cf_sect113r2
@@ -2033,6 +2098,7 @@ PublicKey=BOB_cf_sect113r2_PUB
MDQwEAYHKoZIzj0CAQYFK4EEAAUDIAAEAUoS3of8y28meYu/NoI5AVdhJZCuDjMqFHTriWY4
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_sect113r2:BOB_cf_sect113r2_PUB
# ECDH Alice with Bob peer
@@ -2095,6 +2161,7 @@ MDgwEAYHKoZIzj0CAQYFK4EEABYDJAAEBXCuXD6wOOif91GUlJNKXf8FBNw8crgqi5aEJEZbCdBJ
Ag==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_sect131r1:ALICE_cf_sect131r1_PUB
PrivateKey=BOB_cf_sect131r1
@@ -2108,6 +2175,7 @@ MDgwEAYHKoZIzj0CAQYFK4EEABYDJAAEB8vGy3OQXwWKcJUSSJbCtpMBjFgJeZxzAaI420+B1B+1
5A==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_sect131r1:BOB_cf_sect131r1_PUB
# ECDH Alice with Bob peer
@@ -2171,6 +2239,7 @@ MDgwEAYHKoZIzj0CAQYFK4EEABcDJAAEA5+Y20L8q989I4jnKknZ7hcGlQ6RUIGni9RahT88kB/d
dw==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_sect131r2:ALICE_cf_sect131r2_PUB
PrivateKey=BOB_cf_sect131r2
@@ -2184,6 +2253,7 @@ MDgwEAYHKoZIzj0CAQYFK4EEABcDJAAEB2G2uNkhQNjjl0/Ov6UYpxoFaWNXO+qy7poV6cdrFN7z
pA==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_sect131r2:BOB_cf_sect131r2_PUB
# ECDH Alice with Bob peer
@@ -2247,6 +2317,7 @@ MEAwEAYHKoZIzj0CAQYFK4EEAAIDLAAEA0f195HCcD4D+7wWyl3QuPkRovG/ATy5l7fpMl4BNIg/
sbtEXluCzANF
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_sect163r1:ALICE_cf_sect163r1_PUB
PrivateKey=BOB_cf_sect163r1
@@ -2260,6 +2331,7 @@ MEAwEAYHKoZIzj0CAQYFK4EEAAIDLAAEAul/oBKr9B5MsPHWGF+q07j0JC+WAxj1JzfcIXR98n+r
9FHWU5LC5pDM
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_sect163r1:BOB_cf_sect163r1_PUB
# ECDH Alice with Bob peer
@@ -2323,6 +2395,7 @@ MEgwEAYHKoZIzj0CAQYFK4EEABgDNAAEAeqP0VQobenduwtf4MPmlYQVDjUmxKq50QFHnaBfzwXY
1TYShZZgBr0R6a5dUGCbiF0=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_sect193r1:ALICE_cf_sect193r1_PUB
PrivateKey=BOB_cf_sect193r1
@@ -2336,6 +2409,7 @@ MEgwEAYHKoZIzj0CAQYFK4EEABgDNAAEAaFZVIeqfV9wbPydaBSJKSWJjVyFVSB/QQB5rHonYQmK
f40zok8PJS6ratIcZwk/n20=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_sect193r1:BOB_cf_sect193r1_PUB
# ECDH Alice with Bob peer
@@ -2399,6 +2473,7 @@ MEgwEAYHKoZIzj0CAQYFK4EEABkDNAAEAIn7oSu3adu4ChNXniHKkMIv9gT24rpzzwAeCTDPIkUT
kJ+Tit6e4RpgkB/dph4V+uI=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_sect193r2:ALICE_cf_sect193r2_PUB
PrivateKey=BOB_cf_sect193r2
@@ -2412,6 +2487,7 @@ MEgwEAYHKoZIzj0CAQYFK4EEABkDNAAEAFdSLKI0tlwZDpkndutOLsnHii1aJO8snwEJ0m/AZgMp
xiDevOQ/xE9SpMX25W7YqkU=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_sect193r2:BOB_cf_sect193r2_PUB
# ECDH Alice with Bob peer
@@ -2476,6 +2552,7 @@ MFIwEAYHKoZIzj0CAQYFK4EEAAMDPgAEf5paOMjzcnpVAPMQnIkikE4K2jne3ubX2TD1P3aedknF
lUr6tOU4BsiUQJACF90rQ9/KdeR5mYvYHzvI
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_sect239k1:ALICE_cf_sect239k1_PUB
PrivateKey=BOB_cf_sect239k1
@@ -2490,6 +2567,7 @@ MFIwEAYHKoZIzj0CAQYFK4EEAAMDPgAEKnjJ4RHe+EiElXMrF4ou7VGy1pn0ZiO17FouF31Zbvjc
TcbhfE6ziXM8sekQJBwcwRKQ9+G/Qzq/2A9x
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_sect239k1:BOB_cf_sect239k1_PUB
# ECDH Alice with Bob peer
@@ -2554,6 +2632,7 @@ MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAZkrhWBz/Q4GB8DY4Ia114ew6H7Eg7ri2uxwxd3rAZs5
/ShvunNyndjCt3Qaq8sulBM0nUyERSDakyD+
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls10:ALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls10
@@ -2568,6 +2647,7 @@ MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAGavw4ChHCoWplAumMEBwJgJ2aYtw+utu4vhWnscAPIT
IJ4IiIGj18rCFBap1sgVbpXjhEBLYg6Itwv2
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls10:BOB_cf_wap-wsg-idm-ecid-wtls10_PUB
# ECDH Alice with Bob peer
@@ -2632,6 +2712,7 @@ MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEABttgKKYeGZRmcH/5UZR56lOSgbU4TH2AuIhvj88AL6H
zTCX9elzXpck+u22bnmkuvL2A8XKB5+fabMR
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls11:ALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls11
@@ -2646,6 +2727,7 @@ MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEAL6Xj/KCmXAQAAo847t0bl0wqBrteWRg93OvIJsPAAOE
ehdIgJyruc3KsH0RFlipu5QD8pnGSIXvif19
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls11:BOB_cf_wap-wsg-idm-ecid-wtls11_PUB
# ECDH Alice with Bob peer
@@ -2710,6 +2792,7 @@ ME4wEAYHKoZIzj0CAQYFZysBBAwDOgAE0t0WqG/pFsiCt6agmebw3FCEWAzf9BpNLuzoCkPEe0Li
bqn5udrckL6s3stwCTVFaZUfY2qS9QE=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls12:ALICE_cf_wap-wsg-idm-ecid-wtls12_PUB
PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls12
@@ -2724,6 +2807,7 @@ ME4wEAYHKoZIzj0CAQYFZysBBAwDOgAEvyxedqaWkoAOMjaV5W3/tJpheiHAR0zV6BlIeUuGP2mx
+xsOK9/QB7hzipq9cXx1K/dXu58EoSY=
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls12:BOB_cf_wap-wsg-idm-ecid-wtls12_PUB
# ECDH Alice with Bob peer
@@ -2750,6 +2834,7 @@ PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEACBNPI48xxsPVQBy07jRAAcWzbIkMo8BQotxpfGJ
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls1:ALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls1
@@ -2762,6 +2847,7 @@ PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls1_PUB
MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEAEeHMSBTx/EtOu+bjBinALHSkQuJyiP3mg1tu+I2
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls1:BOB_cf_wap-wsg-idm-ecid-wtls1_PUB
# ECDH Alice with Bob peer
@@ -2824,6 +2910,7 @@ MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEBRIzvK9o7eO2NGmtPFV/zo9/1mlvBwjG7+e6hbPG1KdI
01f8oGBuXMQH
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls3:ALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls3
@@ -2837,6 +2924,7 @@ MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEAYOspjEbzyZw61jCtUrxARr+w66nBH+73QIvlaRVSG/4
hlBUf5kmG4Yn
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls3:BOB_cf_wap-wsg-idm-ecid-wtls3_PUB
# ECDH Alice with Bob peer
@@ -2899,6 +2987,7 @@ PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAW3K4Mus5+KAJVGLzEYrAYuCJSEYXFTo17aW0TwN
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls4:ALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls4
@@ -2911,6 +3000,7 @@ PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls4_PUB
MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAI0F7ixGqOhnYpsuR80nAdTdSXM+YbcUbLe/U/xG
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls4:BOB_cf_wap-wsg-idm-ecid-wtls4_PUB
# ECDH Alice with Bob peer
@@ -2973,6 +3063,7 @@ MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEAH5xyUrvbuN+tWmRhwqrQfFHPHNUBKtAGvJuvSFVwTKk
uFzn9fPvIDe6
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls5:ALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls5
@@ -2986,6 +3077,7 @@ MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEBdXxEk0L2XAVzRNLPcnMxGXXyDfZAoA1Qw2XpOfVWIVR
jdoMGRgUuJmO
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls5:BOB_cf_wap-wsg-idm-ecid-wtls5_PUB
# ECDH Alice with Bob peer
@@ -3048,6 +3140,7 @@ PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls6_PUB
MDIwEAYHKoZIzj0CAQYFZysBBAYDHgAERPw/8Ip/RrXr0gMgLGRQeiQ4Qd6W+Li0ylGKzg==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls6:ALICE_cf_wap-wsg-idm-ecid-wtls6_PUB
PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls6
@@ -3060,6 +3153,7 @@ PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls6_PUB
MDIwEAYHKoZIzj0CAQYFZysBBAYDHgAEhJXqpYGxE/l1X/LiBeyRbIcyzqPxUP5Tkv3U3w==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls6:BOB_cf_wap-wsg-idm-ecid-wtls6_PUB
# ECDH Alice with Bob peer
@@ -3087,6 +3181,7 @@ MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEwQLnZ70n45RLqRtAGNzEa3Rl/9nwyjqYUtw2eeHhnNLT
feGY4CNH0w==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls7:ALICE_cf_wap-wsg-idm-ecid-wtls7_PUB
PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls7
@@ -3100,6 +3195,7 @@ MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEZGN44YbN5r3zcNtOHrvbQLt8/lE7BHp4D/9eKLmwFDn1
QneRu3xwPA==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls7:BOB_cf_wap-wsg-idm-ecid-wtls7_PUB
# ECDH Alice with Bob peer
@@ -3126,6 +3222,7 @@ PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls8_PUB
MDIwEAYHKoZIzj0CAQYFZysBBAgDHgAEJD0h4HEfchwxqhp9eMHh9gczQKHX4MtWVoAxKQ==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls8:ALICE_cf_wap-wsg-idm-ecid-wtls8_PUB
PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls8
@@ -3138,6 +3235,7 @@ PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls8_PUB
MDIwEAYHKoZIzj0CAQYFZysBBAgDHgAEZawmRmzr9P+jihImUi6ykOzaSH484JhMKNdrgw==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls8:BOB_cf_wap-wsg-idm-ecid-wtls8_PUB
# ECDH Alice with Bob peer
@@ -3165,6 +3263,7 @@ MD4wEAYHKoZIzj0CAQYFZysBBAkDKgAET0ppOvd9DU4v+tkKDQ5wRBrN1FwD9+F9t5l3Im+mz3rw
DB/RYdZuUg==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls9:ALICE_cf_wap-wsg-idm-ecid-wtls9_PUB
PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls9
@@ -3178,6 +3277,7 @@ MD4wEAYHKoZIzj0CAQYFZysBBAkDKgAEWc37LGt6lt90iF4lhtDYNFdjAqoczebuNgzGff/Uq8ov
a3EVJ9yK1A==
-----END PUBLIC KEY-----
+Availablein = default
PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls9:BOB_cf_wap-wsg-idm-ecid-wtls9_PUB
# ECDH Alice with Bob peer
diff --git a/test/recipes/65-test_cmp_server.t b/test/recipes/65-test_cmp_server.t
index 478de7751a..ba09fbe924 100644
--- a/test/recipes/65-test_cmp_server.t
+++ b/test/recipes/65-test_cmp_server.t
@@ -36,5 +36,5 @@ ok(run(test([@basic_cmd, "none"])));
ok(run(test([@basic_cmd, "default", srctop_file("test", "default.cnf")])));
unless ($no_fips) {
- ok(run(test([@basic_cmd, "fips", srctop_file("test", "fips.cnf")])));
+ ok(run(test([@basic_cmd, "fips", srctop_file("test", "fips-and-base.cnf")])));
}
diff --git a/test/recipes/65-test_cmp_vfy.t b/test/recipes/65-test_cmp_vfy.t
index cc0ef8cee7..f722800e27 100644
--- a/test/recipes/65-test_cmp_vfy.t
+++ b/test/recipes/65-test_cmp_vfy.t
@@ -47,5 +47,5 @@ ok(run(test([@basic_cmd, "none"])));
ok(run(test([@basic_cmd, "default", srctop_file("test", "default.cnf")])));
unless ($no_fips) {
- ok(run(test([@basic_cmd, "fips", srctop_file("test", "fips.cnf")])));
+ ok(run(test([@basic_cmd, "fips", srctop_file("test", "fips-and-base.cnf")])));
}
More information about the openssl-commits
mailing list