Merge branch 'debian-0.3.7' into debian

1 files changed, 3 insertions, 3 deletions

diff --git a/src/leap/keymanager/errors.py b/src/leap/keymanager/errors.py
index 27180db..ebe4fd5 100644
--- a/src/leap/keymanager/errors.py
+++ b/src/leap/keymanager/errors.py
@@ -58,21 +58,21 @@ class InvalidSignature(Exception):
     pass
 
 
-class EncryptionFailed(Exception):
+class EncryptError(Exception):
     """
     Raised upon failures of encryption.
     """
     pass
 
 
-class DecryptionFailed(Exception):
+class DecryptError(Exception):
     """
     Raised upon failures of decryption.
     """
     pass
 
 
-class EncryptionDecryptionFailed(Exception):
+class GPGError(Exception):
     """
     Raised upon failures of encryption/decryption.
     """