Merge branch 'feature/outgoing'

5 files changed, 84 insertions, 14 deletions

diff --git a/src/mailman_pgp/pgp/tests/data/keys/ecc_curve25519.priv.asc b/src/mailman_pgp/pgp/tests/data/keys/ecc_curve25519.priv.asc
new file mode 100644
index 0000000..d66c89e
--- /dev/null
+++ b/src/mailman_pgp/pgp/tests/data/keys/ecc_curve25519.priv.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lFgEWW5OExYJKwYBBAHaRw8BAQdALuKQqg42UTUC9PP8Ahk7G3p4mYL0niRdheam
+OKNm8wUAAQDYPq5Xlloj4NOhY1yKfpCo6oA2K2VxyY8zD61lDb2+AA9XtDxFQ0Mg
+Q3VydmUyNTUxOSAmIEVDQyBDdXJ2ZTI1NTE5IDxFQ0MtQ3VydmUyNTUxOUBleGFt
+cGxlLm9yZz6IkAQTFggAOBYhBAWwDrTl6xxIhCHhX/qZ76O408i6BQJZbk4TAhsD
+BQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEPqZ76O408i6nHwA/0suG6HBe2NY
+URbNi9b6PQXuhq3sQkBmgAEwt8Yx4HnvAP9qvcN4n3Mv/1vkgSLJzpykffPxo6o4
+2FLQ4jX8yq/EAZxdBFluThMSCisGAQQBl1UBBQEBB0BxjGFvybmP7cfNqMKYCChx
+ThAAO+iY8x6MJZ1sGCnxVgMBCAcAAP9OT1RocktFhCvYwTvISq7yd2f2kRxXooZ5
+gt5OJgF54BA2iHgEGBYIACAWIQQFsA605escSIQh4V/6me+juNPIugUCWW5OEwIb
+DAAKCRD6me+juNPIumkgAP0YawFWdvFTUk9X0iHzZ0o82qnFU/yf1CpPNZ/00O6w
+kAEA+6GQk7kTKq249456imoEY4MiHNz5JP1N/TLPBW/YOAQ=
+=+yZA
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/src/mailman_pgp/pgp/tests/data/keys/ecc_curve25519.pub.asc b/src/mailman_pgp/pgp/tests/data/keys/ecc_curve25519.pub.asc
new file mode 100644
index 0000000..43a5f17
--- /dev/null
+++ b/src/mailman_pgp/pgp/tests/data/keys/ecc_curve25519.pub.asc
@@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEWW5OExYJKwYBBAHaRw8BAQdALuKQqg42UTUC9PP8Ahk7G3p4mYL0niRdheam
+OKNm8wW0PEVDQyBDdXJ2ZTI1NTE5ICYgRUNDIEN1cnZlMjU1MTkgPEVDQy1DdXJ2
+ZTI1NTE5QGV4YW1wbGUub3JnPoiQBBMWCAA4FiEEBbAOtOXrHEiEIeFf+pnvo7jT
+yLoFAlluThMCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQ+pnvo7jTyLqc
+fAD/Sy4bocF7Y1hRFs2L1vo9Be6GrexCQGaAATC3xjHgee8A/2q9w3ifcy//W+SB
+IsnOnKR98/GjqjjYUtDiNfzKr8QBuDgEWW5OExIKKwYBBAGXVQEFAQEHQHGMYW/J
+uY/tx82owpgIKHFOEAA76JjzHowlnWwYKfFWAwEIB4h4BBgWCAAgFiEEBbAOtOXr
+HEiEIeFf+pnvo7jTyLoFAlluThMCGwwACgkQ+pnvo7jTyLppIAD9GGsBVnbxU1JP
+V9Ih82dKPNqpxVP8n9QqTzWf9NDusJABAPuhkJO5EyqtuPeOeopqBGODIhzc+ST9
+Tf0yzwVv2DgE
+=pyIj
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/src/mailman_pgp/pgp/tests/data/keys/ecc_secp256k1.priv.asc b/src/mailman_pgp/pgp/tests/data/keys/ecc_secp256k1.priv.asc
new file mode 100644
index 0000000..901a8f4
--- /dev/null
+++ b/src/mailman_pgp/pgp/tests/data/keys/ecc_secp256k1.priv.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lHQEWW5dURMFK4EEAAoCAwT6ABKEPpMMwAQLnHkv+eSycNslonra5Kv7lNQtEeNv
+VCXQELzmVGfcKerRVH6kFWpX9c1YxpdrG72Y5mHcRx30AAD/SLMJNXahzpcQy8K1
+XjDqdfCmYpMIFf87xIlZngmLNrkQnLQ5RUNDIHNlY3AyNTZrMSAmIEVDQyBzZWNw
+MjU2azEgPEVDQy1zZWNwMjU2azFAZXhhbXBsZS5vcmc+iJAEExMIADgWIQRi7dSu
+UMnX5cDo6nvIw1p/AFOkvwUCWW5dUQIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIX
+gAAKCRDIw1p/AFOkv1kGAP422qrlLxwcZgcZr1k/vJW1s0oYDBlHF2y/I+Q3Kvrs
+jQEAjcl/jTBYJTcDBiIRbrzKQMPgj3lEL2R2v/x0d7CdKeeceARZbl1REgUrgQQA
+CgIDBOlnr/5pUVGZBipSXZXsYmNaYQzQbG/YvuyJoH5v8n59AS5nQF+XVYVtAT19
+pq3stFGqg6uHrxlJvRHxv1QehVoDAQgHAAD9Elh7gUDS/UYfF5rMUDcjuAigDFVt
+MqWIZ+qowNearR8PgYh4BBgTCAAgFiEEYu3UrlDJ1+XA6Op7yMNafwBTpL8FAllu
+XVECGwwACgkQyMNafwBTpL9dBQEA1GRFrTIrx3o6+PdKNMSZSKLgsrocI2NGKI5b
+XZe62kEA/0eWm6fha6T/wjCQ3befbeG9QA2aITv3XLa/va4ki6p5
+=boGQ
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/src/mailman_pgp/pgp/tests/data/keys/ecc_secp256k1.pub.asc b/src/mailman_pgp/pgp/tests/data/keys/ecc_secp256k1.pub.asc
new file mode 100644
index 0000000..edd857a
--- /dev/null
+++ b/src/mailman_pgp/pgp/tests/data/keys/ecc_secp256k1.pub.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mE8EWW5dURMFK4EEAAoCAwT6ABKEPpMMwAQLnHkv+eSycNslonra5Kv7lNQtEeNv
+VCXQELzmVGfcKerRVH6kFWpX9c1YxpdrG72Y5mHcRx30tDlFQ0Mgc2VjcDI1Nmsx
+ICYgRUNDIHNlY3AyNTZrMSA8RUNDLXNlY3AyNTZrMUBleGFtcGxlLm9yZz6IkAQT
+EwgAOBYhBGLt1K5QydflwOjqe8jDWn8AU6S/BQJZbl1RAhsDBQsJCAcCBhUICQoL
+AgQWAgMBAh4BAheAAAoJEMjDWn8AU6S/WQYA/jbaquUvHBxmBxmvWT+8lbWzShgM
+GUcXbL8j5Dcq+uyNAQCNyX+NMFglNwMGIhFuvMpAw+CPeUQvZHa//HR3sJ0p57hT
+BFluXVESBSuBBAAKAgME6Wev/mlRUZkGKlJdlexiY1phDNBsb9i+7Imgfm/yfn0B
+LmdAX5dVhW0BPX2mrey0UaqDq4evGUm9EfG/VB6FWgMBCAeIeAQYEwgAIBYhBGLt
+1K5QydflwOjqe8jDWn8AU6S/BQJZbl1RAhsMAAoJEMjDWn8AU6S/XQUBANRkRa0y
+K8d6Ovj3SjTEmUii4LK6HCNjRiiOW12XutpBAP9Hlpun4Wuk/8IwkN23n23hvUAN
+miE791y2v72uJIuqeQ==
+=ryPP
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/src/mailman_pgp/pgp/tests/test_keygen.py b/src/mailman_pgp/pgp/tests/test_keygen.py
index dab6801..bbd0c84 100644
--- a/src/mailman_pgp/pgp/tests/test_keygen.py
+++ b/src/mailman_pgp/pgp/tests/test_keygen.py
@@ -15,32 +15,42 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
+"""Test the out-of-process key generator."""
 from os.path import exists, isfile, join
 from tempfile import TemporaryDirectory
 from unittest import TestCase
 
