diff options
| author | tb <> | 2023-11-29 21:35:57 +0000 |
|---|---|---|
| committer | tb <> | 2023-11-29 21:35:57 +0000 |
| commit | 69bbc5fea4f411f0c0033ecb0fc5126c895ea82a (patch) | |
| tree | 545e6a340462469cf3c04b8bfe5d2a0f9f885ddb /src/lib/libcrypto/pem/pem_lib.c | |
| parent | 3ebd44f3473783d77d8842eaeb8e6687da31c0a5 (diff) | |
| download | openbsd-69bbc5fea4f411f0c0033ecb0fc5126c895ea82a.tar.gz openbsd-69bbc5fea4f411f0c0033ecb0fc5126c895ea82a.tar.bz2 openbsd-69bbc5fea4f411f0c0033ecb0fc5126c895ea82a.zip | |
Ignore ENGINE at the API boundary
This removes the remaining ENGINE members from various internal structs
and functions. Any ENGINE passed into a public API is now completely
ignored functions returning an ENGINE always return NULL.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/pem/pem_lib.c')
| -rw-r--r-- | src/lib/libcrypto/pem/pem_lib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c index db0e75518b..d4e6599a77 100644 --- a/src/lib/libcrypto/pem/pem_lib.c +++ b/src/lib/libcrypto/pem/pem_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pem_lib.c,v 1.54 2023/11/19 15:46:10 tb Exp $ */ | 1 | /* $OpenBSD: pem_lib.c,v 1.55 2023/11/29 21:35:57 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -220,8 +220,7 @@ check_pem(const char *nm, const char *name) | |||
| 220 | const EVP_PKEY_ASN1_METHOD *ameth; | 220 | const EVP_PKEY_ASN1_METHOD *ameth; |
| 221 | slen = pem_check_suffix(nm, "PARAMETERS"); | 221 | slen = pem_check_suffix(nm, "PARAMETERS"); |
| 222 | if (slen > 0) { | 222 | if (slen > 0) { |
| 223 | ENGINE *e; | 223 | ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen); |
| 224 | ameth = EVP_PKEY_asn1_find_str(&e, nm, slen); | ||
| 225 | if (ameth) { | 224 | if (ameth) { |
| 226 | int r; | 225 | int r; |
| 227 | if (ameth->param_decode) | 226 | if (ameth->param_decode) |
