Centralize decryption in `jirafeau_decrypt_file()`

[jirafeau.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index c42293bcdcba3dfa2e35aa8ad416ea29a7c4c64b..a92509bfdc296443e063c18760d3b9b7cdf5b6d7 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -460,8 +460,9 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
     if ($crypt == true && extension_loaded('sodium') == true) {
         $crypt_key = jirafeau_encrypt_file($file['tmp_name'], $file['tmp_name'].'crypt');
         if (strlen($crypt_key) > 0) {
     if ($crypt == true && extension_loaded('sodium') == true) {
         $crypt_key = jirafeau_encrypt_file($file['tmp_name'], $file['tmp_name'].'crypt');
         if (strlen($crypt_key) > 0) {

-            $crypted = true;
-            rename($file['tmp_name'].'crypt', $file['tmp_name']);
+            if (rename($file['tmp_name'].'crypt', $file['tmp_name']) === true) {
+                $crypted = true;
+            }

         }
     }
 
         }
     }
 


@@ -1145,11 +1146,11 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m
     $crypted = false;
     $crypt_key = '';
     if ($crypt == true && extension_loaded('sodium') == true) {
     $crypted = false;
     $crypt_key = '';
     if ($crypt == true && extension_loaded('sodium') == true) {

-        //$crypt_key = jirafeau_encrypt_file($p, $p);

         $crypt_key = jirafeau_encrypt_file($p, $p.'.crypt');
         if (strlen($crypt_key) > 0) {
         $crypt_key = jirafeau_encrypt_file($p, $p.'.crypt');
         if (strlen($crypt_key) > 0) {

-            $crypted = true;
-            rename($p.'.crypt', $p);
+            if (rename($p.'.crypt', $p) === true) {
+                $crypted = true;
+            }

         }
     }
 
         }
     }
 


@@ -1212,15 +1213,15 @@ function jirafeau_crypt_create_iv($base, $size)
 }
 
 /**
 }
 
 /**

- * Crypt file and returns decrypt key.
+ * Crypt file using Sodium and returns decrypt key.

  * @param $fp_src file path to the file to crypt.
  * @param $fp_src file path to the file to crypt.

- * @param $fp_dst file path to the file to write crypted file (could be the same).
+ * @param $fp_dst file path to the file to write crypted file (must not be the same).

  * @return decrypt key composed of the key and the iv separated by a point ('.')
  */
 function jirafeau_encrypt_file($fp_src, $fp_dst)
 {
     $fs = filesize($fp_src);
  * @return decrypt key composed of the key and the iv separated by a point ('.')
  */
 function jirafeau_encrypt_file($fp_src, $fp_dst)
 {
     $fs = filesize($fp_src);

-    if ($fs === false || $fs == 0 || !(extension_loaded('sodium') == true)) {
+    if ($fs === false || $fs == 0 || extension_loaded('sodium') == false || $fp_src == $fp_dst) {

         return '';
     }
 
         return '';
     }
 


@@ -1252,36 +1253,41 @@ function jirafeau_encrypt_file($fp_src, $fp_dst)
 }
 
 /**
 }
 
 /**

- * Decrypt file.
+ * Decrypt file using Sodium.

  * @param $fp_src file path to the file to decrypt.
  * @param $fp_src file path to the file to decrypt.

- * @param $fp_dst file path to the file to write decrypted file (could be the same).
+ * @param $fp_dst file path to the file to write decrypted file (must not be the same).

  * @param $k string composed of the key and the iv separated by a point ('.')
  * @return key used to decrypt. a string of length 0 is returned if failed.
  */
 function jirafeau_decrypt_file($fp_src, $fp_dst, $k)
 {
     $fs = filesize($fp_src);
  * @param $k string composed of the key and the iv separated by a point ('.')
  * @return key used to decrypt. a string of length 0 is returned if failed.
  */
 function jirafeau_decrypt_file($fp_src, $fp_dst, $k)
 {
     $fs = filesize($fp_src);

-    if ($fs === false || $fs == 0 || extension_loaded('sodium') == false) {
+    if ($fs === false || $fs == 0 || extension_loaded('sodium') == false || $fp_src == $fp_dst) {

         return false;
     }
 
     /* Decrypt file. */
         return false;
     }
 
     /* Decrypt file. */

-    $r = fopen(VAR_FILES . $p . $link['hash'], 'rb');
+    $r = fopen($fp_src, 'rb');
+    $w = fopen($fp_dst, 'wb');

 
     $crypt_header = fread($r, SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES);
 
     /* Init module. */
 
     $crypt_header = fread($r, SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES);
 
     /* Init module. */

-    $crypt_state = sodium_crypto_secretstream_xchacha20poly1305_init_pull($crypt_header, $crypt_key);
+    $crypt_state = sodium_crypto_secretstream_xchacha20poly1305_init_pull($crypt_header, $k);

 
     /* 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);
 
     /* 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;
+        
+        if (fwrite($w, $dec) === false) {
+            return false;
+        }

     }
 
     fclose($r);
     }
 
     fclose($r);

+    fclose($w);

 
     /* Cleanup. */
     sodium_memzero($crypt_state);
 
     /* Cleanup. */
     sodium_memzero($crypt_state);


@@ -1290,7 +1296,7 @@ function jirafeau_decrypt_file($fp_src, $fp_dst, $k)
 }
 
 /**
 }
 
 /**

- * Decrypt file.
+ * Decrypt file using mcrypt.

  * @param $fp_src file path to the file to decrypt.
  * @param $fp_dst file path to the file to write decrypted file (could be the same).
  * @param $k string composed of the key and the iv separated by a point ('.')
  * @param $fp_src file path to the file to decrypt.
  * @param $fp_dst file path to the file to write decrypted file (could be the same).
  * @param $k string composed of the key and the iv separated by a point ('.')