From bd6d937f43887dec7f53b371c41a1ca5dc45d218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Wed, 2 Dec 2015 17:13:57 +0100 Subject: [PATCH] Fix computation of certificate expiration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of 3650 days, actually use 10 years (i.e. take into account leap days). Signed-off-by: Miloslav Trmač --- client/client.go | 2 +- trustmanager/yubikey/yubikeystore.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/client.go b/client/client.go index e4ecdb4960..901e6c0bf1 100644 --- a/client/client.go +++ b/client/client.go @@ -145,7 +145,7 @@ func (r *NotaryRepository) Initialize(rootKeyID string) error { // Hard-coded policy: the generated certificate expires in 10 years. startTime := time.Now() - rootCert, err := cryptoservice.GenerateCertificate(privKey, r.gun, startTime, startTime.Add(time.Hour*24*365*10)) + rootCert, err := cryptoservice.GenerateCertificate(privKey, r.gun, startTime, startTime.AddDate(10, 0, 0)) if err != nil { return err diff --git a/trustmanager/yubikey/yubikeystore.go b/trustmanager/yubikey/yubikeystore.go index 23fa23341e..a10048367a 100644 --- a/trustmanager/yubikey/yubikeystore.go +++ b/trustmanager/yubikey/yubikeystore.go @@ -220,7 +220,7 @@ func addECDSAKey( // Hard-coded policy: the generated certificate expires in 10 years. startTime := time.Now() - template, err := trustmanager.NewCertificate(role, startTime, startTime.Add(time.Hour*24*365*10)) + template, err := trustmanager.NewCertificate(role, startTime, startTime.AddDate(10, 0, 0)) if err != nil { return fmt.Errorf("failed to create the certificate template: %v", err) }