From 7ac7af9bcbdf75ab25020c6e44fc895ea95bc7ce Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@torproject.org>
Date: Sat, 16 Mar 2013 02:05:47 +0000
Subject: [PATCH] Update list of allowed gpg options.

---
 gnupg.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnupg.py b/gnupg.py
index d01232c..d07a8ea 100644
--- a/gnupg.py
+++ b/gnupg.py
@@ -817,7 +817,9 @@ def _is_allowed(input):
         ['--list-packets', '--delete-keys', '--delete-secret-keys',
          '--encrypt', '--print-mds', '--print-md', '--sign',
          '--encrypt-files', '--gen-key', '--decrypt', '--decrypt-files',
-         '--list-keys', '--import', '--verify', '--version'])
+         '--list-keys', '--import', '--verify', '--version',
+         '--status-fd', '--no-tty', '--homedir', '--no-default-keyring',
+         '--keyring', '--passphrase-fd'])
 
     ## check that _allowed is a subset of _possible
     try:
@@ -825,6 +827,7 @@ def _is_allowed(input):
             '_allowed is not subset of known options, difference: %s' \
             % _allowed.difference(_possible)
     except AssertionError as ae:   ## 'as' syntax requires python>=2.6
+        logger.debug("gnupg._is_allowed(): %s" % ae.message)
         raise UsageError(ae.message)
 
     ## if we got a list of args, join them