From cdcecf546b8ea59cd0ac00a53cef7f31c3169480 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Wed, 18 Mar 2015 20:28:58 -0400 Subject: [PATCH] Fix regression in ASN1_UTCTIME_cmp_time_t Previously, ASN1_UTCTIME_cmp_time_t would return 1 if s > t, -1 if s < t, and 0 if s == t. This behavior was broken in upstream's 904348a4922333106b613754136305db229475ea, resulting in the opposite time comparison behavior. PR#3706 (Imported from upstream's da27006df06853a33b132133699a7aa9d4277920.) Change-Id: I9c1c28ba21d82ff4b587e33b262f46be4e846ff9 Reviewed-on: https://boringssl-review.googlesource.com/4043 Reviewed-by: Adam Langley --- crypto/asn1/a_utctm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c index 7a3f5f6db..930437776 100644 --- a/crypto/asn1/a_utctm.c +++ b/crypto/asn1/a_utctm.c @@ -287,7 +287,7 @@ int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t) if (!OPENSSL_gmtime(&t, &ttm)) return -2; - if (!OPENSSL_gmtime_diff(&day, &sec, &stm, &ttm)) + if (!OPENSSL_gmtime_diff(&day, &sec, &ttm, &stm)) return -2; if (day > 0)