Browse Source

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)
master
Richard Levitte 2 years ago
parent
commit
0934cf4834
8 changed files with 6 additions and 10 deletions
  1. +1
    -1
      crypto/pem/pvkfmt.c
  2. +1
    -1
      engines/build.info
  3. +1
    -1
      engines/e_loader_attic.c
  4. +0
    -0
      include/crypto/pem.h
  5. +1
    -1
      providers/implementations/encode_decode/decode_ms2key.c
  6. +1
    -1
      providers/implementations/storemgmt/file_store.c
  7. +1
    -1
      test/endecode_test.c
  8. +0
    -4
      util/libcrypto.num

+ 1
- 1
crypto/pem/pvkfmt.c View 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)


+ 1
- 1
engines/build.info View 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} -}]


+ 1
- 1
engines/e_loader_attic.c View 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"


include/internal/pem.h → include/crypto/pem.h View File


+ 1
- 1
providers/implementations/encode_decode/decode_ms2key.c View 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"


+ 1
- 1
providers/implementations/storemgmt/file_store.c View 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"


+ 1
- 1
test/endecode_test.c View 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"


+ 0
- 4
util/libcrypto.num View 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:


Loading…
Cancel
Save