summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/a_utctm.c
diff options
context:
space:
mode:
authormarkus <>2002-09-05 22:12:12 +0000
committermarkus <>2002-09-05 22:12:12 +0000
commite08fb7998d733407336e83a299f140b0c1d2fcd3 (patch)
tree64de5de3b0be4adfc5050b6f785b6975c564b730 /src/lib/libcrypto/asn1/a_utctm.c
parentb200d1ec45aafc7c92b197a4b605e34834d74f1d (diff)
downloadopenbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.tar.gz
openbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.tar.bz2
openbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.zip
merge with 0.9.7-beta1
Diffstat (limited to 'src/lib/libcrypto/asn1/a_utctm.c')
-rw-r--r--src/lib/libcrypto/asn1/a_utctm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libcrypto/asn1/a_utctm.c b/src/lib/libcrypto/asn1/a_utctm.c
index dbb4a42c9d..ed2d827db2 100644
--- a/src/lib/libcrypto/asn1/a_utctm.c
+++ b/src/lib/libcrypto/asn1/a_utctm.c
@@ -222,7 +222,6 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
222int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t) 222int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
223 { 223 {
224 struct tm *tm; 224 struct tm *tm;
225 struct tm data;
226 int offset; 225 int offset;
227 int year; 226 int year;
228 227
@@ -239,7 +238,7 @@ int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
239 238
240 t -= offset*60; /* FIXME: may overflow in extreme cases */ 239 t -= offset*60; /* FIXME: may overflow in extreme cases */
241 240
242 tm = OPENSSL_gmtime(&t, &data); 241 { struct tm data; tm = OPENSSL_gmtime(&t, &data); }
243 242
244#define return_cmp(a,b) if ((a)<(b)) return -1; else if ((a)>(b)) return 1 243#define return_cmp(a,b) if ((a)<(b)) return -1; else if ((a)>(b)) return 1
245 year = g2(s->data); 244 year = g2(s->data);