openssl: fix the Year 2038 issuetopic/openssl-get-rid-of-time_t

The fix in r55219 was wrong. It fixed the issue only when long is 32bit
and also time_t is 64bit. But time_t may be 32bit. OpenSSL 1.0.0
introduced ASN1_TIME_adj() and X509_time_adj_ex() which takes offset
days. So make use of it.

1 files changed, 2 insertions, 8 deletions

diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
index 34b8aae7cd..13e738f30f 100644
--- a/ext/openssl/ossl_x509cert.c
+++ b/ext/openssl/ossl_x509cert.c
@@ -476,13 +476,10 @@ static VALUE
 ossl_x509_set_not_before(VALUE self, VALUE time)
 {
     X509 *x509;
-    time_t sec;
 
-    sec = time_to_time_t(time);
     GetX509(self, x509);
-    if (!X509_time_adj(X509_get_notBefore(x509), 0, &sec)) {
+    if (!ossl_x509_time_adjust(X509_get_notBefore(x509), time))
 	ossl_raise(eX509CertError, NULL);
-    }
 
     return time;
 }
@@ -513,13 +510,10 @@ static VALUE
 ossl_x509_set_not_after(VALUE self, VALUE time)
 {
     X509 *x509;
-    time_t sec;
 
-    sec = time_to_time_t(time);
     GetX509(self, x509);
-    if (!X509_time_adj(X509_get_notAfter(x509), 0, &sec)) {
+    if (!ossl_x509_time_adjust(X509_get_notAfter(x509), time))
 	ossl_raise(eX509CertError, NULL);
-    }
 
     return time;
 }