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 /engines | |
| 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)
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/build.info | 2 | ||||
| -rw-r--r-- | engines/e_loader_attic.c | 2 |
2 files changed, 2 insertions, 2 deletions
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" |