diff --git a/src/Component/Core/Util/RSAKey.php b/src/Component/Core/Util/RSAKey.php index d207e3d6..b287d117 100644 --- a/src/Component/Core/Util/RSAKey.php +++ b/src/Component/Core/Util/RSAKey.php @@ -156,7 +156,7 @@ public function toPEM(): string ) ); - return PEM::create(PEM::TYPE_RSA_PRIVATE_KEY, $this->sequence->toDER()) + return PEM::create(PEM::TYPE_PRIVATE_KEY, $this->sequence->toDER()) ->string(); } $this->sequence = Sequence::create( @@ -169,7 +169,7 @@ public function toPEM(): string ) ); - return PEM::create(PEM::TYPE_RSA_PUBLIC_KEY, $this->sequence->toDER()) + return PEM::create(PEM::TYPE_PUBLIC_KEY, $this->sequence->toDER()) ->string(); } diff --git a/tests/Component/Console/KeyConversionCommandTest.php b/tests/Component/Console/KeyConversionCommandTest.php index a78beb0e..d6d23868 100644 --- a/tests/Component/Console/KeyConversionCommandTest.php +++ b/tests/Component/Console/KeyConversionCommandTest.php @@ -142,7 +142,7 @@ public function iCanConvertARsaKeyIntoPKCS1(): void $command = new PemConverterCommand(); $command->run($input, $output); $content = $output->fetch(); - static::assertStringContainsString('-----BEGIN RSA PRIVATE KEY-----', $content); + static::assertStringContainsString('-----BEGIN PRIVATE KEY-----', $content); } /** diff --git a/tests/Component/KeyManagement/JWKTest.php b/tests/Component/KeyManagement/JWKTest.php index 460bcd83..8e19773d 100644 --- a/tests/Component/KeyManagement/JWKTest.php +++ b/tests/Component/KeyManagement/JWKTest.php @@ -258,7 +258,7 @@ public function theRSAKeyIsCorrectlyConvertedIntoPEM(): void // Then static::assertSame( - '-----BEGIN RSA PUBLIC KEY----- + '-----BEGIN PUBLIC KEY----- MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz62tHQzm4fDHipqlcrNh C1gUdn0N38pmlcQbVlLvtZf1aRm1OO43cB9YQyWr1MsTrYH4nyWZDMPIGY/BsIfY w1lp9fo2D1tpG2vtCaKRETVimu+N9DySQ9vYs6n8lG0vXy/spK7sGrOLFooijDSt @@ -271,7 +271,7 @@ public function theRSAKeyIsCorrectlyConvertedIntoPEM(): void XCARX1IObFJNoinxYJ5SNX9bCSRtgefuBKE7BSNukAkHyBPf+++kEi9GbYXzlJr+ yCMAIsA0UoiEx264hkAF9zF+N1yRhS/QmrhzU5hpj1IE8WRCqyIZV8f/IbSGXBue 7MmgknLVRWHuGqehkTSfiNECAwEAAQ== ------END RSA PUBLIC KEY-----', +-----END PUBLIC KEY-----', $pem ); } diff --git a/tests/Component/KeyManagement/Keys/RSA/private.key b/tests/Component/KeyManagement/Keys/RSA/private.key index d3cb4f26..5eb9c347 100644 --- a/tests/Component/KeyManagement/Keys/RSA/private.key +++ b/tests/Component/KeyManagement/Keys/RSA/private.key @@ -1,4 +1,4 @@ ------BEGIN RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAN91kQxBuaze3WjI CNjeR/HD8E3kDzp89+Lhtn3tMish4yQxhNl6BEkabuS3pUj3WDP6+AFjBVqA1j3f u8Wqu7hRJDPHOs2kCII+LhIqvqQTLx/nvNOUhW2DimKn0HuHnlwJODq0MHFJEq5R @@ -13,4 +13,4 @@ RVdVjA/gFqJp1Q+VWdS1tvYRIqmadkECQCVdqQuwgedEHmcewtNod42crjmwvWBx BKMTl6/WT4zwVb41eUujVWo0LHRLuCoK//GDqmloIh6L3MU8MqnIGb0CQFWcpD4/ roCkMblk0hPoQPpyapJexc438x7XuEGFEhyxxauqC5R4YFKCf+KBS2gZgr4GSwBU Qww+qZ3eRYM7faM= ------END RSA PRIVATE KEY----- +-----END PRIVATE KEY----- diff --git a/tests/Component/KeyManagement/Keys/RSA/public.key b/tests/Component/KeyManagement/Keys/RSA/public.key index 73e0de9b..50291024 100644 --- a/tests/Component/KeyManagement/Keys/RSA/public.key +++ b/tests/Component/KeyManagement/Keys/RSA/public.key @@ -1,4 +1,4 @@ ------BEGIN RSA PUBLIC KEY----- +-----BEGIN PUBLIC KEY----- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtpS1ZmfVKVP5KofIhMBP 0tSWc4qlh6fm2lrZSkuKxUjEaWjzZSzs72gEIGxraWusMdoRuV54xsWRyf5KeZT0 S+I5Prle3Idi3gICiO4NwvMk6JwSBcJWwmSLFEKyUSnB2CtfiGc0/5rQCpcEt/Dn @@ -6,4 +6,4 @@ S+I5Prle3Idi3gICiO4NwvMk6JwSBcJWwmSLFEKyUSnB2CtfiGc0/5rQCpcEt/Dn t2DMnH1JjoXdDXfxvSP/0gjUYb0ektudYFXoA6wekmQyJeImvgx4Myz1I4iHtkY/ Cp7J4Mn1ejZ6HNmyvoTE/4OuY1uCeYv4UyXFc1s1uUyYtj4z57qsHGsS4dQ3A2MJ swIDAQAB ------END RSA PUBLIC KEY----- +-----END PUBLIC KEY-----