From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 7 Sep 2017 00:31:48 +0000 (-0700)
Subject: [2.7] bpo-21649: Add RFC 7525 and Mozilla server side TLS (GH-3387) (GH-3400)
X-Git-Tag: v2.7.15rc1~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab4894bba6e51105706f9fa016821434256585cd;p=thirdparty%2FPython%2Fcpython.git

[2.7] bpo-21649: Add RFC 7525 and Mozilla server side TLS (GH-3387) (GH-3400)

Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit ad0ffa033ea79f7c7cb14b1b1cc10888ea9e9913)
---

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 183c17bb560d..36beb1777cf0 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1810,3 +1810,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
diff --git a/Misc/NEWS.d/next/Documentation/2017-09-06-10-11-57.bpo-21649.EUvqA9.rst b/Misc/NEWS.d/next/Documentation/2017-09-06-10-11-57.bpo-21649.EUvqA9.rst
new file mode 100644
index 000000000000..a09985aa3d8d
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2017-09-06-10-11-57.bpo-21649.EUvqA9.rst
@@ -0,0 +1 @@
+Add RFC 7525 and Mozilla server side TLS links to SSL documentation.