Commit a00fb340 authored by Luca Toscano's avatar Luca Toscano
Browse files

documentation rebuild 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1841686 13f79535-47bb-0310-9956-ffa450edef68
parent 7e1f827c

docs/manual/mod/mod_ssl.html.en

+25 −6
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ key file.</p> 
<table class="directive">

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cipher Suite available for negotiation in SSL

handshake</td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLCipherSuite <em>cipher-spec</em></code></td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLCipherSuite [<em>protocol</em>] <em>cipher-spec</em></code></td></tr>

<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLCipherSuite DEFAULT (depends on OpenSSL version)</code></td></tr>

<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>

<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</td></tr>
@@ -750,12 +750,26 @@ handshake</td></tr> 
<p>

This complex directive uses a colon-separated <em>cipher-spec</em> string

consisting of OpenSSL cipher specifications to configure the Cipher Suite the

client is permitted to negotiate in the SSL handshake phase. Notice that this

directive can be used both in per-server and per-directory context. In

per-server context it applies to the standard SSL handshake when a connection

client is permitted to negotiate in the SSL handshake phase. The optional 

protocol specifier can configure the Cipher Suite for a specific SSL version.

Possible values include "SSL" for all SSL Protocols up to and including TLSv1.2.

</p>

<p>

Notice that this

directive can be used both in per-server and per-directory context. 

In per-server context it applies to the standard SSL handshake when a connection

is established. In per-directory context it forces a SSL renegotiation with the

reconfigured Cipher Suite after the HTTP request was read but before the HTTP

response is sent.</p>

response is sent. (Since renegotiation is not</p>

<p>

If the SSL library supports TLSv1.3 (OpenSSL 1.1.1 and later), the protocol 

specifier "TLSv1.3" can be used to configure the cipher suites for that protocol.

Since TLSv1.3 does not offer renegotiations, specifying ciphers for it in

a directory context is not allowed.</p>

<p>

For a list of TLSv1.3 cipher names, see 

<a href="https://www.openssl.org/docs/manmaster/man3/SSL_CTX_set_ciphersuites.html">the OpenSSL

documentation</a>.</p>

<p>

An SSL cipher specification in <em>cipher-spec</em> is composed of 4 major

attributes plus a few extra minor ones:</p>
@@ -1494,6 +1508,11 @@ The available (case-insensitive) <em>protocol</em>s are:</p> 
    A revision of the TLS 1.1 protocol, as defined in

    <a href="http://www.ietf.org/rfc/rfc5246.txt">RFC 5246</a>.</p></li>



<li><code>TLSv1.3</code> (when using OpenSSL 1.1.1 and later)

    <p>

    A new version of the TLS protocol, as defined in

    <a href="http://www.ietf.org/rfc/rfc8446.txt">RFC 8446</a>.</p></li>



<li><code>all</code>

    <p>

    This is a shortcut for ``<code>+SSLv3 +TLSv1</code>'' or
@@ -1739,7 +1758,7 @@ improvements. 
<table class="directive">

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cipher Suite available for negotiation in SSL

proxy handshake</td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyCipherSuite <em>cipher-spec</em></code></td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyCipherSuite [<em>protocol</em>] <em>cipher-spec</em></code></td></tr>

<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLProxyCipherSuite ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP</code></td></tr>

<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, proxy section</td></tr>

<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>

docs/manual/mod/mod_ssl.xml

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ The available (case-insensitive) <em>protocol</em>s are:</p> 
<li><code>TLSv1.3</code> (when using OpenSSL 1.1.1 and later)

    <p>

    A new version of the TLS protocol, as defined in

    <a href="https://github.com/tlswg/tls13-spec">RFC TBD</a>.</p></li>

    <a href="http://www.ietf.org/rfc/rfc8446.txt">RFC 8446</a>.</p></li>



<li><code>all</code>

    <p>

docs/manual/mod/mod_ssl.xml.fr

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" ?>

<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">

<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

<!-- English Revision: 1834089 -->

<!-- English Revision: 1834089:1841685 (outdated) -->

<!-- French translation : Lucien GENTIS -->

<!-- Reviewed by : Vincent Deffontaines -->

docs/manual/mod/mod_ssl.xml.meta

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ 


  <variants>

    <variant>en</variant>

    <variant>fr</variant>

    <variant outdated="yes">fr</variant>

  </variants>

</metafile>

docs/manual/mod/quickreference.html.en

+2 −2
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ Client Auth</td></tr> 
<tr class="odd"><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>

<tr><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded X.509 certificate data file</td></tr>

<tr class="odd"><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded private key file</td></tr>

<tr><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> DEFAULT (depends on +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL

<tr><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite [<em>protocol</em>] <em>cipher-spec</em></a></td><td> DEFAULT (depends on +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL

handshake</td></tr>

<tr class="odd"><td><a href="mod_ssl.html#sslcompression">SSLCompression on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable compression on the SSL level</td></tr>

<tr><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
@@ -1047,7 +1047,7 @@ Remote Server Auth</td></tr> 
</td></tr>

<tr><td><a href="mod_ssl.html#sslproxycheckpeername">SSLProxyCheckPeerName on|off</a></td><td> on </td><td>svp</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure host name checking for remote server certificates

</td></tr>

<tr class="odd"><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svp</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL

<tr class="odd"><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite [<em>protocol</em>] <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svp</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL

proxy handshake</td></tr>

<tr><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>svp</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>

<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatechainfile">SSLProxyMachineCertificateChainFile <em>filename</em></a></td><td></td><td>svp</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA certificates to be used by the proxy for choosing a certificate</td></tr>