Merge branch 'v1.5' into 'v1.6'

This commit is contained in:
Fernandez Ludovic 2018-04-11 14:20:53 +02:00
commit edbcd01fbc
5 changed files with 12 additions and 12 deletions

View file

@ -72,7 +72,7 @@ func derCert(privKey *rsa.PrivateKey, expiration time.Time, domain string) ([]by
}
if expiration.IsZero() {
expiration = time.Now().Add(365)
expiration = time.Now().Add(365 * (24 * time.Hour))
}
template := x509.Certificate{