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 /tests/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 'tests/hazmat')
| -rw-r--r-- | tests/hazmat/primitives/test_pkcs12.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/hazmat/primitives/test_pkcs12.py b/tests/hazmat/primitives/test_pkcs12.py index 85be3b51..f084d578 100644 --- a/tests/hazmat/primitives/test_pkcs12.py +++ b/tests/hazmat/primitives/test_pkcs12.py @@ -108,3 +108,16 @@ class TestPKCS12(object): derfile.read(), b"invalid", backend ), mode="rb" ) + + def test_buffer_protocol(self, backend): + p12 = load_vectors_from_file( + os.path.join("pkcs12", "cert-key-aes256cbc.p12"), + lambda derfile: derfile.read(), mode="rb" + ) + p12buffer = bytearray(p12) + parsed_key, parsed_cert, parsed_more_certs = load_key_and_certificates( + p12buffer, bytearray(b"cryptography"), backend + ) + assert parsed_key is not None + assert parsed_cert is not None + assert parsed_more_certs == [] |