Mention that source and destination file must not be the same and abort if they are...

[jirafeau_project.git] / f.php

diff --git a/f.php b/f.php
index 5555523f708cfcb18607069e32b0ccfca9c92199..854da83444d1b4bcf767aa7badd85e4c49b98473 100644 (file)
--- a/f.php
+++ b/f.php
@@ -250,6 +250,30 @@ if ($cfg['litespeed_workaround']) {
 }
 /* Read encrypted file. */
 elseif ($link['crypted']) {
+    /* Decrypt file. */
+    $r = fopen(VAR_FILES . $p . $link['hash'], 'rb');
+    $fs = fstat($r)['size'];
+
+    $crypt_header = fread($r, SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES);
+
+    /* Init module. */
+    $crypt_state = sodium_crypto_secretstream_xchacha20poly1305_init_pull($crypt_header, $crypt_key);
+
+    /* Decrypt file. */
+
+    for ($i = SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES; $i < $fs; $i += JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES) {
+        $to_dec = fread($r, JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES);
+        [$dec, $crypt_tag] = sodium_crypto_secretstream_xchacha20poly1305_pull($crypt_state, $to_dec);
+        echo $dec;
+    }
+
+    fclose($r);
+
+    /* Cleanup. */
+    sodium_memzero($crypt_state);
+}
+/* Read encrypted file (legacy mode using mcrypt). */
+elseif ($link['crypted_legacy']) {
     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
@@ -285,6 +309,9 @@ else {
 if ($link['onetime'] == 'O') {
     jirafeau_delete_link($link_name);
 }
+
+jirafeau_write_download_stats($link_name, get_ip_address($cfg));
+
 exit;
 
 ?>