diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-12-13 23:54:30 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-12-13 23:54:30 +0000 |
| commit | 06db4253e2eb1208b60b5107c6a02d385a0e2129 (patch) | |
| tree | 4a20b56f7d04b4e577cb5a41c1767fd8012fbeb1 /crypto/pkcs7/pk7_asn1.c | |
| parent | 4ce7894c4ab87d7c635e45bf5ff8d1d729b79527 (diff) | |
Change the PKCS7 structure to use SEQUENCE OF for the
authenticated attributes: this is used to retain the
original encoding and not break signatures.
Support for a SET OF which reorders the STACK when
encoding a structure. This will be used with the
PKCS7 code.
Diffstat (limited to 'crypto/pkcs7/pk7_asn1.c')
| -rw-r--r-- | crypto/pkcs7/pk7_asn1.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/pkcs7/pk7_asn1.c b/crypto/pkcs7/pk7_asn1.c index 777a8619d6..192890d6c6 100644 --- a/crypto/pkcs7/pk7_asn1.c +++ b/crypto/pkcs7/pk7_asn1.c @@ -108,7 +108,10 @@ ASN1_SEQUENCE_cb(PKCS7_SIGNER_INFO, si_cb) = { ASN1_SIMPLE(PKCS7_SIGNER_INFO, version, ASN1_INTEGER), ASN1_SIMPLE(PKCS7_SIGNER_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL), ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_alg, X509_ALGOR), - ASN1_IMP_SET_OF_OPT(PKCS7_SIGNER_INFO, auth_attr, X509_ATTRIBUTE, 0), + /* NB this should be a SET OF but we use a SEQUENCE OF so the original order + * is retained when the structure is reencoded. + */ + ASN1_IMP_SEQUENCE_OF_OPT(PKCS7_SIGNER_INFO, auth_attr, X509_ATTRIBUTE, 0), ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_enc_alg, X509_ALGOR), ASN1_SIMPLE(PKCS7_SIGNER_INFO, enc_digest, ASN1_OCTET_STRING), ASN1_IMP_SET_OF_OPT(PKCS7_SIGNER_INFO, unauth_attr, X509_ATTRIBUTE, 1) |