Skip to content

The encryption decrypt position can be int or string #23410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Oct 13, 2020
Merged

The encryption decrypt position can be int or string #23410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
The encryption decrypt position can be int or string 
The public API said string, internally we treated it as int. In reality
both are used. Let's reflect that in the documented argument type.

Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
@ChristophWurst
ChristophWurst committed Oct 13, 2020
commit b2de9a6f9e83d86250c113bfe9f4e7c0f18d9b6a
2 changes: 1 addition & 1 deletion apps/encryption/lib/Crypto/Crypt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ protected function isValidPrivateKey($plainKey) {
* @param string $passPhrase
* @param string $cipher
* @param int $version
* @param int $position
* @param int|string $position
* @return string
* @throws DecryptionFailedException
*/
Expand Down
2 changes: 1 addition & 1 deletion apps/encryption/lib/Crypto/Encryption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ public function encrypt($data, $position = 0) {
* decrypt data
*
* @param string $data you want to decrypt
* @param int $position
* @param int|string $position
* @return string decrypted data
* @throws DecryptionFailedException
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/public/Encryption/IEncryptionModule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public function encrypt($data, $position);
* 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
*
Expand Down