← Back to branch summary

~ubuntu-branches/ubuntu/hardy/openssl/hardy-security

« back to all changes in this revision

Viewing changes to crypto/pkcs7/pk7_asn1.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2005-12-13 21:37:42 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051213213742-7em5nrw5c7ceegyd
Tags: 0.9.8a-5
http://bugs.debian.org/335912
Stop ssh from crashing randomly on sparc (Closes: #335912)
Patch from upstream cvs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/pkcs7/pk7_asn1.c
69
69
ASN1_ADB_TEMPLATE(p7default) = ASN1_EXP_OPT(PKCS7, d.other, ASN1_ANY, 0);
70
70
 
71
71
ASN1_ADB(PKCS7) = {
72
 
        ADB_ENTRY(NID_pkcs7_data, ASN1_EXP_OPT(PKCS7, d.data, ASN1_OCTET_STRING, 0)),
73
 
        ADB_ENTRY(NID_pkcs7_signed, ASN1_EXP_OPT(PKCS7, d.sign, PKCS7_SIGNED, 0)),
74
 
        ADB_ENTRY(NID_pkcs7_enveloped, ASN1_EXP_OPT(PKCS7, d.enveloped, PKCS7_ENVELOPE, 0)),
75
 
        ADB_ENTRY(NID_pkcs7_signedAndEnveloped, ASN1_EXP_OPT(PKCS7, d.signed_and_enveloped, PKCS7_SIGN_ENVELOPE, 0)),
76
 
        ADB_ENTRY(NID_pkcs7_digest, ASN1_EXP_OPT(PKCS7, d.digest, PKCS7_DIGEST, 0)),
77
 
        ADB_ENTRY(NID_pkcs7_encrypted, ASN1_EXP_OPT(PKCS7, d.encrypted, PKCS7_ENCRYPT, 0))
 
72
        ADB_ENTRY(NID_pkcs7_data, ASN1_NDEF_EXP_OPT(PKCS7, d.data, ASN1_OCTET_STRING_NDEF, 0)),
 
73
        ADB_ENTRY(NID_pkcs7_signed, ASN1_NDEF_EXP_OPT(PKCS7, d.sign, PKCS7_SIGNED, 0)),
 
74
        ADB_ENTRY(NID_pkcs7_enveloped, ASN1_NDEF_EXP_OPT(PKCS7, d.enveloped, PKCS7_ENVELOPE, 0)),
 
75
        ADB_ENTRY(NID_pkcs7_signedAndEnveloped, ASN1_NDEF_EXP_OPT(PKCS7, d.signed_and_enveloped, PKCS7_SIGN_ENVELOPE, 0)),
 
76
        ADB_ENTRY(NID_pkcs7_digest, ASN1_NDEF_EXP_OPT(PKCS7, d.digest, PKCS7_DIGEST, 0)),
 
77
        ADB_ENTRY(NID_pkcs7_encrypted, ASN1_NDEF_EXP_OPT(PKCS7, d.encrypted, PKCS7_ENCRYPT, 0))
78
78
} ASN1_ADB_END(PKCS7, 0, type, 0, &p7default_tt, NULL);
79
79
 
80
 
ASN1_SEQUENCE(PKCS7) = {
 
80
ASN1_NDEF_SEQUENCE(PKCS7) = {
81
81
        ASN1_SIMPLE(PKCS7, type, ASN1_OBJECT),
82
82
        ASN1_ADB_OBJECT(PKCS7)
83
 
}ASN1_SEQUENCE_END(PKCS7)
 
83
}ASN1_NDEF_SEQUENCE_END(PKCS7)
84
84
 
85
85
IMPLEMENT_ASN1_FUNCTIONS(PKCS7)
 
86
IMPLEMENT_ASN1_NDEF_FUNCTION(PKCS7)
86
87
IMPLEMENT_ASN1_DUP_FUNCTION(PKCS7)
87
88
 
88
 
ASN1_SEQUENCE(PKCS7_SIGNED) = {
 
89
ASN1_NDEF_SEQUENCE(PKCS7_SIGNED) = {
89
90
        ASN1_SIMPLE(PKCS7_SIGNED, version, ASN1_INTEGER),
90
91
        ASN1_SET_OF(PKCS7_SIGNED, md_algs, X509_ALGOR),
91
92
        ASN1_SIMPLE(PKCS7_SIGNED, contents, PKCS7),
92
93
        ASN1_IMP_SEQUENCE_OF_OPT(PKCS7_SIGNED, cert, X509, 0),
93
94
        ASN1_IMP_SET_OF_OPT(PKCS7_SIGNED, crl, X509_CRL, 1),
94
95
        ASN1_SET_OF(PKCS7_SIGNED, signer_info, PKCS7_SIGNER_INFO)
95
 
} ASN1_SEQUENCE_END(PKCS7_SIGNED)
 
96
} ASN1_NDEF_SEQUENCE_END(PKCS7_SIGNED)
96
97
 
97
98
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGNED)
98
99
 
