Reorganize libssl interop tests. Move netcat tests into separate

directory.  Keep all log files for easier debugging.  Name regress
target names consistently.

1 files changed, 89 insertions, 0 deletions

diff --git a/src/regress/lib/libssl/interop/netcat/Makefile b/src/regress/lib/libssl/interop/netcat/Makefile
new file mode 100644
index 0000000000..def90c1ffb
--- /dev/null
+++ b/src/regress/lib/libssl/interop/netcat/Makefile
@@ -0,0 +1,89 @@
+# $OpenBSD: Makefile,v 1.1 2018/11/11 00:15:04 bluhm Exp $
+
+LIBRARIES =             libressl
+.if exists(/usr/local/bin/eopenssl)
+LIBRARIES +=            openssl
+.endif
+.if exists(/usr/local/bin/eopenssl11)
+LIBRARIES +=            openssl11
+.endif
+
+# run netcat server and connect with test client
+
+.for clib in ${LIBRARIES}
+
+REGRESS_TARGETS +=      run-netcat-client-${clib}-server-nc
+REGRESS_TARGETS +=      run-protocol-client-${clib}
+
+run-netcat-client-${clib}-server-nc: ../${clib}/client 127.0.0.1.crt
+        @echo '\n======== $@ ========'
+        echo "greeting" | \
+            nc >${@:S/^run/server/}.out \
+            -l -c -C 127.0.0.1.crt -K 127.0.0.1.key \
+            127.0.0.1 0 & \
+            for i in `jot 1000`; do fstat -p $$! >netcat.fstat; \
+            grep -q ' stream tcp .*:[1-9][0-9]*$$' netcat.fstat && \
+            exit 0; done; exit 1
+        LD_LIBRARY_PATH=/usr/local/lib/e${clib} \
+            ../${clib}/client >${@:S/^run/client/}.out \
+            `sed -n 's/.* stream tcp .*:/127.0.0.1 /p' netcat.fstat`
+        # check that the client run successfully to the end
+        grep -q '^success$$' ${@:S/^run/client/}.out
+        # client must have read server greeting
+        grep -q '^<<< greeting$$' ${@:S/^run/client/}.out
+        # netstat server must have read client hello
+        grep -q '^hello$$' ${@:S/^run/server/}.out
+
+.endfor
+
+# run test server and connect with netcat client
+
+.for slib in ${LIBRARIES}
+
+REGRESS_TARGETS +=      run-netcat-client-nc-server-${slib}
+
+run-netcat-client-nc-server-${slib}: ../${slib}/server 127.0.0.1.crt
+        @echo '\n======== $@ ========'
+        LD_LIBRARY_PATH=/usr/local/lib/e${slib} \
+            ../${slib}/server >${@:S/^run/server/}.out \
+            127.0.0.1 0
+        echo "hello" | \
+            nc >${@:S/^run/client/}.out \
+            -c -R 127.0.0.1.crt \
+            `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out`
+        # check that the server child run successfully to the end
+        grep -q '^success$$' ${@:S/^run/server/}.out
+        # server must have read client hello
+        grep -q '^<<< hello$$' ${@:S/^run/server/}.out
+        # client must have read server greeting
+        grep -q '^greeting$$' ${@:S/^run/client/}.out
+
+.endfor
+
+# check the TLS protocol version in client and server logs
+
+.for clib in ${LIBRARIES}
+
+REGRESS_TARGETS +=      run-protocol-client-${clib}
+
+run-protocol-client-${clib}: client-netcat-client-${clib}-server-nc.out
+        @echo '\n======== $@ ========'
+        # check that LibTLS protocol version is TLS 1.2
+        # XXX adapt when LibreSSL supports TLS 1.3
+        grep 'Protocol *: TLSv1.2' client-netcat-client-${clib}-server-nc.out
+
+.endfor
+
+.for slib in ${LIBRARIES}
+
+REGRESS_TARGETS +=      run-protocol-server-${slib}
+
+run-protocol-server-${slib}: server-netcat-client-nc-server-${slib}.out
+        @echo '\n======== $@ ========'
+        # check that LibTLS protocol version is TLS 1.2
+        # XXX adapt when LibreSSL supports TLS 1.3
+        grep 'Protocol *: TLSv1.2' server-netcat-client-nc-server-${slib}.out
+
+.endfor
+
+.include <bsd.regress.mk>