Skip to content

Commit

Permalink
Merge pull request #5581 from freedomofpress/5579-fix-focal-source-ke…
Browse files Browse the repository at this point in the history
…y-deletion

Fix Focal source key deletion
  • Loading branch information
kushaldas authored Oct 19, 2020
2 parents dbc129a + 0ef5f3d commit 55df6ab
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion securedrop/crypto_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 55df6ab

Please sign in to comment.