REGTESTS: only use tune.ssl.default-dh-param when not using AWS-LC

This option is not available with AWS-LC and emits a warning, so let's
properly enclose the test to cover this special case.

diff --git a/reg-tests/checks/ssl-hello-check.vtc b/reg-tests/checks/ssl-hello-check.vtc
index 7cabfabc8d71c4170e91af90bedb36a50dd28b40..a44b6e15cb113341198287c32418d2b3cf1f5844 100644 (file)
--- a/reg-tests/checks/ssl-hello-check.vtc
+++ b/reg-tests/checks/ssl-hello-check.vtc
@@ -24,7 +24,9 @@ syslog S3 -level notice {
 
 haproxy htst -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
 
     defaults
         mode tcp

diff --git a/reg-tests/checks/tcp-check-ssl.vtc b/reg-tests/checks/tcp-check-ssl.vtc
index 9ad0dfab5151f9307b24431e830836ea57edcf65..4020f73f5a548ecd0172c23104e075faf7f7c810 100644 (file)
--- a/reg-tests/checks/tcp-check-ssl.vtc
+++ b/reg-tests/checks/tcp-check-ssl.vtc
@@ -29,7 +29,9 @@ syslog S4 -level notice {
 
 haproxy htst -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
 
     defaults
         mode tcp

diff --git a/reg-tests/checks/tls_health_checks.vtc b/reg-tests/checks/tls_health_checks.vtc
index e94a2c719583928f6d61c9a642bd9c5b70001c2d..9c3039f53ed45af1de57439c11f50570c770b132 100644 (file)
--- a/reg-tests/checks/tls_health_checks.vtc
+++ b/reg-tests/checks/tls_health_checks.vtc
@@ -34,7 +34,9 @@ syslog S1 -level notice {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
 
     defaults
         mode http
@@ -83,7 +85,9 @@ syslog S6 -level notice {
 
 haproxy h2 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
 
     defaults
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

diff --git a/reg-tests/connection/proxy_protocol_random_fail.vtc b/reg-tests/connection/proxy_protocol_random_fail.vtc
index 1ae33deb974aeaa401387e48478d21ee08ee38e7..93667decf6c5ff067c9902f62c40b3a092189bcc 100644 (file)
--- a/reg-tests/connection/proxy_protocol_random_fail.vtc
+++ b/reg-tests/connection/proxy_protocol_random_fail.vtc
@@ -24,7 +24,9 @@ syslog Slog_1 -repeat 8 -level info {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         log ${Slog_1_addr}:${Slog_1_port} len 2048 local0 debug err
 
     defaults

diff --git a/reg-tests/jwt/jws_verify.vtc b/reg-tests/jwt/jws_verify.vtc
index 43d37c75528654be7029236b85e71d3a6e7bd82e..57a2ee23978bc9b630944f265ee89e40963668dd 100644 (file)
--- a/reg-tests/jwt/jws_verify.vtc
+++ b/reg-tests/jwt/jws_verify.vtc
@@ -23,7 +23,9 @@ server s1 -repeat 24 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h1/stats" level admin
 

diff --git a/reg-tests/ssl/add_ssl_crt-list.vtc b/reg-tests/ssl/add_ssl_crt-list.vtc
index fbf3817386d67b18ed975401dc79ddbb1a3b2572..6c6379ec33f59c0a589fc42214263787da752e3d 100644 (file)
--- a/reg-tests/ssl/add_ssl_crt-list.vtc
+++ b/reg-tests/ssl/add_ssl_crt-list.vtc
@@ -22,7 +22,9 @@ server s1 -repeat 2 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         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 5cf4c6af32b0dfde6750f66e3f669c8d66cf6938..3a2beccb64091db1ce82b05b5cf0dd8e713c7873 100644 (file)
--- a/reg-tests/ssl/del_ssl_crt-list.vtc
+++ b/reg-tests/ssl/del_ssl_crt-list.vtc
@@ -20,7 +20,9 @@ server s1 -repeat 2 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         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 2123fb030c508ad77d769233899e51f2141a8c3a..7e8a9f19d0d1f2dc9d0393c26083767d177d0a0f 100644 (file)
--- a/reg-tests/ssl/new_del_ssl_cafile.vtc
+++ b/reg-tests/ssl/new_del_ssl_cafile.vtc
@@ -21,7 +21,9 @@ server s1 -repeat 2 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         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 8658a1a7a5638a56ab906eadba01991827971271..8575f26449822f71d5bcf540a7af2210dd0ed870 100644 (file)
--- a/reg-tests/ssl/new_del_ssl_crlfile.vtc
+++ b/reg-tests/ssl/new_del_ssl_crlfile.vtc
@@ -21,7 +21,9 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h1/stats" level admin
         crt-base ${testdir}

diff --git a/reg-tests/ssl/ocsp_auto_update.vtc b/reg-tests/ssl/ocsp_auto_update.vtc
index 019395380359b04e34f9cafd6fede817245c66af..bcaf96b19bd7b91682cb5b5a44ffe2bd9b86bf3a 100644 (file)
--- a/reg-tests/ssl/ocsp_auto_update.vtc
+++ b/reg-tests/ssl/ocsp_auto_update.vtc
@@ -47,7 +47,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h1/stats" level admin
         crt-base ${testdir}/ocsp_update
@@ -115,7 +117,9 @@ syslog Syslog_ocsp -level notice {
 
 haproxy h2 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h2/stats" level admin
         crt-base ${testdir}/ocsp_update
@@ -182,7 +186,9 @@ syslog Syslog_ocsp3 -level notice {
 
 haproxy h3 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h3/stats" level admin
         crt-base ${testdir}/ocsp_update
@@ -254,7 +260,9 @@ syslog Syslog_ocsp4 -level notice {
 
 haproxy h4 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h4/stats" level admin
         crt-base ${testdir}/ocsp_update
@@ -368,7 +376,9 @@ syslog Syslog_ocsp5 -level notice {
 
 haproxy h5 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h5/stats" level admin
         crt-base ${testdir}/ocsp_update
@@ -450,7 +460,9 @@ syslog Syslog_ocsp6 -level notice {
 
 haproxy h6 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h6/stats" level admin
         crt-base ${testdir}
@@ -526,7 +538,9 @@ syslog Syslog_ocsp7 -level notice {
 
 haproxy h7 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h7/stats" level admin
         crt-base ${testdir}
@@ -589,7 +603,9 @@ process p7 -wait
 
 haproxy h8 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h8/stats" level admin
         crt-base ${testdir}/ocsp_update
@@ -683,7 +699,9 @@ syslog Syslog_ocsp9 -level notice {
 
 haproxy h9 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h9/stats" level admin
         crt-base ${testdir}/ocsp_update

diff --git a/reg-tests/ssl/set_ssl_bug_2265.vtc b/reg-tests/ssl/set_ssl_bug_2265.vtc
index e743c0a81880ae7771c7241df235759150dc392a..c773f134ca3d781b64b2673ae3ffd332075ed7c5 100644 (file)
--- a/reg-tests/ssl/set_ssl_bug_2265.vtc
+++ b/reg-tests/ssl/set_ssl_bug_2265.vtc
@@ -25,7 +25,9 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h1/stats" level admin
 

diff --git a/reg-tests/ssl/set_ssl_cafile.vtc b/reg-tests/ssl/set_ssl_cafile.vtc
index b948b4bd7d044a890ecbaeefef99f7120a6e0337..2e5aebbdaa2f4b9c2c68fde9b872a00fc2a0cc8c 100644 (file)
--- a/reg-tests/ssl/set_ssl_cafile.vtc
+++ b/reg-tests/ssl/set_ssl_cafile.vtc
@@ -27,7 +27,9 @@ server s1 -repeat 4 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h1/stats" level admin
 

diff --git a/reg-tests/ssl/set_ssl_cert.vtc b/reg-tests/ssl/set_ssl_cert.vtc
index 70a6f5ee016233db6a4cb9ba95e82edfbbcba192..6373498dee2634b22abe46c5bffaf3a134771451 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert.vtc
+++ b/reg-tests/ssl/set_ssl_cert.vtc
@@ -31,7 +31,9 @@ server s1 -repeat 9 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         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 0941bdba9fae6d62428e5860e71d218292eb5b3d..3b3c0b343a654d99e9d98be03165dbe3afe9e2e2 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert_bundle.vtc
+++ b/reg-tests/ssl/set_ssl_cert_bundle.vtc
@@ -28,7 +28,9 @@ server s1 -repeat 9 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         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 8eb8b24ddde1b8a2ba61443050e9504218a3430a..ed5fdb5c735ed9f4ee4664472e6bbf02f0937689 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert_noext.vtc
+++ b/reg-tests/ssl/set_ssl_cert_noext.vtc
@@ -23,7 +23,9 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         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 54d599859d59a3c056416a6807ca8ea432afe7e1..86cab001735516ea2ef7b6f5baf7c7948ced8006 100644 (file)
--- a/reg-tests/ssl/set_ssl_crlfile.vtc
+++ b/reg-tests/ssl/set_ssl_crlfile.vtc
@@ -30,7 +30,9 @@ server s1 -repeat 4 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h1/stats" level admin
 

diff --git a/reg-tests/ssl/set_ssl_server_cert.vtc b/reg-tests/ssl/set_ssl_server_cert.vtc
index 847d45b8d8d467b35ad406a791c67add835e149d..55d8df0efa2c96e19172f9d66a93eead0a82676e 100644 (file)
--- a/reg-tests/ssl/set_ssl_server_cert.vtc
+++ b/reg-tests/ssl/set_ssl_server_cert.vtc
@@ -16,7 +16,9 @@ server s1 -repeat 4 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         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 8b1db1692e19a180834612b59be54f0f8af1d77e..08969ba2b32f090246bfa0231dee55d48e788245 100644 (file)
--- a/reg-tests/ssl/show_ssl_ocspresponse.vtc
+++ b/reg-tests/ssl/show_ssl_ocspresponse.vtc
@@ -27,7 +27,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h1/stats" level admin
 

diff --git a/reg-tests/ssl/ssl_alpn.vtc b/reg-tests/ssl/ssl_alpn.vtc
index dfc63ac0436eaa5190d4291492a36a0f770aa8df..9d032769c8daf4b44168a7b5cd0c24b6b9e372ad 100644 (file)
--- a/reg-tests/ssl/ssl_alpn.vtc
+++ b/reg-tests/ssl/ssl_alpn.vtc
@@ -11,7 +11,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
 
     defaults
         mode http

diff --git a/reg-tests/ssl/ssl_client_auth.vtc b/reg-tests/ssl/ssl_client_auth.vtc
index ab8ba18fc39c0b1126303bb77a864777aef879a7..a223a9c18ba886e097bf9171aa8165b2bcc77374 100644 (file)
--- a/reg-tests/ssl/ssl_client_auth.vtc
+++ b/reg-tests/ssl/ssl_client_auth.vtc
@@ -25,7 +25,9 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
 
     defaults
         mode http

diff --git a/reg-tests/ssl/ssl_client_samples.vtc b/reg-tests/ssl/ssl_client_samples.vtc
index 5a84e4b254825b1356026190fe859591c4219180..6b770822c94eb9704b38aa9a4ff146063467a049 100644 (file)
--- a/reg-tests/ssl/ssl_client_samples.vtc
+++ b/reg-tests/ssl/ssl_client_samples.vtc
@@ -12,7 +12,9 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         crt-base ${testdir}
 

diff --git a/reg-tests/ssl/ssl_crt-list_filters.vtc b/reg-tests/ssl/ssl_crt-list_filters.vtc
index 1d21ed8a1e9346119c88edffea4ccf313ba247c7..843d85af47a7d3a35c1b27cee2f0a0730660a7bc 100644 (file)
--- a/reg-tests/ssl/ssl_crt-list_filters.vtc
+++ b/reg-tests/ssl/ssl_crt-list_filters.vtc
@@ -16,7 +16,9 @@ server s1 -repeat 6 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         crt-base ${testdir}
         stats socket "${tmpdir}/h1/stats" level admin
 

diff --git a/reg-tests/ssl/ssl_curve_name.vtc b/reg-tests/ssl/ssl_curve_name.vtc
index a285a8f86bd3c4960efb1ccebe719cef7cc7c6c3..551679177e6651604960a8b63c1c1adc2c6041fe 100644 (file)
--- a/reg-tests/ssl/ssl_curve_name.vtc
+++ b/reg-tests/ssl/ssl_curve_name.vtc
@@ -11,7 +11,9 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         crt-base ${testdir}
 

diff --git a/reg-tests/ssl/ssl_curves.vtc b/reg-tests/ssl/ssl_curves.vtc
index 6a8b1b690d6d69ffbf8f3b70b717fffdc7d7b72e..5ffd2d8bdfe0313e05e2844e10b1f92041664569 100644 (file)
--- a/reg-tests/ssl/ssl_curves.vtc
+++ b/reg-tests/ssl/ssl_curves.vtc
@@ -39,7 +39,9 @@ syslog Slg_cust_fmt -level info {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
 
     defaults
         mode http

diff --git a/reg-tests/ssl/ssl_default_server.vtc b/reg-tests/ssl/ssl_default_server.vtc
index 485a9ba17162da6ff371de265929a79b4a2a34ec..88a3ccbe4d5fe17aac16106daeb12d53704b6817 100644 (file)
--- a/reg-tests/ssl/ssl_default_server.vtc
+++ b/reg-tests/ssl/ssl_default_server.vtc
@@ -22,7 +22,9 @@ server s1 -repeat 7 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h1/stats" level admin
         crt-base ${testdir}

diff --git a/reg-tests/ssl/ssl_errors.vtc b/reg-tests/ssl/ssl_errors.vtc
index 8fb9c5a121c4377025960720923bb0d16e6a1e24..a3c54553c679e1b550998f97f46acf776175a238 100644 (file)
--- a/reg-tests/ssl/ssl_errors.vtc
+++ b/reg-tests/ssl/ssl_errors.vtc
@@ -168,7 +168,9 @@ syslog Slg_bcknd_fe -level info {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         stats socket "${tmpdir}/h1/stats" level admin
     .if openssl_version_atleast(3.0.0)

diff --git a/reg-tests/ssl/ssl_frontend_samples.vtc b/reg-tests/ssl/ssl_frontend_samples.vtc
index 401e193448d9643e64b7916a7ed53d5d402fb111..56a208bccdd8ee97c91b8806c2ae70e289725225 100644 (file)
--- a/reg-tests/ssl/ssl_frontend_samples.vtc
+++ b/reg-tests/ssl/ssl_frontend_samples.vtc
@@ -11,7 +11,9 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         crt-base ${testdir}
 

diff --git a/reg-tests/ssl/ssl_generate_certificate.vtc b/reg-tests/ssl/ssl_generate_certificate.vtc
index ba0b53b36c0f780e25cbcc2000341c30fcd2da00..ace27d877bdc0863780d7ec3b16ca274724f6355 100644 (file)
--- a/reg-tests/ssl/ssl_generate_certificate.vtc
+++ b/reg-tests/ssl/ssl_generate_certificate.vtc
@@ -27,7 +27,9 @@ server s1 -repeat 6 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 2048
 
     defaults

diff --git a/reg-tests/ssl/ssl_server_samples.vtc b/reg-tests/ssl/ssl_server_samples.vtc
index c037523b120a9de169645f40e29bc4b54e77c317..2841d1cc63527392d3315ba0d902b84a8545a193 100644 (file)
--- a/reg-tests/ssl/ssl_server_samples.vtc
+++ b/reg-tests/ssl/ssl_server_samples.vtc
@@ -11,7 +11,9 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         tune.ssl.capture-buffer-size 1
         crt-base ${testdir}
         stats socket "${tmpdir}/h1/stats" level admin

diff --git a/reg-tests/ssl/ssl_simple_crt-list.vtc b/reg-tests/ssl/ssl_simple_crt-list.vtc
index f7b03a2753d3ead641cb8910231c762c3b00e5f6..d70327b0b17676d94a51e61422b79335686ff151 100644 (file)
--- a/reg-tests/ssl/ssl_simple_crt-list.vtc
+++ b/reg-tests/ssl/ssl_simple_crt-list.vtc
@@ -12,7 +12,9 @@ server s1 -repeat 4 {
 
 haproxy h1 -conf {
     global
+    .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
+    .endif
         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 dd746d46d1dce8fb186d6c01923528b2e265dd87..4275731fe60f448b1c66472cfae473dd30c3625f 100644 (file)
--- a/reg-tests/ssl/wrong_ctx_storage.vtc
+++ b/reg-tests/ssl/wrong_ctx_storage.vtc
@@ -24,7 +24,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
   global
+  .if !ssllib_name_startswith(AWS-LC)
     tune.ssl.default-dh-param 2048
+  .endif
     tune.ssl.capture-buffer-size 1
 
   defaults