From 0934cf4834059cf2d6e3b7e4106d5e04f50ed7f5 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 20 Oct 2020 18:11:30 +0200 Subject: [PATCH] Unexport internal MSBLOB and PVK functions The following internal functions are affected: ossl_do_blob_header ossl_do_PVK_header ossl_b2i ossl_b2i_bio This is reflected by moving include/internal/pem.h to include/crypto/pem.h engines/e_loader_attic gets the source code added to it to have continued access to those functions. Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13195) --- crypto/pem/pvkfmt.c | 2 +- engines/build.info | 2 +- engines/e_loader_attic.c | 2 +- include/{internal => crypto}/pem.h | 0 providers/implementations/encode_decode/decode_ms2key.c | 2 +- providers/implementations/storemgmt/file_store.c | 2 +- test/endecode_test.c | 2 +- util/libcrypto.num | 4 ---- 8 files changed, 6 insertions(+), 10 deletions(-) rename include/{internal => crypto}/pem.h (100%) diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c index 95d1ff5a94d..bd1d99e338e 100644 --- a/crypto/pem/pvkfmt.c +++ b/crypto/pem/pvkfmt.c @@ -20,7 +20,7 @@ #include "internal/cryptlib.h" #include -#include "internal/pem.h" +#include "crypto/pem.h" #include #include #if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA) diff --git a/engines/build.info b/engines/build.info index 4e83dbf9bcf..e47f2d44a59 100644 --- a/engines/build.info +++ b/engines/build.info @@ -87,7 +87,7 @@ IF[{- !$disabled{"engine"} -}] GENERATE[ossltest.ld]=../util/engines.num ENDIF - SOURCE[loader_attic]=e_loader_attic.c + SOURCE[loader_attic]=e_loader_attic.c ../crypto/pem/pvkfmt.c DEPEND[loader_attic]=../libcrypto INCLUDE[loader_attic]=../include IF[{- defined $target{shared_defflag} -}] diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c index 72ceb38a339..4f238b9cb20 100644 --- a/engines/e_loader_attic.c +++ b/engines/e_loader_attic.c @@ -31,9 +31,9 @@ #include #include /* For the PKCS8 stuff o.O */ #include "internal/asn1.h" /* For asn1_d2i_read_bio */ -#include "internal/pem.h" /* For PVK and "blob" PEM headers */ #include "internal/o_dir.h" #include "internal/cryptlib.h" +#include "crypto/pem.h" /* For PVK and "blob" PEM headers */ #include "e_loader_attic_err.c" diff --git a/include/internal/pem.h b/include/crypto/pem.h similarity index 100% rename from include/internal/pem.h rename to include/crypto/pem.h diff --git a/providers/implementations/encode_decode/decode_ms2key.c b/providers/implementations/encode_decode/decode_ms2key.c index 1bc55e54932..deb2cc2d5bf 100644 --- a/providers/implementations/encode_decode/decode_ms2key.c +++ b/providers/implementations/encode_decode/decode_ms2key.c @@ -22,8 +22,8 @@ #include #include /* For public PVK functions */ #include -#include "internal/pem.h" /* For internal PVK and "blob" headers */ #include "internal/passphrase.h" +#include "crypto/pem.h" /* For internal PVK and "blob" headers */ #include "prov/bio.h" #include "prov/implementations.h" #include "endecoder_local.h" diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c index e41e29ed356..3b6c50c9e5a 100644 --- a/providers/implementations/storemgmt/file_store.c +++ b/providers/implementations/storemgmt/file_store.c @@ -25,7 +25,7 @@ #include #include /* The OSSL_STORE_INFO type numbers */ #include "internal/o_dir.h" -#include "internal/pem.h" /* For PVK and "blob" PEM headers */ +#include "crypto/pem.h" /* For PVK and "blob" PEM headers */ #include "crypto/decoder.h" #include "prov/implementations.h" #include "prov/bio.h" diff --git a/test/endecode_test.c b/test/endecode_test.c index b882ff85b16..7a901e97931 100644 --- a/test/endecode_test.c +++ b/test/endecode_test.c @@ -19,8 +19,8 @@ #include #include -#include "internal/pem.h" /* For PVK and "blob" PEM headers */ #include "internal/cryptlib.h" /* ossl_assert */ +#include "crypto/pem.h" /* For PVK and "blob" PEM headers */ #include "testutil.h" diff --git a/util/libcrypto.num b/util/libcrypto.num index 4fa6d9e50e9..0e8d3953c84 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -5235,12 +5235,8 @@ EVP_PKEY_CTX_set_mac_key ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_new_CMAC_key_ex ? 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_ex ? 3_0_0 EXIST::FUNCTION: -ossl_b2i ? 3_0_0 EXIST::FUNCTION:DSA -ossl_b2i_bio ? 3_0_0 EXIST::FUNCTION:DSA EVP_PKEY_CTX_set1_id ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_CTX_get1_id ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_CTX_get1_id_len ? 3_0_0 EXIST::FUNCTION: -- 2.47.2