diff options
author | Kali Kaneko <kali@leap.se> | 2013-12-23 02:21:40 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-12-23 02:21:40 -0400 |
commit | c0b32dfa1b89d9101022987c6a9569c8988a8437 (patch) | |
tree | a074c2a228a9121c49be0cc4253b406d0aa75e55 /src/leap/keymanager/openpgp.py | |
parent | 2ca219c87a0a338d145cc52171864106688a7297 (diff) | |
parent | 2631d418233e31dd9dfd4d97734372cb67d09951 (diff) |
Merge branch 'develop' into debian-0.3.8-rc
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 856b21e..4276b19 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. |