RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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"
This commit is contained in:
William Lallemand 2024-05-07 09:55:02 +02:00
parent ee58fac1b4
commit ef943c186d
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reg-tests/ssl/ocsp_auto_update.vtc
View File

@ -530,7 +530,7 @@ haproxy h7 -conf {
tune.ssl.capture-buffer-size 1 tune.ssl.capture-buffer-size 1
stats socket "${tmpdir}/h7/stats" level admin stats socket "${tmpdir}/h7/stats" level admin
crt-base ${testdir} crt-base ${testdir}
tune.ssl.ocsp-update.mode on ocsp-update.mode on
log ${Syslog_ocsp7_addr}:${Syslog_ocsp7_port} local0 notice notice log ${Syslog_ocsp7_addr}:${Syslog_ocsp7_port} local0 notice notice
defaults defaults
@ -723,7 +723,7 @@ shell {
# Check that the line is in the crt-list # Check that the line is in the crt-list
haproxy h9 -cli { haproxy h9 -cli {
send "show ssl crt-list ${testdir}/ocsp_update/multicert_ecdsa_no_update.crt-list" 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 # Check that the new certificate is NOT in the auto update list

50
reg-tests/ssl/ocsp_compat_check.vtc
View File

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