From a4c579fa44bbc013481fd30b674ae237293b953f Mon Sep 17 00:00:00 2001 From: tb Date: Thu, 30 Jun 2022 07:28:38 +0000 Subject: [PATCH] With recent a_time_tm.c changes, we also need the bytestring API. --- .../usr.sbin/rpki-client/openssl11/Makefile | 22 +++++++++++-------- .../usr.sbin/rpki-client/openssl11/unistd.h | 2 ++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/regress/usr.sbin/rpki-client/openssl11/Makefile b/regress/usr.sbin/rpki-client/openssl11/Makefile index f3a2c0d1048..12c6926a12b 100644 --- a/regress/usr.sbin/rpki-client/openssl11/Makefile +++ b/regress/usr.sbin/rpki-client/openssl11/Makefile @@ -6,31 +6,35 @@ regress: 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 \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 -SRCS_test-ip = a_time_tm_gen.c o_time.c -SRCS_test-mft = a_time_tm_gen.c o_time.c -SRCS_test-roa = a_time_tm_gen.c o_time.c -SRCS_test-cert = a_time_tm_gen.c o_time.c -SRCS_test-gbr = a_time_tm_gen.c o_time.c -SRCS_test-tal = a_time_tm_gen.c o_time.c -SRCS_test-bgpsec = a_time_tm_gen.c o_time.c -SRCS_test-rrdp = a_time_tm_gen.c o_time.c -SRCS_test-rsc = a_time_tm_gen.c o_time.c +SRCS_test-ip = a_time_tm_gen.c o_time.c bs_ber.c bs_cbb.c bs_cbs.c +SRCS_test-mft = a_time_tm_gen.c o_time.c bs_ber.c bs_cbb.c bs_cbs.c +SRCS_test-roa = a_time_tm_gen.c o_time.c bs_ber.c bs_cbb.c bs_cbs.c +SRCS_test-cert = a_time_tm_gen.c o_time.c bs_ber.c bs_cbb.c bs_cbs.c +SRCS_test-gbr = a_time_tm_gen.c o_time.c bs_ber.c bs_cbb.c bs_cbs.c +SRCS_test-tal = a_time_tm_gen.c o_time.c bs_ber.c bs_cbb.c bs_cbs.c +SRCS_test-bgpsec = a_time_tm_gen.c o_time.c bs_ber.c bs_cbb.c bs_cbs.c +SRCS_test-rrdp = a_time_tm_gen.c o_time.c bs_ber.c bs_cbb.c bs_cbs.c +SRCS_test-rsc = a_time_tm_gen.c o_time.c bs_ber.c bs_cbb.c bs_cbs.c CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/ +CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/bytestring .PATH: ${.CURDIR}/.. .PATH: ${.CURDIR}/../../../../lib/libcrypto .PATH: ${.CURDIR}/../../../../lib/libcrypto/asn1 +.PATH: ${.CURDIR}/../../../../lib/libcrypto/bytestring .include diff --git a/regress/usr.sbin/rpki-client/openssl11/unistd.h b/regress/usr.sbin/rpki-client/openssl11/unistd.h index 337007a8fe9..786040b57c8 100644 --- a/regress/usr.sbin/rpki-client/openssl11/unistd.h +++ b/regress/usr.sbin/rpki-client/openssl11/unistd.h @@ -12,4 +12,6 @@ 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 -- 2.20.1