Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2021-09-28 08:59:13 -05:00
commit addfd93b71

View File

@ -878,9 +878,9 @@ class RSA
); );
$key = "openssh-key-v1\0$key"; $key = "openssh-key-v1\0$key";
return "-----BEGIN OPENSSH PRIVATE KEY-----\r\n" . return "-----BEGIN OPENSSH PRIVATE KEY-----\n" .
chunk_split(base64_encode($key), 70) . chunk_split(base64_encode($key), 70, "\n") .
"-----END OPENSSH PRIVATE KEY-----"; "-----END OPENSSH PRIVATE KEY-----\n";
default: // eg. self::PRIVATE_FORMAT_PKCS1 default: // eg. self::PRIVATE_FORMAT_PKCS1
$components = array(); $components = array();
foreach ($raw as $name => $value) { foreach ($raw as $name => $value) {