diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-07-23 16:56:59 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-09-03 17:48:32 +0200 |
| commit | 16feca71544681cabf873fecd3f860f9853bdf07 (patch) | |
| tree | a1dce6397911d95de73f10208b65dbba04526ac6 /util | |
| parent | bd7a6f16eb52c5c022b2555810efd99006db0a02 (diff) | |
| download | openssl-16feca71544681cabf873fecd3f860f9853bdf07.zip openssl-16feca71544681cabf873fecd3f860f9853bdf07.tar.gz openssl-16feca71544681cabf873fecd3f860f9853bdf07.tar.bz2 | |
STORE: Move the built-in 'file:' loader to become an engine module
From this point on, this engine must be specifically specified.
To replace the internal EMBEDDED hack with something unique for the
new module, functions to create application specific OSSL_STORE_INFO
types were added.
Furthermore, the following function had to be exported:
ossl_do_blob_header()
ossl_do_PVK_header()
asn1_d2i_read_bio()
Finally, evp_pkcs82pkey_int() has become public under a new name,
EVP_PKCS82PKEY_with_libctx()
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12587)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 8 | ||||
| -rw-r--r-- | util/missingcrypto-internal.txt | 5 | ||||
| -rw-r--r-- | util/missingcrypto.txt | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 96f8345..a12d527 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -5286,3 +5286,11 @@ OSSL_PARAM_get_octet_string_ptr ? 3_0_0 EXIST::FUNCTION: OSSL_DECODER_CTX_set_passphrase_cb ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_CTX_set_mac_key ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_new_CMAC_key_with_libctx ? 3_0_0 EXIST::FUNCTION: +OSSL_STORE_INFO_new ? 3_0_0 EXIST::FUNCTION: +OSSL_STORE_INFO_get0_data ? 3_0_0 EXIST::FUNCTION: +ossl_do_blob_header ? 3_0_0 EXIST::FUNCTION:DSA +ossl_do_PVK_header ? 3_0_0 EXIST::FUNCTION:DSA,RC4 +asn1_d2i_read_bio ? 3_0_0 EXIST::FUNCTION: +EVP_PKCS82PKEY_with_libctx ? 3_0_0 EXIST::FUNCTION: +ossl_b2i ? 3_0_0 EXIST::FUNCTION:DSA +ossl_b2i_bio ? 3_0_0 EXIST::FUNCTION:DSA diff --git a/util/missingcrypto-internal.txt b/util/missingcrypto-internal.txt index 4c90857..54e1bc9 100644 --- a/util/missingcrypto-internal.txt +++ b/util/missingcrypto-internal.txt @@ -1,3 +1,8 @@ WPACKET(3) WPACKET_init_der(3) WPACKET_init_null_der(3) +asn1_d2i_read_bio(3) +ossl_do_PVK_header(3) +ossl_do_blob_header(3) +ossl_b2i(3) +ossl_b2i_bio(3) diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt index 54ff9cc..783df12 100644 --- a/util/missingcrypto.txt +++ b/util/missingcrypto.txt @@ -673,6 +673,7 @@ EVP_PBE_find(3) EVP_PBE_get(3) EVP_PBE_scrypt(3) EVP_PKCS82PKEY(3) +EVP_PKCS82PKEY_with_libctx(3) EVP_PKEY2PKCS8(3) EVP_PKEY_CTX_get0_peerkey(3) EVP_PKEY_CTX_get0_pkey(3) |