aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-11-04 23:19:22 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2018-11-04 10:19:22 -0500
commit98420eac4525345cd95c2afa71a04089db8ac8e6 (patch)
tree74fb546d3513c4593571770748b1f1b4ff04d421
parent94c13bb5de37006ee69e7dfa376c1a6beed67efc (diff)
downloadcryptography-98420eac4525345cd95c2afa71a04089db8ac8e6.tar.gz
cryptography-98420eac4525345cd95c2afa71a04089db8ac8e6.tar.bz2
cryptography-98420eac4525345cd95c2afa71a04089db8ac8e6.zip
another pkcs12 vector (#4557)
* another pkcs12 vector also fixed the pathing to be consistent in the docs for PKCS12 vectors * add a cert with no key pkcs12 as well
-rw-r--r--docs/development/test-vectors.rst10
-rw-r--r--vectors/cryptography_vectors/pkcs12/cert-aes256cbc-no-key.p12bin0 -> 605 bytes
-rw-r--r--vectors/cryptography_vectors/pkcs12/no-cert-key-aes256cbc.p12bin0 -> 353 bytes
3 files changed, 8 insertions, 2 deletions
diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst
index 12def6c6..e5ff70bb 100644
--- a/docs/development/test-vectors.rst
+++ b/docs/development/test-vectors.rst
@@ -482,13 +482,19 @@ Custom PKCS12 Test Vectors
(``x509/custom/ca/ca.pem``) and key (``x509/custom/ca/ca_key.pem``)
with no encryption. The password (used for integrity checking only) is
``cryptography``.
-* ``cert-rc2-key-3des.p12`` - A PKCS12 file containing a cert
+* ``pkcs12/cert-rc2-key-3des.p12`` - A PKCS12 file containing a cert
(``x509/custom/ca/ca.pem``) encrypted with RC2 and key
(``x509/custom/ca/ca_key.pem``) encrypted via 3DES with the password
``cryptography``.
-* ``no-password.p12`` - A PKCS12 file containing a cert
+* ``pkcs12/no-password.p12`` - A PKCS12 file containing a cert
(``x509/custom/ca/ca.pem``) and key (``x509/custom/ca/ca_key.pem``) with no
encryption and no password.
+* ``pkcs12/no-cert-key-aes256cbc.p12`` - A PKCS12 file containing a key
+ (``x509/custom/ca/ca_key.pem``) encrypted via AES 256 CBC with the
+ password ``cryptography`` and no certificate.
+* ``pkcs12/cert-aes256cbc-no-key.p12`` - A PKCS12 file containing a cert
+ (``x509/custom/ca/ca.pem``) encrypted via AES 256 CBC with the
+ password ``cryptography`` and no private key.
Hashes
~~~~~~
diff --git a/vectors/cryptography_vectors/pkcs12/cert-aes256cbc-no-key.p12 b/vectors/cryptography_vectors/pkcs12/cert-aes256cbc-no-key.p12
new file mode 100644
index 00000000..2550c8e3
--- /dev/null
+++ b/vectors/cryptography_vectors/pkcs12/cert-aes256cbc-no-key.p12
Binary files differ
diff --git a/vectors/cryptography_vectors/pkcs12/no-cert-key-aes256cbc.p12 b/vectors/cryptography_vectors/pkcs12/no-cert-key-aes256cbc.p12
new file mode 100644
index 00000000..7c56b450
--- /dev/null
+++ b/vectors/cryptography_vectors/pkcs12/no-cert-key-aes256cbc.p12
Binary files differ