GnuTLS: fix autogen cert expiry date. Bug 3014

Broken-by: 48e9099006

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index efdc228b60f9adcef3842d8aba3161f08347defc..aa1db1dfeeab343520de363c9a538a0030c28c50 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -176,6 +176,9 @@ JH/33 Fix free for live variable $value created by a ${run ...} expansion.
 JH/34 Bug 3013: Fix use of $recipients within arguments for ${run...}.
       In 4.96 this would expand to empty.
 
+JH/35 Bug 3014: GnuTLS: fix expiry date for an auto-generated server
+      certificate.  Find and fix by Andreas Metzler.
+
 
 Exim version 4.96
 -----------------

diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index dd70e73e13d37da0e7c9fcdbf148718d26b0e960..e706b638675031d68fabe600088c0df228062db6 100644 (file)
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -1016,7 +1016,7 @@ now = 1;
 if (  (rc = gnutls_x509_crt_set_version(cert, 3))
    || (rc = gnutls_x509_crt_set_serial(cert, &now, sizeof(now)))
    || (rc = gnutls_x509_crt_set_activation_time(cert, now = time(NULL)))
-   || (rc = gnutls_x509_crt_set_expiration_time(cert, (long)2 * 60 * 60))      /* 2 hour */
+   || (rc = gnutls_x509_crt_set_expiration_time(cert, now + (long)2 * 60 * 60))        /* 2 hour */
    || (rc = gnutls_x509_crt_set_key(cert, pkey))
 
    || (rc = gnutls_x509_crt_set_dn_by_oid(cert,