From 246ade44c1686d03fdf6a85cd467d0b89f91dc7c Mon Sep 17 00:00:00 2001 From: Christian Herdtweck Date: Mon, 6 May 2019 12:22:18 +0200 Subject: [PATCH] msodde: Raise proper error when decrypt fails --- oletools/msodde.py | 3 +++ 1 file changed, 3 insertions(+), 0 deletions(-) diff --git a/oletools/msodde.py b/oletools/msodde.py index 0d5bf35..dd40c80 100644 --- a/oletools/msodde.py +++ b/oletools/msodde.py @@ -987,6 +987,9 @@ def process_maybe_encrypted(filepath, passwords=None, crypto_nesting=0, try: logger.debug('Trying to decrypt file') decrypted_file = crypto.decrypt(filepath, passwords) + if not decrypted_file: + logger.error('Decrypt failed, run with debug output to get details') + raise crypto.WrongEncryptionPassword(filepath) logger.info('Analyze decrypted file') result = process_maybe_encrypted(decrypted_file, passwords, crypto_nesting+1, **kwargs) -- libgit2 0.21.4