diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-11-09 07:44:02 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-11-10 07:20:16 +0100 |
| commit | 5c7db52d2471d13d6c8e6c2e763d3ba2560d6cad (patch) | |
| tree | 1ee88469b6907aa15b275a77d5ed306629f0298a /tests/suite | |
| parent | f3da49beff97b399325f4616b6096d7bbdec268d (diff) | |
| download | gnutls-5c7db52d2471d13d6c8e6c2e763d3ba2560d6cad.tar.gz | |
tls13: use system's openssl for interop testing
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Diffstat (limited to 'tests/suite')
| -rw-r--r-- | tests/suite/Makefile.am | 6 | ||||
| -rwxr-xr-x | tests/suite/testcompat-tls13-openssl.sh | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am index f43fe90eee..f6e413ee56 100644 --- a/tests/suite/Makefile.am +++ b/tests/suite/Makefile.am @@ -111,6 +111,10 @@ scripts_to_test += tls-fuzzer/tls-fuzzer-nocert-ssl3.sh TESTS_ENVIRONMENT += ENABLE_SSL3=1 endif +if ENABLE_TLS13_INTEROP +scripts_to_test += testcompat-tls13-openssl.sh +endif + if ENABLE_DANE scripts_to_test += testdane.sh endif @@ -129,7 +133,7 @@ scripts_to_test += eagain.sh endif endif -nodist_check_SCRIPTS = $(scripts_to_test) testcompat-tls13-openssl.sh +nodist_check_SCRIPTS = $(scripts_to_test) TESTS = $(scripts_to_test) prime-check diff --git a/tests/suite/testcompat-tls13-openssl.sh b/tests/suite/testcompat-tls13-openssl.sh index b28aad5bf0..8f385f515e 100755 --- a/tests/suite/testcompat-tls13-openssl.sh +++ b/tests/suite/testcompat-tls13-openssl.sh @@ -55,9 +55,7 @@ check_for_datefudge PORT="${PORT:-${RPORT}}" -export LD_LIBRARY_PATH=${abs_top_srcdir}/devel/openssl -echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH -SERV=../../devel/openssl/apps/openssl +SERV=openssl OPENSSL_CLI="$SERV" if test -z "$OUTPUT";then @@ -347,14 +345,14 @@ _EOF_ echo_cmd "${PREFIX}Checking TLS 1.3 with post handshake auth..." eval "${GETPORT}" - launch_server $$ --echo --priority "NORMAL:-VERS-ALL:+VERS-TLS1.3${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" #>>${OUTPUT} 2>&1 + launch_server $$ --echo --priority "NORMAL:-VERS-ALL:+VERS-TLS1.3${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" >>${OUTPUT} 2>&1 PID=$! wait_server ${PID} expect - >/dev/null <<_EOF_ set timeout 10 set os_error_flag 1 -spawn ${OPENSSL_CLI} s_client -force_pha -host localhost -port "${PORT}" -cert "${CLI_CERT}" -key "${CLI_KEY}" -CAfile "${CA_CERT}" +spawn ${OPENSSL_CLI} s_client -enable_pha -host localhost -port "${PORT}" -cert "${CLI_CERT}" -key "${CLI_KEY}" -CAfile "${CA_CERT}" expect "SSL-Session" {send "**REAUTH**\n"} timeout {exit 1} expect { |