Skip to content

Commit 32bd315

Browse files
committed
Refactor AESCryptoServiceProvider and RSAParameters for improved readability by formatting method parameters and arguments
1 parent a75caed commit 32bd315

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

src/AESCryptoServiceProvider.php

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,17 @@ public function seal(
172172
string $plain_text,
173173
RSAParameters $rSAParameters,
174174
bool $humanReadableData = false
175-
): array
176-
{
175+
): array {
177176
$this->generateIV('aes-256-cbc');
178177

179-
openssl_seal($plain_text, $sealed_data, $ekeys, [$rSAParameters->getPublicKey()], 'aes-256-cbc', $this->iv);
178+
openssl_seal(
179+
$plain_text,
180+
$sealed_data,
181+
$ekeys,
182+
[$rSAParameters->getPublicKey()],
183+
'aes-256-cbc',
184+
$this->iv
185+
);
180186

181187
$sealed_data = $this->iv . $sealed_data;
182188

@@ -201,9 +207,13 @@ public function seal(
201207
* @param RSAParameters $rSAParameters
202208
* @return string Opened data
203209
*/
204-
public function open(string $sealed_data, string $ekeys, RSAParameters $rSAParameters, string $privateKeyPass,
205-
string $salt): string
206-
{
210+
public function open(
211+
string $sealed_data,
212+
string $ekeys,
213+
RSAParameters $rSAParameters,
214+
string $privateKeyPass,
215+
string $salt
216+
): string {
207217
if (preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $sealed_data)) {
208218
$sealed_data = base64_decode($sealed_data);
209219
}
@@ -221,7 +231,14 @@ public function open(string $sealed_data, string $ekeys, RSAParameters $rSAParam
221231
$iv = substr($sealed_data, 0, $iv_len);
222232
$encryptedData = substr($sealed_data, $iv_len);
223233

224-
openssl_open($encryptedData, $open_data, $ekeys, $rSAParameters->getPrivateKey(passphrase: $privateKeyPass, salt: $salt), 'aes-256-cbc', $iv);
234+
openssl_open(
235+
$encryptedData,
236+
$open_data,
237+
$ekeys,
238+
$rSAParameters->getPrivateKey(passphrase: $privateKeyPass, salt: $salt),
239+
'aes-256-cbc',
240+
$iv
241+
);
225242

226243
return $open_data;
227244
}

src/RSAParameters.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,11 @@ private function decryptPrivateKey(string $passphrase, string $privateKey, strin
7171
* @return string|\OpenSSLAsymmetricKey
7272
* @throws DecryptPrivateKeyException
7373
*/
74-
public function getPrivateKey(string $passphrase, string $salt = 'salt', bool $encrypted = false): \OpenSSLAsymmetricKey|string
75-
{
74+
public function getPrivateKey(
75+
string $passphrase,
76+
string $salt = 'salt',
77+
bool $encrypted = false
78+
): \OpenSSLAsymmetricKey|string {
7679
if (!$encrypted) {
7780
return $this->decryptPrivateKey(
7881
privateKey: $this->privateKey,

0 commit comments

Comments
 (0)