Commit 5cf6abd8 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Embed X509_CINF 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 7aef39a7

crypto/asn1/t_x509.c

+5 −5
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, 
    if (nmflags == X509_FLAG_COMPAT)

        nmindent = 16;



    ci = x->cert_info;

    ci = &x->cert_info;

    if (!(cflag & X509_FLAG_NO_HEADER)) {

        if (BIO_write(bp, "Certificate:\n", 13) <= 0)

            goto err;
@@ -272,10 +272,10 @@ int X509_ocspid_print(BIO *bp, X509 *x) 
     */

    if (BIO_printf(bp, "        Subject OCSP hash: ") <= 0)

        goto err;

    derlen = i2d_X509_NAME(x->cert_info->subject, NULL);

    derlen = i2d_X509_NAME(x->cert_info.subject, NULL);

    if ((der = dertmp = OPENSSL_malloc(derlen)) == NULL)

        goto err;

    i2d_X509_NAME(x->cert_info->subject, &dertmp);

    i2d_X509_NAME(x->cert_info.subject, &dertmp);



    if (!EVP_Digest(der, derlen, SHA1md, NULL, EVP_sha1(), NULL))

        goto err;
@@ -292,8 +292,8 @@ int X509_ocspid_print(BIO *bp, X509 *x) 
    if (BIO_printf(bp, "\n        Public key OCSP hash: ") <= 0)

        goto err;



    if (!EVP_Digest(x->cert_info->key->public_key->data,

                    x->cert_info->key->public_key->length,

    if (!EVP_Digest(x->cert_info.key->public_key->data,

                    x->cert_info.key->public_key->length,

                    SHA1md, NULL, EVP_sha1(), NULL))

        goto err;

    for (i = 0; i < SHA_DIGEST_LENGTH; i++) {

crypto/asn1/x_x509.c

+4 −4
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, 


    case ASN1_OP_D2I_POST:

        OPENSSL_free(ret->name);

        ret->name = X509_NAME_oneline(ret->cert_info->subject, NULL, 0);

        ret->name = X509_NAME_oneline(ret->cert_info.subject, NULL, 0);

        break;



    case ASN1_OP_FREE_POST:
@@ -132,7 +132,7 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, 
}



ASN1_SEQUENCE_ref(X509, x509_cb, CRYPTO_LOCK_X509) = {

        ASN1_SIMPLE(X509, cert_info, X509_CINF),

        ASN1_EMBED(X509, cert_info, X509_CINF),

        ASN1_SIMPLE(X509, sig_alg, X509_ALGOR),

        ASN1_SIMPLE(X509, signature, ASN1_BIT_STRING)

} ASN1_SEQUENCE_END_ref(X509, X509)
@@ -209,8 +209,8 @@ int i2d_X509_AUX(X509 *a, unsigned char **pp) 


int i2d_re_X509_tbs(X509 *x, unsigned char **pp)

{

    x->cert_info->enc.modified = 1;

    return i2d_X509_CINF(x->cert_info, pp);

    x->cert_info.enc.modified = 1;

    return i2d_X509_CINF(&x->cert_info, pp);

}



void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,

crypto/x509/by_dir.c

+3 −7
Original line number Diff line number Diff line
@@ -253,10 +253,7 @@ static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type, 
{

    BY_DIR *ctx;

    union {

        struct {

        X509 st_x509;

            X509_CINF st_x509_cinf;

        } x509;

        X509_CRL crl;

    } data;

    int ok = 0;
@@ -271,9 +268,8 @@ static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type, 


    stmp.type = type;

    if (type == X509_LU_X509) {

        data.x509.st_x509.cert_info = &data.x509.st_x509_cinf;

        data.x509.st_x509_cinf.subject = name;

        stmp.data.x509 = &data.x509.st_x509;

        data.st_x509.cert_info.subject = name;

        stmp.data.x509 = &data.st_x509;

        postfix = "";

    } else if (type == X509_LU_CRL) {

        data.crl.crl.issuer = name;

crypto/x509/x509_cmp.c

+24 −26
Original line number Diff line number Diff line
@@ -68,10 +68,10 @@ 
int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)

{

    int i;

    X509_CINF *ai, *bi;

    const X509_CINF *ai, *bi;



    ai = a->cert_info;

    bi = b->cert_info;

    ai = &a->cert_info;

    bi = &b->cert_info;

    i = ASN1_INTEGER_cmp(ai->serialNumber, bi->serialNumber);

    if (i)

        return (i);
@@ -87,15 +87,15 @@ unsigned long X509_issuer_and_serial_hash(X509 *a) 
    char *f;



    EVP_MD_CTX_init(&ctx);

    f = X509_NAME_oneline(a->cert_info->issuer, NULL, 0);

    f = X509_NAME_oneline(a->cert_info.issuer, NULL, 0);

    if (!EVP_DigestInit_ex(&ctx, EVP_md5(), NULL))

        goto err;

    if (!EVP_DigestUpdate(&ctx, (unsigned char *)f, strlen(f)))

        goto err;

    OPENSSL_free(f);

    if (!EVP_DigestUpdate

        (&ctx, (unsigned char *)a->cert_info->serialNumber->data,

         (unsigned long)a->cert_info->serialNumber->length))

        (&ctx, (unsigned char *)a->cert_info.serialNumber->data,

         (unsigned long)a->cert_info.serialNumber->length))

        goto err;

    if (!EVP_DigestFinal_ex(&ctx, &(md[0]), NULL))

        goto err;
@@ -110,12 +110,12 @@ unsigned long X509_issuer_and_serial_hash(X509 *a) 


int X509_issuer_name_cmp(const X509 *a, const X509 *b)

{

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

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

}



int X509_subject_name_cmp(const X509 *a, const X509 *b)

{

    return (X509_NAME_cmp(a->cert_info->subject, b->cert_info->subject));

    return (X509_NAME_cmp(a->cert_info.subject, b->cert_info.subject));

}



int X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b)
@@ -130,40 +130,40 @@ int X509_CRL_match(const X509_CRL *a, const X509_CRL *b) 


X509_NAME *X509_get_issuer_name(X509 *a)

{

    return (a->cert_info->issuer);

    return (a->cert_info.issuer);

}



unsigned long X509_issuer_name_hash(X509 *x)

{

    return (X509_NAME_hash(x->cert_info->issuer));

    return (X509_NAME_hash(x->cert_info.issuer));

}



#ifndef OPENSSL_NO_MD5

unsigned long X509_issuer_name_hash_old(X509 *x)

{

    return (X509_NAME_hash_old(x->cert_info->issuer));

    return (X509_NAME_hash_old(x->cert_info.issuer));

}

#endif



X509_NAME *X509_get_subject_name(X509 *a)

{

    return (a->cert_info->subject);

    return (a->cert_info.subject);

}



ASN1_INTEGER *X509_get_serialNumber(X509 *a)

{

    return (a->cert_info->serialNumber);

    return (a->cert_info.serialNumber);

}



unsigned long X509_subject_name_hash(X509 *x)

{

    return (X509_NAME_hash(x->cert_info->subject));

    return (X509_NAME_hash(x->cert_info.subject));

}



#ifndef OPENSSL_NO_MD5

unsigned long X509_subject_name_hash_old(X509 *x)

{

    return (X509_NAME_hash_old(x->cert_info->subject));

    return (X509_NAME_hash_old(x->cert_info.subject));

}

#endif
@@ -186,12 +186,12 @@ int X509_cmp(const X509 *a, const X509 *b) 
    if (rv)

        return rv;

    /* Check for match against stored encoding too */

    if (!a->cert_info->enc.modified && !b->cert_info->enc.modified) {

        rv = (int)(a->cert_info->enc.len - b->cert_info->enc.len);

    if (!a->cert_info.enc.modified && !b->cert_info.enc.modified) {

        rv = (int)(a->cert_info.enc.len - b->cert_info.enc.len);

        if (rv)

            return rv;

        return memcmp(a->cert_info->enc.enc, b->cert_info->enc.enc,

                      a->cert_info->enc.len);

        return memcmp(a->cert_info.enc.enc, b->cert_info.enc.enc,

                      a->cert_info.enc.len);

    }

    return rv;

}
@@ -273,15 +273,13 @@ X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name, 
                                     ASN1_INTEGER *serial)

{

    int i;

    X509_CINF cinf;

    X509 x, *x509 = NULL;



    if (!sk)

        return NULL;



    x.cert_info = &cinf;

    cinf.serialNumber = serial;

    cinf.issuer = name;

    x.cert_info.serialNumber = serial;

    x.cert_info.issuer = name;



    for (i = 0; i < sk_X509_num(sk); i++) {

        x509 = sk_X509_value(sk, i);
@@ -306,16 +304,16 @@ X509 *X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name) 


EVP_PKEY *X509_get_pubkey(X509 *x)

{

    if ((x == NULL) || (x->cert_info == NULL))

    if (x == NULL)

        return (NULL);

    return (X509_PUBKEY_get(x->cert_info->key));

    return (X509_PUBKEY_get(x->cert_info.key));

}



ASN1_BIT_STRING *X509_get0_pubkey_bitstr(const X509 *x)

{

    if (!x)

        return NULL;

    return x->cert_info->key->public_key;

    return x->cert_info.key->public_key;

}



int X509_check_private_key(X509 *x, EVP_PKEY *k)

crypto/x509/x509_ext.c

+9 −9
Original line number Diff line number Diff line
@@ -114,49 +114,49 @@ int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc) 


int X509_get_ext_count(X509 *x)

{

    return (X509v3_get_ext_count(x->cert_info->extensions));

    return (X509v3_get_ext_count(x->cert_info.extensions));

}



int X509_get_ext_by_NID(X509 *x, int nid, int lastpos)

{

    return (X509v3_get_ext_by_NID(x->cert_info->extensions, nid, lastpos));

    return (X509v3_get_ext_by_NID(x->cert_info.extensions, nid, lastpos));

}



int X509_get_ext_by_OBJ(X509 *x, ASN1_OBJECT *obj, int lastpos)

{

    return (X509v3_get_ext_by_OBJ(x->cert_info->extensions, obj, lastpos));

    return (X509v3_get_ext_by_OBJ(x->cert_info.extensions, obj, lastpos));

}



int X509_get_ext_by_critical(X509 *x, int crit, int lastpos)

{

    return (X509v3_get_ext_by_critical

            (x->cert_info->extensions, crit, lastpos));

            (x->cert_info.extensions, crit, lastpos));

}



X509_EXTENSION *X509_get_ext(X509 *x, int loc)

{

    return (X509v3_get_ext(x->cert_info->extensions, loc));

    return (X509v3_get_ext(x->cert_info.extensions, loc));

}



X509_EXTENSION *X509_delete_ext(X509 *x, int loc)

{

    return (X509v3_delete_ext(x->cert_info->extensions, loc));

    return (X509v3_delete_ext(x->cert_info.extensions, loc));

}



int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc)

{

    return (X509v3_add_ext(&(x->cert_info->extensions), ex, loc) != NULL);

    return (X509v3_add_ext(&(x->cert_info.extensions), ex, loc) != NULL);

}



void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx)

{

    return X509V3_get_d2i(x->cert_info->extensions, nid, crit, idx);

    return X509V3_get_d2i(x->cert_info.extensions, nid, crit, idx);

}



int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,

                      unsigned long flags)

{

    return X509V3_add1_i2d(&x->cert_info->extensions, nid, value, crit,

    return X509V3_add1_i2d(&x->cert_info.extensions, nid, value, crit,

                           flags);

}