summaryrefslogtreecommitdiffstats
path: root/Doc/library/ssl.rst
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2017-09-06 23:19:56 (GMT)
committerGitHub <noreply@github.com>2017-09-06 23:19:56 (GMT)
commitad0ffa033ea79f7c7cb14b1b1cc10888ea9e9913 (patch)
tree943039054d79cc1c7cc1c01c2a7daa63d0ea12ef /Doc/library/ssl.rst
parent49ce74efe845a8a91939ff3990a5f233262d3e1f (diff)
downloadcpython-ad0ffa033ea79f7c7cb14b1b1cc10888ea9e9913.zip
cpython-ad0ffa033ea79f7c7cb14b1b1cc10888ea9e9913.tar.gz
cpython-ad0ffa033ea79f7c7cb14b1b1cc10888ea9e9913.tar.bz2
bpo-21649: Add RFC 7525 and Mozilla server side TLS (#3387)
Signed-off-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Doc/library/ssl.rst')
-rw-r--r--Doc/library/ssl.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 0a09e7e..69bea1e 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -2328,3 +2328,9 @@ successful call of :func:`~ssl.RAND_add`, :func:`~ssl.RAND_bytes` or
`IANA TLS: Transport Layer Security (TLS) Parameters <https://www.iana.org/assignments/tls-parameters/tls-parameters.xml>`_
IANA
+
+ `RFC 7525: Recommendations for Secure Use of Transport Layer Security (TLS) and Datagram Transport Layer Security (DTLS) <https://tools.ietf.org/html/rfc7525>`_
+ IETF
+
+ `Mozilla's Server Side TLS recommendations <https://wiki.mozilla.org/Security/Server_Side_TLS>`_
+ Mozilla