mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23410 from nextcloud/fix/encryption-decrypt-position-type 

The encryption decrypt position can be int or string
This commit is contained in:
Morris Jobke 2020-10-13 17:50:31 +02:00 committed by GitHub
parent e2d223a9a6 b2de9a6f9e
commit 776c65de99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/encryption/lib/Crypto/Crypt.php
View File

@ -459,7 +459,7 @@ class Crypt {
* @param string $passPhrase * @param string $passPhrase
* @param string $cipher * @param string $cipher
* @param int $version * @param int $version
* @param int $position * @param int|string $position
* @return string * @return string
* @throws DecryptionFailedException * @throws DecryptionFailedException
*/ */

2
apps/encryption/lib/Crypto/Encryption.php
View File

@ -360,7 +360,7 @@ class Encryption implements IEncryptionModule {
* decrypt data * decrypt data
* *
* @param string $data you want to decrypt * @param string $data you want to decrypt
* @param int $position * @param int|string $position
* @return string decrypted data * @return string decrypted data
* @throws DecryptionFailedException * @throws DecryptionFailedException
*/ */

2
lib/public/Encryption/IEncryptionModule.php
View File

@ -102,7 +102,7 @@ interface IEncryptionModule {
* decrypt data * decrypt data
* *
* @param string $data you want to decrypt * @param string $data you want to decrypt
* @param string $position position of the block we want to decrypt * @param int|string $position position of the block we want to decrypt
* *
* @return mixed decrypted data * @return mixed decrypted data
* *