Peter M. Groen / oletools

Commit 2f6fb29989ffe66de49d57287de0171ec9bc65a8

Authored by Christian Herdtweck
1 parent 4b10b95a

xls_parser: no use to treat CryptoError differently

Inline Side-by-side
Showing 1 changed file with 1 additions and 4 deletions
oletools/ppt_record_parser.py
  View file @2f6fb29
@@ -63,7 +63,6 @@ except ImportError: @@ -63,7 +63,6 @@ except ImportError:
63 sys.path.insert(0, PARENT_DIR) 63 sys.path.insert(0, PARENT_DIR)
64 del PARENT_DIR 64 del PARENT_DIR
65 from oletools import record_base 65 from oletools import record_base
66 -from oletools.common.errors import CryptoErrorBase  
67 66
68 67
69 # types of relevant records (there are much more than listed here) 68 # types of relevant records (there are much more than listed here)
@@ -174,7 +173,7 @@ def is_ppt(filename): @@ -174,7 +173,7 @@ def is_ppt(filename):
174 for record in stream.iter_records(): 173 for record in stream.iter_records():
175 if record.type == 0x0ff5: # UserEditAtom 174 if record.type == 0x0ff5: # UserEditAtom
176 have_user_edit = True 175 have_user_edit = True
177 - elif record.type == 0x1772: # PersisDirectoryAtom 176 + elif record.type == 0x1772: # PersistDirectoryAtom
178 have_persist_dir = True 177 have_persist_dir = True
179 elif record.type == 0x03e8: # DocumentContainer 178 elif record.type == 0x03e8: # DocumentContainer
180 have_document_container = True 179 have_document_container = True
@@ -185,8 +184,6 @@ def is_ppt(filename): @@ -185,8 +184,6 @@ def is_ppt(filename):
185 return True 184 return True
186 else: # ignore other streams/storages since they are optional 185 else: # ignore other streams/storages since they are optional
187 continue 186 continue
188 - except CryptoErrorBase:  
189 - raise  
190 except Exception as exc: 187 except Exception as exc:
191 logging.debug('Ignoring exception in is_ppt, assume is not ppt', 188 logging.debug('Ignoring exception in is_ppt, assume is not ppt',
192 exc_info=True) 189 exc_info=True)