diff options
author | Rich Salz <rsalz@akamai.com> | 2020-02-25 13:25:13 -0500 |
---|---|---|
committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-03-06 18:25:13 +0100 |
commit | 433deaffce45d58efd6bb014672f7fb95062d458 (patch) | |
tree | 46a9c26d39abe72bd7f8b0681931655199d954b6 | |
parent | 5e828e2a5f95312190f388466826e1a285770e6a (diff) |
Use .cnf for config files, not .conf
The default is openssl.cnf The project seems to prefer xxx.conf these
days, but we should use the default convention.
Rename all foo.conf (except for Configurations) to foo.cnf
Fixes #11174
Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11176)
-rw-r--r-- | .gitignore | 6 | ||||
-rw-r--r-- | doc/man1/openssl-fipsinstall.pod | 10 | ||||
-rw-r--r-- | test/CAss.cnf | 4 | ||||
-rw-r--r-- | test/P1ss.cnf | 4 | ||||
-rw-r--r-- | test/P2ss.cnf | 4 | ||||
-rw-r--r-- | test/README.ssltest.md | 32 | ||||
-rw-r--r-- | test/Uss.cnf | 4 | ||||
-rw-r--r-- | test/build.info | 4 | ||||
-rw-r--r-- | test/ct/log_list.cnf (renamed from test/ct/log_list.conf) | 0 | ||||
-rw-r--r-- | test/default-and-fips.cnf | 2 | ||||
-rw-r--r-- | test/fips.cnf | 2 | ||||
-rw-r--r-- | test/provider_internal_test.cnf.in (renamed from test/provider_internal_test.conf.in) | 0 | ||||
-rw-r--r-- | test/recipes/02-test_internal_provider.t | 2 | ||||
-rw-r--r-- | test/recipes/03-test_fipsinstall.t | 26 | ||||
-rw-r--r-- | test/recipes/04-test_conf.t | 4 | ||||
-rw-r--r-- | test/recipes/04-test_conf_data/dollarid_off.cnf (renamed from test/recipes/04-test_conf_data/dollarid_off.conf) | 0 | ||||
-rw-r--r-- | test/recipes/04-test_conf_data/dollarid_on.cnf (renamed from test/recipes/04-test_conf_data/dollarid_on.conf) | 0 | ||||
-rw-r--r-- | test/recipes/30-test_evp.t | 2 | ||||
-rw-r--r-- | test/recipes/30-test_evp_fetch_prov.t | 2 | ||||
-rw-r--r-- | test/recipes/70-test_comp.t | 2 | ||||
-rw-r--r-- | test/recipes/70-test_sslmessages.t | 2 | ||||
-rw-r--r-- | test/recipes/70-test_sslversions.t | 2 | ||||
-rw-r--r-- | test/recipes/70-test_tls13kexmodes.t | 2 | ||||
-rw-r--r-- | test/recipes/70-test_tls13messages.t | 2 | ||||
-rw-r--r-- | test/recipes/70-test_tls13psk.t | 2 | ||||
-rw-r--r-- | test/recipes/80-test_ct.t | 2 | ||||
-rw-r--r-- | test/recipes/80-test_ssl_new.t | 80 | ||||
-rw-r--r-- | test/recipes/80-test_ssl_old.t | 2 | ||||
-rw-r--r-- | test/recipes/80-test_ssl_test_ctx.t | 4 | ||||
-rw-r--r-- | test/recipes/90-test_gost.t | 2 | ||||
-rw-r--r-- | test/recipes/90-test_gost_data/gost.cnf (renamed from test/recipes/90-test_gost_data/gost.conf) | 0 | ||||
-rw-r--r-- | test/recipes/90-test_includes_data/vms-includes.cnf | 2 | ||||
-rw-r--r-- | test/ssl-tests/01-simple.cnf (renamed from test/ssl-tests/01-simple.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/01-simple.cnf.in (renamed from test/ssl-tests/01-simple.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/02-protocol-version.cnf (renamed from test/ssl-tests/02-protocol-version.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/02-protocol-version.cnf.in (renamed from test/ssl-tests/02-protocol-version.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/03-custom_verify.cnf (renamed from test/ssl-tests/03-custom_verify.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/03-custom_verify.cnf.in (renamed from test/ssl-tests/03-custom_verify.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/04-client_auth.cnf (renamed from test/ssl-tests/04-client_auth.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/04-client_auth.cnf.in (renamed from test/ssl-tests/04-client_auth.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/05-sni.cnf (renamed from test/ssl-tests/05-sni.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/05-sni.cnf.in (renamed from test/ssl-tests/05-sni.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/06-sni-ticket.cnf (renamed from test/ssl-tests/06-sni-ticket.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/06-sni-ticket.cnf.in (renamed from test/ssl-tests/06-sni-ticket.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/07-dtls-protocol-version.cnf (renamed from test/ssl-tests/07-dtls-protocol-version.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/07-dtls-protocol-version.cnf.in (renamed from test/ssl-tests/07-dtls-protocol-version.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/08-npn.cnf (renamed from test/ssl-tests/08-npn.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/08-npn.cnf.in (renamed from test/ssl-tests/08-npn.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/09-alpn.cnf (renamed from test/ssl-tests/09-alpn.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/09-alpn.cnf.in (renamed from test/ssl-tests/09-alpn.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/10-resumption.cnf (renamed from test/ssl-tests/10-resumption.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/10-resumption.cnf.in (renamed from test/ssl-tests/10-resumption.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/11-dtls_resumption.cnf (renamed from test/ssl-tests/11-dtls_resumption.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/11-dtls_resumption.cnf.in (renamed from test/ssl-tests/11-dtls_resumption.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/12-ct.cnf (renamed from test/ssl-tests/12-ct.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/12-ct.cnf.in (renamed from test/ssl-tests/12-ct.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/13-fragmentation.cnf (renamed from test/ssl-tests/13-fragmentation.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/13-fragmentation.cnf.in (renamed from test/ssl-tests/13-fragmentation.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/14-curves.cnf (renamed from test/ssl-tests/14-curves.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/14-curves.cnf.in (renamed from test/ssl-tests/14-curves.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/15-certstatus.cnf (renamed from test/ssl-tests/15-certstatus.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/15-certstatus.cnf.in (renamed from test/ssl-tests/15-certstatus.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/16-dtls-certstatus.cnf (renamed from test/ssl-tests/16-dtls-certstatus.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/16-dtls-certstatus.cnf.in (renamed from test/ssl-tests/16-dtls-certstatus.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/17-renegotiate.cnf (renamed from test/ssl-tests/17-renegotiate.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/17-renegotiate.cnf.in (renamed from test/ssl-tests/17-renegotiate.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/18-dtls-renegotiate.cnf (renamed from test/ssl-tests/18-dtls-renegotiate.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/18-dtls-renegotiate.cnf.in (renamed from test/ssl-tests/18-dtls-renegotiate.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/19-mac-then-encrypt.cnf (renamed from test/ssl-tests/19-mac-then-encrypt.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/19-mac-then-encrypt.cnf.in (renamed from test/ssl-tests/19-mac-then-encrypt.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/20-cert-select.cnf (renamed from test/ssl-tests/20-cert-select.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/20-cert-select.cnf.in (renamed from test/ssl-tests/20-cert-select.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/21-key-update.cnf (renamed from test/ssl-tests/21-key-update.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/21-key-update.cnf.in (renamed from test/ssl-tests/21-key-update.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/22-compression.cnf (renamed from test/ssl-tests/22-compression.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/22-compression.cnf.in (renamed from test/ssl-tests/22-compression.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/23-srp.cnf (renamed from test/ssl-tests/23-srp.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/23-srp.cnf.in (renamed from test/ssl-tests/23-srp.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/24-padding.cnf (renamed from test/ssl-tests/24-padding.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/24-padding.cnf.in (renamed from test/ssl-tests/24-padding.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/25-cipher.cnf (renamed from test/ssl-tests/25-cipher.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/25-cipher.cnf.in (renamed from test/ssl-tests/25-cipher.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/26-tls13_client_auth.cnf (renamed from test/ssl-tests/26-tls13_client_auth.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/26-tls13_client_auth.cnf.in (renamed from test/ssl-tests/26-tls13_client_auth.conf.in) | 2 | ||||
-rw-r--r-- | test/ssl-tests/27-ticket-appdata.cnf (renamed from test/ssl-tests/27-ticket-appdata.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/27-ticket-appdata.cnf.in (renamed from test/ssl-tests/27-ticket-appdata.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/28-seclevel.cnf (renamed from test/ssl-tests/28-seclevel.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/28-seclevel.cnf.in (renamed from test/ssl-tests/28-seclevel.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/29-dtls-sctp-label-bug.cnf (renamed from test/ssl-tests/29-dtls-sctp-label-bug.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/29-dtls-sctp-label-bug.cnf.in (renamed from test/ssl-tests/29-dtls-sctp-label-bug.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl-tests/30-extended-master-secret.cnf (renamed from test/ssl-tests/30-extended-master-secret.conf) | 0 | ||||
-rw-r--r-- | test/ssl-tests/30-extended-master-secret.cnf.in (renamed from test/ssl-tests/30-extended-master-secret.conf.in) | 0 | ||||
-rw-r--r-- | test/ssl_test_ctx_test.c | 2 | ||||
-rw-r--r-- | test/ssl_test_ctx_test.cnf (renamed from test/ssl_test_ctx_test.conf) | 0 | ||||
-rwxr-xr-x | util/fix-includes | 2 |
95 files changed, 101 insertions, 117 deletions
diff --git a/.gitignore b/.gitignore index 3b1a455209..f51ccce56d 100644 --- a/.gitignore +++ b/.gitignore @@ -96,9 +96,9 @@ doc/man1/openssl-x509.pod /test/confdump /test/bio_prefix_text # Other generated files in test/ -/test/provider_internal_test.conf -/test/fipsinstall.conf -/providers/fipsinstall.conf +/test/provider_internal_test.cnf +/test/fipsinstall.cnf +/providers/fipsinstall.cnf # Certain files that get created by tests on the fly /test-runs diff --git a/doc/man1/openssl-fipsinstall.pod b/doc/man1/openssl-fipsinstall.pod index 7cad6091e1..9c7c856b0d 100644 --- a/doc/man1/openssl-fipsinstall.pod +++ b/doc/man1/openssl-fipsinstall.pod @@ -128,21 +128,21 @@ values that can be used. =head1 EXAMPLES Calculate the mac of a FIPS module F<fips.so> and run a FIPS self test -for the module, and save the F<fips.conf> configuration file: +for the module, and save the F<fips.cnf> configuration file: - openssl fipsinstall -module ./fips.so -out fips.conf -provider_name fips \ + openssl fipsinstall -module ./fips.so -out fips.cnf -provider_name fips \ -section_name fipsinstall -mac_name HMAC -macopt digest:SHA256 \ -macopt hexkey:000102030405060708090A0B0C0D0E0F10111213 -Verify that the configuration file F<fips.conf> contains the correct info: +Verify that the configuration file F<fips.cnf> contains the correct info: - openssl fipsinstall -module ./fips.so -in fips.conf -provider_name fips \ + openssl fipsinstall -module ./fips.so -in fips.cnf -provider_name fips \ -section_name fips_install -mac_name HMAC -macopt digest:SHA256 \ -macopt hexkey:000102030405060708090A0B0C0D0E0F10111213 -verify Corrupt any self tests which have the description 'SHA1': - openssl fipsinstall -module ./fips.so -out fips.conf -provider_name fips \ + openssl fipsinstall -module ./fips.so -out fips.cnf -provider_name fips \ -section_name fipsinstall -mac_name HMAC -macopt digest:SHA256 \ -macopt hexkey:000102030405060708090A0B0C0D0E0F10111213 \ -corrupt_desc', 'SHA1' diff --git a/test/CAss.cnf b/test/CAss.cnf index 8ca62b5cf7..d63f85628b 100644 --- a/test/CAss.cnf +++ b/test/CAss.cnf @@ -1,7 +1,3 @@ -# -# SSLeay example configuration file. -# This is mostly being used for generation of certificate requests. -# #################################################################### [ req ] diff --git a/test/P1ss.cnf b/test/P1ss.cnf index 03f3cdb1ad..69baaaf849 100644 --- a/test/P1ss.cnf +++ b/test/P1ss.cnf @@ -1,7 +1,3 @@ -# -# SSLeay example configuration file. -# This is mostly being used for generation of certificate requests. -# #################################################################### [ req ] diff --git a/test/P2ss.cnf b/test/P2ss.cnf index 5adaecc7d5..8d4f3c8a68 100644 --- a/test/P2ss.cnf +++ b/test/P2ss.cnf @@ -1,7 +1,3 @@ -# -# SSLeay example configuration file. -# This is mostly being used for generation of certificate requests. -# #################################################################### [ req ] diff --git a/test/README.ssltest.md b/test/README.ssltest.md index 30360f7652..6fc7301500 100644 --- a/test/README.ssltest.md +++ b/test/README.ssltest.md @@ -2,7 +2,7 @@ SSL testcases are configured in the `ssl-tests` directory. -Each `ssl_*.conf.in` file contains a number of test configurations. These files +Each `ssl_*.cnf.in` file contains a number of test configurations. These files are used to generate testcases in the OpenSSL CONF format. The precise test output can be dependent on the library configuration. The test @@ -10,9 +10,9 @@ harness generates the output files on the fly. However, for verification, we also include checked-in configuration outputs corresponding to the default configuration. These testcases live in -`test/ssl-tests/*.conf` files. +`test/ssl-tests/*.cnf` files. -For more details, see `ssl-tests/01-simple.conf.in` for an example. +For more details, see `ssl-tests/01-simple.cnf.in` for an example. ## Configuring the test @@ -219,24 +219,24 @@ client => { ## Adding a test to the test harness 1. Add a new test configuration to `test/ssl-tests`, following the examples of - existing `*.conf.in` files (for example, `01-simple.conf.in`). + existing `*.cnf.in` files (for example, `01-simple.cnf.in`). -2. Generate the generated `*.conf` test input file. You can do so by running +2. Generate the generated `*.cnf` test input file. You can do so by running `generate_ssl_tests.pl`: ``` $ ./config $ cd test -$ TOP=.. perl -I ../util/perl/ generate_ssl_tests.pl ssl-tests/my.conf.in \ - > ssl-tests/my.conf +$ TOP=.. perl -I ../util/perl/ generate_ssl_tests.pl ssl-tests/my.cnf.in \ + > ssl-tests/my.cnf ``` -where `my.conf.in` is your test input file. +where `my.cnf.in` is your test input file. -For example, to generate the test cases in `ssl-tests/01-simple.conf.in`, do +For example, to generate the test cases in `ssl-tests/01-simple.cnf.in`, do ``` -$ TOP=.. perl -I ../util/perl/ generate_ssl_tests.pl ssl-tests/01-simple.conf.in > ssl-tests/01-simple.conf +$ TOP=.. perl -I ../util/perl/ generate_ssl_tests.pl ssl-tests/01-simple.cnf.in > ssl-tests/01-simple.cnf ``` Alternatively (hackish but simple), you can comment out @@ -273,15 +273,15 @@ environment variable to point to the location of the certs. E.g., from the root OpenSSL directory, do ``` -$ CTLOG_FILE=test/ct/log_list.conf TEST_CERTS_DIR=test/certs test/ssl_test \ - test/ssl-tests/01-simple.conf +$ CTLOG_FILE=test/ct/log_list.cnf TEST_CERTS_DIR=test/certs test/ssl_test \ + test/ssl-tests/01-simple.cnf ``` or for shared builds ``` -$ CTLOG_FILE=test/ct/log_list.conf TEST_CERTS_DIR=test/certs \ - util/wrap.pl test/ssl_test test/ssl-tests/01-simple.conf +$ CTLOG_FILE=test/ct/log_list.cnf TEST_CERTS_DIR=test/certs \ + util/wrap.pl test/ssl_test test/ssl-tests/01-simple.cnf ``` Note that the test expectations sometimes depend on the Configure settings. For @@ -293,7 +293,7 @@ The Perl test harness automatically generates expected outputs, so users who just run `make test` do not need any extra steps. However, when running a test manually, keep in mind that the repository version -of the generated `test/ssl-tests/*.conf` correspond to expected outputs in with +of the generated `test/ssl-tests/*.cnf` correspond to expected outputs in with the default Configure options. To run `ssl_test` manually from the command line in a build with a different configuration, you may need to generate the right -`*.conf` file from the `*.conf.in` input first. +`*.cnf` file from the `*.cnf.in` input first. diff --git a/test/Uss.cnf b/test/Uss.cnf index 27517bd106..95ffb67deb 100644 --- a/test/Uss.cnf +++ b/test/Uss.cnf @@ -1,7 +1,3 @@ -# -# SSLeay example configuration file. -# This is mostly being used for generation of certificate requests. |