[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  da27006df06853a33b132133699a7aa9d4277920 (commit)
      from  556efe7961b300f0fd49c3c8aa47d652caf83c6f (commit)


- Log -----------------------------------------------------------------
commit da27006df06853a33b132133699a7aa9d4277920
Author: Carl Jackson <carl at avtok.com>
Date:   Sat Jan 31 02:22:47 2015 -0800

    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 at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 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 9b55284..e56cbbc 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -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)