From 8cff5b1863313dbed3ac3833073196bd9e031eb1 Mon Sep 17 00:00:00 2001 From: bluhm Date: Tue, 28 Jun 2022 15:46:07 +0000 Subject: [PATCH] Botan 2.19.2 has removed support for the OpenSSL crypto provider. It was incompatible with OpenSSL 3.0. Remove the regression test to check that LibreSSL crypto works with Botan tests. This is better than to keep an outdated Botan in ports. discussed with tb@ beck@ --- regress/lib/libcrypto/Makefile | 4 +--- regress/lib/libcrypto/botan/Makefile | 21 --------------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 regress/lib/libcrypto/botan/Makefile diff --git a/regress/lib/libcrypto/Makefile b/regress/lib/libcrypto/Makefile index f29e594535f..c98dc2dc5ca 100644 --- a/regress/lib/libcrypto/Makefile +++ b/regress/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2022/02/11 16:34:23 jsing Exp $ +# $OpenBSD: Makefile,v 1.44 2022/06/28 15:46:07 bluhm Exp $ SUBDIR += aead SUBDIR += aeswrap @@ -54,8 +54,6 @@ SUBDIR += symbols SUBDIR += utf8 SUBDIR += wycheproof SUBDIR += x509 -# botan tests take 50 seconds, move to the end to fail early in other tests -SUBDIR += botan install: diff --git a/regress/lib/libcrypto/botan/Makefile b/regress/lib/libcrypto/botan/Makefile deleted file mode 100644 index 416b0f70812..00000000000 --- a/regress/lib/libcrypto/botan/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $OpenBSD: Makefile,v 1.2 2019/05/14 05:48:58 bluhm Exp $ - -.if ! exists(/usr/local/bin/botan-test) -regress: - # install botan2 from ports for botan tests with libressl provider - # pkg_add botan2 - @echo SKIPPED -.endif - -# The Botan library from ports an be configured to use OpenSSL or -# LibreSSL as crypto provider. When we run their regression tests, -# we are actually testing our library. This is far from perfect. A -# lot of LibreSSL features have not been implemented as Botan provider. -# Even if provider openssl is specified, botan-test runs a lot of -# non-openssl tests. This can be improved later. - -REGRESS_TARGETS= run-regress -run-regress: - /usr/local/bin/botan-test --provider=openssl - -.include -- 2.20.1