Commit 722ca278 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Rewrite CHOICE field setting code to properly handle 

combine in CHOICE options.

This was causing d2i_DSAPublicKey() to misbehave.
parent 1c72eebf

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


 Changes between 0.9.6 and 0.9.7  [xx XXX 2000]



  *) Rewrite CHOICE field setting in ASN1_item_ex_d2i(). The old code

     could not support the combine flag in choice fields.

     [Steve Henson]



  *) Change bctest to avoid here-documents inside command substitution

     (workaround for FreeBSD /bin/sh bug).

     [Bodo Moeller]

crypto/asn1/tasn_dec.c

+16 −12
Original line number Diff line number Diff line
@@ -227,14 +227,24 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, unsigned char **in, long len, const ASN1 
		case ASN1_ITYPE_CHOICE:

		if(asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it))

				goto auxerr;



		/* Allocate structure */

		if(!*pval) {

			if(!ASN1_item_ex_new(pval, it)) {

				errtt = tt;

				ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);

				goto err;

			}

		}

		/* CHOICE type, try each possibility in turn */

		pchval = NULL;

		p = *in;

		for(i = 0, tt=it->templates; i < it->tcount; i++, tt++) {

			pchptr = asn1_get_field_ptr(pval, tt);

			/* We mark field as OPTIONAL so its absence

			 * can be recognised.

			 */

			ret = asn1_template_ex_d2i(&pchval, &p, len, tt, 1, ctx);

			ret = asn1_template_ex_d2i(pchptr, &p, len, tt, 1, ctx);

			/* If field not present, try the next one */

			if(ret == -1) continue;

			/* If positive return, read OK, break loop */
@@ -247,20 +257,14 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, unsigned char **in, long len, const ASN1 
		/* Did we fall off the end without reading anything? */

		if(i == it->tcount) {

			/* If OPTIONAL, this is OK */

			if(opt) return -1;

			ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_NO_MATCHING_CHOICE_TYPE);

			goto err;

			if(opt) {

				/* Free and zero it */

				ASN1_item_ex_free(pval, it);

				return -1;

			}

		/* Otherwise we got a match, allocate structure and populate it */

		if(!*pval) {

			if(!ASN1_item_ex_new(pval, it)) {

				errtt = tt;

				ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);

			ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_NO_MATCHING_CHOICE_TYPE);

			goto err;

		}

		}

		pchptr = asn1_get_field_ptr(pval, tt);

		*pchptr = pchval;

		asn1_set_choice_selector(pval, i, it);

		*in = p;

		if(asn1_cb && !asn1_cb(ASN1_OP_D2I_POST, pval, it))

crypto/asn1/tasn_new.c

+6 −1
Original line number Diff line number Diff line
@@ -138,7 +138,12 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int 
		if(asn1_cb) {

			i = asn1_cb(ASN1_OP_NEW_PRE, pval, it);

			if(!i) goto auxerr;

			if(i==2) return 1;

			if(i==2) {

#ifdef CRYPTO_MDEBUG

				if(it->sname) CRYPTO_pop_info();

#endif

				return 1;

			}

		}

		if(!combine) {

			*pval = OPENSSL_malloc(it->size);