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

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

pull/7904/head
chrisr3d 2021-10-26 10:03:36 +02:00
parent c6f71047ca b09acc86bc
commit 97460361a6
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -6,6 +6,9 @@ tools/misp-backup/misp-backup.conf
site/
tools/mkdocs
# venv
/venv/*
# Other
/vendors
/app/Vendor

4
app/Model/Attribute.php
View File

@ -815,10 +815,10 @@ class Attribute extends AppModel
return __('Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type "other".', $length);
}
case 'tlsh':
if (preg_match("#^[0-9a-f]{35,}$#", $value)) {
if (preg_match("#^t?[0-9a-f]{35,}$#i", $value)) {
$returnValue = true;
} else {
$returnValue = __('Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type "other".');
$returnValue = __('Checksum has an invalid length or format (expected: at least 35 hexadecimal characters, optionally starting with t1 instead of hexadecimal characters). Please double check the value or select type "other".');
}
break;
case 'pehash':

2
app/files/misp-galaxy

@ -1 +1 @@
Subproject commit 20f14c0090f1963ee485b98fa99c62f7830f734f
Subproject commit aeb57194485cb9fa8483b6bc21308d44e921ff75