diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-06-01 16:33:56 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-06-01 16:33:56 +0900 |
| commit | dc2222fd8323d0c8cb74e25dad819ecdbdd99e2a (patch) | |
| tree | 7a1aee21a017cfd9c51fbaee44193e7257044412 /ext/openssl/ossl_asn1.h | |
| parent | 17b3f3ed11660fd3adaf74ca7e13fdf83689a241 (diff) | |
| download | ruby-dc2222fd8323d0c8cb74e25dad819ecdbdd99e2a.tar.gz | |
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.
Diffstat (limited to 'ext/openssl/ossl_asn1.h')
| -rw-r--r-- | ext/openssl/ossl_asn1.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/openssl/ossl_asn1.h b/ext/openssl/ossl_asn1.h index 8250746c79..5c692bf2f0 100644 --- a/ext/openssl/ossl_asn1.h +++ b/ext/openssl/ossl_asn1.h @@ -14,7 +14,11 @@ * ASN1_DATE conversions */ VALUE asn1time_to_time(ASN1_TIME *); +#if defined(HAVE_ASN1_TIME_ADJ) +void ossl_time_extract(VALUE time, time_t *, int *); +#else time_t time_to_time_t(VALUE); +#endif /* * ASN1_STRING conversions |