diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-27 22:55:54 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-27 22:55:54 -0600 |
| commit | 45be3546398e5516b58c53780a32d7dac36ca79e (patch) | |
| tree | 99c8ed50df540ace9fd0a2fdb90705bf17f2ba9e | |
| parent | 20456e96ed510f96c5bdc24b799b89200e3dba4c (diff) | |
| download | cryptography-45be3546398e5516b58c53780a32d7dac36ca79e.tar.gz cryptography-45be3546398e5516b58c53780a32d7dac36ca79e.tar.bz2 cryptography-45be3546398e5516b58c53780a32d7dac36ca79e.zip | |
add more docs stuff from review that I missed
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/rsa.rst | 2 | ||||
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/serialization.rst | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/docs/hazmat/primitives/asymmetric/rsa.rst b/docs/hazmat/primitives/asymmetric/rsa.rst index 17e13c28..4fba8e12 100644 --- a/docs/hazmat/primitives/asymmetric/rsa.rst +++ b/docs/hazmat/primitives/asymmetric/rsa.rst @@ -83,7 +83,7 @@ There is also support for :func:`loading public keys in the SSH format Key serialization ~~~~~~~~~~~~~~~~~ -If you have a previously loaded or generated key that has the +If you have a key that you've loaded or generated which implements the :class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPrivateKeyWithSerialization` interface you can use :meth:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPrivateKeyWithSerialization.as_bytes` diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst index abf036ac..209c57c5 100644 --- a/docs/hazmat/primitives/asymmetric/serialization.rst +++ b/docs/hazmat/primitives/asymmetric/serialization.rst @@ -80,7 +80,7 @@ methods. >>> key = load_pem_private_key(pem_data, password=None, backend=default_backend()) >>> if isinstance(key, rsa.RSAPrivateKey): ... signature = sign_with_rsa_key(key, message) - ... elif isinstance(key, interfaces.DSAPrivateKey): + ... elif isinstance(key, dsa.DSAPrivateKey): ... signature = sign_with_dsa_key(key, message) ... else: ... raise TypeError @@ -294,10 +294,15 @@ Serialization Formats .. attribute:: TraditionalOpenSSL - Frequently known as PKCS#1 format. + Frequently known as PKCS#1 format. Still a widely used format, but + generally considered legacy. .. attribute:: PKCS8 + A more modern format for serializing keys which allows for better + encryption. Choose this unless you have explicit legacy compatibility + requirements. + Serialization Encodings ~~~~~~~~~~~~~~~~~~~~~~~ |