Commit 7aef39a7 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

X509_CRL_INFO embed 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 2869e79f

crypto/asn1/t_crl.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ int X509_CRL_print(BIO *out, X509_CRL *x) 
        BIO_printf(out, "NONE");

    BIO_printf(out, "\n");



    X509V3_extensions_print(out, "CRL extensions", x->crl->extensions, 0, 8);

    X509V3_extensions_print(out, "CRL extensions", x->crl.extensions, 0, 8);



    rev = X509_CRL_get_REVOKED(x);

crypto/asn1/x_crl.c

+9 −9
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, 
         * directly: applications shouldn't do this.

         */



        exts = crl->crl->extensions;

        exts = crl->crl.extensions;



        for (idx = 0; idx < sk_X509_EXTENSION_num(exts); idx++) {

            int nid;
@@ -331,7 +331,7 @@ static void setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp) 
}



ASN1_SEQUENCE_ref(X509_CRL, crl_cb, CRYPTO_LOCK_X509_CRL) = {

        ASN1_SIMPLE(X509_CRL, crl, X509_CRL_INFO),

        ASN1_EMBED(X509_CRL, crl, X509_CRL_INFO),

        ASN1_SIMPLE(X509_CRL, sig_alg, X509_ALGOR),

        ASN1_SIMPLE(X509_CRL, signature, ASN1_BIT_STRING)

} ASN1_SEQUENCE_END_ref(X509_CRL, X509_CRL)
@@ -356,7 +356,7 @@ static int X509_REVOKED_cmp(const X509_REVOKED *const *a, 
int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev)

{

    X509_CRL_INFO *inf;

    inf = crl->crl;

    inf = &crl->crl;

    if (!inf->revoked)

        inf->revoked = sk_X509_REVOKED_new(X509_REVOKED_cmp);

    if (!inf->revoked || !sk_X509_REVOKED_push(inf->revoked, rev)) {
@@ -394,7 +394,7 @@ int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x) 
static int def_crl_verify(X509_CRL *crl, EVP_PKEY *r)

{

    return (ASN1_item_verify(ASN1_ITEM_rptr(X509_CRL_INFO),

                             crl->sig_alg, crl->signature, crl->crl, r));

                             crl->sig_alg, crl->signature, &crl->crl, r));

}



static int crl_revoked_issuer_match(X509_CRL *crl, X509_NAME *nm,
@@ -435,17 +435,17 @@ static int def_crl_lookup(X509_CRL *crl, 
     * Sort revoked into serial number order if not already sorted. Do this

     * under a lock to avoid race condition.

     */

    if (!sk_X509_REVOKED_is_sorted(crl->crl->revoked)) {

    if (!sk_X509_REVOKED_is_sorted(crl->crl.revoked)) {

        CRYPTO_w_lock(CRYPTO_LOCK_X509_CRL);

        sk_X509_REVOKED_sort(crl->crl->revoked);

        sk_X509_REVOKED_sort(crl->crl.revoked);

        CRYPTO_w_unlock(CRYPTO_LOCK_X509_CRL);

    }

    idx = sk_X509_REVOKED_find(crl->crl->revoked, &rtmp);

    idx = sk_X509_REVOKED_find(crl->crl.revoked, &rtmp);

    if (idx < 0)

        return 0;

    /* Need to look for matching name */

    for (; idx < sk_X509_REVOKED_num(crl->crl->revoked); idx++) {

        rev = sk_X509_REVOKED_value(crl->crl->revoked, idx);

    for (; idx < sk_X509_REVOKED_num(crl->crl.revoked); idx++) {

        rev = sk_X509_REVOKED_value(crl->crl.revoked, idx);

        if (ASN1_INTEGER_cmp(rev->serialNumber, serial))

            return 0;

        if (crl_revoked_issuer_match(crl, issuer, rev)) {

crypto/include/internal/x509_int.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct X509_crl_info_st { 


struct X509_crl_st {

    /* actual signature */

    X509_CRL_INFO *crl;

    X509_CRL_INFO crl;

    X509_ALGOR *sig_alg;

    ASN1_BIT_STRING *signature;

    int references;

crypto/x509/by_dir.c

+3 −7
Original line number Diff line number Diff line
@@ -257,10 +257,7 @@ static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type, 
            X509 st_x509;

            X509_CINF st_x509_cinf;

        } x509;

        struct {

            X509_CRL st_crl;

            X509_CRL_INFO st_crl_info;

        } crl;

        X509_CRL crl;

    } data;

    int ok = 0;

    int i, j, k;
@@ -279,9 +276,8 @@ static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type, 
        stmp.data.x509 = &data.x509.st_x509;

        postfix = "";

    } else if (type == X509_LU_CRL) {

        data.crl.st_crl.crl = &data.crl.st_crl_info;

        data.crl.st_crl_info.issuer = name;

        stmp.data.crl = &data.crl.st_crl;

        data.crl.crl.issuer = name;

        stmp.data.crl = &data.crl;

        postfix = "r";

    } else {

        X509err(X509_F_GET_CERT_BY_SUBJECT, X509_R_WRONG_LOOKUP_TYPE);

crypto/x509/x509_cmp.c

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int X509_subject_name_cmp(const X509 *a, const X509 *b) 


int X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b)

{

    return (X509_NAME_cmp(a->crl->issuer, b->crl->issuer));

    return (X509_NAME_cmp(a->crl.issuer, b->crl.issuer));

}



int X509_CRL_match(const X509_CRL *a, const X509_CRL *b)
@@ -458,7 +458,7 @@ int X509_CRL_check_suiteb(X509_CRL *crl, EVP_PKEY *pk, unsigned long flags) 
    int sign_nid;

    if (!(flags & X509_V_FLAG_SUITEB_128_LOS))

        return X509_V_OK;

    sign_nid = OBJ_obj2nid(crl->crl->sig_alg->algorithm);

    sign_nid = OBJ_obj2nid(crl->crl.sig_alg->algorithm);

    return check_suite_b(pk, sign_nid, &flags);

}