Skip to content

Commit 776c65d

Browse files
authored
Merge pull request #23410 from nextcloud/fix/encryption-decrypt-position-type
The encryption decrypt position can be int or string
2 parents e2d223a + b2de9a6 commit 776c65d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

apps/encryption/lib/Crypto/Crypt.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ protected function isValidPrivateKey($plainKey) {
459459
* @param string $passPhrase
460460
* @param string $cipher
461461
* @param int $version
462-
* @param int $position
462+
* @param int|string $position
463463
* @return string
464464
* @throws DecryptionFailedException
465465
*/

apps/encryption/lib/Crypto/Encryption.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ public function encrypt($data, $position = 0) {
360360
* decrypt data
361361
*
362362
* @param string $data you want to decrypt
363-
* @param int $position
363+
* @param int|string $position
364364
* @return string decrypted data
365365
* @throws DecryptionFailedException
366366
*/

lib/public/Encryption/IEncryptionModule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function encrypt($data, $position);
102102
* decrypt data
103103
*
104104
* @param string $data you want to decrypt
105-
* @param string $position position of the block we want to decrypt
105+
* @param int|string $position position of the block we want to decrypt
106106
*
107107
* @return mixed decrypted data
108108
*

0 commit comments

Comments
 (0)