Fixed headings in CHANGELOG

[jirafeau.git] / f.php

diff --git a/f.php b/f.php
index 0368d97e206a83340244c9c9063699e766e33694..543fc1028cfb33371a009c49d111652c2f52c7c5 100644 (file)
--- a/f.php
+++ b/f.php
@@ -248,25 +248,13 @@ if ($cfg['litespeed_workaround']) {
                $_SERVER['QUERY_STRING'] . '&litespeed_workaround=phase2');
     }
 }
                $_SERVER['QUERY_STRING'] . '&litespeed_workaround=phase2');
     }
 }

-/* Read encrypted file. */
+/* Read encrypted file (Sodium mode). */

 elseif ($link['crypted']) {
 elseif ($link['crypted']) {

-    /* Init module */
-    $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
-    /* Extract key and iv. */
-    $hash_key = md5($crypt_key);
-    $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
-    /* Init module. */
-    mcrypt_generic_init($m, $hash_key, $iv);
-    /* Decrypt file. */
-    $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
-    while (!feof($r)) {
-        $dec = mdecrypt_generic($m, fread($r, 1024));
-        print $dec;
-    }
-    fclose($r);
-    /* Cleanup. */
-    mcrypt_generic_deinit($m);
-    mcrypt_module_close($m);
+    jirafeau_decrypt_file(VAR_FILES . $p . $link['hash'], 'php://output', $crypt_key);
+}
+/* Read encrypted file (legacy mode using mcrypt). */
+elseif ($link['crypted_legacy']) {
+    jirafeau_decrypt_file_legacy(VAR_FILES . $p . $link['hash'], 'php://output', $crypt_key);

 }
 /* Read file. */
 else {
 }
 /* Read file. */
 else {