Merge "Switch TLS tests to TLSv1.2+ only"

This commit is contained in:
Zuul 2023-07-21 16:37:18 +00:00 committed by Gerrit Code Review
commit b52dceee7b
3 changed files with 3 additions and 0 deletions

View File

@ -23,6 +23,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)"
%SSLLISTEN% %SSLENGINE% %SSLLISTEN% %SSLENGINE%
%SSLLISTEN% %SSLCERTFILE% %SSLLISTEN% %SSLCERTFILE%
%SSLLISTEN% %SSLKEYFILE% %SSLLISTEN% %SSLKEYFILE%
%SSLLISTEN% SSLProtocol -all +TLSv1.3 +TLSv1.2
%SSLLISTEN%</VirtualHost> %SSLLISTEN%</VirtualHost>
Alias /identity %KEYSTONE_BIN%/keystone-wsgi-public Alias /identity %KEYSTONE_BIN%/keystone-wsgi-public

View File

@ -24,6 +24,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)"
%SSLLISTEN% %SSLENGINE% %SSLLISTEN% %SSLENGINE%
%SSLLISTEN% %SSLCERTFILE% %SSLLISTEN% %SSLCERTFILE%
%SSLLISTEN% %SSLKEYFILE% %SSLLISTEN% %SSLKEYFILE%
%SSLLISTEN% SSLProtocol -all +TLSv1.3 +TLSv1.2
%SSLLISTEN%</VirtualHost> %SSLLISTEN%</VirtualHost>
Alias /networking %NEUTRON_BIN%/neutron-api Alias /networking %NEUTRON_BIN%/neutron-api

View File

@ -527,6 +527,7 @@ $listen_string
<VirtualHost $f_host:$f_port> <VirtualHost $f_host:$f_port>
SSLEngine On SSLEngine On
SSLCertificateFile $DEVSTACK_CERT SSLCertificateFile $DEVSTACK_CERT
SSLProtocol -all +TLSv1.3 +TLSv1.2
# Disable KeepAlive to fix bug #1630664 a.k.a the # Disable KeepAlive to fix bug #1630664 a.k.a the
# ('Connection aborted.', BadStatusLine("''",)) error # ('Connection aborted.', BadStatusLine("''",)) error