summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2014-07-25 19:26:19 -0500
committerRuben Pollan <meskio@sindominio.net>2014-07-25 19:26:19 -0500
commitfbb711174fc3bb6222c9656546bf7f3bb279e130 (patch)
treef8c08da4880af7add56125b1ee39c62ad4818c79
parentbc1d3adfc408085b0fbc8f09c930a68b42e4c46a (diff)
gpg.verify_file() gets the data as a filename not as a binary stream
-rw-r--r--src/leap/keymanager/openpgp.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py
index 950d022..46ae2aa 100644
--- a/src/leap/keymanager/openpgp.py
+++ b/src/leap/keymanager/openpgp.py
@@ -649,13 +649,17 @@ class OpenPGPScheme(EncryptionScheme):
result = gpg.verify(data)
else:
# to verify using a detached sig we have to use
- # gpg.verify_file(), which receives the data as a binary
- # stream and the name of a file containing the signature.
+ # gpg.verify_file(), which receives the name of
+ # files containing the date and the signature.
sf, sfname = tempfile.mkstemp()
with os.fdopen(sf, 'w') as sfd:
sfd.write(detached_sig)
- with closing(_make_binary_stream(data, gpg._encoding)) as df:
- result = gpg.verify_file(df, sig_file=sfname)
+ df, dfname = tempfile.mkstemp()
+ with os.fdopen(df, 'w') as sdd:
+ sdd.write(data)
+ result = gpg.verify_file(dfname, sig_file=sfname)
+ os.unlink(sfname)
+ os.unlink(dfname)
gpgpubkey = gpg.list_keys().pop()
valid = result.valid
rfprint = result.fingerprint