generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rewrite CHOICE field setting code to properly handle

Browse Source 
combine in CHOICE options.

This was causing d2i_DSAPublicKey() to misbehave.
This commit is contained in:
Dr. Stephen Henson 2001-04-02 00:59:19 +00:00
parent 1c72eebf89
commit 722ca2781c
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -4,6 +4,10 @@
Changes between 0.9.6 and 0.9.7 [xx XXX 2000] 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 *) Change bctest to avoid here-documents inside command substitution
(workaround for FreeBSD /bin/sh bug). (workaround for FreeBSD /bin/sh bug).
[Bodo Moeller] [Bodo Moeller]

28
crypto/asn1/tasn_dec.c
View File

@ -227,14 +227,24 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, unsigned char **in, long len, const ASN1
case ASN1_ITYPE_CHOICE: case ASN1_ITYPE_CHOICE:
if(asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it)) if(asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it))
goto auxerr; 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 */ /* CHOICE type, try each possibility in turn */
pchval = NULL; pchval = NULL;
p = *in; p = *in;
for(i = 0, tt=it->templates; i < it->tcount; i++, tt++) { 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 /* We mark field as OPTIONAL so its absence
* can be recognised. * 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 field not present, try the next one */
if(ret == -1) continue; if(ret == -1) continue;
/* If positive return, read OK, break loop */ /* 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? */ /* Did we fall off the end without reading anything? */
if(i == it->tcount) { if(i == it->tcount) {
/* If OPTIONAL, this is OK */ /* If OPTIONAL, this is OK */
if(opt) return -1; if(opt) {
/* Free and zero it */
ASN1_item_ex_free(pval, it);
return -1;
}
ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_NO_MATCHING_CHOICE_TYPE); ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_NO_MATCHING_CHOICE_TYPE);
goto err; goto err;
} }
/* 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);
goto err;
}
}
pchptr = asn1_get_field_ptr(pval, tt);
*pchptr = pchval;
asn1_set_choice_selector(pval, i, it); asn1_set_choice_selector(pval, i, it);
*in = p; *in = p;
if(asn1_cb && !asn1_cb(ASN1_OP_D2I_POST, pval, it)) if(asn1_cb && !asn1_cb(ASN1_OP_D2I_POST, pval, it))

7
crypto/asn1/tasn_new.c
View File

@ -138,7 +138,12 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int
if(asn1_cb) { if(asn1_cb) {
i = asn1_cb(ASN1_OP_NEW_PRE, pval, it); i = asn1_cb(ASN1_OP_NEW_PRE, pval, it);
if(!i) goto auxerr; 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) { if(!combine) {
*pval = OPENSSL_malloc(it->size); *pval = OPENSSL_malloc(it->size);