diff options
| author | tb <> | 2023-07-28 09:46:36 +0000 |
|---|---|---|
| committer | tb <> | 2023-07-28 09:46:36 +0000 |
| commit | 681b4eb7a5896143c26eac201c041f6f22357b18 (patch) | |
| tree | 1aca488e2c506f6251ea781ae63f28ddea06a4b2 /src/lib/libcrypto/Makefile | |
| parent | 52f7bdc5fb75e3796bdf3fa19043d8ee5213cf45 (diff) | |
| download | openbsd-681b4eb7a5896143c26eac201c041f6f22357b18.tar.gz openbsd-681b4eb7a5896143c26eac201c041f6f22357b18.tar.bz2 openbsd-681b4eb7a5896143c26eac201c041f6f22357b18.zip | |
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
Diffstat (limited to 'src/lib/libcrypto/Makefile')
| -rw-r--r-- | src/lib/libcrypto/Makefile | 13 |
1 files changed, 2 insertions, 11 deletions
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 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.144 2023/07/28 09:42:44 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.145 2023/07/28 09:46:36 tb Exp $ |
| 2 | 2 | ||
| 3 | LIB= crypto | 3 | LIB= crypto |
| 4 | LIBREBUILD=y | 4 | LIBREBUILD=y |
| @@ -25,7 +25,7 @@ CFLAGS+= -DLIBRESSL_NAMESPACE -DLIBRESSL_CRYPTO_NAMESPACE | |||
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | .if !defined(NOPIC) | 27 | .if !defined(NOPIC) |
| 28 | CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H -DHAVE_FUNOPEN | 28 | CFLAGS+= -DHAVE_FUNOPEN |
| 29 | .endif | 29 | .endif |
| 30 | 30 | ||
| 31 | # Hardware engines | 31 | # Hardware engines |
| @@ -318,13 +318,6 @@ SRCS+= dsa_ossl.c | |||
| 318 | SRCS+= dsa_pmeth.c | 318 | SRCS+= dsa_pmeth.c |
| 319 | SRCS+= dsa_prn.c | 319 | SRCS+= dsa_prn.c |
| 320 | 320 | ||
| 321 | # dso/ | ||
| 322 | SRCS+= dso_dlfcn.c | ||
| 323 | SRCS+= dso_err.c | ||
| 324 | SRCS+= dso_lib.c | ||
| 325 | SRCS+= dso_null.c | ||
| 326 | SRCS+= dso_openssl.c | ||
| 327 | |||
| 328 | # ec/ | 321 | # ec/ |
| 329 | SRCS+= ec_ameth.c | 322 | SRCS+= ec_ameth.c |
| 330 | SRCS+= ec_asn1.c | 323 | SRCS+= ec_asn1.c |
| @@ -713,7 +706,6 @@ SRCS+= x_all.c | |||
| 713 | ${LCRYPTO_SRC}/des \ | 706 | ${LCRYPTO_SRC}/des \ |
| 714 | ${LCRYPTO_SRC}/dh \ | 707 | ${LCRYPTO_SRC}/dh \ |
| 715 | ${LCRYPTO_SRC}/dsa \ | 708 | ${LCRYPTO_SRC}/dsa \ |
| 716 | ${LCRYPTO_SRC}/dso \ | ||
| 717 | ${LCRYPTO_SRC}/ec \ | 709 | ${LCRYPTO_SRC}/ec \ |
| 718 | ${LCRYPTO_SRC}/ecdh \ | 710 | ${LCRYPTO_SRC}/ecdh \ |
| 719 | ${LCRYPTO_SRC}/ecdsa \ | 711 | ${LCRYPTO_SRC}/ecdsa \ |
| @@ -774,7 +766,6 @@ HDRS=\ | |||
| 774 | ${LCRYPTO_SRC}/des/des.h \ | 766 | ${LCRYPTO_SRC}/des/des.h \ |
| 775 | ${LCRYPTO_SRC}/dh/dh.h \ | 767 | ${LCRYPTO_SRC}/dh/dh.h \ |
| 776 | ${LCRYPTO_SRC}/dsa/dsa.h \ | 768 | ${LCRYPTO_SRC}/dsa/dsa.h \ |
| 777 | ${LCRYPTO_SRC}/dso/dso.h \ | ||
| 778 | ${LCRYPTO_SRC}/ec/ec.h \ | 769 | ${LCRYPTO_SRC}/ec/ec.h \ |
| 779 | ${LCRYPTO_SRC}/ecdh/ecdh.h \ | 770 | ${LCRYPTO_SRC}/ecdh/ecdh.h \ |
| 780 | ${LCRYPTO_SRC}/ecdsa/ecdsa.h \ | 771 | ${LCRYPTO_SRC}/ecdsa/ecdsa.h \ |
