Commit 2743e38c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

make X509_NAME opaque 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 70e5fd87

apps/ca.c

+1 −1
Original line number Diff line number Diff line
@@ -1688,7 +1688,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, 


        if (msie_hack) {

            /* assume all type should be strings */

            nid = OBJ_obj2nid(ne->object);

            nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(ne));



            if (str->type == V_ASN1_UNIVERSALSTRING)

                ASN1_UNIVERSALSTRING_to_string(str);

crypto/asn1/Makefile

+2 −15
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 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_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_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_long.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 \

	tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \
@@ -35,7 +35,7 @@ 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_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_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_long.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 \

	tasn_new.o tasn_fre.o tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o \
@@ -781,19 +781,6 @@ x_long.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 
x_long.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h

x_long.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

x_long.o: ../cryptlib.h x_long.c

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

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

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

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

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

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

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

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

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

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

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

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

x_name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn1_locl.h x_name.c

x_nx509.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

x_nx509.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h

x_nx509.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

crypto/asn1/a_strex.c

+2 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static int do_name_ex(char_io *io_ch, void *arg, X509_NAME *n, 
        else

            ent = X509_NAME_get_entry(n, i);

        if (prev != -1) {

            if (prev == ent->set) {

            if (prev == X509_NAME_ENTRY_set(ent)) {

                if (!io_ch(arg, sep_mv, sep_mv_len))

                    return -1;

                outlen += sep_mv_len;
@@ -514,7 +514,7 @@ static int do_name_ex(char_io *io_ch, void *arg, X509_NAME *n, 
                outlen += indent;

            }

        }

        prev = ent->set;

        prev = X509_NAME_ENTRY_set(ent);

        fn = X509_NAME_ENTRY_get_object(ent);

        val = X509_NAME_ENTRY_get_data(ent);

        fn_nid = OBJ_obj2nid(fn);

crypto/asn1/asn1_locl.h

+0 −10
Original line number Diff line number Diff line
@@ -62,16 +62,6 @@ 
int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d);

int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d);



/* ASN1 print context structure */



struct asn1_pctx_st {

    unsigned long flags;

    unsigned long nm_flags;

    unsigned long cert_flags;

    unsigned long oid_flags;

    unsigned long str_flags;

} /* ASN1_PCTX */ ;



/* ASN1 scan context structure */



struct asn1_sctx_st {

crypto/asn1/tasn_prn.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
#include <openssl/buffer.h>

#include <openssl/err.h>

#include <openssl/x509v3.h>

#include "asn1_locl.h"

#include "internal/asn1_int.h"



/*

 * Print routines.