MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/6538/head
iglocska 2020-11-02 13:55:37 +01:00
parent b2bed4f8ed 3ef2cb10c1
commit b7deb3efa9
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit f248a8bfffe400a4be54c34d222775f74831d1e9
Subproject commit 0947e5eabebf591b2cd56cda5eb84092c83e6ad8

2
app/Controller/AppController.php
View File

@ -49,7 +49,7 @@ class AppController extends Controller
public $helpers = array('Utility', 'OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
private $__queryVersion = '114';
public $pyMispVersion = '2.4.133';
public $pyMispVersion = '2.4.134';
public $phpmin = '7.2';
public $phprec = '7.4';
public $pythonmin = '3.6';

2
app/files/misp-galaxy

@ -1 +1 @@
Subproject commit b56a4d9e5c84e5f3aa10bd852c83e199f327391d
Subproject commit fad39a2c296c6af1bc452651195afcb6968a84ed

2
app/files/scripts/stix2misp.py
View File

@ -1241,6 +1241,8 @@ class ExternalStixParser(StixParser):
except KeyError:
print(f'Unknown Test Mechanism type: {test_mechanism._XSI_TYPE}', file=sys.stderr)
continue
if test_mechanism.rule.value is None:
continue
attribute = MISPAttribute()
attribute.from_dict(**{
'type': attribute_type,

2
app/files/taxonomies

@ -1 +1 @@
Subproject commit b2aeefcab17390b3aa5e3ef7b1d215945ddcce58
Subproject commit 44357ecea92efc92aa0520e60d141c896e981ddc