]> git.p6c8.net - jirafeau/jirafeau.git/blobdiff - f.php
aligned naming convention for md5_legacy_hash_compare so it is the same in both files...
[jirafeau/jirafeau.git] / f.php
diff --git a/f.php b/f.php
index b13e03b8144679e4b0e6e041268379b46c1ed94a..13fe280f06386f4d3697afe74ead3d2b37a2d7e9 100644 (file)
--- a/f.php
+++ b/f.php
@@ -171,7 +171,13 @@ if (!empty($link['key'])) {
         require(JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
     } else {
         require(JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
     } else {
-        if (hash_equals($link['key'], md5($_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 ( $md5_legacy_hash_compare ) {
             $password_challenged = true;
         } else {
             sleep(2);
             $password_challenged = true;
         } else {
             sleep(2);
@@ -272,12 +278,12 @@ else {
     }
 }
 
     }
 }
 
+jirafeau_write_download_stats($link_name, get_ip_address($cfg));
+
 if ($link['onetime'] == 'O') {
     jirafeau_delete_link($link_name);
 }
 
 if ($link['onetime'] == 'O') {
     jirafeau_delete_link($link_name);
 }
 
-jirafeau_write_download_stats($link_name, get_ip_address($cfg));
-
 exit;
 
 ?>
 exit;
 
 ?>

patrick-canterino.de