Commit 9b0a4531 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make X509_ATTRIBUTE opaque. 



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

apps/pkcs12.c

+6 −4
Original line number Diff line number Diff line
@@ -993,17 +993,19 @@ int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst, 
    }

    BIO_printf(out, "%s\n", name);

    for (i = 0; i < sk_X509_ATTRIBUTE_num(attrlst); i++) {

        ASN1_OBJECT *attr_obj;

        attr = sk_X509_ATTRIBUTE_value(attrlst, i);

        attr_nid = OBJ_obj2nid(attr->object);

        attr_obj = X509_ATTRIBUTE_get0_object(attr);

        attr_nid = OBJ_obj2nid(attr_obj);

        BIO_printf(out, "    ");

        if (attr_nid == NID_undef) {

            i2a_ASN1_OBJECT(out, attr->object);

            i2a_ASN1_OBJECT(out, attr_obj);

            BIO_printf(out, ": ");

        } else

            BIO_printf(out, "%s: ", OBJ_nid2ln(attr_nid));



        if (sk_ASN1_TYPE_num(attr->value.set)) {

            av = sk_ASN1_TYPE_value(attr->value.set, 0);

        if (X509_ATTRIBUTE_count(attr)) {

            av = X509_ATTRIBUTE_get0_type(attr, 0);

            switch (av->type) {

            case V_ASN1_BMPSTRING:

                value = OPENSSL_uni2asc(av->value.bmpstring->data,

crypto/asn1/Makefile

+2 −15
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ LIB=$(TOP)/libcrypto.a 
LIBSRC=	a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \

	a_print.c a_type.c a_set.c a_dup.c a_d2i_fp.c a_i2d_fp.c \

	a_enum.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c \

	x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c x_bignum.c \

	x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_bignum.c \

	x_long.c x_name.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c \

	x_nx509.c d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\

	t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c \
@@ -34,7 +34,7 @@ LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \ 
LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \

	a_print.o a_type.o a_set.o a_dup.o a_d2i_fp.o a_i2d_fp.o \

	a_enum.o a_utf8.o a_sign.o a_digest.o a_verify.o a_mbstr.o a_strex.o \

	x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_attrib.o x_bignum.o \

	x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_bignum.o \

	x_long.o x_name.o x_x509.o x_x509a.o x_crl.o x_info.o x_spki.o nsseq.o \

	x_nx509.o d2i_pu.o d2i_pr.o i2d_pu.o i2d_pr.o \

	t_req.o t_x509.o t_x509a.o t_crl.o t_pkey.o t_spki.o t_bitst.o \
@@ -759,19 +759,6 @@ x_algor.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h 
x_algor.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

x_algor.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

x_algor.o: ../../include/openssl/x509_vfy.h x_algor.c

x_attrib.o: ../../e_os.h ../../include/openssl/asn1.h

x_attrib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h

x_attrib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

x_attrib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

x_attrib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h

x_attrib.o: ../../include/openssl/err.h ../../include/openssl/evp.h

x_attrib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

x_attrib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

x_attrib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

x_attrib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h

x_attrib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

x_attrib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

x_attrib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_attrib.c

x_bignum.o: ../../e_os.h ../../include/openssl/asn1.h

x_bignum.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h

x_bignum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

crypto/asn1/t_req.c

+9 −14
Original line number Diff line number Diff line
@@ -161,28 +161,23 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, 
                ASN1_TYPE *at;

                X509_ATTRIBUTE *a;

                ASN1_BIT_STRING *bs = NULL;

                ASN1_TYPE *t;

                ASN1_OBJECT *aobj;

                int j, type = 0, count = 1, ii = 0;



                a = sk_X509_ATTRIBUTE_value(sk, i);

                if (X509_REQ_extension_nid(OBJ_obj2nid(a->object)))

                aobj = X509_ATTRIBUTE_get0_object(a);

                if (X509_REQ_extension_nid(OBJ_obj2nid(aobj)))

                    continue;

                if (BIO_printf(bp, "%12s", "") <= 0)

                    goto err;

                if ((j = i2a_ASN1_OBJECT(bp, a->object)) > 0) {

                    if (a->single) {

                        t = a->value.single;

                        type = t->type;

                        bs = t->value.bit_string;

                    } else {

                if ((j = i2a_ASN1_OBJECT(bp, aobj)) > 0) {

                    ii = 0;

                        count = sk_ASN1_TYPE_num(a->value.set);

                    count = X509_ATTRIBUTE_count(a);

 get_next:

                        at = sk_ASN1_TYPE_value(a->value.set, ii);

                    at = X509_ATTRIBUTE_get0_type(a, ii);

                    type = at->type;

                    bs = at->value.asn1_string;

                }

                }

                for (j = 25 - j; j > 0; j--)

                    if (BIO_write(bp, " ", 1) != 1)

                        goto err;

crypto/pkcs12/p12_attr.c

+3 −12
Original line number Diff line number Diff line
@@ -121,18 +121,9 @@ ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid) 
{

    X509_ATTRIBUTE *attrib;

    int i;

    if (!attrs)

        return NULL;

    for (i = 0; i < sk_X509_ATTRIBUTE_num(attrs); i++) {

        attrib = sk_X509_ATTRIBUTE_value(attrs, i);

        if (OBJ_obj2nid(attrib->object) == attr_nid) {

            if (sk_ASN1_TYPE_num(attrib->value.set))

                return sk_ASN1_TYPE_value(attrib->value.set, 0);

            else

                return NULL;

        }

    }

    return NULL;

    i = X509at_get_attr_by_NID(attrs, attr_nid, -1);

    attrib = X509at_get_attr(attrs, i);

    return X509_ATTRIBUTE_get0_type(attrib, 0);

}



char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)

crypto/pkcs7/pk7_doit.c

+5 −17
Original line number Diff line number Diff line
@@ -1067,23 +1067,11 @@ ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid) 


static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid)

{

    int i;

    int idx;

    X509_ATTRIBUTE *xa;

    ASN1_OBJECT *o;



    o = OBJ_nid2obj(nid);

    if (!o || !sk)

        return (NULL);

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

        xa = sk_X509_ATTRIBUTE_value(sk, i);

        if (OBJ_cmp(xa->object, o) == 0) {

            if (!xa->single && sk_ASN1_TYPE_num(xa->value.set))

                return (sk_ASN1_TYPE_value(xa->value.set, 0));

            else

                return (NULL);

        }

    }

    return (NULL);

    idx = X509at_get_attr_by_NID(sk, nid, -1);

    xa = X509at_get_attr(sk, idx);

    return X509_ATTRIBUTE_get0_type(xa, 0);

}



ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk)
@@ -1167,7 +1155,7 @@ static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype, 


        for (i = 0; i < sk_X509_ATTRIBUTE_num(*sk); i++) {

            attr = sk_X509_ATTRIBUTE_value(*sk, i);

            if (OBJ_obj2nid(attr->object) == nid) {

            if (OBJ_obj2nid(X509_ATTRIBUTE_get0_object(attr)) == nid) {

                X509_ATTRIBUTE_free(attr);

                attr = X509_ATTRIBUTE_create(nid, atrtype, value);

                if (attr == NULL)