summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2017-09-07 00:31:30 (GMT)
committerMariatta <Mariatta@users.noreply.github.com>2017-09-07 00:31:30 (GMT)
commit1fc47b40af3e3e80902100a2baa472b19dd47010 (patch)
tree1c61459d768b3310a8f83c5e62d1289a552b91d0 /Doc/library
parente29ab7e75138e198b51c8bd04afa16d9d2c976a5 (diff)
downloadcpython-1fc47b40af3e3e80902100a2baa472b19dd47010.zip
cpython-1fc47b40af3e3e80902100a2baa472b19dd47010.tar.gz
cpython-1fc47b40af3e3e80902100a2baa472b19dd47010.tar.bz2
[3.6] bpo-21649: Add RFC 7525 and Mozilla server side TLS (GH-3387) (GH-3399)
Signed-off-by: Christian Heimes <christian@python.org> (cherry picked from commit ad0ffa033ea79f7c7cb14b1b1cc10888ea9e9913)
Diffstat (limited to 'Doc/library')
-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 357f65a..0f09b3f 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -2321,3 +2321,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