MEDIUM: config: Deprecate tune.ssl.capture-cipherlist-size
Deprecate tune.ssl.capture-cipherlist-size in favor of
tune.ssl.capture-buffer-size which better describes the purpose of the
setting.
diff --git a/reg-tests/ssl/add_ssl_crt-list.vtc b/reg-tests/ssl/add_ssl_crt-list.vtc
index 7aae233..d3f8d75 100644
--- a/reg-tests/ssl/add_ssl_crt-list.vtc
+++ b/reg-tests/ssl/add_ssl_crt-list.vtc
@@ -24,7 +24,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
crt-base ${testdir}
stats socket "${tmpdir}/h1/stats" level admin
diff --git a/reg-tests/ssl/del_ssl_crt-list.vtc b/reg-tests/ssl/del_ssl_crt-list.vtc
index 4bf89f9..4815e2d 100644
--- a/reg-tests/ssl/del_ssl_crt-list.vtc
+++ b/reg-tests/ssl/del_ssl_crt-list.vtc
@@ -22,7 +22,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
crt-base ${testdir}
stats socket "${tmpdir}/h1/stats" level admin
diff --git a/reg-tests/ssl/new_del_ssl_cafile.vtc b/reg-tests/ssl/new_del_ssl_cafile.vtc
index 1b5bef1..b6cbc20 100644
--- a/reg-tests/ssl/new_del_ssl_cafile.vtc
+++ b/reg-tests/ssl/new_del_ssl_cafile.vtc
@@ -22,7 +22,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
stats socket "${tmpdir}/h1/stats" level admin
crt-base ${testdir}
diff --git a/reg-tests/ssl/new_del_ssl_crlfile.vtc b/reg-tests/ssl/new_del_ssl_crlfile.vtc
index 54bbdc2..7330163 100644
--- a/reg-tests/ssl/new_del_ssl_crlfile.vtc
+++ b/reg-tests/ssl/new_del_ssl_crlfile.vtc
@@ -22,7 +22,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
stats socket "${tmpdir}/h1/stats" level admin
crt-base ${testdir}
diff --git a/reg-tests/ssl/set_ssl_cafile.vtc b/reg-tests/ssl/set_ssl_cafile.vtc
index 72ce3e6..0b5c3ba 100644
--- a/reg-tests/ssl/set_ssl_cafile.vtc
+++ b/reg-tests/ssl/set_ssl_cafile.vtc
@@ -28,7 +28,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
stats socket "${tmpdir}/h1/stats" level admin
defaults
diff --git a/reg-tests/ssl/set_ssl_cert.vtc b/reg-tests/ssl/set_ssl_cert.vtc
index 85684bc..6938b20 100644
--- a/reg-tests/ssl/set_ssl_cert.vtc
+++ b/reg-tests/ssl/set_ssl_cert.vtc
@@ -33,7 +33,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
stats socket "${tmpdir}/h1/stats" level admin
crt-base ${testdir}
diff --git a/reg-tests/ssl/set_ssl_cert_bundle.vtc b/reg-tests/ssl/set_ssl_cert_bundle.vtc
index 218f7bf..11abdaf 100644
--- a/reg-tests/ssl/set_ssl_cert_bundle.vtc
+++ b/reg-tests/ssl/set_ssl_cert_bundle.vtc
@@ -28,7 +28,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
stats socket "${tmpdir}/h1/stats" level admin
crt-base ${testdir}
diff --git a/reg-tests/ssl/set_ssl_cert_noext.vtc b/reg-tests/ssl/set_ssl_cert_noext.vtc
index b7bafa8..0947fe0 100644
--- a/reg-tests/ssl/set_ssl_cert_noext.vtc
+++ b/reg-tests/ssl/set_ssl_cert_noext.vtc
@@ -25,7 +25,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
ssl-load-extra-del-ext
stats socket "${tmpdir}/h1/stats" level admin
diff --git a/reg-tests/ssl/set_ssl_crlfile.vtc b/reg-tests/ssl/set_ssl_crlfile.vtc
index f6d97ce..ce83ff7 100644
--- a/reg-tests/ssl/set_ssl_crlfile.vtc
+++ b/reg-tests/ssl/set_ssl_crlfile.vtc
@@ -31,7 +31,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
stats socket "${tmpdir}/h1/stats" level admin
defaults
diff --git a/reg-tests/ssl/set_ssl_server_cert.vtc b/reg-tests/ssl/set_ssl_server_cert.vtc
index 3fccaa6..880e7b0 100644
--- a/reg-tests/ssl/set_ssl_server_cert.vtc
+++ b/reg-tests/ssl/set_ssl_server_cert.vtc
@@ -17,7 +17,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
stats socket "${tmpdir}/h1/stats" level admin
nbthread 1
diff --git a/reg-tests/ssl/show_ssl_ocspresponse.vtc b/reg-tests/ssl/show_ssl_ocspresponse.vtc
index 387f36a..d2a9345 100644
--- a/reg-tests/ssl/show_ssl_ocspresponse.vtc
+++ b/reg-tests/ssl/show_ssl_ocspresponse.vtc
@@ -27,7 +27,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
stats socket "${tmpdir}/h1/stats" level admin
defaults
diff --git a/reg-tests/ssl/ssl_client_samples.vtc b/reg-tests/ssl/ssl_client_samples.vtc
index 83662be..2b6fd5b 100644
--- a/reg-tests/ssl/ssl_client_samples.vtc
+++ b/reg-tests/ssl/ssl_client_samples.vtc
@@ -13,7 +13,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
crt-base ${testdir}
defaults
diff --git a/reg-tests/ssl/ssl_default_server.vtc b/reg-tests/ssl/ssl_default_server.vtc
index 607225d..32179b1 100644
--- a/reg-tests/ssl/ssl_default_server.vtc
+++ b/reg-tests/ssl/ssl_default_server.vtc
@@ -23,7 +23,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
stats socket "${tmpdir}/h1/stats" level admin
crt-base ${testdir}
ca-base ${testdir}
diff --git a/reg-tests/ssl/ssl_errors.vtc b/reg-tests/ssl/ssl_errors.vtc
index 0d652d4..d8fea43 100644
--- a/reg-tests/ssl/ssl_errors.vtc
+++ b/reg-tests/ssl/ssl_errors.vtc
@@ -106,7 +106,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
stats socket "${tmpdir}/h1/stats" level admin
defaults
diff --git a/reg-tests/ssl/ssl_frontend_samples.vtc b/reg-tests/ssl/ssl_frontend_samples.vtc
index bca0856..92eec6a 100644
--- a/reg-tests/ssl/ssl_frontend_samples.vtc
+++ b/reg-tests/ssl/ssl_frontend_samples.vtc
@@ -12,7 +12,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
crt-base ${testdir}
defaults
diff --git a/reg-tests/ssl/ssl_server_samples.vtc b/reg-tests/ssl/ssl_server_samples.vtc
index 136ccaf..17b1bc4 100644
--- a/reg-tests/ssl/ssl_server_samples.vtc
+++ b/reg-tests/ssl/ssl_server_samples.vtc
@@ -13,7 +13,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
crt-base ${testdir}
stats socket "${tmpdir}/h1/stats" level admin
diff --git a/reg-tests/ssl/wrong_ctx_storage.vtc b/reg-tests/ssl/wrong_ctx_storage.vtc
index 7dc7528..c6cb19a 100644
--- a/reg-tests/ssl/wrong_ctx_storage.vtc
+++ b/reg-tests/ssl/wrong_ctx_storage.vtc
@@ -25,7 +25,7 @@
haproxy h1 -conf {
global
tune.ssl.default-dh-param 2048
- tune.ssl.capture-cipherlist-size 1
+ tune.ssl.capture-buffer-size 1
listen frt
mode http