summaryrefslogtreecommitdiff
path: root/memoryhole/gpg.py
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2016-07-06 18:00:44 +0200
committerRuben Pollan <meskio@sindominio.net>2016-07-06 18:00:44 +0200
commit10574757e77bb828782b467656ce304f562417e5 (patch)
treeada0c5150d9d9ff1b415b04a4f354f91b933aef8 /memoryhole/gpg.py
parentaafba6d33f8af1d4967d069999b9fb0052ebcd65 (diff)
[feat] add multipart/signed
Diffstat (limited to 'memoryhole/gpg.py')
-rw-r--r--memoryhole/gpg.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/memoryhole/gpg.py b/memoryhole/gpg.py
index 3f1c59a..1ff3ac8 100644
--- a/memoryhole/gpg.py
+++ b/memoryhole/gpg.py
@@ -9,8 +9,13 @@ class Gnupg(object):
from gnupg import GPG
self.gpg = GPG()
- def encrypt(self, data, encraddr, signaddr):
- result = self.gpg.encrypt(data, *encraddr, default_key=signaddr)
+ def encrypt(self, data, encraddr):
+ result = self.gpg.encrypt(data, *encraddr)
+ self._check_gpg_error(result)
+ return result.data
+
+ def sign(self, data):
+ result = self.gpg.sign(data)
self._check_gpg_error(result)
return result.data
@@ -23,4 +28,4 @@ class Gnupg(object):
def _check_gpg_error(self, result):
stderr = getattr(result, 'stderr', '')
if getattr(result, 'ok', False) is not True:
- raise RuntimeError('Failed to encrypt/decrypt: %s' % stderr)
+ raise RuntimeError('Failed gnupg operation: %s' % stderr)