Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion crypto/pem/pem.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func EncodePrivateKey(key any) ([]byte, error) {
)

switch key := key.(type) {
case *ecdsa.PrivateKey, *ed25519.PrivateKey:
case *ecdsa.PrivateKey, ed25519.PrivateKey:
keyBytes, err = x509.MarshalPKCS8PrivateKey(key)
if err != nil {
return nil, err
Expand Down
5 changes: 2 additions & 3 deletions crypto/spiffe/spiffe.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ package spiffe

import (
"context"
"crypto/ecdsa"
"crypto/elliptic"
"crypto/ed25519"
"crypto/rand"
"crypto/x509"
"errors"
Expand Down Expand Up @@ -221,7 +220,7 @@ func (s *SPIFFE) runRotation(ctx context.Context) {

// Returns both X.509 SVID and JWT SVID (if available).
func (s *SPIFFE) fetchIdentity(ctx context.Context) (*Identity, error) {
key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
_, key, err := ed25519.GenerateKey(rand.Reader)
if err != nil {
return nil, fmt.Errorf("failed to generate private key: %w", err)
}
Expand Down
17 changes: 8 additions & 9 deletions crypto/test/pki.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ package test
import (
"context"
"crypto"
"crypto/ecdsa"
"crypto/elliptic"
"crypto/ed25519"
"crypto/rand"
"crypto/x509"
"crypto/x509/pkix"
Expand Down Expand Up @@ -70,7 +69,7 @@ func GenPKI(t *testing.T, opts PKIOptions) PKI {
}

func GenPKIError(opts PKIOptions) (PKI, error) {
rootPK, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
rootPub, rootPK, err := ed25519.GenerateKey(rand.Reader)
if err != nil {
return PKI{}, err
}
Expand All @@ -81,10 +80,10 @@ func GenPKIError(opts PKIOptions) (PKI, error) {
NotBefore: time.Now(),
NotAfter: time.Now().Add(time.Hour),
IsCA: true,
KeyUsage: x509.KeyUsageCertSign,
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
BasicConstraintsValid: true,
}
rootCertBytes, err := x509.CreateCertificate(rand.Reader, rootCert, rootCert, &rootPK.PublicKey, rootPK)
rootCertBytes, err := x509.CreateCertificate(rand.Reader, rootCert, rootCert, rootPub, rootPK)
if err != nil {
return PKI{}, err
}
Expand Down Expand Up @@ -169,8 +168,8 @@ func (p PKI) ClientGRPCCtx(t *testing.T) context.Context {
return gs.ctx
}

func genLeafCert(rootPK *ecdsa.PrivateKey, rootCert *x509.Certificate, id spiffeid.ID, dns string) ([]byte, []byte, *x509.Certificate, crypto.Signer, error) {
pk, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
func genLeafCert(rootPK crypto.Signer, rootCert *x509.Certificate, id spiffeid.ID, dns string) ([]byte, []byte, *x509.Certificate, crypto.Signer, error) {
pub, pk, err := ed25519.GenerateKey(rand.Reader)
if err != nil {
return nil, nil, nil, nil, err
}
Expand All @@ -184,7 +183,7 @@ func genLeafCert(rootPK *ecdsa.PrivateKey, rootCert *x509.Certificate, id spiffe
SerialNumber: big.NewInt(1),
NotBefore: time.Now(),
NotAfter: time.Now().Add(time.Hour),
KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment,
KeyUsage: x509.KeyUsageDigitalSignature,
ExtKeyUsage: []x509.ExtKeyUsage{
x509.ExtKeyUsageServerAuth,
x509.ExtKeyUsageClientAuth,
Expand All @@ -199,7 +198,7 @@ func genLeafCert(rootPK *ecdsa.PrivateKey, rootCert *x509.Certificate, id spiffe
cert.URIs = []*url.URL{id.URL()}
}

certBytes, err := x509.CreateCertificate(rand.Reader, cert, rootCert, &pk.PublicKey, rootPK)
certBytes, err := x509.CreateCertificate(rand.Reader, cert, rootCert, pub, rootPK)
if err != nil {
return nil, nil, nil, nil, err
}
Expand Down