REGTESTS: update the ocsp-update tests

Update the ocsp-update tests for the recent changes:

- "tune.ssl.ocsp-update.mode" was renamed iin "ocsp-update.mode"

diff --git a/reg-tests/ssl/ocsp_auto_update.vtc b/reg-tests/ssl/ocsp_auto_update.vtc
index 214c63e692f4cd658c392ca58550d6f2499a1a21..05cfd82c61dafd55a7b01981c521462d27ff24e7 100644 (file)
--- a/reg-tests/ssl/ocsp_auto_update.vtc
+++ b/reg-tests/ssl/ocsp_auto_update.vtc
@@ -530,7 +530,7 @@ haproxy h7 -conf {
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h7/stats" level admin
         crt-base ${testdir}
-        tune.ssl.ocsp-update.mode on
+        ocsp-update.mode on
         log ${Syslog_ocsp7_addr}:${Syslog_ocsp7_port} local0 notice notice
 
     defaults
@@ -723,7 +723,7 @@ shell {
 # Check that the line is in the crt-list
 haproxy h9 -cli {
     send "show ssl crt-list ${testdir}/ocsp_update/multicert_ecdsa_no_update.crt-list"
-    expect ~ "${testdir}/ocsp_update/rsa.pem .* foo.bar"
+    expect ~ "${testdir}/ocsp_update/rsa.pem.*ocsp-update off.*foo.bar"
 }
 
 # Check that the new certificate is NOT in the auto update list

diff --git a/reg-tests/ssl/ocsp_compat_check.vtc b/reg-tests/ssl/ocsp_compat_check.vtc
index 088dbf3d50a101fe88838d981fa69f7233ae3b2c..d45f1ef9ec075cfb6d6302864559563810e01092 100644 (file)
--- a/reg-tests/ssl/ocsp_compat_check.vtc
+++ b/reg-tests/ssl/ocsp_compat_check.vtc
@@ -3,7 +3,7 @@
 # broken with BoringSSL.
 #
 # This reg-test tries loading multiple configurations that make use of the
-# 'ocsp-update' crt-list option and the global 'tune.ssl.ocsp-update.mode'
+# 'ocsp-update' crt-list option and the global 'ocsp-update.mode'
 # option. It ensures that an error message is raised when the user provides an
 # incoherent configuration. Any configuration in which a given certificate has
 # the ocsp auto update mode set to 'on' as well as 'off' simultaneously should
@@ -37,7 +37,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-#    tune.ssl.ocsp-update.mode on
+#    ocsp-update.mode on
 
 defaults
     log stderr local0 debug err
@@ -67,7 +67,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode on
+    ocsp-update.mode on
 
 defaults
     log stderr local0 debug err
@@ -97,7 +97,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode off
+    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -127,7 +127,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-#    tune.ssl.ocsp-update.mode off
+#    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -158,7 +158,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode on
+    ocsp-update.mode on
 
 defaults
     log stderr local0 debug err
@@ -189,7 +189,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode off
+    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -222,7 +222,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-#    tune.ssl.ocsp-update.mode off
+#    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -254,7 +254,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-#    tune.ssl.ocsp-update.mode off
+#    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -286,7 +286,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode on
+    ocsp-update.mode on
 
 defaults
     log stderr local0 debug err
@@ -318,7 +318,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode on
+    ocsp-update.mode on
 
 defaults
     log stderr local0 debug err
@@ -350,7 +350,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode off
+    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -382,7 +382,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode off
+    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -421,7 +421,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-#    tune.ssl.ocsp-update.mode on
+#    ocsp-update.mode on
 
 defaults
     log stderr local0 debug err
@@ -449,7 +449,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode on
+    ocsp-update.mode on
 
 defaults
     log stderr local0 debug err
@@ -477,7 +477,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode off
+    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -505,7 +505,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-#    tune.ssl.ocsp-update.mode off
+#    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -534,7 +534,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode on
+    ocsp-update.mode on
 
 defaults
     log stderr local0 debug err
@@ -563,7 +563,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode off
+    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -594,7 +594,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-#    tune.ssl.ocsp-update.mode off
+#    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -624,7 +624,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-#    tune.ssl.ocsp-update.mode off
+#    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -654,7 +654,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode on
+    ocsp-update.mode on
 
 defaults
     log stderr local0 debug err
@@ -684,7 +684,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode on
+    ocsp-update.mode on
 
 defaults
     log stderr local0 debug err
@@ -714,7 +714,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode off
+    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err
@@ -744,7 +744,7 @@ EOF
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
     crt-base ${testdir}/ocsp_update/multicert
-    tune.ssl.ocsp-update.mode off
+    ocsp-update.mode off
 
 defaults
     log stderr local0 debug err