]> git.ipfire.org Git - thirdparty/haproxy.git/commit
REGTESTS: ssl: Move all the SSL certificates, keys, crt-lists inside "certs" directory
authorFrederic Lecaille <flecaille@haproxy.com>
Wed, 26 Nov 2025 14:21:51 +0000 (15:21 +0100)
committerFrederic Lecaille <flecaille@haproxy.com>
Mon, 8 Dec 2025 09:40:59 +0000 (10:40 +0100)
commit6e94b69665c8142ee78190dd013babf0d5ee982f
tree19de2a0c45afa61b7769be2ebe38b7146d97d957
parent21293dd6c3cdfa0bde778960044f30e30f97a3bd
REGTESTS: ssl: Move all the SSL certificates, keys, crt-lists inside "certs" directory

Move all these files and others for OCSP tests found into reg-tests/ssl
to reg-test/ssl/certs and adapt all the VTC files which use them.

This patch is needed by other tests which have to include the SSL tests.
Indeed, some VTC commands contain paths to these files which cannot
be customized with environment variables, depending on the location the VTC file
is runi from, because VTC does not resolve the environment variables. Only macros
as ${testdir} can be resolved.

For instance this command run from a VTC file from reg-tests/ssl directory cannot
be reused from another directory, except if we add a symbolic link for each certs,
key etc.

 haproxy h1 -cli {
   send "del ssl crt-list ${testdir}/localhost.crt-list ${testdir}/common.pem:1"
 }

This is not what we want. We add a symbolic link to reg-test/ssl/certs to the
directory and modify the command above as follows:

 haproxy h1 -cli {
   send "del ssl crt-list ${testdir}/certs/localhost.crt-list ${testdir}/certs/common.pem:1"
 }
