Commit 67567b22 authored by Emilia Kasper's avatar Emilia Kasper Committed by Richard Levitte
Browse files

X509_cmp_time: only return 1, 0, -1. 



The behaviour of X509_cmp_time used to be undocumented.

The new behaviour, documented in master, is to return only 0, 1, or -1.
Make the code in the other branches to adhere to this behaviour too,
to reduce confusion. There is nothing to be gained from returning
other values.

Fixes GH#4954

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4955)

(cherry picked from commit 48345917)
parent 82d8cec0

crypto/x509/x509_vfy.c

+5 −4
Original line number Diff line number Diff line
@@ -2046,10 +2046,11 @@ int X509_cmp_time(const ASN1_TIME *ctm, time_t *cmp_time) 
            return 1;

    }

    i = strcmp(buff1, buff2);

    if (i == 0)                 /* wait a second then return younger :-) */

        return -1;

    else

        return i;

    /*

     * X509_cmp_time comparison is <=.

     * The return value 0 is reserved for errors.

     */

    return i > 0 ? 1 : -1;

}



ASN1_TIME *X509_gmtime_adj(ASN1_TIME *s, long adj)