File tree 2 files changed +21
-2
lines changed
2 files changed +21
-2
lines changed Original file line number Diff line number Diff line change @@ -436,11 +436,29 @@ ssl_version
436
436
* ``--ssl-version ``
437
437
* ``_SSLMethod.PROTOCOL_TLS ``
438
438
439
- SSL version to use (see stdlib ssl module's)
439
+ SSL version to use.
440
+
441
+ ============= ============
442
+ --ssl-version Description
443
+ ============= ============
444
+ SSLv3 SSLv3 is not-secure and is strongly discouraged.
445
+ SSLv23 Alias for TLS. Deprecated in Python 3.6, use TLS.
446
+ TLS Negotiate highest possible version between client/server.
447
+ Can yield SSL. (Python 3.6+)
448
+ TLSv1 TLS 1.0
449
+ TLSv1_1 TLS 1.1 (Python 3.4+)
450
+ TLSv1_2 TLS 1.2 (Python 3.4+)
451
+ TLS_SERVER Auto-negotiate the highest protocol version like TLS,
452
+ but only support server-side SSLSocket connections.
453
+ (Python 3.6+)
454
+ ============= ============
440
455
441
456
.. versionchanged :: 19.7
442
457
The default value has been changed from ``ssl.PROTOCOL_TLSv1 `` to
443
458
``ssl.PROTOCOL_SSLv23 ``.
459
+ .. versionchanged :: 20.0
460
+ This setting now accepts string names based on ``ssl.PROTOCOL_ ``
461
+ constants.
444
462
445
463
.. _cert-reqs :
446
464
Original file line number Diff line number Diff line change @@ -1900,10 +1900,11 @@ class SSLVersion(Setting):
1900
1900
Can yield SSL. (Python 3.6+)
1901
1901
TLSv1 TLS 1.0
1902
1902
TLSv1_1 TLS 1.1 (Python 3.4+)
1903
- TLSv2 TLS 1.2 (Python 3.4+)
1903
+ TLSv1_2 TLS 1.2 (Python 3.4+)
1904
1904
TLS_SERVER Auto-negotiate the highest protocol version like TLS,
1905
1905
but only support server-side SSLSocket connections.
1906
1906
(Python 3.6+)
1907
+ ============= ============
1907
1908
1908
1909
.. versionchanged:: 19.7
1909
1910
The default value has been changed from ``ssl.PROTOCOL_TLSv1`` to
You can’t perform that action at this time.
0 commit comments