diff options
Diffstat (limited to 'src/lib/libcrypto/pem')
| -rw-r--r-- | src/lib/libcrypto/pem/pem_lib.c | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/pem/pem_pkey.c | 6 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c index 3f23a0131b..db0e75518b 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.53 2023/07/07 13:40:44 beck Exp $ */ | 1 | /* $OpenBSD: pem_lib.c,v 1.54 2023/11/19 15:46:10 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 | * |
| @@ -74,9 +74,6 @@ | |||
| 74 | #ifndef OPENSSL_NO_DES | 74 | #ifndef OPENSSL_NO_DES |
| 75 | #include <openssl/des.h> | 75 | #include <openssl/des.h> |
| 76 | #endif | 76 | #endif |
| 77 | #ifndef OPENSSL_NO_ENGINE | ||
| 78 | #include <openssl/engine.h> | ||
| 79 | #endif | ||
| 80 | 77 | ||
| 81 | #include "asn1_local.h" | 78 | #include "asn1_local.h" |
| 82 | #include "evp_local.h" | 79 | #include "evp_local.h" |
| @@ -231,9 +228,6 @@ check_pem(const char *nm, const char *name) | |||
| 231 | r = 1; | 228 | r = 1; |
| 232 | else | 229 | else |
| 233 | r = 0; | 230 | r = 0; |
| 234 | #ifndef OPENSSL_NO_ENGINE | ||
| 235 | ENGINE_finish(e); | ||
| 236 | #endif | ||
| 237 | return r; | 231 | return r; |
| 238 | } | 232 | } |
| 239 | } | 233 | } |
diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c index 2961952139..d7001c83cc 100644 --- a/src/lib/libcrypto/pem/pem_pkey.c +++ b/src/lib/libcrypto/pem/pem_pkey.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pem_pkey.c,v 1.27 2023/07/07 13:40:44 beck Exp $ */ | 1 | /* $OpenBSD: pem_pkey.c,v 1.28 2023/11/19 15:46:10 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 | * |
| @@ -69,10 +69,6 @@ | |||
| 69 | #include <openssl/pkcs12.h> | 69 | #include <openssl/pkcs12.h> |
| 70 | #include <openssl/x509.h> | 70 | #include <openssl/x509.h> |
| 71 | 71 | ||
| 72 | #ifndef OPENSSL_NO_ENGINE | ||
| 73 | #include <openssl/engine.h> | ||
| 74 | #endif | ||
| 75 | |||
| 76 | #include "asn1_local.h" | 72 | #include "asn1_local.h" |
| 77 | #include "evp_local.h" | 73 | #include "evp_local.h" |
| 78 | 74 | ||
