diff options
author | tb <> | 2023-11-19 15:46:10 +0000 |
---|---|---|
committer | tb <> | 2023-11-19 15:46:10 +0000 |
commit | 593d97e74cc873d99aced677883cf55625efe62d (patch) | |
tree | 9a8bf5329015d40f6a79820880c1ca7bb820bf58 /src/lib/libcrypto/pem/pem_lib.c | |
parent | cde35b41c5eb9d9d0b61fe730c39e6a5c553b840 (diff) | |
download | openbsd-593d97e74cc873d99aced677883cf55625efe62d.tar.gz openbsd-593d97e74cc873d99aced677883cf55625efe62d.tar.bz2 openbsd-593d97e74cc873d99aced677883cf55625efe62d.zip |
Unifdef OPENSSL_NO_ENGINE in libcrypto
This is mechanical apart from a few manual edits to avoid doubled empty
lines.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/pem/pem_lib.c')
-rw-r--r-- | src/lib/libcrypto/pem/pem_lib.c | 8 |
1 files changed, 1 insertions, 7 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 | } |