summaryrefslogtreecommitdiff
path: root/src/regress/lib/libssl/interop/cipher
diff options
context:
space:
mode:
authorbeck <>2020-09-21 15:13:24 +0000
committerbeck <>2020-09-21 15:13:24 +0000
commit11de539d915a22f42d21f9ed4114d8edd9a3f93d (patch)
treea3c21e131c8eed8abf93309cb7dd44dea8364462 /src/regress/lib/libssl/interop/cipher
parentb4bc8d8b755aef4f7b08455fb0bbf31f536da85b (diff)
downloadopenbsd-11de539d915a22f42d21f9ed4114d8edd9a3f93d.tar.gz
openbsd-11de539d915a22f42d21f9ed4114d8edd9a3f93d.tar.bz2
openbsd-11de539d915a22f42d21f9ed4114d8edd9a3f93d.zip
1) Move the interop tests to the end so we see tlsfuzzer first
2) Reorder the interop tests so the really slow "cert" test is at the end 3) Change the cert tests to use REGRESS_SLOW_TARGETS when testing combination of client and server that does not involve libressl. This way we can skip testing openssl to openssl11 when running these manually by setting REGRESS_SKIP_SLOW to "yet" in mk.conf ok jsing@
Diffstat (limited to 'src/regress/lib/libssl/interop/cipher')
-rw-r--r--src/regress/lib/libssl/interop/cipher/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/regress/lib/libssl/interop/cipher/Makefile b/src/regress/lib/libssl/interop/cipher/Makefile
index 4ad2dbe39b..fe74901d11 100644
--- a/src/regress/lib/libssl/interop/cipher/Makefile
+++ b/src/regress/lib/libssl/interop/cipher/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.5 2020/09/12 15:48:30 bluhm Exp $ 1# $OpenBSD: Makefile,v 1.6 2020/09/21 15:13:24 beck Exp $
2 2
3# Connect a client to a server. Both can be current libressl, or 3# Connect a client to a server. Both can be current libressl, or
4# openssl 1.0.2, or openssl 1.1. Create lists of supported ciphers 4# openssl 1.0.2, or openssl 1.1. Create lists of supported ciphers
@@ -103,7 +103,11 @@ DHPARAM_${cipher}_${slib} = -p dh.param
103DHPARAM_${cipher}_${slib} = 103DHPARAM_${cipher}_${slib} =
104.endif 104.endif
105 105
106.if ("${clib}" == "libressl" || "${slib}" == "libressl")
106REGRESS_TARGETS += run-cipher-${cipher}-client-${clib}-server-${slib} 107REGRESS_TARGETS += run-cipher-${cipher}-client-${clib}-server-${slib}
108.else
109REGRESS_SLOW_TARGETS += run-cipher-${cipher}-client-${clib}-server-${slib}
110.endif
107run-cipher-${cipher}-client-${clib}-server-${slib} \ 111run-cipher-${cipher}-client-${clib}-server-${slib} \
108client-cipher-${cipher}-client-${clib}-server-${slib}.out \ 112client-cipher-${cipher}-client-${clib}-server-${slib}.out \
109server-cipher-${cipher}-client-${clib}-server-${slib}.out: dh.param \ 113server-cipher-${cipher}-client-${clib}-server-${slib}.out: dh.param \
@@ -122,7 +126,11 @@ server-cipher-${cipher}-client-${clib}-server-${slib}.out: dh.param \
122 { sleep 1; grep -q '^success$$' ${@:S/^run/server/}.out; } 126 { sleep 1; grep -q '^success$$' ${@:S/^run/server/}.out; }
123 grep -q '^success$$' ${@:S/^run/client/}.out 127 grep -q '^success$$' ${@:S/^run/client/}.out
124 128
129.if ("${clib}" == "libressl" || "${slib}" == "libressl")
125REGRESS_TARGETS += check-cipher-${cipher}-client-${clib}-server-${slib} 130REGRESS_TARGETS += check-cipher-${cipher}-client-${clib}-server-${slib}
131.else
132REGRESS_SLOW_TARGETS += check-cipher-${cipher}-client-${clib}-server-${slib}
133.endif
126check-cipher-${cipher}-client-${clib}-server-${slib}: \ 134check-cipher-${cipher}-client-${clib}-server-${slib}: \
127 client-cipher-${cipher}-client-${clib}-server-${slib}.out \ 135 client-cipher-${cipher}-client-${clib}-server-${slib}.out \
128 server-cipher-${cipher}-client-${clib}-server-${slib}.out 136 server-cipher-${cipher}-client-${clib}-server-${slib}.out