Visitar URL original
[3.6] bpo-19180: Updated references for RFC 1750, RFC 3280 & RFC 4366 · python/cpython@c422959 · GitHub
Skip to content

Commit c422959

Browse files
ncoghlanncoghlan
authored
[3.6] bpo-19180: Updated references for RFC 1750, RFC 3280 & RFC 4366
* 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. (cherry picked from commit 63c2c8a)
1 parent f0ff849 commit c422959

3 files changed

Lines changed: 10 additions & 13 deletions

File tree

‎Doc/library/ssl.rst‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,9 @@ Certificate handling
374374
Verify that *cert* (in decoded format as returned by
375375
:meth:`SSLSocket.getpeercert`) matches the given *hostname*. The rules
376376
applied are those for checking the identity of HTTPS servers as outlined
377-
in :rfc:`2818` and :rfc:`6125`. In addition to HTTPS, this function
378-
should be suitable for checking the identity of servers in various
379-
SSL-based protocols such as FTPS, IMAPS, POPS and others.
377+
in :rfc:`2818`, :rfc:`5280` and :rfc:`6125`. In addition to HTTPS, this
378+
function should be suitable for checking the identity of servers in
379+
various SSL-based protocols such as FTPS, IMAPS, POPS and others.
380380

381381
:exc:`CertificateError` is raised on failure. On success, the function
382382
returns nothing::
@@ -820,7 +820,7 @@ Constants
820820
.. data:: HAS_SNI
821821

822822
Whether the OpenSSL library has built-in support for the *Server Name
823-
Indication* extension (as defined in :rfc:`4366`).
823+
Indication* extension (as defined in :rfc:`6066`).
824824

825825
.. versionadded:: 3.2
826826

@@ -2306,14 +2306,11 @@ successful call of :func:`~ssl.RAND_add`, :func:`~ssl.RAND_bytes` or
23062306
`RFC 1422: Privacy Enhancement for Internet Electronic Mail: Part II: Certificate-Based Key Management <https://www.ietf.org/rfc/rfc1422>`_
23072307
Steve Kent
23082308

2309-
`RFC 1750: Randomness Recommendations for Security <https://www.ietf.org/rfc/rfc1750>`_
2310-
D. Eastlake et. al.
2309+
`RFC 4086: Randomness Requirements for Security <http://datatracker.ietf.org/doc/rfc4086/>`_
2310+
Donald E., Jeffrey I. Schiller
23112311

2312-
`RFC 3280: Internet X.509 Public Key Infrastructure Certificate and CRL Profile <https://www.ietf.org/rfc/rfc3280>`_
2313-
Housley et. al.
2314-
2315-
`RFC 4366: Transport Layer Security (TLS) Extensions <https://www.ietf.org/rfc/rfc4366>`_
2316-
Blake-Wilson et. al.
2312+
`RFC 5280: Internet X.509 Public Key Infrastructure Certificate and Certificate Revocation List (CRL) Profile <http://datatracker.ietf.org/doc/rfc5280/>`_
2313+
D. Cooper
23172314

23182315
`RFC 5246: The Transport Layer Security (TLS) Protocol Version 1.2 <https://tools.ietf.org/html/rfc5246>`_
23192316
T. Dierks et. al.

‎Modules/_ssl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4475,7 +4475,7 @@ _ssl.RAND_add
44754475
Mix string into the OpenSSL PRNG state.
44764476
44774477
entropy (a float) is a lower bound on the entropy contained in
4478-
string. See RFC 1750.
4478+
string. See RFC 4086.
44794479
[clinic start generated code]*/
44804480

44814481
static PyObject *

‎Modules/clinic/_ssl.c.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ PyDoc_STRVAR(_ssl_RAND_add__doc__,
839839
"Mix string into the OpenSSL PRNG state.\n"
840840
"\n"
841841
"entropy (a float) is a lower bound on the entropy contained in\n"
842-
"string. See RFC 1750.");
842+
"string. See RFC 4086.");
843843

844844
#define _SSL_RAND_ADD_METHODDEF \
845845
{"RAND_add", (PyCFunction)_ssl_RAND_add, METH_VARARGS, _ssl_RAND_add__doc__},

0 commit comments

Comments
 (0)