summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pem/pem_lib.c
diff options
context:
space:
mode:
authortb <>2023-11-29 21:35:57 +0000
committertb <>2023-11-29 21:35:57 +0000
commitfc4faac9b396d551d0f7729a4dffa6ee31ac2d3e (patch)
tree545e6a340462469cf3c04b8bfe5d2a0f9f885ddb /src/lib/libcrypto/pem/pem_lib.c
parent0423d363b45d6891ba1e59c1ae770ef1443bf41c (diff)
downloadopenbsd-fc4faac9b396d551d0f7729a4dffa6ee31ac2d3e.tar.gz
openbsd-fc4faac9b396d551d0f7729a4dffa6ee31ac2d3e.tar.bz2
openbsd-fc4faac9b396d551d0f7729a4dffa6ee31ac2d3e.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.c5
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)