diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-12-17 14:57:59 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-12-17 14:57:59 -0300 |
commit | 3d7d74fa5759b168eb57e4259ad56bcb71f9a4a0 (patch) | |
tree | 3ddbec84c37df60b0689f1053a7ec93a4421ecd2 /src/leap/keymanager/openpgp.py | |
parent | 77e4e1d037a8eb796553b3f28f31e4f4d1ccee84 (diff) | |
parent | 27c25df5533f9312c93fa79af2d7a442b389b9b8 (diff) |
Merge remote-tracking branch 'refs/remotes/kali/feature/memoize-calls' into develop
Diffstat (limited to 'src/leap/keymanager/openpgp.py')
-rw-r--r-- | src/leap/keymanager/openpgp.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py index 856b21e4..4276b19f 100644 --- a/src/leap/keymanager/openpgp.py +++ b/src/leap/keymanager/openpgp.py @@ -14,13 +14,9 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - - """ Infrastructure for using OpenPGP keys in Key Manager. """ - - import locale import logging import os @@ -298,7 +294,7 @@ class OpenPGPScheme(EncryptionScheme): @raise KeyNotFound: If the key was not found on local storage. """ # Remove the identity suffix after the '+' until the '@' - # e.g.: test_user+something@provider.com becomes test_user@probider.com + # e.g.: test_user+something@provider.com becomes test_user@provider.com # since the key belongs to the identity without the '+' suffix. address = re.sub(r'\+.*\@', '@', address) @@ -581,7 +577,6 @@ class OpenPGPScheme(EncryptionScheme): logger.error('Failed to decrypt: %s.' % str(e)) raise errors.DecryptError(str(e)) - def is_encrypted(self, data): """ Return whether C{data} was asymmetrically encrypted using OpenPGP. |