diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-01-16 19:08:12 -0600 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2019-01-16 20:08:12 -0500 |
| commit | c6656af81d3b4440d0d1032fd82e64d717541d62 (patch) | |
| tree | 494efaf4002a90fe79b114cd4d189f1c07411d92 /docs/hazmat | |
| parent | c33ef91143c93fa7d59214f88fd5954b1bb3df09 (diff) | |
| download | cryptography-c6656af81d3b4440d0d1032fd82e64d717541d62.tar.gz cryptography-c6656af81d3b4440d0d1032fd82e64d717541d62.tar.bz2 cryptography-c6656af81d3b4440d0d1032fd82e64d717541d62.zip | |
add support for byteslike password/data to load_{pem,der}_private_key (#4693)
* add support for byteslike password/data to load_{pem,der}_private_key
* pypy 5.4 can't do memoryview from_buffer
Diffstat (limited to 'docs/hazmat')
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/serialization.rst | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst index 85aeced3..4c2e5f2a 100644 --- a/docs/hazmat/primitives/asymmetric/serialization.rst +++ b/docs/hazmat/primitives/asymmetric/serialization.rst @@ -133,10 +133,12 @@ all begin with ``-----BEGIN {format}-----`` and end with ``-----END Deserialize a private key from PEM encoded data to one of the supported asymmetric private key types. - :param bytes data: The PEM encoded key data. + :param data: The PEM encoded key data. + :type data: :term:`bytes-like` - :param bytes password: The password to use to decrypt the data. Should + :param password: The password to use to decrypt the data. Should be ``None`` if the private key is not encrypted. + :type data: :term:`bytes-like` :param backend: An instance of :class:`~cryptography.hazmat.backends.interfaces.PEMSerializationBackend`. @@ -241,10 +243,12 @@ the rest. Deserialize a private key from DER encoded data to one of the supported asymmetric private key types. - :param bytes data: The DER encoded key data. + :param data: The DER encoded key data. + :type data: :term:`bytes-like` - :param bytes password: The password to use to decrypt the data. Should + :param password: The password to use to decrypt the data. Should be ``None`` if the private key is not encrypted. + :type password: :term:`bytes-like` :param backend: An instance of :class:`~cryptography.hazmat.backends.interfaces.DERSerializationBackend`. |