feature/outgoing

1 files changed, 19 insertions, 15 deletions

diff --git a/src/mailman_pgp/testing/mailman_pgp.cfg b/src/mailman_pgp/testing/mailman_pgp.cfg
index 735f1a0..871f429 100644
--- a/src/mailman_pgp/testing/mailman_pgp.cfg
+++ b/src/mailman_pgp/testing/mailman_pgp.cfg
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Default PGP config
+# Testing PGP config
 
 [db]
 # db path the PGP plugin will use to store list/user configuration (not keys!).
@@ -24,7 +24,7 @@ url = sqlite:////$DATA_DIR/pgp.db
 
 [keydirs]
 # Key directory used to store user public keys.
-user_keydir= $DATA_DIR/pgp/user_keydir/
+user_keydir = $DATA_DIR/pgp/user_keydir/
 
 # Key directory used to store list keypairs.
 list_keydir = $DATA_DIR/pgp/list_keydir/
@@ -34,22 +34,26 @@ archive_keydir = $DATA_DIR/pgp/archive_keydir/
 
 
 [keypairs]
-# Whether to autogenerate
+# Whether to autogenerate the list key on list creation.
 autogenerate = no
 
-# Length of primary list key.
-key_length = 1024
+# Type of primary list key and its size.
+# Format: type:size
+# type is one of:
+#     RSA, DSA, ECDSA.
+# size is the key size or curve name for ECDSA, which can be one of:
+#     nistp256, nistp384, nistp521, brainpoolP256r1, brainpoolP384r1,
+#     brainpoolP512r1, secp256k1
+primary_key = ECDSA:secp256k1
 
-# Type of primary list key.
-# One of RSA, DSA, ECDSA.
-key_type = RSA
-
-# Length of list encryption subkey.
-subkey_length = 1024
-
-# Type of list encryption subkey.
-# One of RSA, ECDH.
-subkey_type = RSA
+# Type of list encryption subkey and its size.
+# Format: type:size
+# type is one of:
+#     RSA, ECDH
+# size is the key size or curve name for ECDH, which can be one of:
+#     nistp256, nistp384, nistp521, brainpoolP256r1, brainpoolP384r1,
+#     brainpoolP512r1, secp256k1
+sub_key = ECDH:secp256k1
 
 
 [queues]