Fix regression in ASN1_UTCTIME_cmp_time_t
authorCarl Jackson <carl@avtok.com>
Sat, 31 Jan 2015 10:22:47 +0000 (02:22 -0800)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 15 Mar 2015 19:46:24 +0000 (19:46 +0000)
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 a refactor [0], resulting in the opposite
time comparison behavior.

[0]: 904348a4922333106b613754136305db229475ea

PR#3706

Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
crypto/asn1/a_utctm.c

index 9b55284..e56cbbc 100644 (file)
@@ -249,7 +249,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)