summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/regress/lib/libc/setjmp-fpu/Makefile4
-rw-r--r--src/regress/lib/libc/sys/Makefile3
-rw-r--r--src/regress/lib/libcrypto/bn/general/Makefile5
-rw-r--r--src/regress/lib/libcrypto/ocsp/Makefile3
-rw-r--r--src/regress/lib/libssl/handshake/Makefile3
-rw-r--r--src/regress/lib/libssl/interop/Makefile.inc3
-rw-r--r--src/regress/lib/libssl/interop/botan/Makefile3
-rw-r--r--src/regress/lib/libssl/interop/cert/Makefile3
-rw-r--r--src/regress/lib/libssl/interop/cipher/Makefile5
-rw-r--r--src/regress/lib/libssl/interop/libressl/Makefile5
-rw-r--r--src/regress/lib/libssl/interop/netcat/Makefile6
-rw-r--r--src/regress/lib/libssl/interop/openssl/Makefile5
-rw-r--r--src/regress/lib/libssl/interop/openssl11/Makefile5
-rw-r--r--src/regress/lib/libssl/interop/session/Makefile4
-rw-r--r--src/regress/lib/libssl/interop/version/Makefile4
15 files changed, 15 insertions, 46 deletions
diff --git a/src/regress/lib/libc/setjmp-fpu/Makefile b/src/regress/lib/libc/setjmp-fpu/Makefile
index c4e7196c1d..e3dd2daa52 100644
--- a/src/regress/lib/libc/setjmp-fpu/Makefile
+++ b/src/regress/lib/libc/setjmp-fpu/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.4 2020/01/16 13:03:42 bluhm Exp $ 1# $OpenBSD: Makefile,v 1.5 2020/12/17 00:51:11 bluhm Exp $
2 2
3PROGS= fpu _setjmp setjmp sigsetjmp 3PROGS= fpu _setjmp setjmp sigsetjmp
4 4
@@ -6,14 +6,12 @@ LDADD= -lm
6 6
7REGRESS_TARGETS = run-fpu 7REGRESS_TARGETS = run-fpu
8run-fpu: fpu 8run-fpu: fpu
9 @echo '======== $@ ========'
10 # check fpu functions without setjmp/longjmp before testing the latter 9 # check fpu functions without setjmp/longjmp before testing the latter
11 ./fpu 10 ./fpu
12 11
13.for p in ${PROGS:M*jmp} 12.for p in ${PROGS:M*jmp}
14REGRESS_TARGETS += run-$p 13REGRESS_TARGETS += run-$p
15run-$p: $p 14run-$p: $p
16 @echo '======== $@ ========'
17 ./$p 15 ./$p
18.endfor 16.endfor
19 17
diff --git a/src/regress/lib/libc/sys/Makefile b/src/regress/lib/libc/sys/Makefile
index 7dcfcb73a9..7a3b920426 100644
--- a/src/regress/lib/libc/sys/Makefile
+++ b/src/regress/lib/libc/sys/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.9 2020/12/06 18:46:07 bluhm Exp $ 1# $OpenBSD: Makefile,v 1.10 2020/12/17 00:51:11 bluhm Exp $
2 2
3# Copyright (c) 2019 Moritz Buhl <openbsd@moritzbuhl.de> 3# Copyright (c) 2019 Moritz Buhl <openbsd@moritzbuhl.de>
4# Copyright (c) 2019 Alexander Bluhm <bluhm@openbsd.org> 4# Copyright (c) 2019 Alexander Bluhm <bluhm@openbsd.org>
@@ -75,7 +75,6 @@ CLEANFILES = access dummy mmap truncate_test.root_owned
75 75
76.for p in ${PROGS} 76.for p in ${PROGS}
77run-$p: $p 77run-$p: $p
78 @echo "\n======== $@ ========"
79 ntests="`./$p -n`" && \ 78 ntests="`./$p -n`" && \
80 echo "1..$$ntests" && \ 79 echo "1..$$ntests" && \
81 tnumbers="`jot -ns' ' - 1 $$ntests`" && \ 80 tnumbers="`jot -ns' ' - 1 $$ntests`" && \
diff --git a/src/regress/lib/libcrypto/bn/general/Makefile b/src/regress/lib/libcrypto/bn/general/Makefile
index ca3dcf9b08..6b7919eb53 100644
--- a/src/regress/lib/libcrypto/bn/general/Makefile
+++ b/src/regress/lib/libcrypto/bn/general/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.6 2019/09/05 00:59:36 bluhm Exp $ 1# $OpenBSD: Makefile,v 1.7 2020/12/17 00:51:11 bluhm Exp $
2 2
3.include "../../Makefile.inc" 3.include "../../Makefile.inc"
4 4
@@ -13,18 +13,15 @@ CLEANFILES = bntest.out bc.out
13 13
14REGRESS_TARGETS += run-bntest 14REGRESS_TARGETS += run-bntest
15run-bntest bntest.out: bntest 15run-bntest bntest.out: bntest
16 @echo '\n======== $@ ========'
17 ./bntest -out bntest.out 16 ./bntest -out bntest.out
18 17
19REGRESS_TARGETS += run-bc 18REGRESS_TARGETS += run-bc
20run-bc: bntest.out 19run-bc: bntest.out
21 @echo '\n======== $@ ========'
22 bc < bntest.out | tee bc.out | grep -v '^0$$' 20 bc < bntest.out | tee bc.out | grep -v '^0$$'
23 ! grep -v '^test ' <bc.out | grep -v '^0$$' 21 ! grep -v '^test ' <bc.out | grep -v '^0$$'
24 22
25REGRESS_TARGETS += run-bn_to_string 23REGRESS_TARGETS += run-bn_to_string
26run-bn_to_string: bn_to_string 24run-bn_to_string: bn_to_string
27 @echo '\n======== $@ ========'
28 ./bn_to_string 25 ./bn_to_string
29 26
30.include <bsd.regress.mk> 27.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/ocsp/Makefile b/src/regress/lib/libcrypto/ocsp/Makefile
index b1b437c916..f0b43acc2b 100644
--- a/src/regress/lib/libcrypto/ocsp/Makefile
+++ b/src/regress/lib/libcrypto/ocsp/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.4 2020/11/05 20:48:05 bluhm Exp $ 1# $OpenBSD: Makefile,v 1.5 2020/12/17 00:51:11 bluhm Exp $
2 2
3PROG= ocsp_test 3PROG= ocsp_test
4LDADD= -lcrypto -lssl 4LDADD= -lcrypto -lssl
@@ -15,7 +15,6 @@ REGRESS_TARGETS =
15.for s in ${SERVERS} 15.for s in ${SERVERS}
16REGRESS_TARGETS += run-domain-$s 16REGRESS_TARGETS += run-domain-$s
17run-domain-$s: ${PROG} 17run-domain-$s: ${PROG}
18 @echo '======== $@ ========'
19 if ping -n -c 1 -w 1 $s; then \ 18 if ping -n -c 1 -w 1 $s; then \
20 ./${PROG} $s 443; else \ 19 ./${PROG} $s 443; else \
21 echo server $s not reachable; echo SKIPPED; fi 20 echo server $s not reachable; echo SKIPPED; fi
diff --git a/src/regress/lib/libssl/handshake/Makefile b/src/regress/lib/libssl/handshake/Makefile
index 626bf4767a..aa0f70bd3b 100644
--- a/src/regress/lib/libssl/handshake/Makefile
+++ b/src/regress/lib/libssl/handshake/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.7 2019/11/06 10:28:58 tb Exp $ 1# $OpenBSD: Makefile,v 1.8 2020/12/17 00:51:11 bluhm Exp $
2 2
3PROGS += handshake_table 3PROGS += handshake_table
4PROGS += valid_handshakes_terminate 4PROGS += valid_handshakes_terminate
@@ -34,7 +34,6 @@ CLEANFILES += handshake.${_FMT}
34 34
35.for p in ${PROGS} 35.for p in ${PROGS}
36run-$p: $p 36run-$p: $p
37 @echo '\n======== $@ ========'
38 ./$p 37 ./$p
39 38
40.PHONY: run-$p 39.PHONY: run-$p
diff --git a/src/regress/lib/libssl/interop/Makefile.inc b/src/regress/lib/libssl/interop/Makefile.inc
index 91f88e2b0b..ed5fe26147 100644
--- a/src/regress/lib/libssl/interop/Makefile.inc
+++ b/src/regress/lib/libssl/interop/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.7 2020/09/15 01:45:16 bluhm Exp $ 1# $OpenBSD: Makefile.inc,v 1.8 2020/12/17 00:51:11 bluhm Exp $
2 2
3.PATH: ${.CURDIR}/.. 3.PATH: ${.CURDIR}/..
4 4
@@ -16,7 +16,6 @@ ldd-$p.out: $p
16client-self.out server-self.out: run-self-client-server 16client-self.out server-self.out: run-self-client-server
17 17
18run-self-client-server: client server 127.0.0.1.crt 18run-self-client-server: client server 127.0.0.1.crt
19 @echo '\n======== $@ ========'
20 # check that tls client and server work together 19 # check that tls client and server work together
21 LD_LIBRARY_PATH=${LD_LIBRARY_PATH} \ 20 LD_LIBRARY_PATH=${LD_LIBRARY_PATH} \
22 ./server >server-self.out \ 21 ./server >server-self.out \
diff --git a/src/regress/lib/libssl/interop/botan/Makefile b/src/regress/lib/libssl/interop/botan/Makefile
index 7d5435f9d2..a162ee9e17 100644
--- a/src/regress/lib/libssl/interop/botan/Makefile
+++ b/src/regress/lib/libssl/interop/botan/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.3 2020/10/30 03:12:40 tb Exp $ 1# $OpenBSD: Makefile,v 1.4 2020/12/17 00:51:11 bluhm Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
@@ -37,7 +37,6 @@ DPADD = /usr/local/lib/libbotan-2.a
37REGRESS_TARGETS += run-client-botan-server-${lib} 37REGRESS_TARGETS += run-client-botan-server-${lib}
38 38
39run-client-botan-server-${lib}: client server.crt 39run-client-botan-server-${lib}: client server.crt
40 @echo '\n======== $@ ========'
41 LD_LIBRARY_PATH=/usr/local/lib/e${lib} \ 40 LD_LIBRARY_PATH=/usr/local/lib/e${lib} \
42 ../${lib}/server >server-${lib}.out \ 41 ../${lib}/server >server-${lib}.out \
43 -c server.crt -k server.key \ 42 -c server.crt -k server.key \
diff --git a/src/regress/lib/libssl/interop/cert/Makefile b/src/regress/lib/libssl/interop/cert/Makefile
index a2838499e8..a8ea88aaa3 100644
--- a/src/regress/lib/libssl/interop/cert/Makefile
+++ b/src/regress/lib/libssl/interop/cert/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.5 2020/09/21 15:13:24 beck Exp $ 1# $OpenBSD: Makefile,v 1.6 2020/12/17 00:51:11 bluhm 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 client and server certificates 4# openssl 1.0.2, or openssl 1.1. Create client and server certificates
@@ -45,7 +45,6 @@ REGRESS_SLOW_TARGETS += run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${s
45run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv}: \ 45run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv}: \
46 127.0.0.1.crt ca.crt fake-ca.crt client.crt server.crt \ 46 127.0.0.1.crt ca.crt fake-ca.crt client.crt server.crt \
47 ../${clib}/client ../${slib}/server 47 ../${clib}/client ../${slib}/server
48 @echo '\n======== $@ ========'
49 LD_LIBRARY_PATH=/usr/local/lib/e${slib} \ 48 LD_LIBRARY_PATH=/usr/local/lib/e${slib} \
50 ../${slib}/server >${@:S/^run/server/}.out \ 49 ../${slib}/server >${@:S/^run/server/}.out \
51 ${sca:S/^noca//:S/^fakeca/-C fake-ca.crt/:S/^ca/-C ca.crt/} \ 50 ${sca:S/^noca//:S/^fakeca/-C fake-ca.crt/:S/^ca/-C ca.crt/} \
diff --git a/src/regress/lib/libssl/interop/cipher/Makefile b/src/regress/lib/libssl/interop/cipher/Makefile
index fe74901d11..c88309962d 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.6 2020/09/21 15:13:24 beck Exp $ 1# $OpenBSD: Makefile,v 1.7 2020/12/17 00:51:11 bluhm 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
@@ -14,7 +14,6 @@ server-cipher-GOST2001-GOST89-GOST89-client-libressl-server-libressl.out \
14server-cipher-GOST2012256-GOST89-GOST89-client-libressl-server-libressl.out \ 14server-cipher-GOST2012256-GOST89-GOST89-client-libressl-server-libressl.out \
15check-cipher-GOST2001-GOST89-GOST89-client-libressl-server-libressl \ 15check-cipher-GOST2001-GOST89-GOST89-client-libressl-server-libressl \
16check-cipher-GOST2012256-GOST89-GOST89-client-libressl-server-libressl: 16check-cipher-GOST2012256-GOST89-GOST89-client-libressl-server-libressl:
17 @echo '\n======== $@ ========'
18 # gost does not work with libressl TLS 1.3 right now 17 # gost does not work with libressl TLS 1.3 right now
19 @echo DISABLED 18 @echo DISABLED
20 19
@@ -112,7 +111,6 @@ run-cipher-${cipher}-client-${clib}-server-${slib} \
112client-cipher-${cipher}-client-${clib}-server-${slib}.out \ 111client-cipher-${cipher}-client-${clib}-server-${slib}.out \
113server-cipher-${cipher}-client-${clib}-server-${slib}.out: dh.param \ 112server-cipher-${cipher}-client-${clib}-server-${slib}.out: dh.param \
114 127.0.0.1.crt ${TYPE_${cipher}}.crt ../${clib}/client ../${slib}/server 113 127.0.0.1.crt ${TYPE_${cipher}}.crt ../${clib}/client ../${slib}/server
115 @echo '\n======== $@ ========'
116 LD_LIBRARY_PATH=/usr/local/lib/e${slib} \ 114 LD_LIBRARY_PATH=/usr/local/lib/e${slib} \
117 ../${slib}/server >${@:S/^run/server/}.out \ 115 ../${slib}/server >${@:S/^run/server/}.out \
118 -c ${TYPE_${cipher}}.crt -k ${TYPE_${cipher}}.key \ 116 -c ${TYPE_${cipher}}.crt -k ${TYPE_${cipher}}.key \
@@ -134,7 +132,6 @@ REGRESS_SLOW_TARGETS += check-cipher-${cipher}-client-${clib}-server-${slib}
134check-cipher-${cipher}-client-${clib}-server-${slib}: \ 132check-cipher-${cipher}-client-${clib}-server-${slib}: \
135 client-cipher-${cipher}-client-${clib}-server-${slib}.out \ 133 client-cipher-${cipher}-client-${clib}-server-${slib}.out \
136 server-cipher-${cipher}-client-${clib}-server-${slib}.out 134 server-cipher-${cipher}-client-${clib}-server-${slib}.out
137 @echo '\n======== $@ ========'
138.if "${clib}" != "openssl" && "${slib}" != "openssl" && \ 135.if "${clib}" != "openssl" && "${slib}" != "openssl" && \
139 "${cipher:C/AEAD-(AES.*-GCM|CHACHA.*-POLY.*)-SHA.*/TLS1_3/}" != TLS1_3 136 "${cipher:C/AEAD-(AES.*-GCM|CHACHA.*-POLY.*)-SHA.*/TLS1_3/}" != TLS1_3
140 # client and server 1.3 capable, not TLS 1.3 cipher 137 # client and server 1.3 capable, not TLS 1.3 cipher
diff --git a/src/regress/lib/libssl/interop/libressl/Makefile b/src/regress/lib/libssl/interop/libressl/Makefile
index d19e6eb306..78e995abef 100644
--- a/src/regress/lib/libssl/interop/libressl/Makefile
+++ b/src/regress/lib/libssl/interop/libressl/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.7 2020/09/14 00:51:04 bluhm Exp $ 1# $OpenBSD: Makefile,v 1.8 2020/12/17 00:51:11 bluhm Exp $
2 2
3PROGS = client server 3PROGS = client server
4CFLAGS = -DLIBRESSL_HAS_TLS1_3 4CFLAGS = -DLIBRESSL_HAS_TLS1_3
@@ -15,7 +15,6 @@ REGRESS_TARGETS += run-ldd-$p run-version-$p run-protocol-$p
15.for p in ${PROGS} 15.for p in ${PROGS}
16 16
17run-ldd-$p: ldd-$p.out 17run-ldd-$p: ldd-$p.out
18 @echo '\n======== $@ ========'
19 # check that $p is linked with LibreSSL 18 # check that $p is linked with LibreSSL
20 grep -q /usr/lib/libcrypto.so ldd-$p.out 19 grep -q /usr/lib/libcrypto.so ldd-$p.out
21 grep -q /usr/lib/libssl.so ldd-$p.out 20 grep -q /usr/lib/libssl.so ldd-$p.out
@@ -23,12 +22,10 @@ run-ldd-$p: ldd-$p.out
23 ! grep /usr/local/lib/ ldd-$p.out 22 ! grep /usr/local/lib/ ldd-$p.out
24 23
25run-version-$p: $p-self.out 24run-version-$p: $p-self.out
26 @echo '\n======== $@ ========'
27 # check that runtime version is LibreSSL 25 # check that runtime version is LibreSSL
28 grep 'SSLEAY_VERSION: LibreSSL' $p-self.out 26 grep 'SSLEAY_VERSION: LibreSSL' $p-self.out
29 27
30run-protocol-$p: $p-self.out 28run-protocol-$p: $p-self.out
31 @echo '\n======== $@ ========'
32 # check that LibreSSL protocol version is TLS 1.3 29 # check that LibreSSL protocol version is TLS 1.3
33 grep 'Protocol *: TLSv1.3' $p-self.out 30 grep 'Protocol *: TLSv1.3' $p-self.out
34 31
diff --git a/src/regress/lib/libssl/interop/netcat/Makefile b/src/regress/lib/libssl/interop/netcat/Makefile
index ef51d0597e..f337d4aae8 100644
--- a/src/regress/lib/libssl/interop/netcat/Makefile
+++ b/src/regress/lib/libssl/interop/netcat/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.4 2020/05/11 18:20:24 jsing Exp $ 1# $OpenBSD: Makefile,v 1.5 2020/12/17 00:51:11 bluhm Exp $
2 2
3LIBRARIES = libressl 3LIBRARIES = libressl
4.if exists(/usr/local/bin/eopenssl) 4.if exists(/usr/local/bin/eopenssl)
@@ -16,7 +16,6 @@ REGRESS_TARGETS += run-netcat-client-${clib}-server-nc
16REGRESS_TARGETS += run-protocol-client-${clib} 16REGRESS_TARGETS += run-protocol-client-${clib}
17 17
18run-netcat-client-${clib}-server-nc: ../${clib}/client 127.0.0.1.crt 18run-netcat-client-${clib}-server-nc: ../${clib}/client 127.0.0.1.crt
19 @echo '\n======== $@ ========'
20 echo "greeting" | \ 19 echo "greeting" | \
21 nc >${@:S/^run/server/}.out \ 20 nc >${@:S/^run/server/}.out \
22 -l -c -C 127.0.0.1.crt -K 127.0.0.1.key \ 21 -l -c -C 127.0.0.1.crt -K 127.0.0.1.key \
@@ -43,7 +42,6 @@ run-netcat-client-${clib}-server-nc: ../${clib}/client 127.0.0.1.crt
43REGRESS_TARGETS += run-netcat-client-nc-server-${slib} 42REGRESS_TARGETS += run-netcat-client-nc-server-${slib}
44 43
45run-netcat-client-nc-server-${slib}: ../${slib}/server 127.0.0.1.crt 44run-netcat-client-nc-server-${slib}: ../${slib}/server 127.0.0.1.crt
46 @echo '\n======== $@ ========'
47 LD_LIBRARY_PATH=/usr/local/lib/e${slib} \ 45 LD_LIBRARY_PATH=/usr/local/lib/e${slib} \
48 ../${slib}/server >${@:S/^run/server/}.out \ 46 ../${slib}/server >${@:S/^run/server/}.out \
49 127.0.0.1 0 47 127.0.0.1 0
@@ -68,7 +66,6 @@ run-netcat-client-nc-server-${slib}: ../${slib}/server 127.0.0.1.crt
68REGRESS_TARGETS += run-protocol-client-${clib} 66REGRESS_TARGETS += run-protocol-client-${clib}
69 67
70run-protocol-client-${clib}: client-netcat-client-${clib}-server-nc.out 68run-protocol-client-${clib}: client-netcat-client-${clib}-server-nc.out
71 @echo '\n======== $@ ========'
72 # check that LibTLS protocol version is TLS 1.2 or TLS 1.3 69 # check that LibTLS protocol version is TLS 1.2 or TLS 1.3
73 grep 'Protocol *: TLSv1.[23]' client-netcat-client-${clib}-server-nc.out 70 grep 'Protocol *: TLSv1.[23]' client-netcat-client-${clib}-server-nc.out
74 71
@@ -79,7 +76,6 @@ run-protocol-client-${clib}: client-netcat-client-${clib}-server-nc.out
79REGRESS_TARGETS += run-protocol-server-${slib} 76REGRESS_TARGETS += run-protocol-server-${slib}
80 77
81run-protocol-server-${slib}: server-netcat-client-nc-server-${slib}.out 78run-protocol-server-${slib}: server-netcat-client-nc-server-${slib}.out
82 @echo '\n======== $@ ========'
83 # check that LibTLS protocol version is TLS 1.2 or TLS 1.3 79 # check that LibTLS protocol version is TLS 1.2 or TLS 1.3
84 grep 'Protocol *: TLSv1.[23]' server-netcat-client-nc-server-${slib}.out 80 grep 'Protocol *: TLSv1.[23]' server-netcat-client-nc-server-${slib}.out
85 81
diff --git a/src/regress/lib/libssl/interop/openssl/Makefile b/src/regress/lib/libssl/interop/openssl/Makefile
index e56312505f..181d35aa02 100644
--- a/src/regress/lib/libssl/interop/openssl/Makefile
+++ b/src/regress/lib/libssl/interop/openssl/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.7 2020/10/29 06:05:12 tb Exp $ 1# $OpenBSD: Makefile,v 1.8 2020/12/17 00:51:11 bluhm Exp $
2 2
3.if ! exists(/usr/local/bin/eopenssl) 3.if ! exists(/usr/local/bin/eopenssl)
4regress: 4regress:
@@ -21,7 +21,6 @@ REGRESS_TARGETS += run-ldd-$p run-version-$p run-protocol-$p
21.for p in ${PROGS} 21.for p in ${PROGS}
22 22
23run-ldd-$p: ldd-$p.out 23run-ldd-$p: ldd-$p.out
24 @echo '\n======== $@ ========'
25 # check that $p is linked with OpenSSL 24 # check that $p is linked with OpenSSL
26 grep -q /usr/local/lib/eopenssl/libcrypto.so ldd-$p.out 25 grep -q /usr/local/lib/eopenssl/libcrypto.so ldd-$p.out
27 grep -q /usr/local/lib/eopenssl/libssl.so ldd-$p.out 26 grep -q /usr/local/lib/eopenssl/libssl.so ldd-$p.out
@@ -29,12 +28,10 @@ run-ldd-$p: ldd-$p.out
29 ! grep -v libc.so ldd-$p.out | grep /usr/lib/ 28 ! grep -v libc.so ldd-$p.out | grep /usr/lib/
30 29
31run-version-$p: $p-self.out 30run-version-$p: $p-self.out
32 @echo '\n======== $@ ========'
33 # check that runtime version is OpenSSL 1.0.2 31 # check that runtime version is OpenSSL 1.0.2
34 grep 'SSLEAY_VERSION: OpenSSL 1.0.2' $p-self.out 32 grep 'SSLEAY_VERSION: OpenSSL 1.0.2' $p-self.out
35 33
36run-protocol-$p: $p-self.out 34run-protocol-$p: $p-self.out
37 @echo '\n======== $@ ========'
38 # check that OpenSSL 1.0.2 protocol version is TLS 1.2 35 # check that OpenSSL 1.0.2 protocol version is TLS 1.2
39 grep 'Protocol *: TLSv1.2' $p-self.out 36 grep 'Protocol *: TLSv1.2' $p-self.out
40 37
diff --git a/src/regress/lib/libssl/interop/openssl11/Makefile b/src/regress/lib/libssl/interop/openssl11/Makefile
index 678b1be255..32fd611ae4 100644
--- a/src/regress/lib/libssl/interop/openssl11/Makefile
+++ b/src/regress/lib/libssl/interop/openssl11/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.6 2020/10/29 06:05:12 tb Exp $ 1# $OpenBSD: Makefile,v 1.7 2020/12/17 00:51:11 bluhm Exp $
2 2
3.if ! exists(/usr/local/bin/eopenssl11) 3.if ! exists(/usr/local/bin/eopenssl11)
4regress: 4regress:
@@ -21,7 +21,6 @@ REGRESS_TARGETS += run-ldd-$p run-version-$p run-protocol-$p
21.for p in ${PROGS} 21.for p in ${PROGS}
22 22
23run-ldd-$p: ldd-$p.out 23run-ldd-$p: ldd-$p.out
24 @echo '\n======== $@ ========'
25 # check that $p is linked with OpenSSL 1.1 24 # check that $p is linked with OpenSSL 1.1
26 grep -q /usr/local/lib/eopenssl11/libcrypto.so ldd-$p.out 25 grep -q /usr/local/lib/eopenssl11/libcrypto.so ldd-$p.out
27 grep -q /usr/local/lib/eopenssl11/libssl.so ldd-$p.out 26 grep -q /usr/local/lib/eopenssl11/libssl.so ldd-$p.out
@@ -29,12 +28,10 @@ run-ldd-$p: ldd-$p.out
29 ! grep -v libc.so ldd-$p.out | grep /usr/lib/ 28 ! grep -v libc.so ldd-$p.out | grep /usr/lib/
30 29
31run-version-$p: $p-self.out 30run-version-$p: $p-self.out
32 @echo '\n======== $@ ========'
33 # check that runtime version is OpenSSL 1.1 31 # check that runtime version is OpenSSL 1.1
34 grep 'SSLEAY_VERSION: OpenSSL 1.1' $p-self.out 32 grep 'SSLEAY_VERSION: OpenSSL 1.1' $p-self.out
35 33
36run-protocol-$p: $p-self.out 34run-protocol-$p: $p-self.out
37 @echo '\n======== $@ ========'
38 # check that OpenSSL 1.1 protocol version is TLS 1.3 35 # check that OpenSSL 1.1 protocol version is TLS 1.3
39 grep 'Protocol *: TLSv1.3' $p-self.out 36 grep 'Protocol *: TLSv1.3' $p-self.out
40 37
diff --git a/src/regress/lib/libssl/interop/session/Makefile b/src/regress/lib/libssl/interop/session/Makefile
index a99ab008a6..12d3eb2af7 100644
--- a/src/regress/lib/libssl/interop/session/Makefile
+++ b/src/regress/lib/libssl/interop/session/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.5 2020/05/11 18:20:24 jsing Exp $ 1# $OpenBSD: Makefile,v 1.6 2020/12/17 00:51:11 bluhm Exp $
2 2
3LIBRARIES = libressl 3LIBRARIES = libressl
4.if exists(/usr/local/bin/eopenssl) 4.if exists(/usr/local/bin/eopenssl)
@@ -12,7 +12,6 @@ run-session-client-libressl-server-libressl \
12run-session-client-libressl-server-openssl11 \ 12run-session-client-libressl-server-openssl11 \
13run-session-client-openssl11-server-libressl \ 13run-session-client-openssl11-server-libressl \
14run-session-client-openssl11-server-openssl11: 14run-session-client-openssl11-server-openssl11:
15 @echo '\n======== $@ ========'
16 # TLS 1.3 needs some extra setup for session reuse 15 # TLS 1.3 needs some extra setup for session reuse
17 @echo DISABLED 16 @echo DISABLED
18 17
@@ -23,7 +22,6 @@ REGRESS_TARGETS += run-session-client-${clib}-server-${slib}
23 22
24run-session-client-${clib}-server-${slib}: \ 23run-session-client-${clib}-server-${slib}: \
25 127.0.0.1.crt ../${clib}/client ../${slib}/server 24 127.0.0.1.crt ../${clib}/client ../${slib}/server
26 @echo '\n======== $@ ========'
27 LD_LIBRARY_PATH=/usr/local/lib/e${slib} \ 25 LD_LIBRARY_PATH=/usr/local/lib/e${slib} \
28 ../${slib}/server >${@:S/^run/server/}.out \ 26 ../${slib}/server >${@:S/^run/server/}.out \
29 -ss \ 27 -ss \
diff --git a/src/regress/lib/libssl/interop/version/Makefile b/src/regress/lib/libssl/interop/version/Makefile
index 420b236421..7ac86ccbeb 100644
--- a/src/regress/lib/libssl/interop/version/Makefile
+++ b/src/regress/lib/libssl/interop/version/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.2 2020/09/21 15:13:24 beck Exp $ 1# $OpenBSD: Makefile,v 1.3 2020/12/17 00:51:12 bluhm 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. Pin client or server to a fixed TLS 4# openssl 1.0.2, or openssl 1.1. Pin client or server to a fixed TLS
@@ -41,7 +41,6 @@ run-version-client-${clib}-${cver}-server-${slib}-${sver} \
41client-version-client-${clib}-${cver}-server-${slib}-${sver}.out \ 41client-version-client-${clib}-${cver}-server-${slib}-${sver}.out \
42server-version-client-${clib}-${cver}-server-${slib}-${sver}.out: \ 42server-version-client-${clib}-${cver}-server-${slib}-${sver}.out: \
43 127.0.0.1.crt ../${clib}/client ../${slib}/server 43 127.0.0.1.crt ../${clib}/client ../${slib}/server
44 @echo '\n======== $@ ========'
45 LD_LIBRARY_PATH=/usr/local/lib/e${slib} \ 44 LD_LIBRARY_PATH=/usr/local/lib/e${slib} \
46 ../${slib}/server >${@:S/^run/server/}.out \ 45 ../${slib}/server >${@:S/^run/server/}.out \
47 -c 127.0.0.1.crt -k 127.0.0.1.key \ 46 -c 127.0.0.1.crt -k 127.0.0.1.key \
@@ -69,7 +68,6 @@ REGRESS_SLOW_TARGETS += check-version-client-${clib}-${cver}-server-${slib}-${sv
69check-version-client-${clib}-${cver}-server-${slib}-${sver}: \ 68check-version-client-${clib}-${cver}-server-${slib}-${sver}: \
70 client-version-client-${clib}-${cver}-server-${slib}-${sver}.out \ 69 client-version-client-${clib}-${cver}-server-${slib}-${sver}.out \
71 server-version-client-${clib}-${cver}-server-${slib}-${sver}.out 70 server-version-client-${clib}-${cver}-server-${slib}-${sver}.out
72 @echo '\n======== $@ ========'
73 @grep ' Protocol *: ' ${@:S/^check/client/}.out 71 @grep ' Protocol *: ' ${@:S/^check/client/}.out
74 @grep ' Protocol *: ' ${@:S/^check/server/}.out 72 @grep ' Protocol *: ' ${@:S/^check/server/}.out
75.if "${cver}" == any 73.if "${cver}" == any
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-26 22:22:12 +0000