aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-07-10 13:20:29 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-07-10 13:20:29 -0700
commit192f1f714d2b35b9b38916aebf6132ad58e076da (patch)
tree24832ce88a8836759655440540c76b9a60df5413 /docs/hazmat/primitives
parent9883e4e970cd8ed3bcdb58ee4679fb166fb0c391 (diff)
downloadcryptography-192f1f714d2b35b9b38916aebf6132ad58e076da.tar.gz
cryptography-192f1f714d2b35b9b38916aebf6132ad58e076da.tar.bz2
cryptography-192f1f714d2b35b9b38916aebf6132ad58e076da.zip
Mention both RFCs
Diffstat (limited to 'docs/hazmat/primitives')
-rw-r--r--docs/hazmat/primitives/asymmetric/serialization.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst
index 2a70146f..739bfb88 100644
--- a/docs/hazmat/primitives/asymmetric/serialization.rst
+++ b/docs/hazmat/primitives/asymmetric/serialization.rst
@@ -29,10 +29,10 @@ PKCS #8 Format
~~~~~~~~~~~~~~
PKCS #8 is a serialization format originally standardized by RSA and currently
-maintained by the IETF in :rfc:`5208`. It supports password based encryption
-and additional key metadata attributes. These keys are recognizable because
-they all begin with ``-----BEGIN PRIVATE KEY-----`` or with ``-----BEGIN
-ENCRYPTED PRIVATE KEY-----`` if they have a password.
+maintained by the IETF in :rfc:`5208` and :rfc:`5958`. It supports password
+based encryption and additional key metadata attributes. These keys are
+recognizable because they all begin with ``-----BEGIN PRIVATE KEY-----`` or
+with ``-----BEGIN ENCRYPTED PRIVATE KEY-----`` if they have a password.
.. function:: load_pkcs8_private_key(data, password, backend)