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

Merge branch 'develop' into 2.4

pull/8052/head
iglocska 2021-12-22 13:01:54 +01:00
parent 6cf7d42791 b0cd5495cb
commit b00711ee2f
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit 8b66d5f75346271c78d4737f79fb302e17c961d2
Subproject commit d991e53f9a9641f454e116e83d2913edf405a53f

2
app/Controller/AppController.php
View File

@ -34,7 +34,7 @@ class AppController extends Controller
public $helpers = array('OrgImg', 'FontAwesome', 'UserName');
private $__queryVersion = '135';
public $pyMispVersion = '2.4.151';
public $pyMispVersion = '2.4.152';
public $phpmin = '7.2';
public $phprec = '7.4';
public $phptoonew = '8.0';

9
app/Lib/Tools/SecurityAudit.php
View File

@ -461,13 +461,16 @@ class SecurityAudit
if (PHP_OS !== 'Linux') {
return false;
}
$version = php_uname('v');
if (substr($version, 0, 7) !== '#1 SMP ') {
return false;
}
$buildTime = substr($version, 7);
return new DateTime($buildTime);
$buildTime = strtotime(substr($version, 7));
if ($buildTime) {
return new DateTime($buildTime);
} else {
return false;
}
}
private function getLinuxVersion()