From: Carl Jackson <carl@avtok.com>
Date: Sat, 31 Jan 2015 10:22:47 +0000 (-0800)
Subject: Fix regression in ASN1_UTCTIME_cmp_time_t
X-Git-Tag: OpenSSL_1_0_2a~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=912c8c92b5e703b19a6508de15b229e9fe788656;p=oweals%2Fopenssl.git

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 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>
(cherry picked from commit da27006df06853a33b132133699a7aa9d4277920)
---

diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index 0578c88874..724a10be4e 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -297,7 +297,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)