Merge remote-tracking branch 'origin/master'

This commit is contained in:
Jakub Roztocil 2018-11-02 14:58:08 +01:00
commit 89b66f1608
2 changed files with 2 additions and 1 deletions

View File

@ -927,7 +927,7 @@ SSL version
Use the ``--ssl=<PROTOCOL>`` to specify the desired protocol version to use.
This will default to SSL v2.3 which will negotiate the highest protocol that both
the server and your installation of OpenSSL support. The available protocols
are ``ssl2.3``, ``ssl3``, ``tls1``, ``tls1.1``, ``tls1.2``. (The actually
are ``ssl2.3``, ``ssl3``, ``tls1``, ``tls1.1``, ``tls1.2``, ``tls1.3``. (The actually
available set of protocols may vary depending on your OpenSSL installation.)
.. code-block:: bash

View File

@ -111,6 +111,7 @@ SSL_VERSION_ARG_MAPPING = {
'tls1': 'PROTOCOL_TLSv1',
'tls1.1': 'PROTOCOL_TLSv1_1',
'tls1.2': 'PROTOCOL_TLSv1_2',
'tls1.3': 'PROTOCOL_TLSv1_3',
}
SSL_VERSION_ARG_MAPPING = {
cli_arg: getattr(ssl, ssl_constant)