130
131
 
131
132
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
132
133
 
133
 
ASN1_SEQUENCE(PKCS7_ENVELOPE) = {
 
134
ASN1_NDEF_SEQUENCE(PKCS7_ENVELOPE) = {
134
135
        ASN1_SIMPLE(PKCS7_ENVELOPE, version, ASN1_INTEGER),
135
136
        ASN1_SET_OF(PKCS7_ENVELOPE, recipientinfo, PKCS7_RECIP_INFO),
136
137
        ASN1_SIMPLE(PKCS7_ENVELOPE, enc_data, PKCS7_ENC_CONTENT)
137
 
} ASN1_SEQUENCE_END(PKCS7_ENVELOPE)
 
138
} ASN1_NDEF_SEQUENCE_END(PKCS7_ENVELOPE)
138
139
 
139
140
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENVELOPE)
140
141
 
157
158
 
158
159
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_RECIP_INFO)
159
160
 
160
 
ASN1_SEQUENCE(PKCS7_ENC_CONTENT) = {
 
161
ASN1_NDEF_SEQUENCE(PKCS7_ENC_CONTENT) = {
161
162
        ASN1_SIMPLE(PKCS7_ENC_CONTENT, content_type, ASN1_OBJECT),
162
163
        ASN1_SIMPLE(PKCS7_ENC_CONTENT, algorithm, X509_ALGOR),
163
164
        ASN1_IMP_OPT(PKCS7_ENC_CONTENT, enc_data, ASN1_OCTET_STRING, 0)
164
 
} ASN1_SEQUENCE_END(PKCS7_ENC_CONTENT)
 
165
} ASN1_NDEF_SEQUENCE_END(PKCS7_ENC_CONTENT)
165
166
 
166
167
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENC_CONTENT)
167
168
 
168
 
ASN1_SEQUENCE(PKCS7_SIGN_ENVELOPE) = {
 
169
ASN1_NDEF_SEQUENCE(PKCS7_SIGN_ENVELOPE) = {
169
170
        ASN1_SIMPLE(PKCS7_SIGN_ENVELOPE, version, ASN1_INTEGER),
170
171
        ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, recipientinfo, PKCS7_RECIP_INFO),
171
172
        ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, md_algs, X509_ALGOR),
173
174
        ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, cert, X509, 0),
174
175
        ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, crl, X509_CRL, 1),
175
176
        ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, signer_info, PKCS7_SIGNER_INFO)
176
 
} ASN1_SEQUENCE_END(PKCS7_SIGN_ENVELOPE)
 
177
} ASN1_NDEF_SEQUENCE_END(PKCS7_SIGN_ENVELOPE)
177
178
 
178
179
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGN_ENVELOPE)
179
180
 
180
 
ASN1_SEQUENCE(PKCS7_ENCRYPT) = {
 
181
ASN1_NDEF_SEQUENCE(PKCS7_ENCRYPT) = {
181
182
        ASN1_SIMPLE(PKCS7_ENCRYPT, version, ASN1_INTEGER),
182
183
        ASN1_SIMPLE(PKCS7_ENCRYPT, enc_data, PKCS7_ENC_CONTENT)
183
 
} ASN1_SEQUENCE_END(PKCS7_ENCRYPT)
 
184
} ASN1_NDEF_SEQUENCE_END(PKCS7_ENCRYPT)
184
185
 
185
186
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENCRYPT)
186
187
 
187
 
ASN1_SEQUENCE(PKCS7_DIGEST) = {
 
188
ASN1_NDEF_SEQUENCE(PKCS7_DIGEST) = {
188
189
        ASN1_SIMPLE(PKCS7_DIGEST, version, ASN1_INTEGER),
189
190
        ASN1_SIMPLE(PKCS7_DIGEST, md, X509_ALGOR),
190
191
        ASN1_SIMPLE(PKCS7_DIGEST, contents, PKCS7),
191
192
        ASN1_SIMPLE(PKCS7_DIGEST, digest, ASN1_OCTET_STRING)
192
 
} ASN1_SEQUENCE_END(PKCS7_DIGEST)
 
193
} ASN1_NDEF_SEQUENCE_END(PKCS7_DIGEST)
193
194
 
194
195
IMPLEMENT_ASN1_FUNCTIONS(PKCS7_DIGEST)
195
196