Skip to content

Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS transition #1355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mariatta merged 1 commit into from
May 2, 2017
Merged

Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS transition #1355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Doc/library/ssl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,13 +614,13 @@ Constants
.. data:: PROTOCOL_TLS

Selects the highest protocol version that both the client and server support.
Despite the name, this option can select "TLS" protocols as well as "SSL".
Despite the name, this option can select both "SSL" and "TLS" protocols.

.. versionadded:: 3.6

.. data:: PROTOCOL_TLS_CLIENT

Auto-negotiate the highest protocol version like :data:`PROTOCOL_SSLv23`,
Auto-negotiate the highest protocol version like :data:`PROTOCOL_TLS`,
but only support client-side :class:`SSLSocket` connections. The protocol
enables :data:`CERT_REQUIRED` and :attr:`~SSLContext.check_hostname` by
default.
Expand All @@ -629,7 +629,7 @@ Constants

.. data:: PROTOCOL_TLS_SERVER

Auto-negotiate the highest protocol version like :data:`PROTOCOL_SSLv23`,
Auto-negotiate the highest protocol version like :data:`PROTOCOL_TLS`,
but only support server-side :class:`SSLSocket` connections.

.. versionadded:: 3.6
Expand Down