Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to ECDSA based key in fulcio-createcerts #1303

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Switch to ECDSA based key in fulcio-createcerts #1303

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd39f8e
Switch to ECDSA based key in fulcio-createcerts
priyawadhwa Oct 10, 2024
9ba0daf
update public key
priyawadhwa Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions cmd/fulcio/createcerts/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
package main

import (
"crypto/ecdsa"
"crypto/elliptic"
"crypto/rand"
"crypto/rsa"
"crypto/x509"
"crypto/x509/pkix"
"encoding/pem"
Expand All @@ -36,11 +37,6 @@ import (
"sigs.k8s.io/release-utils/version"
)

const (
// Key in the configmap holding the value of the tree.
bitSize = 4096
)

var (
secretName = flag.String("secret", "fulcio-secrets", "Name of the secret to create for the certs")
pubkeySecretName = flag.String("pubkeysecret", "fulcio-pub-key", "Name of the secret that holds the public Fulcio information like cert / public key")
Expand All @@ -54,6 +50,7 @@ var (

func main() {
flag.Parse()

ns := os.Getenv("NAMESPACE")
if ns == "" {
panic("env variable NAMESPACE must be set")
Expand Down Expand Up @@ -101,13 +98,11 @@ func main() {
// createAll creates a password protected keypair, and returns PEM encoded
// CA Cert, crypto.PublicKey, crypto.PrivateKey, password
func createAll() ([]byte, []byte, []byte, string, error) {
// Generate RSA key.
key, err := rsa.GenerateKey(rand.Reader, bitSize)
// Generate ECDSA key.
privateKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
if err != nil {
return nil, nil, nil, "", fmt.Errorf("GenerateKey failed: %w", err)
return nil, nil, nil, "", fmt.Errorf("failed to generate ecdsa key: %w", err)
}
// Extract public component.
pub := key.Public()

serialNumber, err := rand.Int(rand.Reader, new(big.Int).SetInt64(math.MaxInt64))
if err != nil {
Expand All @@ -130,18 +125,23 @@ func createAll() ([]byte, []byte, []byte, string, error) {
BasicConstraintsValid: true,
MaxPathLen: 1,
}
derBytes, err := x509.CreateCertificate(rand.Reader, rootCA, rootCA, pub, key)

derBytes, err := x509.CreateCertificate(rand.Reader, rootCA, rootCA, privateKey.Public(), privateKey)
if err != nil {
return nil, nil, nil, "", fmt.Errorf("failed to create certificate: %w", err)
}
certPEM := pem.EncodeToMemory(
&pem.Block{Type: "CERTIFICATE", Bytes: derBytes},
)

// Encode private key to PKCS#1 ASN.1 PEM.
// Encode private key to PKCS #8 ASN.1 PEM.
marshalledPrivKey, err := x509.MarshalPKCS8PrivateKey(privateKey)
if err != nil {
return nil, nil, nil, "", fmt.Errorf("marshal pkcs8 private key: %w", err)
}
block := &pem.Block{
Type: "RSA PRIVATE KEY",
Bytes: x509.MarshalPKCS1PrivateKey(key),
Type: "PRIVATE KEY",
Bytes: marshalledPrivKey,
}

// Generate a uuid as a password
Expand All @@ -158,11 +158,15 @@ func createAll() ([]byte, []byte, []byte, string, error) {
if privPEM == nil {
return nil, nil, nil, "", fmt.Errorf("EncodeToMemory private key failed: %w", err)
}
// Encode public key to PKCS#1 ASN.1 PEM.

marshalledPubKey, err := x509.MarshalPKIXPublicKey(privateKey.Public())
if err != nil {
return nil, nil, nil, "", fmt.Errorf("failed to unmarshal public key: %w", err)
}
pubPEM := pem.EncodeToMemory(
&pem.Block{
Type: "RSA PUBLIC KEY",
Bytes: x509.MarshalPKCS1PublicKey(pub.(*rsa.PublicKey)),
Type: "PUBLIC KEY",
Bytes: marshalledPubKey,
},
)
if pubPEM == nil {
Expand Down
Loading