Commit f53e66af authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Respect ISO aliasing rules. 

PR: 1296
parent 5cbe626d

crypto/asn1/x_name.c

+20 −20
Original line number Diff line number Diff line
@@ -160,40 +160,40 @@ static int x509_name_ex_d2i(ASN1_VALUE **val, const unsigned char **in, long len 
					int tag, int aclass, char opt, ASN1_TLC *ctx)

{

	const unsigned char *p = *in, *q;

	STACK *intname = NULL, **intname_pp = &intname;

	union { STACK *s; ASN1_VALUE *a; } intname = {NULL};

	union { X509_NAME *x; ASN1_VALUE *a; } nm = {NULL};

	int i, j, ret;

	X509_NAME *nm = NULL, **nm_pp = &nm;

	STACK_OF(X509_NAME_ENTRY) *entries;

	X509_NAME_ENTRY *entry;

	q = p;



	/* Get internal representation of Name */

	ret = ASN1_item_ex_d2i((ASN1_VALUE **)intname_pp,

	ret = ASN1_item_ex_d2i(&intname.a,

			       &p, len, ASN1_ITEM_rptr(X509_NAME_INTERNAL),

			       tag, aclass, opt, ctx);

	

	if(ret <= 0) return ret;



	if(*val) x509_name_ex_free(val, NULL);

	if(!x509_name_ex_new((ASN1_VALUE **)nm_pp, NULL)) goto err;

	if(!x509_name_ex_new(&nm.a, NULL)) goto err;

	/* We've decoded it: now cache encoding */

	if(!BUF_MEM_grow(nm->bytes, p - q)) goto err;

	memcpy(nm->bytes->data, q, p - q);

	if(!BUF_MEM_grow(nm.x->bytes, p - q)) goto err;

	memcpy(nm.x->bytes->data, q, p - q);



	/* Convert internal representation to X509_NAME structure */

	for(i = 0; i < sk_num(intname); i++) {

		entries = (STACK_OF(X509_NAME_ENTRY) *)sk_value(intname, i);

	for(i = 0; i < sk_num(intname.s); i++) {

		entries = (STACK_OF(X509_NAME_ENTRY) *)sk_value(intname.s, i);

		for(j = 0; j < sk_X509_NAME_ENTRY_num(entries); j++) {

			entry = sk_X509_NAME_ENTRY_value(entries, j);

			entry->set = i;

			if(!sk_X509_NAME_ENTRY_push(nm->entries, entry))

			if(!sk_X509_NAME_ENTRY_push(nm.x->entries, entry))

				goto err;

		}

		sk_X509_NAME_ENTRY_free(entries);

	}

	sk_free(intname);

	nm->modified = 0;

	*val = (ASN1_VALUE *)nm;

	sk_free(intname.s);

	nm.x->modified = 0;

	*val = nm.a;

	*in = p;

	return ret;

	err:
@@ -219,35 +219,35 @@ static int x509_name_ex_i2d(ASN1_VALUE **val, unsigned char **out, const ASN1_IT 


static int x509_name_encode(X509_NAME *a)

{

	STACK *intname = NULL, **intname_pp = &intname;

	union { STACK *s; ASN1_VALUE *a; } intname = {NULL};

	int len;

	unsigned char *p;

	STACK_OF(X509_NAME_ENTRY) *entries = NULL;

	X509_NAME_ENTRY *entry;

	int i, set = -1;

	intname = sk_new_null();

	if(!intname) goto memerr;

	intname.s = sk_new_null();

	if(!intname.s) goto memerr;

	for(i = 0; i < sk_X509_NAME_ENTRY_num(a->entries); i++) {

		entry = sk_X509_NAME_ENTRY_value(a->entries, i);

		if(entry->set != set) {

			entries = sk_X509_NAME_ENTRY_new_null();

			if(!entries) goto memerr;

			if(!sk_push(intname, (char *)entries)) goto memerr;

			if(!sk_push(intname.s, (char *)entries)) goto memerr;

			set = entry->set;

		}

		if(!sk_X509_NAME_ENTRY_push(entries, entry)) goto memerr;

	}

	len = ASN1_item_ex_i2d((ASN1_VALUE **)intname_pp, NULL,

	len = ASN1_item_ex_i2d(&intname.a, NULL,

			       ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);

	if (!BUF_MEM_grow(a->bytes,len)) goto memerr;

	p=(unsigned char *)a->bytes->data;

	ASN1_item_ex_i2d((ASN1_VALUE **)intname_pp,

	ASN1_item_ex_i2d(&intname.a,

			 &p, ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);

	sk_pop_free(intname, sk_internal_free);

	sk_pop_free(intname.s, sk_internal_free);

	a->modified = 0;

	return len;

	memerr:

	sk_pop_free(intname, sk_internal_free);

	sk_pop_free(intname.s, sk_internal_free);

	ASN1err(ASN1_F_X509_NAME_ENCODE, ERR_R_MALLOC_FAILURE);

	return -1;

}