diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2001-04-02 00:59:19 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2001-04-02 00:59:19 +0000 |
| commit | 722ca2781c975a419f83b846db0f387939dfc988 (patch) | |
| tree | 8a8200286c202ebff0e6faf4b0052eaec0987e4e /crypto/asn1/tasn_new.c | |
| parent | 1c72eebf895712ebd79343da1fecba5ba5707fbb (diff) | |
Rewrite CHOICE field setting code to properly handle
combine in CHOICE options.
This was causing d2i_DSAPublicKey() to misbehave.
Diffstat (limited to 'crypto/asn1/tasn_new.c')
| -rw-r--r-- | crypto/asn1/tasn_new.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c index 8637d2b1c7..e93db4f0c1 100644 --- a/crypto/asn1/tasn_new.c +++ b/crypto/asn1/tasn_new.c @@ -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); |