summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChandan Kumar <chkumar246@users.noreply.github.com>2017-06-09 09:43:58 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2017-06-09 09:43:58 (GMT)
commit63c2c8ac17750ba2be2cfc4e339cae1f4edee54f (patch)
tree6796905974555c26c1530fcbe1014596263a5be5
parent59fdf0f3ba0469f5ee45eee59cc166411fbe0b75 (diff)
downloadcpython-63c2c8ac17750ba2be2cfc4e339cae1f4edee54f.zip
cpython-63c2c8ac17750ba2be2cfc4e339cae1f4edee54f.tar.gz
cpython-63c2c8ac17750ba2be2cfc4e339cae1f4edee54f.tar.bz2
bpo-19180: Updated references for RFC 1750, RFC 3280 & RFC 4366 (GH-148)
* RFC 1750 has been been obsoleted by RFC 4086. * RFC 3280 has been obsoleted by RFC 5280. * RFC 4366 has been obsoleted by RFC 6066.
-rw-r--r--Doc/library/ssl.rst19
-rw-r--r--Modules/_ssl.c2
-rw-r--r--Modules/clinic/_ssl.c.h2
3 files changed, 10 insertions, 13 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 6deaded..8cb3186 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -378,9 +378,9 @@ Certificate handling
Verify that *cert* (in decoded format as returned by
:meth:`SSLSocket.getpeercert`) matches the given *hostname*. The rules
applied are those for checking the identity of HTTPS servers as outlined
- in :rfc:`2818` and :rfc:`6125`. In addition to HTTPS, this function
- should be suitable for checking the identity of servers in various
- SSL-based protocols such as FTPS, IMAPS, POPS and others.
+ in :rfc:`2818`, :rfc:`5280` and :rfc:`6125`. In addition to HTTPS, this
+ function should be suitable for checking the identity of servers in
+ various SSL-based protocols such as FTPS, IMAPS, POPS and others.
:exc:`CertificateError` is raised on failure. On success, the function
returns nothing::
@@ -824,7 +824,7 @@ Constants
.. data:: HAS_SNI
Whether the OpenSSL library has built-in support for the *Server Name
- Indication* extension (as defined in :rfc:`4366`).
+ Indication* extension (as defined in :rfc:`6066`).
.. versionadded:: 3.2
@@ -2313,14 +2313,11 @@ successful call of :func:`~ssl.RAND_add`, :func:`~ssl.RAND_bytes` or
`RFC 1422: Privacy Enhancement for Internet Electronic Mail: Part II: Certificate-Based Key Management <https://www.ietf.org/rfc/rfc1422>`_
Steve Kent
- `RFC 1750: Randomness Recommendations for Security <https://www.ietf.org/rfc/rfc1750>`_
- D. Eastlake et. al.
+ `RFC 4086: Randomness Requirements for Security <http://datatracker.ietf.org/doc/rfc4086/>`_
+ Donald E., Jeffrey I. Schiller
- `RFC 3280: Internet X.509 Public Key Infrastructure Certificate and CRL Profile <https://www.ietf.org/rfc/rfc3280>`_
- Housley et. al.
-
- `RFC 4366: Transport Layer Security (TLS) Extensions <https://www.ietf.org/rfc/rfc4366>`_
- Blake-Wilson et. al.
+ `RFC 5280: Internet X.509 Public Key Infrastructure Certificate and Certificate Revocation List (CRL) Profile <http://datatracker.ietf.org/doc/rfc5280/>`_
+ D. Cooper
`RFC 5246: The Transport Layer Security (TLS) Protocol Version 1.2 <https://tools.ietf.org/html/rfc5246>`_
T. Dierks et. al.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index d318b25..9077d0a 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -4440,7 +4440,7 @@ _ssl.RAND_add
Mix string into the OpenSSL PRNG state.
entropy (a float) is a lower bound on the entropy contained in
-string. See RFC 1750.
+string. See RFC 4086.
[clinic start generated code]*/
static PyObject *
diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h
index 905274f..4a053d4 100644
--- a/Modules/clinic/_ssl.c.h
+++ b/Modules/clinic/_ssl.c.h
@@ -847,7 +847,7 @@ PyDoc_STRVAR(_ssl_RAND_add__doc__,
"Mix string into the OpenSSL PRNG state.\n"
"\n"
"entropy (a float) is a lower bound on the entropy contained in\n"
-"string. See RFC 1750.");
+"string. See RFC 4086.");
#define _SSL_RAND_ADD_METHODDEF \
{"RAND_add", (PyCFunction)_ssl_RAND_add, METH_FASTCALL, _ssl_RAND_add__doc__},