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/conf/conf_mall.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/conf/conf_mall.c')
| -rw-r--r-- | src/lib/libcrypto/conf/conf_mall.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libcrypto/conf/conf_mall.c b/src/lib/libcrypto/conf/conf_mall.c index 18631b3ba8..e2a1d2db07 100644 --- a/src/lib/libcrypto/conf/conf_mall.c +++ b/src/lib/libcrypto/conf/conf_mall.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: conf_mall.c,v 1.9 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: conf_mall.c,v 1.10 2023/11/19 15:46:09 tb Exp $ */ |
| 2 | /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2001. | 3 | * project 2001. |
| 4 | */ | 4 | */ |
| @@ -65,10 +65,6 @@ | |||
| 65 | #include <openssl/crypto.h> | 65 | #include <openssl/crypto.h> |
| 66 | #include <openssl/x509.h> | 66 | #include <openssl/x509.h> |
| 67 | 67 | ||
| 68 | #ifndef OPENSSL_NO_ENGINE | ||
| 69 | #include <openssl/engine.h> | ||
| 70 | #endif | ||
| 71 | |||
| 72 | /* Load all OpenSSL builtin modules */ | 68 | /* Load all OpenSSL builtin modules */ |
| 73 | 69 | ||
| 74 | void | 70 | void |
| @@ -76,7 +72,4 @@ OPENSSL_load_builtin_modules(void) | |||
| 76 | { | 72 | { |
| 77 | /* Add builtin modules here */ | 73 | /* Add builtin modules here */ |
| 78 | ASN1_add_oid_module(); | 74 | ASN1_add_oid_module(); |
| 79 | #ifndef OPENSSL_NO_ENGINE | ||
| 80 | ENGINE_add_conf_module(); | ||
| 81 | #endif | ||
| 82 | } | 75 | } |
