diff options
| author | J08nY | 2017-06-27 15:50:33 +0200 |
|---|---|---|
| committer | J08nY | 2017-06-27 15:50:33 +0200 |
| commit | a2f2b42cc5ba705463830d32a06ecd0b368d4c39 (patch) | |
| tree | f546587c077589e74dfb3f42dd094b02a6dea568 /src/mailman_pgp/pgp/wrapper.py | |
| parent | e2653d12da7c9fb15f9431419eff0ea1819ebb53 (diff) | |
| download | mailman-pgp-a2f2b42cc5ba705463830d32a06ecd0b368d4c39.tar.gz mailman-pgp-a2f2b42cc5ba705463830d32a06ecd0b368d4c39.tar.zst mailman-pgp-a2f2b42cc5ba705463830d32a06ecd0b368d4c39.zip | |
Diffstat (limited to 'src/mailman_pgp/pgp/wrapper.py')
| -rw-r--r-- | src/mailman_pgp/pgp/wrapper.py | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/src/mailman_pgp/pgp/wrapper.py b/src/mailman_pgp/pgp/wrapper.py index bc0a3c6..19e4b42 100644 --- a/src/mailman_pgp/pgp/wrapper.py +++ b/src/mailman_pgp/pgp/wrapper.py @@ -47,20 +47,8 @@ class PGPWrapper(): MIMEWrapper.__name__ + ' ' + InlineWrapper.__name__ + '.') - def is_mime_signed(self): - return self.mime.is_signed() - - def is_inline_signed(self): - return self.inline.is_signed() - def is_signed(self): - return self.is_mime_signed() or self.is_inline_signed() - - def mime_sign(self, key): - return self.mime.sign(key) - - def inline_sign(self, key): - return self.inline.sign(key) + return self.mime.is_signed() or self.inline.is_signed() def sign(self, key): return self.default.sign(key) @@ -74,28 +62,16 @@ class PGPWrapper(): :return: The verified signature. :rtype: generator of pgpy.types.SignatureVerification """ - if self.is_mime_signed(): + if self.mime.is_signed(): yield from self.mime.verify(key) - elif self.is_inline_signed(): + elif self.inline.is_signed(): yield from self.inline.verify(key) def verifies(self, key): return all(bool(verification) for verification in self.verify(key)) - def is_mime_encrypted(self): - return self.mime.is_encrypted() - - def is_inline_encrypted(self): - return self.inline.is_encrypted() - def is_encrypted(self): - return self.is_mime_encrypted() or self.is_inline_encrypted() - - def mime_encrypt(self, *keys, **kwargs): - return self.mime.encrypt(*keys, **kwargs) - - def inline_encrypt(self, *keys, **kwargs): - return self.inline.encrypt(*keys, **kwargs) + return self.mime.is_encrypted() or self.inline.is_encrypted() def encrypt(self, *keys, **kwargs): return self.default.encrypt(*keys, **kwargs) @@ -109,9 +85,9 @@ class PGPWrapper(): :return: The decrypted message. :rtype: PGPMessage """ - if self.is_mime_encrypted(): + if self.mime.is_encrypted(): return self.mime.decrypt(key) - elif self.is_inline_encrypted(): + elif self.inline.is_encrypted(): return self.inline.decrypt(key) def is_keys(self): |
