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

Merge branch 'master' of https://github.com/MISP/MISP

pull/734/head
aaronkaplan 2016-02-01 12:15:01 +01:00
parent 04f3650fe1 7a28b5be72
commit 3ca4bf96e0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/Server.php
View File

@ -1480,7 +1480,7 @@ class Server extends AppModel {
public function stixDiagnostics(&$diagnostic_errors, &$stixVersion, &$cyboxVersion) {
$result = array();
$expected = array('stix' => '1.1.1.4', 'cybox' => '2.1.0.10');
$expected = array('stix' => '1.1.1.4', 'cybox' => '2.1.0.12');
// check if the STIX and Cybox libraries are working using the test script stixtest.py
$scriptResult = shell_exec('python ' . APP . 'files' . DS . 'scripts' . DS . 'stixtest.py');
$scriptResult = json_decode($scriptResult, true);