From f94d1800c2bcef623d825d9ec18437897e187e0e Mon Sep 17 00:00:00 2001
From: tb <>
Date: Fri, 28 Jul 2023 09:46:36 +0000
Subject: Drop DSO and define OPENSSL_NO_DSO

DSO and in particular dlopen() was used for dynamic engines, which we
removed a long time ago and for dynamic conf modules, which we removed
only very recently. Now remove this dangerous interface.

ok jsing
---
 src/lib/libcrypto/Makefile | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src/lib/libcrypto/Makefile')

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index abcd91d0ef..9067c5673e 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.144 2023/07/28 09:42:44 tb Exp $
+# $OpenBSD: Makefile,v 1.145 2023/07/28 09:46:36 tb Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -25,7 +25,7 @@ CFLAGS+= -DLIBRESSL_NAMESPACE -DLIBRESSL_CRYPTO_NAMESPACE
 
 
 .if !defined(NOPIC)
-CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H -DHAVE_FUNOPEN
+CFLAGS+= -DHAVE_FUNOPEN
 .endif
 
 # Hardware engines
@@ -318,13 +318,6 @@ SRCS+= dsa_ossl.c
 SRCS+= dsa_pmeth.c
 SRCS+= dsa_prn.c
 
-# dso/
-SRCS+= dso_dlfcn.c
-SRCS+= dso_err.c
-SRCS+= dso_lib.c
-SRCS+= dso_null.c
-SRCS+= dso_openssl.c
-
 # ec/
 SRCS+= ec_ameth.c
 SRCS+= ec_asn1.c
@@ -713,7 +706,6 @@ SRCS+= x_all.c
 	${LCRYPTO_SRC}/des \
 	${LCRYPTO_SRC}/dh \
 	${LCRYPTO_SRC}/dsa \
-	${LCRYPTO_SRC}/dso \
 	${LCRYPTO_SRC}/ec \
 	${LCRYPTO_SRC}/ecdh \
 	${LCRYPTO_SRC}/ecdsa \
@@ -774,7 +766,6 @@ HDRS=\
 	${LCRYPTO_SRC}/des/des.h \
 	${LCRYPTO_SRC}/dh/dh.h \
 	${LCRYPTO_SRC}/dsa/dsa.h \
-	${LCRYPTO_SRC}/dso/dso.h \
 	${LCRYPTO_SRC}/ec/ec.h \
 	${LCRYPTO_SRC}/ecdh/ecdh.h \
 	${LCRYPTO_SRC}/ecdsa/ecdsa.h \
-- 
cgit v1.2.3-55-g6feb