From b1c96930b34b47dd1c8f6321d62beeceb87afb00 Mon Sep 17 00:00:00 2001 From: Patrick Canterino Date: Mon, 1 Apr 2024 15:08:53 +0200 Subject: [PATCH 1/1] Mention that source and destination file must not be the same and abort if they are the same --- lib/functions.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/functions.php b/lib/functions.php index 805b958..fff8c44 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -1213,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_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); - if ($fs === false || $fs == 0 || !(extension_loaded('sodium') == true)) { + if ($fs === false || $fs == 0 || extension_loaded('sodium') == false || $fp_src == $fp_dst) { return ''; } @@ -1253,16 +1253,16 @@ 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_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); - if ($fs === false || $fs == 0 || extension_loaded('sodium') == false) { + if ($fs === false || $fs == 0 || extension_loaded('sodium') == false || $fp_src == $fp_dst) { return false; } @@ -1291,7 +1291,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 ('.') -- 2.34.1