Skip to content

Commit 01bcd87

Browse files
committed
Add changelog and fixed GetPublicKeyResponse
1 parent e67890a commit 01bcd87

File tree

4 files changed

+5
-24
lines changed

4 files changed

+5
-24
lines changed

src/Service/Kms/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## NOT RELEASED
44

5+
- Added getPublicKey and verify operation
6+
57
## 1.6.0
68

79
### Added

src/Service/Kms/src/Result/GetPublicKeyResponse.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ protected function populateResult(Response $response): void
174174
$data = $response->toArray();
175175

176176
$this->keyId = isset($data['KeyId']) ? (string) $data['KeyId'] : null;
177-
$this->publicKey = isset($data['PublicKey']) ? self::formatKey($data['PublicKey']) : null;
177+
$this->publicKey = isset($data['PublicKey']) ? base64_decode((string) $data['PublicKey']) : null;
178178
$this->customerMasterKeySpec = isset($data['CustomerMasterKeySpec']) ? (string) $data['CustomerMasterKeySpec'] : null;
179179
$this->keySpec = isset($data['KeySpec']) ? (string) $data['KeySpec'] : null;
180180
$this->keyUsage = isset($data['KeyUsage']) ? (string) $data['KeyUsage'] : null;
@@ -183,14 +183,6 @@ protected function populateResult(Response $response): void
183183
$this->keyAgreementAlgorithms = empty($data['KeyAgreementAlgorithms']) ? [] : $this->populateResultKeyAgreementAlgorithmSpecList($data['KeyAgreementAlgorithms']);
184184
}
185185

186-
private static function formatKey(string $derData): string
187-
{
188-
$pem = "-----BEGIN PUBLIC KEY-----\n";
189-
$pem .= chunk_split((string) $derData, 64, "\n");
190-
191-
return $pem . "-----END PUBLIC KEY-----\n";
192-
}
193-
194186
/**
195187
* @return list<EncryptionAlgorithmSpec::*>
196188
*/

src/Service/Kms/tests/Integration/KmsClientTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function testGetPublicKey(): void
131131

132132
$result->resolve();
133133

134-
self::assertStringStartsWith('-----BEGIN PUBLIC KEY-----', $result->getPublicKey());
134+
self::assertSame(550, \strlen($result->getPublicKey()));
135135
self::assertSame($key->getKeyMetadata()->getArn(), $result->getKeyId());
136136
self::assertSame(KeySpec::RSA_4096, $result->getKeySpec());
137137
self::assertSame(KeyUsageType::ENCRYPT_DECRYPT, $result->getKeyUsage());

src/Service/Kms/tests/Unit/Result/GetPublicKeyResponseTest.php

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,7 @@ public function testGetPublicKeyResponse(): void
3737
$result = new GetPublicKeyResponse(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
3838

3939
self::assertSame('arn:aws:kms:us-west-2:111122223333:key/0987dcba-09fe-87dc-65ba-ab0987654321', $result->getKeyId());
40-
41-
$pubkey =
42-
"-----BEGIN PUBLIC KEY-----\n" .
43-
"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyP/BlKX04RLmV8Q2VTSg\n" .
44-
"TpJloxi6MBa1KQ3PMpelcRK4qbTX2+KLw1fiRWsoihvKyVDjvCoehSiv3gnHqzXo\n" .
45-
"mMYk/9BxZlJV3R7bDCaeNbjgTem3Qgoxe/0MhYjGoGpNkryJnSJXy03Mx8WNA05Z\n" .
46-
"YErvpt5YATaw7wQtJ+Mei6I/OxemaTQ6QqE5ulQ8wYeF96f4me6RYVuMHb5XcYkA\n" .
47-
"1BMv+two3YCxvQ445EsE+HjExGvNL6Ot+g4yS+cwfcWIcU1kdVTTjXxQVqwQ3kRG\n" .
48-
"b3G934XSyl5BeT7ItbTFNZGJVTNq3GAa3mAQv3BMXPsrhhqcZ/u+F+t2VKe93hw1\n" .
49-
"+QIDAQAB\n" .
50-
"-----END PUBLIC KEY-----\n";
51-
52-
self::assertSame($pubkey, $result->getPublicKey());
53-
40+
self::assertSame('MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyP/BlKX04RLmV8Q2VTSgTpJloxi6MBa1KQ3PMpelcRK4qbTX2+KLw1fiRWsoihvKyVDjvCoehSiv3gnHqzXomMYk/9BxZlJV3R7bDCaeNbjgTem3Qgoxe/0MhYjGoGpNkryJnSJXy03Mx8WNA05ZYErvpt5YATaw7wQtJ+Mei6I/OxemaTQ6QqE5ulQ8wYeF96f4me6RYVuMHb5XcYkA1BMv+two3YCxvQ445EsE+HjExGvNL6Ot+g4yS+cwfcWIcU1kdVTTjXxQVqwQ3kRGb3G934XSyl5BeT7ItbTFNZGJVTNq3GAa3mAQv3BMXPsrhhqcZ/u+F+t2VKe93hw1+QIDAQAB', base64_encode($result->getPublicKey()));
5441
self::assertSame('RSA_4096', $result->getKeySpec());
5542
self::assertSame('ENCRYPT_DECRYPT', $result->getKeyUsage());
5643
self::assertContains('RSAES_OAEP_SHA_1', $result->getEncryptionAlgorithms());

0 commit comments

Comments
 (0)