Undo static linking and other workarounds that are no longer needed

after the bump

1 files changed, 2 insertions, 3 deletions

diff --git a/src/regress/lib/libcrypto/asn1/Makefile b/src/regress/lib/libcrypto/asn1/Makefile
index 307c8b6928..44de13520a 100644
--- a/src/regress/lib/libcrypto/asn1/Makefile
+++ b/src/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