Added PKCS8 encoded private keys to tests

Generated two files with the same private key as PEM_Serialization's
ec_private_key.pem, one unencrypted and one encrypted with "123456". Also
changed existing PEMSerialization unit tests to take parameters so that
tests can be extended easily.

3 files changed, 41 insertions, 18 deletions

diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py
index 8542408b..7c912a92 100644
--- a/tests/hazmat/primitives/test_serialization.py
+++ b/tests/hazmat/primitives/test_serialization.py
@@ -49,29 +49,21 @@ class TestPEMSerialization(object):
         if isinstance(key, interfaces.RSAPrivateKeyWithNumbers):
             _check_rsa_private_numbers(key.private_numbers())
 
+    @pytest.mark.parametrize(
+        ("key_file", "password"),
+        [
+            ("ec_private_key.pem", None),
+            ("ec_private_key_encrypted.pem", b"123456"),
+        ]
+    )
     @pytest.mark.elliptic
-    def test_load_pem_ec_private_key_unencrypted(self, backend):
-        _skip_curve_unsupported(backend, ec.SECP256R1())
-        key = load_vectors_from_file(
-            os.path.join(
-                "asymmetric", "PEM_Serialization", "ec_private_key.pem"),
-            lambda pemfile: load_pem_private_key(
-                pemfile.read().encode(), None, backend
-            )
-        )
-
-        assert key
-        assert isinstance(key, interfaces.EllipticCurvePrivateKey)
-
-    @pytest.mark.elliptic
-    def test_load_pem_ec_private_key_encrypted(self, backend):
+    def test_load_pem_ec_private_key(self, key_file, password, backend):
         _skip_curve_unsupported(backend, ec.SECP256R1())
         key = load_vectors_from_file(
             os.path.join(
-                "asymmetric", "PEM_Serialization",
-                "ec_private_key_encrypted.pem"),
+                "asymmetric", "PEM_Serialization", key_file),
             lambda pemfile: load_pem_private_key(
-                pemfile.read().encode(), b"123456", backend
+                pemfile.read().encode(), password, backend
             )
         )
 
@@ -335,6 +327,26 @@ class TestPKCS8Serialization(object):
         if isinstance(key, interfaces.RSAPrivateKeyWithNumbers):
             _check_rsa_private_numbers(key.private_numbers())
 
+    @pytest.mark.parametrize(
+        ("key_file", "password"),
+        [
+            ("ec_private_key.pem", None),
+            ("ec_private_key_encrypted.pem", b"123456"),
+        ]
+    )
+    @pytest.mark.elliptic
+    def test_load_pem_ec_private_key(self, key_file, password, backend):
+        _skip_curve_unsupported(backend, ec.SECP256R1())
+        key = load_vectors_from_file(
+            os.path.join(
+                "asymmetric", "PKCS8", key_file),
+            lambda pemfile: load_pem_pkcs8_private_key(
+                pemfile.read().encode(), password, backend
+            )
+        )
+        assert key
+        assert isinstance(key, interfaces.EllipticCurvePrivateKey)
+
     def test_unused_password(self, backend):
         key_file = os.path.join(
             "asymmetric", "PKCS8", "unencpkcs8.pem")
diff --git a/vectors/cryptography_vectors/asymmetric/PKCS8/ec_private_key.pem b/vectors/cryptography_vectors/asymmetric/PKCS8/ec_private_key.pem
new file mode 100644
index 00000000..3a625b6b
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/PKCS8/ec_private_key.pem
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgYirTZSx+5O8Y6tlG
+cka6W6btJiocdrdolfcukSoTEk+hRANCAAQkvPNu7Pa1GcsWU4v7ptNfqCJVq8Cx
+zo0MUVPQgwJ3aJtNM1QMOQUayCrRwfklg+D/rFSUwEUqtZh7fJDiFqz3
+-----END PRIVATE KEY-----
diff --git a/vectors/cryptography_vectors/asymmetric/PKCS8/ec_private_key_encrypted.pem b/vectors/cryptography_vectors/asymmetric/PKCS8/ec_private_key_encrypted.pem
new file mode 100644
index 00000000..7c35200f
--- /dev/null
+++ b/vectors/cryptography_vectors/asymmetric/PKCS8/ec_private_key_encrypted.pem
@@ -0,0 +1,6 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIGwMBsGCSqGSIb3DQEFAzAOBAh618AJwpxyvQICCAAEgZBhr8rmqfqMHmPh/Gjo
+S1VgD8sZUG3oILVzmuSb/k4uvynfctSG/ajwkacMF9UR6PvbTHjJUqX9RXHF6hug
+r08T/tXDaHhdNkj0TzW+ZZD1Ky6+saBkMZr9C0XDdsHDEEtRkYAb9xtWj+Z1iars
+C/xyREp46ZyeinO4Vy8BJXxCwMaSa/6HtogSb9eWWXKk0uA=
+-----END ENCRYPTED PRIVATE KEY-----