From: Blackeye <> Date: Wed, 28 Oct 2026 16:17:28 +0000 (+0100) Subject: aligned to fix_issue_53 X-Git-Tag: 4.8.0~10^2~1 X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/commitdiff_plain/refs/heads/f_issue_53 aligned to fix_issue_53 --- diff --git a/f.php b/f.php index 9454540..13fe280 100644 --- a/f.php +++ b/f.php @@ -171,9 +171,13 @@ if (!empty($link['key'])) { require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } else { - if (strpos($link['key'], '[SHA256]') == 0 && hash_equals(substr($link['key'], 8), hash('sha256', $_POST['key']))) { + $sha_hash_compare = strpos($link['key'], '[SHA256]') === 0 && hash_equals(substr($link['key'], 8), hash('sha256', $_POST['key'])); + // legacy md5 compare - before prefixing + $md5_legacy_hash_compare = hash_equals($link['key'], md5($_POST['key'])); + + if ( $sha_hash_compare ) { $password_challenged = true; - } elseif (hash_equals($link['key'], md5($_POST['key']))) { + } elseif ( $md5_legacy_hash_compare ) { $password_challenged = true; } else { sleep(2); diff --git a/script.php b/script.php index da3785f..b0cc0ac 100644 --- a/script.php +++ b/script.php @@ -185,9 +185,12 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) echo 'Error 9'; exit; } - // info: link contains the used hash as prefix - $file_hash = "[SHA256]" . hash('sha256', $key); - if (strlen($link['key']) > 0 && $file_hash != $link['key']) { + // sha hash compare + $sha_hash_compare = (strpos($link['key'], '[SHA256]') === 0 && hash_equals(substr($link['key'], 8), hash('sha256', $key))); + // legacy md5 compare - before prefixing + $md5_hash_compare = hash_equals($link['key'], md5($key)); + + if (strlen($link['key']) > 0 && !$sha_hash_compare && !$md5_hash_compare ) { sleep(2); echo 'Error 10'; exit;