Bye, bye, horrible reacharounds into libcrypto

Now that rpki-client no longer uses LibreSSL-specific ASN1_time_* API,
we can get rid of some of the gross hacks needed for testing against
OpenSSL in regress. This simplifies things greatly.

Unfortunately, the unistd.h hack needs to stay until someone unearths
their STACK_OF compat diffs.

diff --git a/regress/usr.sbin/rpki-client/openssl11/Makefile b/regress/usr.sbin/rpki-client/openssl11/Makefile
index d0f7702..d712299 100644 (file)
--- a/regress/usr.sbin/rpki-client/openssl11/Makefile
+++ b/regress/usr.sbin/rpki-client/openssl11/Makefile
@@ -1,44 +1,8 @@
-# $OpenBSD: Makefile,v 1.17 2023/04/14 15:35:12 tb Exp $
+# $OpenBSD: Makefile,v 1.18 2023/05/22 15:20:16 tb Exp $
 
 LDADD +=       -Wl,-rpath,/usr/local/lib/eopenssl11 -L/usr/local/lib/eopenssl11
 CFLAGS +=      -I${.CURDIR}/ -I/usr/local/include/eopenssl11/
-CFLAGS +=      -DLIBRESSL_INTERNAL
-
-# For mft.c we need ASN1_time_parse() and ASN1_time_tm_cmp() from LibreSSL
-
-# Provide a missing prototype
-a_time_tm_gen.c: a_time_tm.c
-       echo '#include <openssl/asn1.h>\n' > $@.tmp
-       echo '#include "bytestring.h"\n' >> $@.tmp
-       echo '#define ASN1error(err) ASN1err(0, (err));' >> $@.tmp
-       cat $> >> $@.tmp
-       mv -f $@.tmp $@
-
-CLEANFILES += a_time_tm_gen.c a_time_tm_gen.c.tmp
-
-LIBCRYPTO_COMPAT +=    a_time_tm_gen.c a_time_posix.c
-LIBCRYPTO_COMPAT +=    bs_ber.c bs_cbb.c bs_cbs.c
-
-SRCS_test-ip =         ${LIBCRYPTO_COMPAT}
-SRCS_test-mft =                ${LIBCRYPTO_COMPAT}
-SRCS_test-roa =                ${LIBCRYPTO_COMPAT}
-SRCS_test-cert =       ${LIBCRYPTO_COMPAT}
-SRCS_test-gbr =                ${LIBCRYPTO_COMPAT}
-SRCS_test-geofeed =    ${LIBCRYPTO_COMPAT}
-SRCS_test-tal =                ${LIBCRYPTO_COMPAT}
-SRCS_test-bgpsec =     ${LIBCRYPTO_COMPAT}
-SRCS_test-rrdp =       ${LIBCRYPTO_COMPAT}
-SRCS_test-rsc =                ${LIBCRYPTO_COMPAT}
-SRCS_test-aspa =       ${LIBCRYPTO_COMPAT}
-SRCS_test-tak =                ${LIBCRYPTO_COMPAT}
-
-CFLAGS +=      -I${.CURDIR}/../../../../lib/libcrypto/
-CFLAGS +=      -I${.CURDIR}/../../../../lib/libcrypto/asn1
-CFLAGS +=      -I${.CURDIR}/../../../../lib/libcrypto/bytestring
 
 .PATH:         ${.CURDIR}/..
-.PATH:         ${.CURDIR}/../../../../lib/libcrypto
-.PATH:         ${.CURDIR}/../../../../lib/libcrypto/asn1
-.PATH:         ${.CURDIR}/../../../../lib/libcrypto/bytestring
 
 .include <bsd.regress.mk>

diff --git a/regress/usr.sbin/rpki-client/openssl11/unistd.h b/regress/usr.sbin/rpki-client/openssl11/unistd.h
index 786040b..6fd88bc 100644 (file)
--- a/regress/usr.sbin/rpki-client/openssl11/unistd.h
+++ b/regress/usr.sbin/rpki-client/openssl11/unistd.h
@@ -6,12 +6,8 @@
 
 #include_next <unistd.h>
 
-#include <openssl/asn1.h>
 #include <openssl/stack.h>
 
-int ASN1_time_parse(const char *, size_t, struct tm *, int);
-int ASN1_time_tm_cmp(struct tm *, struct tm *);
-
 #ifndef DECLARE_STACK_OF
 #define DECLARE_STACK_OF DEFINE_STACK_OF
 #endif