diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-01-15 20:52:38 -0600 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2019-01-15 21:52:38 -0500 |
| commit | 2f34994fe909d8862225c03427c7b4525fff4190 (patch) | |
| tree | 4fe933529e4a7418e388a17b9b6b088790583cfe /docs/hazmat | |
| parent | 9b49a87e469d7366798b29d0f4259b08b2fbd5de (diff) | |
| download | cryptography-2f34994fe909d8862225c03427c7b4525fff4190.tar.gz cryptography-2f34994fe909d8862225c03427c7b4525fff4190.tar.bz2 cryptography-2f34994fe909d8862225c03427c7b4525fff4190.zip | |
add support for byteslike on password and data for pkcs12 loading (#4690)
* add support for byteslike on password and data for pkcs12 loading
* use a contextmanager to yield a null terminated buffer we can zero
* review feedback
* updated text
* one last change
Diffstat (limited to 'docs/hazmat')
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/serialization.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst index 04bc705a..85aeced3 100644 --- a/docs/hazmat/primitives/asymmetric/serialization.rst +++ b/docs/hazmat/primitives/asymmetric/serialization.rst @@ -417,10 +417,12 @@ file suffix. Deserialize a PKCS12 blob. - :param bytes data: The binary data. + :param data: The binary data. + :type data: :term:`bytes-like` - :param bytes password: The password to use to decrypt the data. ``None`` + :param password: The password to use to decrypt the data. ``None`` if the PKCS12 is not encrypted. + :type password: :term:`bytes-like` :param backend: A backend instance. |