From 2655f2ba336829ee1862c4ec3aab12216f3f4ce3 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Thu, 30 Sep 2021 17:57:04 +0200 Subject: [PATCH] REGTESTS: ssl: show_ssl_ocspresponse w/ freebsd won't use base64 The reg-test show_ssl_ocspresponse.vtc won't use the "base64" binary on freebsd, replace it by a "openssl base64" which does the same thing. --- reg-tests/ssl/show_ssl_ocspresponse.vtc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reg-tests/ssl/show_ssl_ocspresponse.vtc b/reg-tests/ssl/show_ssl_ocspresponse.vtc index dd3102fb28..86cbc8d624 100644 --- a/reg-tests/ssl/show_ssl_ocspresponse.vtc +++ b/reg-tests/ssl/show_ssl_ocspresponse.vtc @@ -22,7 +22,7 @@ varnishtest "Test the 'show ssl ocsp-response' and 'show ssl cert foo.pem.ocsp' features of the CLI" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'" -feature cmd "command -v socat" +feature cmd "command -v socat openssl" feature ignore_unknown_macro haproxy h1 -conf { @@ -83,7 +83,7 @@ haproxy h1 -cli { # Change the server certificate's OCSP response through "set ssl ocsp-response" shell { - printf "set ssl ocsp-response <<\n$(base64 ${testdir}/show_ocsp_server.pem.ocsp.revoked)\n\n" | socat "${tmpdir}/h1/stats" - + printf "set ssl ocsp-response <<\n$(cat ${testdir}/show_ocsp_server.pem.ocsp.revoked|openssl base64)\n\n" | socat "${tmpdir}/h1/stats" - } # Check that the change was taken into account @@ -104,7 +104,7 @@ haproxy h1 -cli { # Change the server certificate's OCSP response through a transaction shell { printf "set ssl cert ${testdir}/show_ocsp_server.pem <<\n$(cat ${testdir}/show_ocsp_server.pem)\n\n" | socat "${tmpdir}/h1/stats" - - printf "set ssl cert ${testdir}/show_ocsp_server.pem.ocsp <<\n$(base64 ${testdir}/show_ocsp_server.pem.ocsp)\n\n" | socat "${tmpdir}/h1/stats" - + printf "set ssl cert ${testdir}/show_ocsp_server.pem.ocsp <<\n$(cat ${testdir}/show_ocsp_server.pem.ocsp|openssl base64)\n\n" | socat "${tmpdir}/h1/stats" - }