+from parameterized import parameterized
 from pgpy import PGPKey
-from pgpy.constants import PubKeyAlgorithm
+from pgpy.constants import PubKeyAlgorithm, EllipticCurveOID
 
 from mailman_pgp.pgp.keygen import ListKeyGenerator
 
 
-class TesKeygen(TestCase):
+class TestKeygen(TestCase):
     def setUp(self):
-        self.keypair_config = {
-            'key_type': PubKeyAlgorithm.RSAEncryptOrSign,
-            'key_length': 1024,
-            'subkey_type': PubKeyAlgorithm.RSAEncryptOrSign,
-            'subkey_length': 1024
-        }
         self.display_name = 'Display Name'
         self.posting_address = 'posting@address.com'
         self.request_address = 'posting-request@address.com'
 
-    def test_generate(self):
+    @parameterized.expand([
+        # RSA + RSA
+        (PubKeyAlgorithm.RSAEncryptOrSign, 1024,
+         PubKeyAlgorithm.RSAEncryptOrSign, 1024),
+        # ECDSA + ECDH
+        (PubKeyAlgorithm.ECDSA, EllipticCurveOID.SECP256K1,
+         PubKeyAlgorithm.ECDH, EllipticCurveOID.SECP256K1),
+        # DSA + ECDH
+        (PubKeyAlgorithm.DSA, 1024,
+         PubKeyAlgorithm.ECDH, EllipticCurveOID.SECP256K1)
+    ])
+    def test_generate(self, primary_key_type, primary_key_size, sub_key_type,
+                      sub_key_size):
         with TemporaryDirectory() as temp_dir:
             key_path = join(temp_dir, 'key.asc')
-            keygen = ListKeyGenerator(self.keypair_config, self.display_name,
+            keygen = ListKeyGenerator((primary_key_type, primary_key_size),
+                                      (sub_key_type, sub_key_size),
+                                      self.display_name,
                                       self.posting_address,
                                       self.request_address, key_path)
             keygen.start()
@@ -50,18 +60,18 @@ class TesKeygen(TestCase):
 
             key, _ = PGPKey.from_file(key_path)
             self.assertEqual(key.key_algorithm,
-                             self.keypair_config['key_type'])
+                             primary_key_type)
             self.assertEqual(key.key_size,
-                             self.keypair_config['key_length'])
+                             primary_key_size)
 
             subs = key.subkeys
             self.assertEqual(len(subs), 1)
 
             keyid, sub = subs.popitem()
             self.assertEqual(sub.key_algorithm,
-                             self.keypair_config['subkey_type'])
+                             sub_key_type)
             self.assertEqual(sub.key_size,
-                             self.keypair_config['subkey_length'])
+                             sub_key_size)
 
             uids = key.userids
             self.assertEqual(len(uids), 2)