Addressed review comments

ironcore-dev · Jan 16, 2025 · 5d9e762 · 5d9e762
1 parent c1f7308
commit 5d9e762
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/internal/controller/server_controller.go b/internal/controller/server_controller.go
@@ -7,7 +7,6 @@ import (
 	"context"
 	"crypto/rand"
 	"crypto/rsa"
-	"crypto/x509"
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
@@ -567,11 +566,11 @@ func generateSSHKeyPairAndPassword() ([]byte, []byte, []byte, error) {
 		return nil, nil, nil, fmt.Errorf("failed to generate private key: %w", err)
 	}
 
-	privateKeyBytes := x509.MarshalPKCS1PrivateKey(privateKey)
-	privateKeyPem := pem.EncodeToMemory(&pem.Block{
-		Type:  "RSA PRIVATE KEY",
-		Bytes: privateKeyBytes,
-	})
+	privateKeyBlock, err := ssh.MarshalPrivateKey(privateKey, "")
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	privateKeyPem := pem.EncodeToMemory(privateKeyBlock)
 
 	sshPubKey, err := ssh.NewPublicKey(&privateKey.PublicKey)
 	if err != nil {

diff --git a/internal/controller/server_controller_test.go b/internal/controller/server_controller_test.go
@@ -306,6 +306,10 @@ var _ = FDescribe("Server Controller", func() {
 			HaveField("Data", HaveKeyWithValue(SSHKeyPairSecretPrivateKeyName, Not(BeEmpty()))),
 			HaveField("Data", HaveKeyWithValue(SShKeyPairSecretPasswordKeyName, Not(BeEmpty()))),
 		))
+		_, err := ssh.ParsePrivateKey(sshSecret.Data[SSHKeyPairSecretPrivateKeyName])
+		Expect(err).NotTo(HaveOccurred())
+		_, _, _, _, err = ssh.ParseAuthorizedKey(sshSecret.Data[SSHKeyPairSecretPublicKeyName])
+		Expect(err).NotTo(HaveOccurred())
 
 		By("Ensuring that the default ignition configuration has been created")
 		ignitionSecret := &v1.Secret{