diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-07-23 23:06:27 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-09-03 17:48:32 +0200 |
| commit | a1447076beee138cab1cc4b277aae189defffdf4 (patch) | |
| tree | 7c553a8aabaebd9970ca4968ada98ceff5c42e3b /crypto/pem/pem_pkey.c | |
| parent | 63f187cfedd21550094b5d69a52f7f617545b209 (diff) | |
STORE: Deprecate legacy / ENGINE functions
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12587)
Diffstat (limited to 'crypto/pem/pem_pkey.c')
| -rw-r--r-- | crypto/pem/pem_pkey.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c index 8aee82ea80..8b9bfe101e 100644 --- a/crypto/pem/pem_pkey.c +++ b/crypto/pem/pem_pkey.c @@ -7,6 +7,9 @@ * https://www.openssl.org/source/license.html */ +/* We need to use some STORE deprecated APIs */ +#define OPENSSL_SUPPRESS_DEPRECATED + #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/buffer.h> @@ -58,11 +61,13 @@ static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x, NULL, NULL)) == NULL) goto err; #ifndef OPENSSL_NO_SECURE_HEAP - if (try_secure) { +# ifndef OPENSSL_NO_DEPRECATED_3_0 + if (try_secure) { int on = 1; if (!OSSL_STORE_ctrl(ctx, OSSL_STORE_C_USE_SECMEM, &on)) goto err; } +# endif #endif while (!OSSL_STORE_eof(ctx) |