diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2000-12-31 01:13:04 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2000-12-31 01:13:04 +0000 |
commit | ecbe07817ab8fff2aca97eeb69fabdd5c54b4bda (patch) | |
tree | 71a101c30b45069272befb805c9b285059a4cd4b /crypto/pkcs12/p12_asn.c | |
parent | 71db02813c8d1ac2901be397ee4aa5f4dceabb17 (diff) | |
download | openssl-ecbe07817ab8fff2aca97eeb69fabdd5c54b4bda.zip openssl-ecbe07817ab8fff2aca97eeb69fabdd5c54b4bda.tar.gz openssl-ecbe07817ab8fff2aca97eeb69fabdd5c54b4bda.tar.bz2 |
Rewrite PKCS#12 code and remove some of the old
horrible macros.
Fix two evil ASN1 bugs. Attempt to use 'ctx' when
NULL if input is indefinite length constructed
in asn1_check_tlen() and invalid pointer to ASN1_TYPE
when reusing existing structure (this took *ages* to
find because the new PKCS#12 code triggered it).
Diffstat (limited to 'crypto/pkcs12/p12_asn.c')
-rw-r--r-- | crypto/pkcs12/p12_asn.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/crypto/pkcs12/p12_asn.c b/crypto/pkcs12/p12_asn.c index cbee733..860a6bb 100644 --- a/crypto/pkcs12/p12_asn.c +++ b/crypto/pkcs12/p12_asn.c @@ -112,3 +112,14 @@ ASN1_SEQUENCE(PKCS12_SAFEBAG) = { } ASN1_SEQUENCE_END(PKCS12_SAFEBAG); IMPLEMENT_ASN1_FUNCTIONS(PKCS12_SAFEBAG) + +/* SEQUENCE OF SafeBag */ +ASN1_ITEM_TEMPLATE(PKCS12_SAFEBAGS) = + ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_SAFEBAGS, PKCS12_SAFEBAG) +ASN1_ITEM_TEMPLATE_END(PKCS12_SAFEBAGS); + +/* Authsafes: SEQUENCE OF PKCS7 */ +ASN1_ITEM_TEMPLATE(PKCS12_AUTHSAFES) = + ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_AUTHSAFES, PKCS7) +ASN1_ITEM_TEMPLATE_END(PKCS12_AUTHSAFES); + |