From: Adam Langley <agl@golang.org>
Date: Wed, 4 Jan 2012 19:56:16 +0000 (-0500)
Subject: crypto/tls: update generate_cert.go for new time package
X-Git-Tag: weekly.2012-01-15~153
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d5e6b8d016774776d3ca6af72839a9138e2fe996;p=gostls13.git

crypto/tls: update generate_cert.go for new time package

Fixes #2635.

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/5512043
---

diff --git a/src/pkg/crypto/tls/generate_cert.go b/src/pkg/crypto/tls/generate_cert.go
index c4463ff48f..7c0718b82a 100644
--- a/src/pkg/crypto/tls/generate_cert.go
+++ b/src/pkg/crypto/tls/generate_cert.go
@@ -31,7 +31,7 @@ func main() {
 		return
 	}
 
-	now := time.Seconds()
+	now := time.Now()
 
 	template := x509.Certificate{
 		SerialNumber: new(big.Int).SetInt64(0),
@@ -39,8 +39,8 @@ func main() {
 			CommonName:   *hostName,
 			Organization: []string{"Acme Co"},
 		},
-		NotBefore: time.SecondsToUTC(now - 300),
-		NotAfter:  time.SecondsToUTC(now + 60*60*24*365), // valid for 1 year.
+		NotBefore: now.Add(-5 * time.Minute).UTC(),
+		NotAfter:  now.AddDate(1, 0, 0).UTC(), // valid for 1 year.
 
 		SubjectKeyId: []byte{1, 2, 3, 4},
 		KeyUsage:     x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,