1 files changed, 11 insertions, 19 deletions

diff --git a/src/regress/lib/libssl/interop/libressl/Makefile b/src/regress/lib/libssl/interop/libressl/Makefile
index 6923e12469..868c3c146f 100644
--- a/src/regress/lib/libssl/interop/libressl/Makefile
+++ b/src/regress/lib/libssl/interop/libressl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2018/11/09 06:30:41 bluhm Exp $
+# $OpenBSD: Makefile,v 1.5 2018/11/11 00:15:04 bluhm Exp $
 
 PROGS =                 client server
 CPPFLAGS =
@@ -6,21 +6,13 @@ LDFLAGS =
 LDADD =                 -lssl -lcrypto
 DPADD =                 ${LIBSSL} ${LIBCRYPTO}
 LD_LIBRARY_PATH =
-REGRESS_TARGETS =       run-self
+REGRESS_TARGETS =       run-self-client-server
 .for p in ${PROGS}
-REGRESS_TARGETS +=      run-ldd-$p run-$p
-.for x in nc self
-REGRESS_TARGETS +=      run-version-$x-$p run-protocol-$x-$p
+REGRESS_TARGETS +=      run-ldd-$p run-version-$p run-protocol-$p
 .endfor
-.endfor
-
-run-protocol-self-client run-protocol-self-server \
-run-protocol-nc-client run-protocol-nc-server:
-        @echo '\n======== $@ ========'
-        # LibreSSL does not support TLS 1.3 yet
-        @echo DISABLED
 
 .for p in ${PROGS}
+
 run-ldd-$p: ldd-$p.out
         @echo '\n======== $@ ========'
         # check that $p is linked with LibreSSL
@@ -28,18 +20,18 @@ run-ldd-$p: ldd-$p.out
         grep -q /usr/lib/libssl.so ldd-$p.out
         # check that $p is not linked with OpenSSL
         ! grep /usr/local/lib/ ldd-$p.out
-.endfor
 
-.for o in nc-client nc-server self-client self-server
-run-version-$o: $o.out
+run-version-$p: $p-self.out
         @echo '\n======== $@ ========'
         # check that runtime version is LibreSSL
-        grep 'SSLEAY_VERSION: LibreSSL' $o.out
+        grep 'SSLEAY_VERSION: LibreSSL' $p-self.out
 
-run-protocol-$o: $o.out
+run-protocol-$p: $p-self.out
         @echo '\n======== $@ ========'
-        # check that protocol version is TLS 1.3
-        grep 'Protocol *: TLSv1.3' $o.out
+        # check that LibreSSL protocol version is TLS 1.2
+        # XXX adapt when LibreSSL supports TLS 1.3
+        grep 'Protocol *: TLSv1.2' $p-self.out
+
 .endfor
 
 .include <bsd.regress.mk>