diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-28 14:34:21 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-28 14:34:21 -0600 |
| commit | 35194c99aeb846b2d85d6303dbe4f11b21eadaa6 (patch) | |
| tree | a1f6b0a9f1fa6722104c69e8e09d03ada977dd6c /docs | |
| parent | 45be3546398e5516b58c53780a32d7dac36ca79e (diff) | |
| download | cryptography-35194c99aeb846b2d85d6303dbe4f11b21eadaa6.tar.gz cryptography-35194c99aeb846b2d85d6303dbe4f11b21eadaa6.tar.bz2 cryptography-35194c99aeb846b2d85d6303dbe4f11b21eadaa6.zip | |
linkify some things per review, fix an import
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/rsa.rst | 10 | ||||
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/serialization.rst | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/docs/hazmat/primitives/asymmetric/rsa.rst b/docs/hazmat/primitives/asymmetric/rsa.rst index 4fba8e12..adb5cbfc 100644 --- a/docs/hazmat/primitives/asymmetric/rsa.rst +++ b/docs/hazmat/primitives/asymmetric/rsa.rst @@ -536,8 +536,14 @@ Key interfaces .. method:: as_bytes(encoding, format, encryption_algorithm) - Allows serialization of the key to bytes. Encoding (PEM or DER), format - (TraditionalOpenSSL or PKCS8) and encryption algorithm (such as + Allows serialization of the key to bytes. Encoding ( + :attr:`~cryptography.hazmat.primitives.serialization.Encoding.PEM` or + :attr:`~cryptography.hazmat.primitives.serialization.Encoding.DER`), + format ( + :attr:`~cryptography.hazmat.primitives.serialization.Format.TraditionalOpenSSL` + or + :attr:`~cryptography.hazmat.primitives.serialization.Format.PKCS8`) and + encryption algorithm (such as :class:`~cryptography.hazmat.primitives.serialization.BestAvailableEncryption` or :class:`~cryptography.hazmat.primitives.serialization.NoEncryption`) are chosen to define the exact serialization. diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst index 209c57c5..36ba241b 100644 --- a/docs/hazmat/primitives/asymmetric/serialization.rst +++ b/docs/hazmat/primitives/asymmetric/serialization.rst @@ -75,7 +75,7 @@ methods. .. doctest:: >>> from cryptography.hazmat.backends import default_backend - >>> from cryptography.hazmat.primitives.asymmetric import rsa + >>> from cryptography.hazmat.primitives.asymmetric import dsa, rsa >>> from cryptography.hazmat.primitives.serialization import load_pem_private_key >>> key = load_pem_private_key(pem_data, password=None, backend=default_backend()) >>> if isinstance(key, rsa.RSAPrivateKey): |