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)

diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index 95d1ff5a94d4cd5287daa289ec2f618f6ff2e097..bd1d99e338e1943d2985303b0009768b2f7b39d9 100644 (file)
--- 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 4e83dbf9bcf325fb457a443d8b624c24e69a0c12..e47f2d44a59f414faf26cc1d0378db0952c6723e 100644 (file)
--- 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 72ceb38a3396613150e434d49be2c3ef03345576..4f238b9cb207ce85133e1617ec58bb9e85c5d70b 100644 (file)
--- 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
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 1bc55e5493278a15daf3df8978b04107d1096fa0..deb2cc2d5bf86197df24b075cae02e592671681e 100644 (file)
--- 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 e41e29ed3565871f94a6ff487fd437ce3f4929bc..3b6c50c9e5ad500d5501f0973d3d04d36b15899b 100644 (file)
--- 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 b882ff85b16cf2495ee3f4560d55d574bc4f8f08..7a901e9793161e86509d9ab07a2e59231dec0e22 100644 (file)
--- 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 4fa6d9e50e9cc8071077fa17832e864cb53679b6..0e8d3953c84dfdb61d6ba5f418f24c63ddde499c 100644 (file)
--- 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: