2 files changed, 22 insertions, 1 deletions

diff --git a/src/regress/lib/libcrypto/Makefile b/src/regress/lib/libcrypto/Makefile
index 80ffceb128..3f179d3df5 100644
--- a/src/regress/lib/libcrypto/Makefile
+++ b/src/regress/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.33 2018/11/09 19:24:50 tb Exp $
+#       $OpenBSD: Makefile,v 1.34 2018/11/09 23:44:32 bluhm Exp $
 
 SUBDIR += aead
 SUBDIR += aeswrap
@@ -45,6 +45,8 @@ SUBDIR += sha512
 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/src/regress/lib/libcrypto/botan/Makefile b/src/regress/lib/libcrypto/botan/Makefile
new file mode 100644
index 0000000000..9aa3f2ef57
--- /dev/null
+++ b/src/regress/lib/libcrypto/botan/Makefile
@@ -0,0 +1,19 @@
+# $OpenBSD: Makefile,v 1.1 2018/11/09 23:44:32 bluhm Exp $
+
+.if ! exists(/usr/local/bin/botan-test)
+regress:
+        # install botan2 from ports for botan tests with libressl provider
+        @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:
+        /usr/local/bin/botan-test --provider=openssl
+
+.include <bsd.regress.mk>