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/crypto_init.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/crypto_init.c')
| -rw-r--r-- | src/lib/libcrypto/crypto_init.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/libcrypto/crypto_init.c b/src/lib/libcrypto/crypto_init.c index a2c1c786c3..2b39d2604b 100644 --- a/src/lib/libcrypto/crypto_init.c +++ b/src/lib/libcrypto/crypto_init.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crypto_init.c,v 1.11 2023/07/08 08:28:23 beck Exp $ */ | 1 | /* $OpenBSD: crypto_init.c,v 1.12 2023/11/19 15:46:09 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> |
| 4 | * | 4 | * |
| @@ -22,9 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | #include <openssl/asn1.h> | 23 | #include <openssl/asn1.h> |
| 24 | #include <openssl/conf.h> | 24 | #include <openssl/conf.h> |
| 25 | #ifndef OPENSSL_NO_ENGINE | ||
| 26 | #include <openssl/engine.h> | ||
| 27 | #endif | ||
| 28 | #include <openssl/err.h> | 25 | #include <openssl/err.h> |
| 29 | #include <openssl/evp.h> | 26 | #include <openssl/evp.h> |
| 30 | #include <openssl/objects.h> | 27 | #include <openssl/objects.h> |
| @@ -84,9 +81,6 @@ OPENSSL_cleanup(void) | |||
| 84 | ERR_free_strings(); | 81 | ERR_free_strings(); |
| 85 | 82 | ||
| 86 | CRYPTO_cleanup_all_ex_data(); | 83 | CRYPTO_cleanup_all_ex_data(); |
| 87 | #ifndef OPENSSL_NO_ENGINE | ||
| 88 | ENGINE_cleanup(); | ||
| 89 | #endif | ||
| 90 | EVP_cleanup(); | 84 | EVP_cleanup(); |
| 91 | 85 | ||
| 92 | ASN1_STRING_TABLE_cleanup(); | 86 | ASN1_STRING_TABLE_cleanup(); |