127 files changed:
.github/h2spec.config
reg-tests/checks/certs [new symlink]
reg-tests/checks/common.pem [deleted symlink]
reg-tests/checks/ssl-hello-check.vtc
reg-tests/checks/tcp-check-client-hello.vtc
reg-tests/checks/tcp-check-ssl.vtc
reg-tests/checks/tls_health_checks.vtc
reg-tests/compression/certs [new symlink]
reg-tests/compression/common.pem [deleted symlink]
reg-tests/compression/lua_validation.vtc
reg-tests/connection/ca-auth.crt [deleted symlink]
reg-tests/connection/certs [new symlink]
reg-tests/connection/client1.pem [deleted symlink]
reg-tests/connection/common.pem [deleted symlink]
reg-tests/connection/http_reuse_conn_hash.vtc
reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc
reg-tests/connection/reverse_server_name.vtc
reg-tests/http-messaging/certs [new symlink]
reg-tests/http-messaging/common.pem [deleted symlink]
reg-tests/http-messaging/srv_ws.vtc
reg-tests/lua/certs [new symlink]
reg-tests/lua/common.pem [deleted symlink]
reg-tests/lua/txn_get_priv-thread.vtc
reg-tests/lua/txn_get_priv.vtc
reg-tests/peers/certs [new symlink]
reg-tests/peers/common.pem [deleted symlink]
reg-tests/peers/tls_basic_sync.vtc
reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
reg-tests/quic/certs [new symlink]
reg-tests/quic/common.pem [deleted symlink]
reg-tests/quic/retry.vtc
reg-tests/server/certs [new symlink]
reg-tests/server/cli_add_ssl_server.vtc
reg-tests/server/common.pem [deleted symlink]
reg-tests/ssl/add_ssl_crt-list.vtc
reg-tests/ssl/certs/bug-2265.crt [moved from reg-tests/ssl/bug-2265.crt with 100% similarity]
reg-tests/ssl/certs/ca-auth.crt [moved from reg-tests/ssl/ca-auth.crt with 100% similarity]
reg-tests/ssl/certs/cert1-example.com.pem.ecdsa [moved from reg-tests/ssl/cert1-example.com.pem.ecdsa with 100% similarity]
reg-tests/ssl/certs/cert1-example.com.pem.rsa [moved from reg-tests/ssl/cert1-example.com.pem.rsa with 100% similarity]
reg-tests/ssl/certs/cert2-example.com.pem.ecdsa [moved from reg-tests/ssl/cert2-example.com.pem.ecdsa with 100% similarity]
reg-tests/ssl/certs/cert2-example.com.pem.rsa [moved from reg-tests/ssl/cert2-example.com.pem.rsa with 100% similarity]
reg-tests/ssl/certs/client.ecdsa.pem [moved from reg-tests/ssl/client.ecdsa.pem with 100% similarity]
reg-tests/ssl/certs/client1.pem [moved from reg-tests/ssl/client1.pem with 100% similarity]
reg-tests/ssl/certs/client2_expired.pem [moved from reg-tests/ssl/client2_expired.pem with 100% similarity]
reg-tests/ssl/certs/client3_revoked.pem [moved from reg-tests/ssl/client3_revoked.pem with 100% similarity]
reg-tests/ssl/certs/common.4096.dh [moved from reg-tests/ssl/common.4096.dh with 100% similarity]
reg-tests/ssl/certs/common.crt [moved from reg-tests/ssl/common.crt with 100% similarity]
reg-tests/ssl/certs/common.key [moved from reg-tests/ssl/common.key with 100% similarity]
reg-tests/ssl/certs/common.pem [moved from reg-tests/ssl/common.pem with 100% similarity]
reg-tests/ssl/certs/crl-auth.pem [moved from reg-tests/ssl/crl-auth.pem with 100% similarity]
reg-tests/ssl/certs/ecdsa.crt [moved from reg-tests/ssl/ecdsa.crt with 100% similarity]
reg-tests/ssl/certs/ecdsa.key [moved from reg-tests/ssl/ecdsa.key with 100% similarity]
reg-tests/ssl/certs/ecdsa.pem [moved from reg-tests/ssl/ecdsa.pem with 100% similarity]
reg-tests/ssl/certs/filters.crt-list [moved from reg-tests/ssl/filters.crt-list with 100% similarity]
reg-tests/ssl/certs/generate_certificates/gen_cert_ca.pem [moved from reg-tests/ssl/generate_certificates/gen_cert_ca.pem with 100% similarity]
reg-tests/ssl/certs/generate_certificates/gen_cert_server.pem [moved from reg-tests/ssl/generate_certificates/gen_cert_server.pem with 100% similarity]
reg-tests/ssl/certs/interCA1_crl.pem [moved from reg-tests/ssl/interCA1_crl.pem with 100% similarity]
reg-tests/ssl/certs/interCA1_crl_empty.pem [moved from reg-tests/ssl/interCA1_crl_empty.pem with 100% similarity]
reg-tests/ssl/certs/interCA2_crl.pem [moved from reg-tests/ssl/interCA2_crl.pem with 100% similarity]
reg-tests/ssl/certs/interCA2_crl_empty.pem [moved from reg-tests/ssl/interCA2_crl_empty.pem with 100% similarity]
reg-tests/ssl/certs/issuers-chain-path/ca/ca.crt [moved from reg-tests/ssl/issuers-chain-path/ca/ca.crt with 100% similarity]
reg-tests/ssl/certs/issuers-chain-path/server.pem [moved from reg-tests/ssl/issuers-chain-path/server.pem with 100% similarity]
reg-tests/ssl/certs/localhost.crt-list [moved from reg-tests/ssl/localhost.crt-list with 100% similarity]
reg-tests/ssl/certs/ocsp_update/index.txt [moved from reg-tests/ssl/ocsp_update/index.txt with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert/server_ocsp.pem.ecdsa [moved from reg-tests/ssl/ocsp_update/multicert/server_ocsp.pem.ecdsa with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert/server_ocsp.pem.ecdsa.issuer [moved from reg-tests/ssl/ocsp_update/multicert/server_ocsp.pem.ecdsa.issuer with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert/server_ocsp.pem.ecdsa.ocsp [moved from reg-tests/ssl/ocsp_update/multicert/server_ocsp.pem.ecdsa.ocsp with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert/server_ocsp.pem.rsa [moved from reg-tests/ssl/ocsp_update/multicert/server_ocsp.pem.rsa with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert/server_ocsp.pem.rsa.issuer [moved from reg-tests/ssl/ocsp_update/multicert/server_ocsp.pem.rsa.issuer with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert/server_ocsp.pem.rsa.ocsp [moved from reg-tests/ssl/ocsp_update/multicert/server_ocsp.pem.rsa.ocsp with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert/server_ocsp_ecdsa.pem [moved from reg-tests/ssl/ocsp_update/multicert/server_ocsp_ecdsa.pem with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert/server_ocsp_ecdsa.pem.ocsp [moved from reg-tests/ssl/ocsp_update/multicert/server_ocsp_ecdsa.pem.ocsp with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert_both_certs.crt-list [moved from reg-tests/ssl/ocsp_update/multicert_both_certs.crt-list with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert_ecdsa.crt-list [moved from reg-tests/ssl/ocsp_update/multicert_ecdsa.crt-list with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert_ecdsa_no_update.crt-list [moved from reg-tests/ssl/ocsp_update/multicert_ecdsa_no_update.crt-list with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert_no_ocsp/server_ocsp_ecdsa.pem [moved from reg-tests/ssl/ocsp_update/multicert_no_ocsp/server_ocsp_ecdsa.pem with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert_no_ocsp/server_ocsp_rsa.pem [moved from reg-tests/ssl/ocsp_update/multicert_no_ocsp/server_ocsp_rsa.pem with 100% similarity]
reg-tests/ssl/certs/ocsp_update/multicert_rsa.crt-list [moved from reg-tests/ssl/ocsp_update/multicert_rsa.crt-list with 100% similarity]
reg-tests/ssl/certs/ocsp_update/ocsp.haproxy.com.pem [moved from reg-tests/ssl/ocsp_update/ocsp.haproxy.com.pem with 100% similarity]
reg-tests/ssl/certs/ocsp_update/ocsp_update_rootca.crt [moved from reg-tests/ssl/ocsp_update/ocsp_update_rootca.crt with 100% similarity]
reg-tests/ssl/certs/rootCA_crl.pem [moved from reg-tests/ssl/rootCA_crl.pem with 100% similarity]
reg-tests/ssl/certs/set_cafile_client.pem [moved from reg-tests/ssl/set_cafile_client.pem with 100% similarity]
reg-tests/ssl/certs/set_cafile_interCA1.crt [moved from reg-tests/ssl/set_cafile_interCA1.crt with 100% similarity]
reg-tests/ssl/certs/set_cafile_interCA2.crt [moved from reg-tests/ssl/set_cafile_interCA2.crt with 100% similarity]
reg-tests/ssl/certs/set_cafile_rootCA.crt [moved from reg-tests/ssl/set_cafile_rootCA.crt with 100% similarity]
reg-tests/ssl/certs/set_cafile_server.pem [moved from reg-tests/ssl/set_cafile_server.pem with 100% similarity]
reg-tests/ssl/certs/set_default_cert.crt-list [moved from reg-tests/ssl/set_default_cert.crt-list with 100% similarity]
reg-tests/ssl/certs/set_default_cert.pem [moved from reg-tests/ssl/set_default_cert.pem with 100% similarity]
reg-tests/ssl/certs/show_ocsp_server.pem [moved from reg-tests/ssl/show_ocsp_server.pem with 100% similarity]
reg-tests/ssl/certs/show_ocsp_server.pem.issuer [moved from reg-tests/ssl/show_ocsp_server.pem.issuer with 100% similarity]
reg-tests/ssl/certs/show_ocsp_server.pem.ocsp [moved from reg-tests/ssl/show_ocsp_server.pem.ocsp with 100% similarity]
reg-tests/ssl/certs/show_ocsp_server.pem.ocsp.revoked [moved from reg-tests/ssl/show_ocsp_server.pem.ocsp.revoked with 100% similarity]
reg-tests/ssl/certs/simple.crt-list [moved from reg-tests/ssl/simple.crt-list with 100% similarity]
reg-tests/ssl/crt_store.vtc
reg-tests/ssl/del_ssl_crt-list.vtc
reg-tests/ssl/dynamic_server_ssl.vtc
reg-tests/ssl/issuers_chain_path.vtc
reg-tests/ssl/log_forward_ssl.vtc
reg-tests/ssl/new_del_ssl_cafile.vtc
reg-tests/ssl/new_del_ssl_crlfile.vtc
reg-tests/ssl/ocsp_auto_update.vtc
reg-tests/ssl/ocsp_compat_check.vtc
reg-tests/ssl/set_ssl_bug_2265.vtc
reg-tests/ssl/set_ssl_cafile.vtc
reg-tests/ssl/set_ssl_cert.vtc
reg-tests/ssl/set_ssl_cert_bundle.vtc
reg-tests/ssl/set_ssl_cert_noext.vtc
reg-tests/ssl/set_ssl_crlfile.vtc
reg-tests/ssl/set_ssl_server_cert.vtc
reg-tests/ssl/show_ssl_ocspresponse.vtc
reg-tests/ssl/ssl-0rtt.vtci
reg-tests/ssl/ssl_alpn.vtc
reg-tests/ssl/ssl_client_auth.vtc
reg-tests/ssl/ssl_client_samples.vtc
reg-tests/ssl/ssl_crt-list_filters.vtc
reg-tests/ssl/ssl_curve_name.vtc
reg-tests/ssl/ssl_curves.vtc
reg-tests/ssl/ssl_default_server.vtc
reg-tests/ssl/ssl_dh.vtc
reg-tests/ssl/ssl_errors.vtc
reg-tests/ssl/ssl_frontend_samples.vtc
reg-tests/ssl/ssl_generate_certificate.vtc
reg-tests/ssl/ssl_reuse.vtci
reg-tests/ssl/ssl_server_samples.vtc
reg-tests/ssl/ssl_simple_crt-list.vtc
reg-tests/ssl/ssl_sni_auto.vtc
reg-tests/ssl/wrong_ctx_storage.vtc