Merge pull request #286 from gstrauss/apache-explicit-sslprotocol

apache,oraclehttp: explicit SSLProtocol list
mozilla · Dec 6, 2024 · b737c6f · b737c6f
2 parents c68fd7a + 5fbe100
commit b737c6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/templates/partials/apache.hbs b/src/templates/partials/apache.hbs
@@ -38,10 +38,7 @@
 </VirtualHost>
 
 # {{form.config}} configuration
-SSLProtocol             all {{#unless (minver "2.3.16" form.serverVersion)}}-SSLv2 {{/unless}}-SSLv3
-                        {{~#unless (includes "TLSv1" output.protocols)}} -TLSv1{{/unless}}
-                        {{~#unless (includes "TLSv1.1" output.protocols)}} -TLSv1.1{{/unless}}
-                        {{~#unless (includes "TLSv1.2" output.protocols)}} -TLSv1.2{{/unless}}
+SSLProtocol             {{{join output.protocols " "}}}
 {{#if output.ciphers.length}}
 SSLCipherSuite          {{{join output.ciphers ":"}}}
 {{/if}}

diff --git a/src/templates/partials/oraclehttp.hbs b/src/templates/partials/oraclehttp.hbs
@@ -18,7 +18,7 @@
 </VirtualHost>
 
 # {{form.config}} configuration
-SSLProtocol             All {{#unless (includes "TLSv1" output.protocols)}}-TLSv1{{/unless}}{{#unless (includes "TLSv1.1" output.protocols)}} -TLSv1.1{{/unless}}
+SSLProtocol             {{{join output.protocols " "}}}
 SSLCipherSuite          {{{join output.ciphers ":"}}}
 {{#if (minver "12.2.1" form.serverVersion)}}
 SSLHonorCipherOrder     {{#if output.serverPreferredOrder}}on{{else}}off{{/if}}