GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #899 from slingamn/rsacert 

fix #898
This commit is contained in:
Shivaram Lingamneni 2020-03-23 05:37:34 -07:00 committed by GitHub
parent 5dcc2a32d6 f2da69d49f
commit 8f284d6ef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
irc/mkcerts/certs.go
View File

@ -4,9 +4,8 @@
package mkcerts package mkcerts
import ( import (
"crypto/ecdsa"
"crypto/elliptic"
"crypto/rand" "crypto/rand"
"crypto/rsa"
"crypto/x509" "crypto/x509"
"crypto/x509/pkix" "crypto/x509/pkix"
"encoding/pem" "encoding/pem"
@ -23,7 +22,10 @@ func CreateCertBytes(orgName string, host string) (certBytes []byte, keyBytes []
validFor := 365 * 24 * time.Hour validFor := 365 * 24 * time.Hour
notAfter := validFrom.Add(validFor) 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) serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
serialNumber, err := rand.Int(rand.Reader, serialNumberLimit) 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}) certBytes = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
b, err := x509.MarshalECPrivateKey(priv) b, err := x509.MarshalPKCS8PrivateKey(priv)
if err != nil { 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) keyBytes = pem.EncodeToMemory(&pemBlock)
return certBytes, keyBytes, nil return certBytes, keyBytes, nil
} }