Improve error message

msoffcrypto/__init__.py

@@ -34,4 +34,4 @@ def OfficeFile(file):
         from .format.xls97 import Xls97File
         return Xls97File(file)
     else:
-        raise AssertionError("Unrecognized file format")
+        raise Exception("Unrecognized file format")

msoffcrypto/__main__.py

@@ -59,14 +59,14 @@ def main():
         return
 
     if not olefile.isOleFile(args.infile):
-        raise AssertionError("Not OLE file")
+        raise Exception("Not OLE file")
 
     file = OfficeFile(args.infile)
 
     if args.password:
         file.load_key(password=args.password)
     else:
-        raise AssertionError("Password is required")
+        raise Exception("Password is required")
 
     if args.outfile is None:
         ifWIN32SetBinary(sys.stdout)

msoffcrypto/format/doc97.py

@@ -317,7 +317,7 @@ def load_key(self, password=None):
                         self.key = password
                         self.salt = info['salt']
                     else:
-                        raise AssertionError("Failed to verify password")
+                        raise Exception("Failed to verify password")
                 elif vMajor in [0x0002, 0x0003, 0x0004] and vMinor == 0x0002:  # RC4 CryptoAPI
                     info = _parse_header_RC4CryptoAPI(encryptionHeader)
                     if DocumentRC4CryptoAPI.verifypw(password, info['salt'], info['keySize'],
@@ -327,9 +327,9 @@ def load_key(self, password=None):
                         self.salt = info['salt']
                         self.keySize = info['keySize']
                     else:
-                        raise AssertionError("Failed to verify password")
+                        raise Exception("Failed to verify password")
                 else:
-                    raise AssertionError("Unsupported encryption method")
+                    raise Exception("Unsupported encryption method")
 
     def decrypt(self, ofile):
         # fd, _ofile_path = tempfile.mkstemp()

msoffcrypto/format/ooxml.py

@@ -66,7 +66,7 @@ def _parseinfo(ole):
     elif versionMajor in [2, 3, 4] and versionMinor == 2:  # Standard
         return 'standard', _parseinfo_standard(ole)
     elif versionMajor in [3, 4] and versionMinor == 3:  # Extensible
-        raise AssertionError("Unsupported EncryptionInfo version (Extensible Encryption)")
+        raise Exception("Unsupported EncryptionInfo version (Extensible Encryption)")
 
 
 class OOXMLFile(base.BaseOfficeFile):
@@ -113,14 +113,14 @@ def load_key(self, password=None, private_key=None, secret_key=None, strict=Fals
                     self.info['verifier']['encryptedVerifierHash']
                 )
                 if not verified:
-                    raise AssertionError()
+                    raise Exception("Key verification failed")
             elif self.type == 'extensible':
                 pass
         elif private_key:
             if self.type == 'agile':
                 self.secret_key = ECMA376Agile.makekey_from_privkey(private_key, self.info['encryptedKeyValue'])
             else:
-                raise AssertionError("Unsupported key type for the encryption method")
+                raise Exception("Unsupported key type for the encryption method")
         elif secret_key:
             self.secret_key = secret_key
 

msoffcrypto/format/xls97.py

@@ -483,7 +483,7 @@ def load_key(self, password=None):
         wEncryptionType, = unpack("<H", workbook.data.read(2))
 
         if wEncryptionType == 0x0000:  # XOR obfuscation
-            raise AssertionError("Unsupported encryption method")
+            raise Exception("Unsupported encryption method")
         elif wEncryptionType == 0x0001:  # RC4
             pass
 
@@ -499,7 +499,7 @@ def load_key(self, password=None):
                 self.key = password
                 self.salt = info['salt']
             else:
-                raise AssertionError("Failed to verify password")
+                raise Exception("Failed to verify password")
         elif vMajor in [0x0002, 0x0003, 0x0004] and vMinor == 0x0002:  # RC4 CryptoAPI
             info = _parse_header_RC4CryptoAPI(encryptionInfo)
             if DocumentRC4CryptoAPI.verifypw(password, info['salt'], info['keySize'],
@@ -509,9 +509,9 @@ def load_key(self, password=None):
                 self.salt = info['salt']
                 self.keySize = info['keySize']
             else:
-                raise AssertionError("Failed to verify password")
+                raise Exception("Failed to verify password")
         else:
-            raise AssertionError("Unsupported encryption method")
+            raise Exception("Unsupported encryption method")
 
     def decrypt(self, ofile):
         # fd, _ofile_path = tempfile.mkstemp()
@@ -619,6 +619,6 @@ def is_encrypted(self):
             return True
         elif wEncryptionType == 0x0000:  # XOR obfuscation
             # If not compatible no point stating that
-            raise AssertionError("Unsupported encryption method")
+            raise Exception("Unsupported encryption method")
         else:
             return False