summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2014-03-23 15:31:34 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2014-03-23 15:31:34 (GMT)
commit211e6d5908e8ff2a903a10a54bced7b13c4f07c3 (patch)
treea47dcb2b18a3291b9c2b8b5f98a9786e53c9c704 /Doc/library
parent18116871225d9ee7cbcdc85e263ef5fcca220455 (diff)
parentf8cbbbb652caf694661ab0ee8a4858fc7692c59a (diff)
downloadcpython-211e6d5908e8ff2a903a10a54bced7b13c4f07c3.zip
cpython-211e6d5908e8ff2a903a10a54bced7b13c4f07c3.tar.gz
cpython-211e6d5908e8ff2a903a10a54bced7b13c4f07c3.tar.bz2
Issue #20913: make it clear that create_default_context() also enables hostname checking
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/ssl.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index e0b8eec..1673da7 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1626,7 +1626,8 @@ For **client use**, if you don't have any special requirements for your
security policy, it is highly recommended that you use the
:func:`create_default_context` function to create your SSL context.
It will load the system's trusted CA certificates, enable certificate
-validation, and try to choose reasonably secure protocol and cipher settings.
+validation and hostname checking, and try to choose reasonably secure
+protocol and cipher settings.
For example, here is how you would use the :class:`smtplib.SMTP` class to
create a trusted, secure connection to a SMTP server::
@@ -1641,9 +1642,9 @@ If a client certificate is needed for the connection, it can be added with
:meth:`SSLContext.load_cert_chain`.
By contrast, if you create the SSL context by calling the :class:`SSLContext`
-constructor yourself, it will not have certificate validation enabled by
-default. If you do so, please read the paragraphs below to achieve a good
-security level.
+constructor yourself, it will not have certificate validation nor hostname
+checking enabled by default. If you do so, please read the paragraphs below
+to achieve a good security level.
Manual settings
^^^^^^^^^^^^^^^