aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ08nY2017-06-18 02:14:09 +0200
committerJ08nY2017-06-18 02:14:09 +0200
commit7e59f56c80ca60b14766558dd86d581fb651e59d (patch)
tree73e72b30de20cd10279435eee40a27a1bbdd156a
parente21a52b751ad7d692d03b78c06f5164f6fabe79a (diff)
downloadmailman-pgp-7e59f56c80ca60b14766558dd86d581fb651e59d.tar.gz
mailman-pgp-7e59f56c80ca60b14766558dd86d581fb651e59d.tar.zst
mailman-pgp-7e59f56c80ca60b14766558dd86d581fb651e59d.zip
-rw-r--r--src/mailman_pgp/pgp/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mailman_pgp/pgp/__init__.py b/src/mailman_pgp/pgp/__init__.py
index ec31b2d..52506a6 100644
--- a/src/mailman_pgp/pgp/__init__.py
+++ b/src/mailman_pgp/pgp/__init__.py
@@ -12,6 +12,10 @@ from mailman_pgp.config import config
GPG_CONFIG_PATHS = ['homedir', 'keyring', 'secring', 'binary']
KEYPAIR_CONFIG_VARIABLES = ['key_type', 'key_length',
'subkey_type', 'subkey_length']
+KEYPAIR_CONFIG_DEFAULTS = {
+ 'key_usage': 'auth,sign,cert',
+ 'subkey_usage': 'enc'
+}
@public
@@ -20,8 +24,7 @@ class GPG(gpgmime.GPG):
# Get all the [keypairs] config variables.
self.keypair_config = dict(
(k, config.get('keypairs', k)) for k in KEYPAIR_CONFIG_VARIABLES)
- self.keypair_config['key_usage'] = 'auth,sign,cert'
- self.keypair_config['subkey_usage'] = 'enc'
+ self.keypair_config.update(KEYPAIR_CONFIG_DEFAULTS)
# Get and expand all [gpg] config paths against Mailman's directories.
self.gpg_config = dict(