diff options
author | deraadt <> | 2014-04-18 23:42:00 +0000 |
---|---|---|
committer | deraadt <> | 2014-04-18 23:42:00 +0000 |
commit | 4855ea84e69fe2edcf4d523233d15c950bd77e4d (patch) | |
tree | d34f0513fa7ea1f0d59700feaf05db49838ca750 /src/lib/libcrypto/asn1 | |
parent | 8b311d691c1644d610b65caacf0e7589a47eee84 (diff) | |
download | openbsd-4855ea84e69fe2edcf4d523233d15c950bd77e4d.tar.gz openbsd-4855ea84e69fe2edcf4d523233d15c950bd77e4d.tar.bz2 openbsd-4855ea84e69fe2edcf4d523233d15c950bd77e4d.zip |
OPENSSL_gmtime() is really just gmtime_r(); ok guenther
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/asn1/a_gentm.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/a_time.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/a_utctm.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/asn1/a_gentm.c b/src/lib/libcrypto/asn1/a_gentm.c index 56f8992424..856aaf0c77 100644 --- a/src/lib/libcrypto/asn1/a_gentm.c +++ b/src/lib/libcrypto/asn1/a_gentm.c | |||
@@ -222,7 +222,7 @@ ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s, time_t t, int offset_day, | |||
222 | if (s == NULL) | 222 | if (s == NULL) |
223 | return (NULL); | 223 | return (NULL); |
224 | 224 | ||
225 | ts = OPENSSL_gmtime(&t, &data); | 225 | ts = gmtime_r(&t, &data); |
226 | if (ts == NULL) | 226 | if (ts == NULL) |
227 | return (NULL); | 227 | return (NULL); |
228 | 228 | ||
diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c index 13fd324517..f3f28369f4 100644 --- a/src/lib/libcrypto/asn1/a_time.c +++ b/src/lib/libcrypto/asn1/a_time.c | |||
@@ -94,7 +94,7 @@ ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t, | |||
94 | struct tm *ts; | 94 | struct tm *ts; |
95 | struct tm data; | 95 | struct tm data; |
96 | 96 | ||
97 | ts=OPENSSL_gmtime(&t,&data); | 97 | ts=gmtime_r(&t,&data); |
98 | if (ts == NULL) { | 98 | if (ts == NULL) { |
99 | ASN1err(ASN1_F_ASN1_TIME_ADJ, ASN1_R_ERROR_GETTING_TIME); | 99 | ASN1err(ASN1_F_ASN1_TIME_ADJ, ASN1_R_ERROR_GETTING_TIME); |
100 | return NULL; | 100 | return NULL; |
diff --git a/src/lib/libcrypto/asn1/a_utctm.c b/src/lib/libcrypto/asn1/a_utctm.c index d8135d0457..a2325f2525 100644 --- a/src/lib/libcrypto/asn1/a_utctm.c +++ b/src/lib/libcrypto/asn1/a_utctm.c | |||
@@ -181,7 +181,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t, | |||
181 | if (s == NULL) | 181 | if (s == NULL) |
182 | return(NULL); | 182 | return(NULL); |
183 | 183 | ||
184 | ts=OPENSSL_gmtime(&t, &data); | 184 | ts=gmtime_r(&t, &data); |
185 | if (ts == NULL) | 185 | if (ts == NULL) |
186 | return(NULL); | 186 | return(NULL); |
187 | 187 | ||
@@ -232,7 +232,7 @@ int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t) | |||
232 | 232 | ||
233 | t -= offset*60; /* FIXME: may overflow in extreme cases */ | 233 | t -= offset*60; /* FIXME: may overflow in extreme cases */ |
234 | 234 | ||
235 | tm = OPENSSL_gmtime(&t, &data); | 235 | tm = gmtime_r(&t, &data); |
236 | 236 | ||
237 | #define return_cmp(a,b) if ((a)<(b)) return -1; else if ((a)>(b)) return 1 | 237 | #define return_cmp(a,b) if ((a)<(b)) return -1; else if ((a)>(b)) return 1 |
238 | year = g2(s->data); | 238 | year = g2(s->data); |