diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-10-13 17:50:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 17:50:31 +0200 |
| commit | 776c65de99350dc85704d242f433588cbb8f710d (patch) | |
| tree | f127be598bee051668477158bfc3d94587a41af0 /apps | |
| parent | e2d223a9a6f428cb27f382773531d1578bdc4762 (diff) | |
| parent | b2de9a6f9e83d86250c113bfe9f4e7c0f18d9b6a (diff) | |
| download | nextcloud-server-776c65de99350dc85704d242f433588cbb8f710d.tar.gz nextcloud-server-776c65de99350dc85704d242f433588cbb8f710d.zip | |
Merge pull request #23410 from nextcloud/fix/encryption-decrypt-position-type
The encryption decrypt position can be int or string
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/encryption/lib/Crypto/Crypt.php | 2 | ||||
| -rw-r--r-- | apps/encryption/lib/Crypto/Encryption.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php index 6559deb9400..57aecf95633 100644 --- a/apps/encryption/lib/Crypto/Crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.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 */ diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php index 263e9a15df8..6fa388e8875 100644 --- a/apps/encryption/lib/Crypto/Encryption.php +++ b/apps/encryption/lib/Crypto/Encryption.php @@ -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 */ |