Browse Source
Merge pull request #23410 from nextcloud/fix/encryption-decrypt-position-type
The encryption decrypt position can be int or string
pull/23401/head
Morris Jobke
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
3 deletions
-
apps/encryption/lib/Crypto/Crypt.php
-
apps/encryption/lib/Crypto/Encryption.php
-
lib/public/Encryption/IEncryptionModule.php
|
|
|
@ -459,7 +459,7 @@ class Crypt { |
|
|
|
* @param string $passPhrase |
|
|
|
* @param string $cipher |
|
|
|
* @param int $version |
|
|
|
* @param int $position |
|
|
|
* @param int|string $position |
|
|
|
* @return string |
|
|
|
* @throws DecryptionFailedException |
|
|
|
*/ |
|
|
|
|
|
|
|
@ -360,7 +360,7 @@ class Encryption implements IEncryptionModule { |
|
|
|
* decrypt data |
|
|
|
* |
|
|
|
* @param string $data you want to decrypt |
|
|
|
* @param int $position |
|
|
|
* @param int|string $position |
|
|
|
* @return string decrypted data |
|
|
|
* @throws DecryptionFailedException |
|
|
|
*/ |
|
|
|
|
|
|
|
@ -102,7 +102,7 @@ interface IEncryptionModule { |
|
|
|
* decrypt data |
|
|
|
* |
|
|
|
* @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 |
|
|
|
* |
|
|
|
|