summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/conf/conf_sap.c
diff options
context:
space:
mode:
authortb <>2023-11-19 15:46:10 +0000
committertb <>2023-11-19 15:46:10 +0000
commit593d97e74cc873d99aced677883cf55625efe62d (patch)
tree9a8bf5329015d40f6a79820880c1ca7bb820bf58 /src/lib/libcrypto/conf/conf_sap.c
parentcde35b41c5eb9d9d0b61fe730c39e6a5c553b840 (diff)
downloadopenbsd-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_sap.c')
-rw-r--r--src/lib/libcrypto/conf/conf_sap.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libcrypto/conf/conf_sap.c b/src/lib/libcrypto/conf/conf_sap.c
index 827cf96e74..689b7a325d 100644
--- a/src/lib/libcrypto/conf/conf_sap.c
+++ b/src/lib/libcrypto/conf/conf_sap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: conf_sap.c,v 1.14 2018/03/19 03:56:08 beck Exp $ */ 1/* $OpenBSD: conf_sap.c,v 1.15 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 */
@@ -67,10 +67,6 @@
67#include <openssl/err.h> 67#include <openssl/err.h>
68#include <openssl/x509.h> 68#include <openssl/x509.h>
69 69
70#ifndef OPENSSL_NO_ENGINE
71#include <openssl/engine.h>
72#endif
73
74/* This is the automatic configuration loader: it is called automatically by 70/* This is the automatic configuration loader: it is called automatically by
75 * OpenSSL when any of a number of standard initialisation functions are called, 71 * OpenSSL when any of a number of standard initialisation functions are called,
76 * unless this is overridden by calling OPENSSL_no_config() 72 * unless this is overridden by calling OPENSSL_no_config()
@@ -84,10 +80,6 @@ static void
84OPENSSL_config_internal(void) 80OPENSSL_config_internal(void)
85{ 81{
86 OPENSSL_load_builtin_modules(); 82 OPENSSL_load_builtin_modules();
87#ifndef OPENSSL_NO_ENGINE
88 /* Need to load ENGINEs */
89 ENGINE_load_builtin_engines();
90#endif
91 /* Add others here? */ 83 /* Add others here? */
92 84
93 ERR_clear_error(); 85 ERR_clear_error();