X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/b1c96930b34b47dd1c8f6321d62beeceb87afb00..72d4080a3eafca5f496bad8604233d67411e9dc0:/lib/functions.php?ds=sidebyside diff --git a/lib/functions.php b/lib/functions.php index fff8c44..b87f6c3 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -879,7 +879,7 @@ function jirafeau_fileperms($path) function jirafeau_admin_bug_report($cfg) { $out = "
" . t('REPORTING_AN_ISSUE') . ""; - $out .= "If you have a problem related to Jirafeau, please open an issue, explain your problem in english and copy-paste the following content:

"; + $out .= "If you have a problem related to Jirafeau, please open an issue, explain your problem in english and copy-paste the following content:

"; $out .= "# Jirafeau
"; $out .= "- version: " . JIRAFEAU_VERSION . "
"; @@ -1216,7 +1216,7 @@ function jirafeau_crypt_create_iv($base, $size) * 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 (must not be the same). - * @return decrypt key composed of the key and the iv separated by a point ('.') + * @return key used to encrypt the file */ function jirafeau_encrypt_file($fp_src, $fp_dst) { @@ -1256,8 +1256,8 @@ function jirafeau_encrypt_file($fp_src, $fp_dst) * 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 (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. + * @param $k decryption key + * @return true if decryption succeeded, false otherwise */ function jirafeau_decrypt_file($fp_src, $fp_dst, $k) { @@ -1267,22 +1267,27 @@ function jirafeau_decrypt_file($fp_src, $fp_dst, $k) } /* 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_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); - echo $dec; + + if (fwrite($w, $dec) === false) { + return false; + } } fclose($r); + fclose($w); /* Cleanup. */ sodium_memzero($crypt_state); @@ -1295,7 +1300,7 @@ function jirafeau_decrypt_file($fp_src, $fp_dst, $k) * @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 ('.') - * @return key used to decrypt. a string of length 0 is returned if failed. + * @return true if decryption succeeded, false otherwise */ function jirafeau_decrypt_file_legacy($fp_src, $fp_dst, $k) { @@ -1310,6 +1315,8 @@ function jirafeau_decrypt_file_legacy($fp_src, $fp_dst, $k) $crypt_key = $k; $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($fp_src, 'r'); $w = fopen($fp_dst, 'c');