From bcd944f568335ac6f3fa2cfe26e0d7abca57210a Mon Sep 17 00:00:00 2001
From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Tue, 19 Mar 2019 13:44:21 +0100
Subject: [PATCH] olevba: return encryption error return code when appropriate

---
 oletools/olevba.py | 7 +++++++
 1 file changed, 7 insertions(+), 0 deletions(-)

diff --git a/oletools/olevba.py b/oletools/olevba.py
index 445177d..e8a6305 100644
--- a/oletools/olevba.py
+++ b/oletools/olevba.py
@@ -3996,6 +3996,13 @@ def main(cmd_line_args=None):
             print_json(type='MetaInformation', return_code=return_code,
                        n_processed=count, _json_is_last=True)
 
+    except crypto.CryptoErrorBase as exc:
+        log.exception('Problems with encryption in main: {}'.format(exc),
+                      exc_info=True)
+        if return_code == RETURN_OK:
+            return_code = RETURN_ENCRYPTED
+        else:
+            return_code == RETURN_SEVERAL_ERRS
     except Exception as exc:
         # some unexpected error, maybe some of the types caught in except clauses
         # above were not sufficient. This is very bad, so log complete trace at exception level
--
libgit2 0.21.4