add DER asymmetric keys

16 files changed, 18 insertions, 7 deletions

diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst
index f59a3552..bdb20466 100644
--- a/docs/development/test-vectors.rst
+++ b/docs/development/test-vectors.rst
@@ -37,29 +37,40 @@ Asymmetric ciphers
 Custom Asymmetric Vectors
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-* ``asymmetric/PEM_Serialization/ec_private_key.pem`` - Contains an Elliptic
+* ``asymmetric/PEM_Serialization/ec_private_key.pem`` and
+  ``asymmetric/DER_Serialization/ec_private_key.der`` - Contains an Elliptic
   Curve key generated by OpenSSL from the curve ``secp256r1``.
-* ``asymmetric/PEM_Serialization/ec_private_key_encrypted.pem`` - Contains the
+* ``asymmetric/PEM_Serialization/ec_private_key_encrypted.pem`` and
+  ``asymmetric/DER_Serialization/ec_private_key_encrypted.der``- Contains the
   same Elliptic Curve key as ``ec_private_key.pem``, except that it is
   encrypted with AES-128 with the password "123456".
-* ``asymmetric/PEM_Serialization/ec_public_key.pem`` - Contains the public key
+* ``asymmetric/PEM_Serialization/ec_public_key.pem`` and
+  ``asymmetric/DER_Serialization/ec_public_key.der``- Contains the public key
   corresponding to ``ec_private_key.pem``, generated using OpenSSL.
 * ``asymmetric/PEM_Serialization/rsa_private_key.pem`` - Contains an RSA 2048
   bit key generated using OpenSSL, protected by the secret "123456" with DES3
   encryption.
-* ``asymmetric/PEM_Serialization/rsa_public_key.pem`` - Contains an RSA 2048
+* ``asymmetric/PEM_Serialization/rsa_public_key.pem`` and
+  ``asymmetric/DER_Serialization/rsa_public_key.der``- Contains an RSA 2048
   bit public generated using OpenSSL from ``rsa_private_key.pem``.
 * ``asymmetric/PEM_Serialization/dsaparam.pem`` - Contains 2048-bit DSA
   parameters generated using OpenSSL; contains no keys.
 * ``asymmetric/PEM_Serialization/dsa_private_key.pem`` - Contains a DSA 2048
   bit key generated using OpenSSL from the parameters in ``dsaparam.pem``,
   protected by the secret "123456" with DES3 encryption.
-* ``asymmetric/PEM_Serialization/dsa_public_key.pem`` - Contains a DSA 2048 bit
+* ``asymmetric/PEM_Serialization/dsa_public_key.pem`` and
+  ``asymmetric/DER_Serialization/dsa_public_key.der`` - Contains a DSA 2048 bit
   key generated using OpenSSL from ``dsa_private_key.pem``.
-* ``asymmetric/PEM_Serialization/unenc-dsa-pkcs8.pem`` - Contains a DSA 1024
+* ``asymmetric/PEM_Serialization/unenc-dsa-pkcs8.pem`` and
+  ``asymmetric/DER_Serialization/unenc-dsa-pkcs8.der`` - Contains a DSA 1024
   bit key generated using OpenSSL.
-* ``asymmetric/PEM_Serialization/unenc-dsa-pkcs8.pub.pem`` - Contains a DSA
+* ``asymmetric/PEM_Serialization/unenc-dsa-pkcs8.pub.pem`` and
+  ``asymmetric/DER_Serialization/unenc-dsa-pkcs8.pub.der`` - Contains a DSA
   2048 bit public key generated using OpenSSL from ``unenc-dsa-pkcs8.pem``.
+* DER conversions of the `GnuTLS example keys`_ for DSA as well as the
+  `OpenSSL example key`_ for RSA.
+* DER conversions of `enc-rsa-pkcs8.pem`_, `enc2-rsa-pkcs8.pem`_, and
+  `unenc-rsa-pkcs8.pem`_.
 
 
 X.509
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa.1024.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa.1024.der
new file mode 100644
index 00000000..8c08b450
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa.1024.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa.2048.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa.2048.der
new file mode 100644
index 00000000..6c65a6c0
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa.2048.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa.3072.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa.3072.der
new file mode 100644
index 00000000..627b9978
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa.3072.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa_public_key.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa_public_key.der
new file mode 100644
index 00000000..013a42f3
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/dsa_public_key.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/ec_private_key.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/ec_private_key.der
new file mode 100644
index 00000000..1e5491f4
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/ec_private_key.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/ec_private_key_encrypted.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/ec_private_key_encrypted.der
new file mode 100644
index 00000000..2798743c
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/ec_private_key_encrypted.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/ec_public_key.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/ec_public_key.der
new file mode 100644
index 00000000..628ae2b2
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/ec_public_key.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/enc-rsa-pkcs8.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/enc-rsa-pkcs8.der
new file mode 100644
index 00000000..7c513b8e
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/enc-rsa-pkcs8.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/enc2-rsa-pkcs8.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/enc2-rsa-pkcs8.der
new file mode 100644
index 00000000..f80a70fd
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/enc2-rsa-pkcs8.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/rsa_public_key.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/rsa_public_key.der
new file mode 100644
index 00000000..1b55deb2
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/rsa_public_key.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/testrsa.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/testrsa.der
new file mode 100644
index 00000000..79cc1cec
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/testrsa.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-dsa-pkcs8.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-dsa-pkcs8.der
new file mode 100644
index 00000000..678a1d27
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-dsa-pkcs8.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-dsa-pkcs8.pub.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-dsa-pkcs8.pub.der
new file mode 100644
index 00000000..4038c7e6
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-dsa-pkcs8.pub.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-rsa-pkcs8.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-rsa-pkcs8.der
new file mode 100644
index 00000000..bb7a38cf
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-rsa-pkcs8.der
diff --git a/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-rsa-pkcs8.pub.der b/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-rsa-pkcs8.pub.der
new file mode 100644
index 00000000..b4b6bbd0
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/DER_Serialization/unenc-rsa-pkcs8.pub.der