Skip to content

Commit f0402ec

Browse files
committed
Revert "SSHKeysHelper: print "RSA PRIVATE KEY" instead of "PRIVATE KEY""
This reverts commit 960d2aa445a9adf5c0c71c800c40625359cb4c6e.
1 parent 738ec86 commit f0402ec

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

utils/src/main/java/com/cloud/utils/ssh/SSHKeysHelper.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package com.cloud.utils.ssh;
2121

2222
import java.io.ByteArrayOutputStream;
23-
import java.io.StringWriter;
2423
import java.math.BigInteger;
2524
import java.nio.ByteBuffer;
2625
import java.nio.charset.StandardCharsets;
@@ -32,8 +31,6 @@
3231

3332
import org.apache.cloudstack.utils.security.CertUtils;
3433
import org.apache.commons.codec.binary.Base64;
35-
import org.bouncycastle.util.io.pem.PemObject;
36-
import org.bouncycastle.util.io.pem.PemWriter;
3734

3835
public class SSHKeysHelper {
3936

@@ -149,12 +146,7 @@ public String getPrivateKey() {
149146
return null;
150147
}
151148
try {
152-
final PemObject pemObject = new PemObject("RSA PRIVATE KEY", keyPair.getPrivate().getEncoded());
153-
final StringWriter sw = new StringWriter();
154-
try (final PemWriter pw = new PemWriter(sw)) {
155-
pw.writeObject(pemObject);
156-
}
157-
return sw.toString();
149+
return CertUtils.privateKeyToPem(keyPair.getPrivate());
158150
} catch (Exception e) {
159151
e.printStackTrace();
160152
}

0 commit comments

Comments
 (0)