Context Navigation

← Previous Changeset
Next Changeset →

Changeset e080eef in mod_gnutls

Timestamp:

Aug 13, 2020, 2:17:52 AM (7 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio

Children:

43a601f

Parents:

facbb08

Message:

Use default priorities in tests that don't require specific ones

Setting GnuTLSPriorities in all tests is a relic of the time when it
didn't have a default value, and is not needed anymore, except for
tests that specifically test priority configuration.

Location:

test/tests

Files:

: 28 edited

02_cache_in_vhost/apache.conf (modified) (1 diff)
03_cachetimeout_in_vhost/apache.conf (modified) (1 diff)
04_basic_nosni/apache.conf (modified) (1 diff)
06_verify_sni_a/apache.conf (modified) (2 diffs)
07_verify_sni_b/apache.conf (modified) (2 diffs)
08_verify_no_sni_fallback_to_first_vhost/apache.conf (modified) (2 diffs)
09_verify_no_sni_fails_with_wrong_order/apache.conf (modified) (2 diffs)
10_basic_client_verification/apache.conf (modified) (1 diff)
11_basic_client_verification_fail/apache.conf (modified) (1 diff)
12_cgi_variables/apache.conf (modified) (1 diff)
13_cgi_variables_no_client_cert/apache.conf (modified) (1 diff)
14_resume_session/apache.conf (modified) (1 diff)
15_basic_msva/apache.conf (modified) (1 diff)
16_view-status/apache.conf (modified) (1 diff)
17_cgi_vars_large_cert/apache.conf (modified) (1 diff)
18_client_verification_wrong_cert/apache.conf (modified) (1 diff)
20_TLS_reverse_proxy_client_auth/apache.conf (modified) (2 diffs)
20_TLS_reverse_proxy_client_auth/backend.conf (modified) (1 diff)
21_TLS_reverse_proxy_wrong_cert/apache.conf (modified) (1 diff)
21_TLS_reverse_proxy_wrong_cert/backend.conf (modified) (1 diff)
22_TLS_reverse_proxy_crl_revoke/apache.conf (modified) (1 diff)
22_TLS_reverse_proxy_crl_revoke/backend.conf (modified) (1 diff)
24_pkcs11_cert/apache.conf (modified) (1 diff)
26_redirect_HTTP_to_HTTPS/apache.conf (modified) (1 diff)
27_OCSP_server/apache.conf (modified) (1 diff)
28_HTTP2_support/apache.conf (modified) (2 diffs)
35_client_reauth/apache.conf (modified) (1 diff)
36_OCSP_server_nonce/apache.conf (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

test/tests/02_cache_in_vhost/apache.conf

rfacbb08	re080eef
8	8	GnuTLSCertificateFile authority/server/x509.pem
9	9	GnuTLSKeyFile authority/server/secret.key
10		~~GnuTLSPriorities NORMAL~~
11	10	</VirtualHost>

test/tests/03_cachetimeout_in_vhost/apache.conf

rfacbb08	re080eef
8	8	GnuTLSCertificateFile authority/server/x509.pem
9	9	GnuTLSKeyFile authority/server/secret.key
10		~~GnuTLSPriorities NORMAL~~
11	10	</VirtualHost>

test/tests/04_basic_nosni/apache.conf

rfacbb08	re080eef
8	8	GnuTLSCertificateFile authority/server/x509.pem
9	9	GnuTLSKeyFile authority/server/secret.key
10		~~GnuTLSPriorities NORMAL~~
11	10	</VirtualHost>

test/tests/06_verify_sni_a/apache.conf

-                      rfacbb08
+                      re080eef
  GnuTLSCertificateFile  authority/server/x509.pem
  GnuTLSKeyFile          authority/server/secret.key
- GnuTLSPriorities NORMAL
 </VirtualHost>
 …
  GnuTLSCertificateFile  authority/imposter/x509.pem
  GnuTLSKeyFile          authority/imposter/secret.key
- GnuTLSPriorities NORMAL
 </VirtualHost>

test/tests/07_verify_sni_b/apache.conf

-                      rfacbb08
+                      re080eef
  GnuTLSCertificateFile  authority/imposter/x509.pem
  GnuTLSKeyFile          authority/imposter/secret.key
- GnuTLSPriorities NORMAL
 </VirtualHost>
 …
  GnuTLSCertificateFile  authority/server/x509.pem
  GnuTLSKeyFile          authority/server/secret.key
- GnuTLSPriorities NORMAL
 </VirtualHost>

test/tests/08_verify_no_sni_fallback_to_first_vhost/apache.conf

-                      rfacbb08
+                      re080eef
  GnuTLSCertificateFile  authority/server/x509.pem
  GnuTLSKeyFile          authority/server/secret.key
- GnuTLSPriorities NORMAL
 </VirtualHost>
 …
  GnuTLSCertificateFile  authority/imposter/x509.pem
  GnuTLSKeyFile          authority/imposter/secret.key
- GnuTLSPriorities NORMAL
 </VirtualHost>

test/tests/09_verify_no_sni_fails_with_wrong_order/apache.conf

-                      rfacbb08
+                      re080eef
  GnuTLSCertificateFile  authority/imposter/x509.pem
  GnuTLSKeyFile          authority/imposter/secret.key
- GnuTLSPriorities NORMAL
 </VirtualHost>
 …
  GnuTLSCertificateFile  authority/server/x509.pem
  GnuTLSKeyFile          authority/server/secret.key
- GnuTLSPriorities NORMAL
 </VirtualHost>

test/tests/10_basic_client_verification/apache.conf

rfacbb08	re080eef
8	8	GnuTLSCertificateFile authority/server/x509.pem
9	9	GnuTLSKeyFile authority/server/secret.key
10		~~GnuTLSPriorities NORMAL~~
11	10	GnuTLSClientCAFile authority/x509.pem
12	11	GnuTLSClientVerify require

test/tests/11_basic_client_verification_fail/apache.conf

rfacbb08	re080eef
8	8	GnuTLSCertificateFile authority/server/x509.pem
9	9	GnuTLSKeyFile authority/server/secret.key
10		~~GnuTLSPriorities NORMAL~~
11	10	GnuTLSClientCAFile authority/x509.pem
12	11	GnuTLSClientVerify require

test/tests/12_cgi_variables/apache.conf

rfacbb08	re080eef
13	13	GnuTLSCertificateFile authority/server/x509.pem
14	14	GnuTLSKeyFile authority/server/secret.key
15		~~GnuTLSPriorities NORMAL~~
16	15	GnuTLSClientCAFile authority/x509.pem
17	16	GnuTLSClientVerify request

test/tests/13_cgi_variables_no_client_cert/apache.conf

rfacbb08	re080eef
13	13	GnuTLSCertificateFile authority/server/x509.pem
14	14	GnuTLSKeyFile authority/server/secret.key
15		~~GnuTLSPriorities NORMAL~~
16	15	GnuTLSClientCAFile authority/x509.pem
17	16	GnuTLSClientVerify request

test/tests/14_resume_session/apache.conf

rfacbb08	re080eef
9	9	GnuTLSCertificateFile authority/server/x509.pem
10	10	GnuTLSKeyFile authority/server/secret.key
11		~~GnuTLSPriorities NORMAL~~
12	11	</VirtualHost>

test/tests/15_basic_msva/apache.conf

rfacbb08	re080eef
10	10	GnuTLSClientVerify require
11	11	GnuTLSClientVerifyMethod msva
12		~~GnuTLSPriorities NORMAL~~
13	12	</VirtualHost>

test/tests/16_view-status/apache.conf

rfacbb08	re080eef
14	14	GnuTLSCertificateFile authority/server/x509.pem
15	15	GnuTLSKeyFile authority/server/secret.key
16		~~GnuTLSPriorities NORMAL~~
17	16	</VirtualHost>

test/tests/17_cgi_vars_large_cert/apache.conf

rfacbb08	re080eef
13	13	GnuTLSCertificateFile authority/server/x509.pem
14	14	GnuTLSKeyFile authority/server/secret.key
15		~~GnuTLSPriorities NORMAL~~
16	15	GnuTLSClientCAFile authority/x509.pem
17	16	GnuTLSClientVerify request

test/tests/18_client_verification_wrong_cert/apache.conf

rfacbb08	re080eef
8	8	GnuTLSCertificateFile authority/server/x509.pem
9	9	GnuTLSKeyFile authority/server/secret.key
10		~~GnuTLSPriorities NORMAL~~
11	10	GnuTLSClientCAFile authority/x509.pem
12	11	GnuTLSClientVerify require

test/tests/20_TLS_reverse_proxy_client_auth/apache.conf

-                      rfacbb08
+                      re080eef
  GnuTLSCertificateFile  authority/server/x509.pem
  GnuTLSKeyFile          authority/server/secret.key
- GnuTLSPriorities NORMAL
  GnuTLSProxyEngine              On
 …
  GnuTLSProxyCertificateFile     authority/client/x509.pem
  GnuTLSProxyCAFile              authority/x509.pem
- GnuTLSProxyPriorities          NORMAL
  ProxyPass /proxy/ https://${BACKEND_HOST}:${BACKEND_PORT}/
  ProxyPassReverse /proxy/ https://${BACKEND_HOST}:${BACKEND_PORT}/

test/tests/20_TLS_reverse_proxy_client_auth/backend.conf

rfacbb08	re080eef
8	8	GnuTLSCertificateFile authority/server/x509.pem
9	9	GnuTLSKeyFile authority/server/secret.key
10		~~GnuTLSPriorities NORMAL~~
11	10	GnuTLSClientCAFile authority/x509.pem
12	11	GnuTLSClientVerify require

test/tests/21_TLS_reverse_proxy_wrong_cert/apache.conf

-                      rfacbb08
+                      re080eef
  GnuTLSCertificateFile  authority/server/x509.pem
  GnuTLSKeyFile          authority/server/secret.key
- GnuTLSPriorities NORMAL
  GnuTLSProxyEngine      On
  GnuTLSProxyCAFile      authority/x509.pem
- GnuTLSProxyPriorities  NORMAL
  ProxyPass /proxy/ https://${BACKEND_HOST}:${BACKEND_PORT}/
  ProxyPassReverse /proxy/ https://${BACKEND_HOST}:${BACKEND_PORT}/

test/tests/21_TLS_reverse_proxy_wrong_cert/backend.conf

rfacbb08	re080eef
8	8	GnuTLSCertificateFile authority/imposter/x509.pem
9	9	GnuTLSKeyFile authority/imposter/secret.key
10		~~GnuTLSPriorities NORMAL~~
11	10	</VirtualHost>

test/tests/22_TLS_reverse_proxy_crl_revoke/apache.conf

-                      rfacbb08
+                      re080eef
  GnuTLSCertificateFile  authority/server/x509.pem
  GnuTLSKeyFile          authority/server/secret.key
- GnuTLSPriorities NORMAL
  GnuTLSProxyEngine      On
  GnuTLSProxyCAFile      authority/x509.pem
  GnuTLSProxyCRLFile     authority/server/crl.pem
- GnuTLSProxyPriorities  NORMAL
  ProxyPass /proxy/ https://${BACKEND_HOST}:${BACKEND_PORT}/
  ProxyPassReverse /proxy/ https://${BACKEND_HOST}:${BACKEND_PORT}/

test/tests/22_TLS_reverse_proxy_crl_revoke/backend.conf

rfacbb08	re080eef
8	8	GnuTLSCertificateFile authority/server/x509.pem
9	9	GnuTLSKeyFile authority/server/secret.key
10		~~GnuTLSPriorities NORMAL~~
11	10	</VirtualHost>

test/tests/24_pkcs11_cert/apache.conf

rfacbb08	re080eef
11	11	GnuTLSKeyFile ${P11_KEY_URL}
12	12	GnuTLSPIN ${P11_PIN}
13		~~GnuTLSPriorities NORMAL~~
14	13	</VirtualHost>

test/tests/26_redirect_HTTP_to_HTTPS/apache.conf

rfacbb08	re080eef
31	31	GnuTLSCertificateFile authority/server/x509.pem
32	32	GnuTLSKeyFile authority/server/secret.key
33		~~GnuTLSPriorities NORMAL~~
34	33	</VirtualHost>

test/tests/27_OCSP_server/apache.conf

rfacbb08	re080eef
15	15	GnuTLSCertificateFile authority/subca/server/x509-chain.pem
16	16	GnuTLSKeyFile authority/subca/server/secret.key
17		~~GnuTLSPriorities NORMAL~~
18	17	</VirtualHost>

test/tests/28_HTTP2_support/apache.conf

-                      rfacbb08
+                      re080eef
         GnuTLSCertificateFile   authority/server/x509.pem
         GnuTLSKeyFile           authority/server/secret.key
-        GnuTLSPriorities        NORMAL
 </VirtualHost>
 …
         GnuTLSCertificateFile   authority/server/x509.pem
         GnuTLSKeyFile           authority/server/secret.key
-        GnuTLSPriorities        NORMAL
 </VirtualHost>

test/tests/35_client_reauth/apache.conf

rfacbb08	re080eef
13	13	GnuTLSCertificateFile authority/server/x509.pem
14	14	GnuTLSKeyFile authority/server/secret.key
15		~~GnuTLSPriorities NORMAL~~
16	15	GnuTLSClientCAFile authority/x509.pem
17	16	<Location /secret/>

test/tests/36_OCSP_server_nonce/apache.conf

rfacbb08	re080eef
15	15	GnuTLSCertificateFile authority/subca/server/x509-chain.pem
16	16	GnuTLSKeyFile authority/subca/server/secret.key
17		~~GnuTLSPriorities NORMAL~~
18	17	GnuTLSOCSPCheckNonce On
19	18	</VirtualHost>

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset e080eef in mod_gnutls

Legend:

Download in other formats: