Skip to content

[release-4.2] Bug 1810421: Set a random serial number for signing certificate templates #730

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

Merged
mfojtik merged 1 commit into from
Mar 18, 2020
Merged

[release-4.2] Bug 1810421: Set a random serial number for signing certificate templates #730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions pkg/crypto/crypto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,16 @@ type RandomSerialGenerator struct {
}

func (s *RandomSerialGenerator) Next(template *x509.Certificate) (int64, error) {
return randomSerialNumber(), nil
}

// randomSerialNumber returns a random int64 serial number based on
// time.Now. It is defined separately from the generator interface so
// that the caller doesn't have to worry about an input template or
// error - these are unnecessary when creating a random serial.
func randomSerialNumber() int64 {
r := mathrand.New(mathrand.NewSource(time.Now().UTC().UnixNano()))
return r.Int63(), nil
return r.Int63()
}

// EnsureCA returns a CA, whether it was created (as opposed to pre-existing), and any error
Expand Down Expand Up @@ -843,9 +851,13 @@ func newSigningCertificateTemplateForDuration(subject pkix.Name, caLifetime time

SignatureAlgorithm: x509.SHA256WithRSA,

NotBefore: currentTime().Add(-1 * time.Second),
NotAfter: currentTime().Add(caLifetime),
SerialNumber: big.NewInt(1),
NotBefore: currentTime().Add(-1 * time.Second),
NotAfter: currentTime().Add(caLifetime),

// Specify a random serial number to avoid the same issuer+serial
// number referring to different certs in a chain of trust if the
// signing certificate is ever rotated.
SerialNumber: big.NewInt(randomSerialNumber()),

KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
BasicConstraintsValid: true,
Expand Down