From 17c48214f31972da71d88840602fb53b74fa36b0 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Sat, 18 May 2019 14:13:21 -0400 Subject: [PATCH] GPGBase: Do not set a default pubring/secring GnuPG will infer those from `homedir`, and newer versions of GnuPG do not store secret keys in secring.gpg but under private-keys-v1.d/ --- pretty_bad_protocol/_meta.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pretty_bad_protocol/_meta.py b/pretty_bad_protocol/_meta.py index ac6ea40..0355c7c 100644 --- a/pretty_bad_protocol/_meta.py +++ b/pretty_bad_protocol/_meta.py @@ -189,10 +189,19 @@ def __init__(self, binary=None, home=None, keyring=None, secring=None, self.ignore_homedir_permissions = ignore_homedir_permissions self.binary = _util._find_binary(binary) self.homedir = os.path.expanduser(home) if home else _util._conf - pub = _parsers._fix_unsafe(keyring) if keyring else 'pubring.gpg' - sec = _parsers._fix_unsafe(secring) if secring else 'secring.gpg' - self.keyring = os.path.join(self._homedir, pub) - self.secring = os.path.join(self._homedir, sec) + + if keyring: + pub = _parsers._fix_unsafe(keyring) + self.keyring = os.path.join(self._homedir, pub) + else: + self.keyring = None + + if secring: + sec = _parsers._fix_unsafe(secring) + self.secring = os.path.join(self._homedir, sec) + else: + self.secring = None + self.options = list(_parsers._sanitise_list(options)) if options else None #: The version string of our GnuPG binary