From 5fde141412cbeabac79c91a10b67a4e3a93982f3 Mon Sep 17 00:00:00 2001 From: John Hensley Date: Wed, 14 Oct 2020 15:13:17 -0400 Subject: [PATCH] Add --yes option to gpg2 when deleting source keypair --- securedrop/crypto_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/securedrop/crypto_util.py b/securedrop/crypto_util.py index 20e6bd63a39..f4d02134089 100644 --- a/securedrop/crypto_util.py +++ b/securedrop/crypto_util.py @@ -267,7 +267,7 @@ def delete_reply_keypair(self, source_filesystem_id: str) -> None: # Always delete keys without invoking pinentry-mode = loopback # see: https://lists.gnupg.org/pipermail/gnupg-users/2016-May/055965.html - temp_gpg = gnupg.GPG(binary='gpg2', homedir=self.gpg_key_dir) + temp_gpg = gnupg.GPG(binary='gpg2', homedir=self.gpg_key_dir, options=["--yes"]) # The subkeys keyword argument deletes both secret and public keys. temp_gpg.delete_keys(fingerprint, secret=True, subkeys=True)