diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-10-20 18:11:30 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-10-21 21:10:48 +0200 |
| commit | 0934cf4834059cf2d6e3b7e4106d5e04f50ed7f5 (patch) | |
| tree | 949c0f709a0512bea4c5ade63f19c185e6a92c17 | |
| parent | Work around Windows ftell() bug as per Microsoft engineering's suggestion (diff) | |
| download | openssl-0934cf4834059cf2d6e3b7e4106d5e04f50ed7f5.tar.xz openssl-0934cf4834059cf2d6e3b7e4106d5e04f50ed7f5.zip | |
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 <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13195)
| -rw-r--r-- | crypto/pem/pvkfmt.c | 2 | ||||
| -rw-r--r-- | engines/build.info | 2 | ||||
| -rw-r--r-- | engines/e_loader_attic.c | 2 | ||||
| -rw-r--r-- | include/crypto/pem.h (renamed from include/internal/pem.h) | 0 | ||||
| -rw-r--r-- | providers/implementations/encode_decode/decode_ms2key.c | 2 | ||||
| -rw-r--r-- | providers/implementations/storemgmt/file_store.c | 2 | ||||
| -rw-r--r-- | test/endecode_test.c | 2 | ||||
| -rw-r--r-- | util/libcrypto.num | 4 |
8 files changed, 6 insertions, 10 deletions
diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c index 95d1ff5a94..bd1d99e338 100644 --- a/crypto/pem/pvkfmt.c +++ b/crypto/pem/pvkfmt.c @@ -20,7 +20,7 @@ #include "internal/cryptlib.h" #include <openssl/pem.h> -#include "internal/pem.h" +#include "crypto/pem.h" #include <openssl/rand.h> #include <openssl/bn.h> #if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA) diff --git a/engines/build.info b/engines/build.info index 4e83dbf9bc..e47f2d44a5 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 72ceb38a33..4f238b9cb2 100644 --- a/engines/e_loader_attic.c +++ b/engines/e_loader_attic.c @@ -31,9 +31,9 @@ #include <openssl/engine.h> #include <openssl/x509.h> /* 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 index b6a10241f3..b6a10241f3 100644 --- a/include/internal/pem.h +++ b/include/crypto/pem.h diff --git a/providers/implementations/encode_decode/decode_ms2key.c b/providers/implementations/encode_decode/decode_ms2key.c index 1bc55e5493..deb2cc2d5b 100644 --- a/providers/implementations/encode_decode/decode_ms2key.c +++ b/providers/implementations/encode_decode/decode_ms2key.c @@ -22,8 +22,8 @@ #include <openssl/params.h> #include <openssl/pem.h> /* For public PVK functions */ #include <openssl/x509.h> -#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 e41e29ed35..3b6c50c9e5 100644 --- a/providers/implementations/storemgmt/file_store.c +++ b/providers/implementations/storemgmt/file_store.c @@ -25,7 +25,7 @@ #include <openssl/decoder.h> #include <openssl/store.h> /* 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 b882ff85b1..7a901e9793 100644 --- a/test/endecode_test.c +++ b/test/endecode_test.c @@ -19,8 +19,8 @@ #include <openssl/encoder.h> #include <openssl/decoder.h> -#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 4fa6d9e50e..0e8d3953c8 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: |