diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2001-02-23 03:16:09 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2001-02-23 03:16:09 +0000 |
| commit | bb5ea36b962453c4d74dab15ac1897725a02707d (patch) | |
| tree | 3bf427b77627b9c2a45c7f6288deda545822ccca /crypto/asn1/tasn_enc.c | |
| parent | e3a91640739c4c016e234550ed913e7f7f6970f9 (diff) | |
Initial support for ASN1_ITEM_FUNCTION option to
change the way ASN1 modules are exported.
Still needs a bit of work for example the hack which a
dummy function prototype to avoid compilers warning about
multiple ;s.
Diffstat (limited to 'crypto/asn1/tasn_enc.c')
| -rw-r--r-- | crypto/asn1/tasn_enc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c index 365c4f75b0..2e1eafba26 100644 --- a/crypto/asn1/tasn_enc.c +++ b/crypto/asn1/tasn_enc.c @@ -240,7 +240,7 @@ int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_TEMPLAT skcontlen = 0; for(i = 0; i < sk_ASN1_VALUE_num(sk); i++) { skitem = sk_ASN1_VALUE_value(sk, i); - skcontlen += ASN1_item_ex_i2d(&skitem, NULL, tt->item, -1, 0); + skcontlen += ASN1_item_ex_i2d(&skitem, NULL, ASN1_ITEM_ptr(tt->item), -1, 0); } sklen = ASN1_object_size(1, skcontlen, sktag); /* If EXPLICIT need length of surrounding tag */ @@ -257,7 +257,7 @@ int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_TEMPLAT /* SET or SEQUENCE and IMPLICIT tag */ ASN1_put_object(out, 1, skcontlen, sktag, skaclass); /* And finally the stuff itself */ - asn1_set_seq_out(sk, out, skcontlen, tt->item, isset); + asn1_set_seq_out(sk, out, skcontlen, ASN1_ITEM_ptr(tt->item), isset); return ret; } @@ -265,23 +265,23 @@ int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_TEMPLAT if(flags & ASN1_TFLG_EXPTAG) { /* EXPLICIT tagging */ /* Find length of tagged item */ - i = ASN1_item_ex_i2d(pval, NULL, tt->item, -1, 0); + i = ASN1_item_ex_i2d(pval, NULL, ASN1_ITEM_ptr(tt->item), -1, 0); if(!i) return 0; /* Find length of EXPLICIT tag */ ret = ASN1_object_size(1, i, tt->tag); if(out) { /* Output tag and item */ ASN1_put_object(out, 1, i, tt->tag, aclass); - ASN1_item_ex_i2d(pval, out, tt->item, -1, 0); + ASN1_item_ex_i2d(pval, out, ASN1_ITEM_ptr(tt->item), -1, 0); } return ret; } if(flags & ASN1_TFLG_IMPTAG) { /* IMPLICIT tagging */ - return ASN1_item_ex_i2d(pval, out, tt->item, tt->tag, aclass); + return ASN1_item_ex_i2d(pval, out, ASN1_ITEM_ptr(tt->item), tt->tag, aclass); } /* Nothing special: treat as normal */ - return ASN1_item_ex_i2d(pval, out, tt->item, -1, 0); + return ASN1_item_ex_i2d(pval, out, ASN1_ITEM_ptr(tt->item), -1, 0); } /* Temporary structure used to hold DER encoding of items for SET OF */ |