Merge branch 'master' of github.com:MISP/misp-modules into test

pull/163/head
chrisr3d 2018-02-04 17:16:25 +01:00
commit 54ebb8a96f
2 changed files with 2 additions and 1 deletions

View File

@ -51,6 +51,7 @@ For more information: [Extending MISP with Python modules](https://www.circl.lu/
### Import modules ### Import modules
* [CSV import](misp_modules/modules/import_mod/csvimport.py) Customizable CSV import module.
* [Cuckoo JSON](misp_modules/modules/import_mod/cuckooimport.py) Cuckoo JSON import. * [Cuckoo JSON](misp_modules/modules/import_mod/cuckooimport.py) Cuckoo JSON import.
* [Email Import](misp_modules/modules/import_mod/email_import.py) Email import module for MISP to import basic metadata. * [Email Import](misp_modules/modules/import_mod/email_import.py) Email import module for MISP to import basic metadata.
* [OCR](misp_modules/modules/import_mod/ocr.py) Optical Character Recognition (OCR) module for MISP to import attributes from images, scan or faxes. * [OCR](misp_modules/modules/import_mod/ocr.py) Optical Character Recognition (OCR) module for MISP to import attributes from images, scan or faxes.

View File

@ -1,4 +1,4 @@
from . import _vmray from . import _vmray
__all__ = ['vmray_import', 'testimport', 'ocr', 'stiximport', 'cuckooimport', __all__ = ['vmray_import', 'testimport', 'ocr', 'stiximport', 'cuckooimport',
'email_import', 'mispjson', 'openiocimport', 'threatanalyzer_import'] 'email_import', 'mispjson', 'openiocimport', 'threatanalyzer_import', 'csvimport']