From f2da69d49fea3d803ea4d3e36215a2c82657eeb8 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Sun, 22 Mar 2020 14:46:17 -0400 Subject: [PATCH] fix #898 --- irc/mkcerts/certs.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/irc/mkcerts/certs.go b/irc/mkcerts/certs.go index 59e9ae97..bdf9c632 100644 --- a/irc/mkcerts/certs.go +++ b/irc/mkcerts/certs.go @@ -4,9 +4,8 @@ package mkcerts import ( - "crypto/ecdsa" - "crypto/elliptic" "crypto/rand" + "crypto/rsa" "crypto/x509" "crypto/x509/pkix" "encoding/pem" @@ -23,7 +22,10 @@ func CreateCertBytes(orgName string, host string) (certBytes []byte, keyBytes [] validFor := 365 * 24 * time.Hour notAfter := validFrom.Add(validFor) - priv, err := ecdsa.GenerateKey(elliptic.P521(), rand.Reader) + priv, err := rsa.GenerateKey(rand.Reader, 2048) + if err != nil { + return + } serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128) serialNumber, err := rand.Int(rand.Reader, serialNumberLimit) @@ -59,11 +61,11 @@ func CreateCertBytes(orgName string, host string) (certBytes []byte, keyBytes [] certBytes = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: derBytes}) - b, err := x509.MarshalECPrivateKey(priv) + b, err := x509.MarshalPKCS8PrivateKey(priv) if err != nil { - return nil, nil, fmt.Errorf("Unable to marshal ECDSA private key: %v", err.Error()) + return nil, nil, fmt.Errorf("Unable to marshal private key: %v", err.Error()) } - pemBlock := pem.Block{Type: "EC PRIVATE KEY", Bytes: b} + pemBlock := pem.Block{Type: "PRIVATE KEY", Bytes: b} keyBytes = pem.EncodeToMemory(&pemBlock) return certBytes, keyBytes, nil }