From 2f34994fe909d8862225c03427c7b4525fff4190 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 15 Jan 2019 20:52:38 -0600 Subject: 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 --- docs/hazmat/primitives/asymmetric/serialization.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'docs/hazmat/primitives/asymmetric/serialization.rst') 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. -- cgit v1.2.3