Merged next-release into master

diff --combined README.md
index 3e9a1775648a7df88ba817398f911afd2ee6a0c0,ddedec6726860f6d81e4b9d3d86a4aa5f2d5a606..765b5bd99dc95176838a86e0c5490b632bfd0ae9
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -1,14 -1,9 +1,14 @@@
 +# DISCLAMER
 +
 +The project is not maintained anymore. See [announcement](https://gitlab.com/mojo42/Jirafeau/-/issues/360).
 +
 +If you are forking the project, feel free to mention it in [comments](https://gitlab.com/mojo42/Jirafeau/-/issues/360). I will add it here.
 +- @Blackstareye [fork](https://gitlab.com/shared1270023/Jirafeau)
 +
  # Jirafeau
  
 -![Build Status](https://img.shields.io/gitlab/pipeline/mojo42/Jirafeau/master.svg)
  ![Made With](https://img.shields.io/badge/made_with-php-blue.svg)
  ![License](https://img.shields.io/badge/license-agpl--3.0-blue.svg)
 -![Contribution](https://img.shields.io/badge/contributions_welcome-brightgreen.svg?labelColor=brightgreen)
  
  Welcome to the official Jirafeau project, an [Open-Source software](https://en.wikipedia.org/wiki/Open-source_software).
  
@@@ -25,6 -20,7 +25,7 @@@ See [jirafeau.net](https://jirafeau.net
  - Shows progression: speed, percentage and remaining upload time
  - Preview content in browser (if possible)
  - Optional password protection (for uploading or downloading)
+ - option to require, check or generate file download passwords
  - Set expiration time for downloads
  - Option to self-destruct after first download
  - Shortened URLs using base 64 encoding
@@@ -127,13 -123,13 +128,13 @@@ An other obvious basic security is to l
  
  Data encryption can be activated in options. This feature makes the server encrypt data and send the decryt key to the user (inside download URL).
  The decrypt key is not stored on the server so if you loose an url, you won't be able to retrieve file content.
- Encryption is configured to use AES256 in OFB mode.
+ Encryption is configured to use [XChaCha20-Poly1305](https://en.wikipedia.org/wiki/ChaCha20-Poly1305).
  In case of security troubles on the server, attacker won't be able to access files.
  
  By activating this feature, you have to be aware of few things:
  -  Data encryption has a cost (cpu) and it takes more time for downloads to complete once file sent.
  -  During the download, the server will decrypt on the fly (and use resource).
- -  This feature needs to have the mcrypt php module.
+ -  This feature needs to have the Sodium php module.
  -  File de-duplication will stop to work (as we can't compare two encrypted files).
  -  Be sure your server do not log client's requests.
  -  Don't forget to enable https.