From: tb <tb@openbsd.org>
Date: Fri, 14 Jan 2022 09:38:50 +0000 (+0000)
Subject: Undo static linking and other workarounds that are no longer needed
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=676ea2e3f74eee50d27c26e561c9c33a7d84cebb;p=openbsd

Undo static linking and other workarounds that are no longer needed
after the bump
---

diff --git a/regress/lib/libcrypto/aead/Makefile b/regress/lib/libcrypto/aead/Makefile
index 16430803333..c7ee88bf6a2 100644
--- a/regress/lib/libcrypto/aead/Makefile
+++ b/regress/lib/libcrypto/aead/Makefile
@@ -1,11 +1,10 @@
-#	$OpenBSD: Makefile,v 1.4 2022/01/12 08:54:23 tb Exp $
+#	$OpenBSD: Makefile,v 1.5 2022/01/14 09:38:50 tb Exp $
 
 PROG=	aeadtest
-#LDADD=	-lcrypto
-LDADD=	${CRYPTO_INT} # XXX link dynamically after bump
+LDADD=	-lcrypto
 DPADD=	${LIBCRYPTO}
 WARNINGS=	Yes
-CFLAGS+=	-DLIBRESSL_INTERNAL -DLIBRESSL_CRYPTO_INTERNAL -Werror
+CFLAGS+=	-DLIBRESSL_INTERNAL -Werror
 
 REGRESS_TARGETS=regress-aeadtest
 
diff --git a/regress/lib/libcrypto/asn1/Makefile b/regress/lib/libcrypto/asn1/Makefile
index 307c8b69288..44de13520a8 100644
--- a/regress/lib/libcrypto/asn1/Makefile
+++ b/regress/lib/libcrypto/asn1/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2022/01/12 08:45:09 tb Exp $
+#	$OpenBSD: Makefile,v 1.15 2022/01/14 09:38:50 tb Exp $
 
 PROGS = \
 	asn1api \
@@ -14,13 +14,12 @@ PROGS = \
 DPADD+=		${LIBCRYPTO} ${LIBSSL}
 WARNINGS=	Yes
 LDFLAGS+=	-lcrypto
-CFLAGS+=	-DLIBRESSL_INTERNAL -DLIBRESSL_CRYPTO_INTERNAL
+CFLAGS+=	-DLIBRESSL_INTERNAL
 CFLAGS+=	-Wall -Wundef -Werror
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libcrypto/asn1
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libcrypto/bytestring
 
 LDADD_asn1basic = ${CRYPTO_INT}
-LDADD_asn1x509 = ${CRYPTO_INT} # XXX Remove after bump
 
 .for p in ${PROGS}
 REGRESS_TARGETS +=	run-$p
diff --git a/regress/lib/libcrypto/dh/Makefile b/regress/lib/libcrypto/dh/Makefile
index d8f7a51c7f3..0485ddfd661 100644
--- a/regress/lib/libcrypto/dh/Makefile
+++ b/regress/lib/libcrypto/dh/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.4 2022/01/12 08:56:49 tb Exp $
+#	$OpenBSD: Makefile,v 1.5 2022/01/14 09:38:50 tb Exp $
 
 PROG=	dhtest
-LDADD=	${CRYPTO_INT} # XXX link dynamically after bump
+LDADD=	-lcrypto
 DPADD=	${LIBCRYPTO}
 WARNINGS=	Yes
-CFLAGS+=	-DLIBRESSL_INTERNAL -DLIBRESSL_CRYPTO_INTERNAL -Werror
+CFLAGS+=	-DLIBRESSL_INTERNAL -Werror
 
 .include <bsd.regress.mk>
diff --git a/regress/lib/libcrypto/dsa/Makefile b/regress/lib/libcrypto/dsa/Makefile
index 489c2225d2c..f87eb77e8a4 100644
--- a/regress/lib/libcrypto/dsa/Makefile
+++ b/regress/lib/libcrypto/dsa/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.4 2022/01/12 08:59:56 tb Exp $
+#	$OpenBSD: Makefile,v 1.5 2022/01/14 09:38:50 tb Exp $
 
 PROG=	dsatest
-LDADD=	${CRYPTO_INT}	# XXX link dynamically after bump
+LDADD=	-lcrypto
 DPADD=	${LIBCRYPTO}
 WARNINGS=	Yes
-CFLAGS+=	-DLIBRESSL_INTERNAL -DLIBRESSL_CRYPTO_INTERNAL -Werror
+CFLAGS+=	-DLIBRESSL_INTERNAL -Werror
 
 REGRESS_TARGETS=regress-dsatest
 
diff --git a/regress/lib/libcrypto/ecdsa/Makefile b/regress/lib/libcrypto/ecdsa/Makefile
index 5cd4c4c87e6..11360dff75d 100644
--- a/regress/lib/libcrypto/ecdsa/Makefile
+++ b/regress/lib/libcrypto/ecdsa/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.4 2022/01/12 09:02:34 tb Exp $
+#	$OpenBSD: Makefile,v 1.5 2022/01/14 09:38:50 tb Exp $
 
 PROG=	ecdsatest
-LDADD=	${CRYPTO_INT}	# XXX link dynamically after bump
+LDADD=	-lcrypto
 DPADD=	${LIBCRYPTO}
 WARNINGS=	Yes
-CFLAGS+=	-DLIBRESSL_INTERNAL -DLIBRESSL_CRYPTO_INTERNAL -Werror
+CFLAGS+=	-DLIBRESSL_INTERNAL -Werror
 
 .include <bsd.regress.mk>
diff --git a/regress/lib/libcrypto/evp/Makefile b/regress/lib/libcrypto/evp/Makefile
index c4a5294e66d..5abec99a983 100644
--- a/regress/lib/libcrypto/evp/Makefile
+++ b/regress/lib/libcrypto/evp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2022/01/12 09:11:48 tb Exp $
+#	$OpenBSD: Makefile,v 1.6 2022/01/14 09:38:50 tb Exp $
 
 PROGS=	evptest evp_pkey_check
 LDADD=	-lcrypto
@@ -9,8 +9,6 @@ CFLAGS+=	-DLIBRESSL_INTERNAL -DLIBRESSL_CRYPTO_INTERNAL -Werror
 REGRESS_TARGETS+=	regress-evptest
 REGRESS_TARGETS+=	regress-evp_pkey_check
 
-LDADD_evp_pkey_check= ${CRYPTO_INT}  # XXX remove after bump
-
 regress-evptest:	evptest
 	./evptest ${.CURDIR}/evptests.txt