summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorJon Spillett <jon.spillett@oracle.com>2021-03-15 14:26:09 +1000
committerTomas Mraz <tomas@openssl.org>2021-06-01 12:16:27 +0200
commit169eca602c67f37abf0a44e1605998d5e7f04fa6 (patch)
tree221d3097ca04a1549d0cb93442c1c2d00f954928 /util
parent8ee66a092c07e618191ef49c8912f8235b08bb95 (diff)
Enhance the encoder/decoder tests to allow testing with a non-default library context and configurable providers
Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14587)
Diffstat (limited to 'util')
-rw-r--r--util/libcrypto.num2
-rw-r--r--util/missingcrypto.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 1016d9c327..c7d89421a2 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -5416,3 +5416,5 @@ OSSL_PROVIDER_get0_dispatch 5543 3_0_0 EXIST::FUNCTION:
PKCS5_PBE_keyivgen_ex 5544 3_0_0 EXIST::FUNCTION:
EVP_MAC_CTX_get_block_size 5545 3_0_0 EXIST::FUNCTION:
BIO_debug_callback_ex 5546 3_0_0 EXIST::FUNCTION:
+b2i_PVK_bio_ex 5547 3_0_0 EXIST::FUNCTION:
+i2b_PVK_bio_ex 5548 3_0_0 EXIST::FUNCTION:
diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt
index 04eace5da7..df71963deb 100644
--- a/util/missingcrypto.txt
+++ b/util/missingcrypto.txt
@@ -1413,7 +1413,6 @@ a2i_ASN1_STRING(3)
a2i_GENERAL_NAME(3)
a2i_IPADDRESS(3)
a2i_IPADDRESS_NC(3)
-b2i_PVK_bio(3)
b2i_PrivateKey(3)
b2i_PrivateKey_bio(3)
b2i_PublicKey(3)
@@ -1429,7 +1428,6 @@ i2a_ASN1_ENUMERATED(3)
i2a_ASN1_INTEGER(3)
i2a_ASN1_OBJECT(3)
i2a_ASN1_STRING(3)
-i2b_PVK_bio(3)
i2b_PrivateKey_bio(3)
i2b_PublicKey_bio(3)
i2d_X509_bio(3)