Commit 325da823 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Use newest CRL. 



If two CRLs are equivalent then use the one with a later lastUpdate field:
this will result in the newest CRL available being used.

RT#4615

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(cherry picked from commit 626aa248)
parent 02f873c5

crypto/x509/x509_vfy.c

+14 −6
Original line number Diff line number Diff line
@@ -1122,14 +1122,22 @@ static int get_crl_sk(X509_STORE_CTX *ctx, X509_CRL **pcrl, X509_CRL **pdcrl, 
        crl = sk_X509_CRL_value(crls, i);

        reasons = *preasons;

        crl_score = get_crl_score(ctx, &crl_issuer, &reasons, crl, x);



        if (crl_score > best_score) {

        if (crl_score < best_score)

            continue;

        /* If current CRL is equivalent use it if it is newer */

        if (crl_score == best_score) {

            int day, sec;

            if (ASN1_TIME_diff(&day, &sec, X509_CRL_get_lastUpdate(best_crl),

                               X509_CRL_get_lastUpdate(crl)) == 0)

                continue;

            if (day < 0 || sec <= 0)

                continue;

        }

        best_crl = crl;

        best_crl_issuer = crl_issuer;

        best_score = crl_score;

        best_reasons = reasons;

    }

    }



    if (best_crl) {

        if (*pcrl)