Skip to content

Commit ae2ea33

Browse files
zmwangxcsabella
authored andcommitted
Add versionadded directives to ssl.minimum_version and ssl.maximum_version (pythonGH-11894)
1 parent 4cbea51 commit ae2ea33

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

Doc/library/ssl.rst

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,12 +1328,12 @@ SSL sockets also have the following additional methods and attributes:
13281328
If any precondition isn't met (e.g. not TLS 1.3, PHA not enabled), an
13291329
:exc:`SSLError` is raised.
13301330

1331-
.. versionadded:: 3.8
1332-
13331331
.. note::
13341332
Only available with OpenSSL 1.1.1 and TLS 1.3 enabled. Without TLS 1.3
13351333
support, the method raises :exc:`NotImplementedError`.
13361334

1335+
.. versionadded:: 3.8
1336+
13371337
.. method:: SSLSocket.version()
13381338

13391339
Return the actual SSL protocol version negotiated by the connection
@@ -1922,6 +1922,8 @@ to speed up repeated connections from the same clients.
19221922
This attribute is not available unless the ssl module is compiled
19231923
with OpenSSL 1.1.0g or newer.
19241924

1925+
.. versionadded:: 3.7
1926+
19251927
.. attribute:: SSLContext.minimum_version
19261928

19271929
Like :attr:`SSLContext.maximum_version` except it is the lowest
@@ -1932,6 +1934,8 @@ to speed up repeated connections from the same clients.
19321934
This attribute is not available unless the ssl module is compiled
19331935
with OpenSSL 1.1.0g or newer.
19341936

1937+
.. versionadded:: 3.7
1938+
19351939
.. attribute:: SSLContext.options
19361940

19371941
An integer representing the set of SSL options enabled on this context.
@@ -1965,12 +1969,12 @@ to speed up repeated connections from the same clients.
19651969
:meth:`SSLSocket.verify_client_post_handshake` is called and some I/O is
19661970
performed.
19671971

1968-
.. versionadded:: 3.8
1969-
19701972
.. note::
19711973
Only available with OpenSSL 1.1.1 and TLS 1.3 enabled. Without TLS 1.3
19721974
support, the property value is None and can't be modified
19731975

1976+
.. versionadded:: 3.8
1977+
19741978
.. attribute:: SSLContext.protocol
19751979

19761980
The protocol version chosen when constructing the context. This attribute
@@ -1982,11 +1986,11 @@ to speed up repeated connections from the same clients.
19821986
subject common name in the absence of a subject alternative name
19831987
extension (default: true).
19841988

1985-
.. versionadded:: 3.7
1986-
19871989
.. note::
19881990
Only writeable with OpenSSL 1.1.0 or higher.
19891991

1992+
.. versionadded:: 3.7
1993+
19901994
.. attribute:: SSLContext.verify_flags
19911995

19921996
The flags for certificate verification operations. You can set flags like

0 commit comments

Comments
 (0)