From 5d942c1352eff2855a447ea39c282df9d3ec68e6 Mon Sep 17 00:00:00 2001 From: beck Date: Fri, 28 Apr 2023 09:11:35 +0000 Subject: [PATCH] Hook up the the x509 policy regression tests to x509 regress. These were adapted from BoringSSL's regress tests for x509 policy. They are currently marked as expected to fail as we have not enabled LIBRESSL_HAS_POLICY_DAG by default yet, and the old tree based policy code from OpenSSL is special. These tests pass when we build with LIBRESSL_HAS_POLICY_DAG. --- regress/lib/libcrypto/x509/Makefile | 4 ++-- regress/lib/libcrypto/x509/policy/Makefile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/regress/lib/libcrypto/x509/Makefile b/regress/lib/libcrypto/x509/Makefile index d6c94f352ac..a8796ebe315 100644 --- a/regress/lib/libcrypto/x509/Makefile +++ b/regress/lib/libcrypto/x509/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2023/04/26 08:58:03 job Exp $ +# $OpenBSD: Makefile,v 1.19 2023/04/28 09:11:35 beck Exp $ PROGS = constraints verify x509attribute x509name x509req_ext callback PROGS += expirecallback callbackfailures x509_asn1 @@ -13,7 +13,7 @@ CFLAGS += -DLIBRESSL_INTERNAL -Wall -Werror CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/x509 CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/bytestring -SUBDIR += bettertls rfc3779 +SUBDIR += bettertls rfc3779 policy CLEANFILES += x509name.result callback.out diff --git a/regress/lib/libcrypto/x509/policy/Makefile b/regress/lib/libcrypto/x509/policy/Makefile index b365499412e..89de5a43483 100644 --- a/regress/lib/libcrypto/x509/policy/Makefile +++ b/regress/lib/libcrypto/x509/policy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2023/04/27 12:23:31 beck Exp $ +# $OpenBSD: Makefile,v 1.2 2023/04/28 09:11:35 beck Exp $ PROGS = policy @@ -14,6 +14,7 @@ CFLAGS += -I${.CURDIR}/../../../../../lib/libcrypto/bytestring CFLAGS += -DCERTSDIR=\"${.CURDIR}/../../../libcrypto/x509/policy\" REGRESS_TARGETS = policy-test +REGRESS_EXPECTED_FAILURES = policy-test policy-test: policy ./policy -- 2.20.1