Unexport internal MSBLOB and PVK functions
authorRichard Levitte <levitte@openssl.org>
Tue, 20 Oct 2020 16:11:30 +0000 (18:11 +0200)
committerRichard Levitte <levitte@openssl.org>
Wed, 21 Oct 2020 19:10:48 +0000 (21:10 +0200)
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)

crypto/pem/pvkfmt.c
engines/build.info
engines/e_loader_attic.c
include/crypto/pem.h [moved from include/internal/pem.h with 100% similarity]
providers/implementations/encode_decode/decode_ms2key.c
providers/implementations/storemgmt/file_store.c
test/endecode_test.c
util/libcrypto.num

index 95d1ff5..bd1d99e 100644 (file)
@@ -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)
index 4e83dbf..e47f2d4 100644 (file)
@@ -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} -}]
index 72ceb38..4f238b9 100644 (file)
@@ -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"
 
similarity index 100%
rename from include/internal/pem.h
rename to include/crypto/pem.h
index 1bc55e5..deb2cc2 100644 (file)
@@ -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"
index e41e29e..3b6c50c 100644 (file)
@@ -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"
index b882ff8..7a901e9 100644 (file)
@@ -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"
 
index 4fa6d9e..0e8d395 100644 (file)
@@ -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: