]>
Commit | Line | Data |
---|---|---|
d02b48c6 | 1 | /* crypto/pkcs7/pk7_doit.c */ |
58964a49 | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
d02b48c6 RE |
3 | * All rights reserved. |
4 | * | |
5 | * This package is an SSL implementation written | |
6 | * by Eric Young (eay@cryptsoft.com). | |
7 | * The implementation was written so as to conform with Netscapes SSL. | |
8 | * | |
9 | * This library is free for commercial and non-commercial use as long as | |
10 | * the following conditions are aheared to. The following conditions | |
11 | * apply to all code found in this distribution, be it the RC4, RSA, | |
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | |
13 | * included with this distribution is covered by the same copyright terms | |
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | |
15 | * | |
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | |
17 | * the code are not to be removed. | |
18 | * If this package is used in a product, Eric Young should be given attribution | |
19 | * as the author of the parts of the library used. | |
20 | * This can be in the form of a textual message at program startup or | |
21 | * in documentation (online or textual) provided with the package. | |
22 | * | |
23 | * Redistribution and use in source and binary forms, with or without | |
24 | * modification, are permitted provided that the following conditions | |
25 | * are met: | |
26 | * 1. Redistributions of source code must retain the copyright | |
27 | * notice, this list of conditions and the following disclaimer. | |
28 | * 2. Redistributions in binary form must reproduce the above copyright | |
29 | * notice, this list of conditions and the following disclaimer in the | |
30 | * documentation and/or other materials provided with the distribution. | |
31 | * 3. All advertising materials mentioning features or use of this software | |
32 | * must display the following acknowledgement: | |
33 | * "This product includes cryptographic software written by | |
34 | * Eric Young (eay@cryptsoft.com)" | |
35 | * The word 'cryptographic' can be left out if the rouines from the library | |
36 | * being used are not cryptographic related :-). | |
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | |
38 | * the apps directory (application code) you must include an acknowledgement: | |
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | |
40 | * | |
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | |
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | |
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | |
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
51 | * SUCH DAMAGE. | |
52 | * | |
53 | * The licence and distribution terms for any publically available version or | |
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | |
55 | * copied and put under another distribution licence | |
56 | * [including the GNU Public Licence.] | |
57 | */ | |
58 | ||
59 | #include <stdio.h> | |
60 | #include "cryptlib.h" | |
ec577822 BM |
61 | #include <openssl/rand.h> |
62 | #include <openssl/objects.h> | |
63 | #include <openssl/x509.h> | |
d02b48c6 | 64 | |
b6436ff2 BL |
65 | static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype, |
66 | void *value); | |
67 | static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid); | |
dfeab068 | 68 | |
6b691a5c | 69 | BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio) |
d02b48c6 RE |
70 | { |
71 | int i,j; | |
dfeab068 | 72 | BIO *out=NULL,*btmp=NULL; |
d02b48c6 | 73 | X509_ALGOR *xa; |
e778802f BL |
74 | const EVP_MD *evp_md; |
75 | const EVP_CIPHER *evp_cipher=NULL; | |
426edadf | 76 | STACK_OF(X509_ALGOR) *md_sk=NULL; |
8f0edcd1 | 77 | STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL; |
58964a49 RE |
78 | X509_ALGOR *xalg=NULL; |
79 | PKCS7_RECIP_INFO *ri=NULL; | |
80 | EVP_PKEY *pkey; | |
d02b48c6 RE |
81 | |
82 | i=OBJ_obj2nid(p7->type); | |
83 | p7->state=PKCS7_S_HEADER; | |
84 | ||
85 | switch (i) | |
86 | { | |
87 | case NID_pkcs7_signed: | |
58964a49 RE |
88 | md_sk=p7->d.sign->md_algs; |
89 | break; | |
90 | case NID_pkcs7_signedAndEnveloped: | |
91 | rsk=p7->d.signed_and_enveloped->recipientinfo; | |
92 | md_sk=p7->d.signed_and_enveloped->md_algs; | |
84fa704c DSH |
93 | xalg=p7->d.signed_and_enveloped->enc_data->algorithm; |
94 | evp_cipher=p7->d.signed_and_enveloped->enc_data->cipher; | |
58964a49 | 95 | if (evp_cipher == NULL) |
d02b48c6 | 96 | { |
84fa704c DSH |
97 | PKCS7err(PKCS7_F_PKCS7_DATAINIT, |
98 | PKCS7_R_CIPHER_NOT_INITIALIZED); | |
58964a49 RE |
99 | goto err; |
100 | } | |
58964a49 | 101 | break; |
dfeab068 RE |
102 | case NID_pkcs7_enveloped: |
103 | rsk=p7->d.enveloped->recipientinfo; | |
84fa704c DSH |
104 | xalg=p7->d.enveloped->enc_data->algorithm; |
105 | evp_cipher=p7->d.enveloped->enc_data->cipher; | |
dfeab068 RE |
106 | if (evp_cipher == NULL) |
107 | { | |
84fa704c DSH |
108 | PKCS7err(PKCS7_F_PKCS7_DATAINIT, |
109 | PKCS7_R_CIPHER_NOT_INITIALIZED); | |
dfeab068 RE |
110 | goto err; |
111 | } | |
dfeab068 | 112 | break; |
58964a49 RE |
113 | default: |
114 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE); | |
115 | goto err; | |
116 | } | |
117 | ||
118 | if (md_sk != NULL) | |
119 | { | |
426edadf | 120 | for (i=0; i<sk_X509_ALGOR_num(md_sk); i++) |
58964a49 | 121 | { |
426edadf | 122 | xa=sk_X509_ALGOR_value(md_sk,i); |
dfeab068 RE |
123 | if ((btmp=BIO_new(BIO_f_md())) == NULL) |
124 | { | |
125 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_BIO_LIB); | |
126 | goto err; | |
127 | } | |
d02b48c6 RE |
128 | |
129 | j=OBJ_obj2nid(xa->algorithm); | |
130 | evp_md=EVP_get_digestbyname(OBJ_nid2sn(j)); | |
131 | if (evp_md == NULL) | |
132 | { | |
133 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNKNOWN_DIGEST_TYPE); | |
134 | goto err; | |
135 | } | |
136 | ||
137 | BIO_set_md(btmp,evp_md); | |
138 | if (out == NULL) | |
139 | out=btmp; | |
140 | else | |
141 | BIO_push(out,btmp); | |
dfeab068 | 142 | btmp=NULL; |
d02b48c6 | 143 | } |
d02b48c6 | 144 | } |
58964a49 RE |
145 | |
146 | if (evp_cipher != NULL) | |
147 | { | |
148 | unsigned char key[EVP_MAX_KEY_LENGTH]; | |
149 | unsigned char iv[EVP_MAX_IV_LENGTH]; | |
150 | int keylen,ivlen; | |
151 | int jj,max; | |
152 | unsigned char *tmp; | |
84fa704c | 153 | EVP_CIPHER_CTX *ctx; |
58964a49 | 154 | |
dfeab068 RE |
155 | if ((btmp=BIO_new(BIO_f_cipher())) == NULL) |
156 | { | |
157 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_BIO_LIB); | |
158 | goto err; | |
159 | } | |
84fa704c | 160 | BIO_get_cipher_ctx(btmp, &ctx); |
58964a49 RE |
161 | keylen=EVP_CIPHER_key_length(evp_cipher); |
162 | ivlen=EVP_CIPHER_iv_length(evp_cipher); | |
84fa704c | 163 | RAND_bytes(key,keylen); |
84fa704c | 164 | xalg->algorithm = OBJ_nid2obj(EVP_CIPHER_type(evp_cipher)); |
1b266dab DSH |
165 | if (ivlen > 0) RAND_bytes(iv,ivlen); |
166 | EVP_CipherInit(ctx, evp_cipher, key, iv, 1); | |
58964a49 | 167 | |
884e8ec6 | 168 | if (ivlen > 0) { |
884e8ec6 DSH |
169 | if (xalg->parameter == NULL) |
170 | xalg->parameter=ASN1_TYPE_new(); | |
171 | if(EVP_CIPHER_param_to_asn1(ctx, xalg->parameter) < 0) | |
172 | goto err; | |
173 | } | |
58964a49 RE |
174 | |
175 | /* Lets do the pub key stuff :-) */ | |
176 | max=0; | |
8f0edcd1 | 177 | for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++) |
58964a49 | 178 | { |
8f0edcd1 | 179 | ri=sk_PKCS7_RECIP_INFO_value(rsk,i); |
dfeab068 RE |
180 | if (ri->cert == NULL) |
181 | { | |
182 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_MISSING_CERIPEND_INFO); | |
183 | goto err; | |
184 | } | |
58964a49 RE |
185 | pkey=X509_get_pubkey(ri->cert); |
186 | jj=EVP_PKEY_size(pkey); | |
924acc54 | 187 | EVP_PKEY_free(pkey); |
58964a49 RE |
188 | if (max < jj) max=jj; |
189 | } | |
dfeab068 RE |
190 | if ((tmp=(unsigned char *)Malloc(max)) == NULL) |
191 | { | |
192 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_MALLOC_FAILURE); | |
193 | goto err; | |
194 | } | |
8f0edcd1 | 195 | for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++) |
58964a49 | 196 | { |
8f0edcd1 | 197 | ri=sk_PKCS7_RECIP_INFO_value(rsk,i); |
58964a49 RE |
198 | pkey=X509_get_pubkey(ri->cert); |
199 | jj=EVP_PKEY_encrypt(tmp,key,keylen,pkey); | |
924acc54 | 200 | EVP_PKEY_free(pkey); |
dfeab068 RE |
201 | if (jj <= 0) |
202 | { | |
203 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_EVP_LIB); | |
204 | Free(tmp); | |
205 | goto err; | |
206 | } | |
08e9c1af | 207 | M_ASN1_OCTET_STRING_set(ri->enc_key,tmp,jj); |
58964a49 | 208 | } |
dfeab068 | 209 | Free(tmp); |
1b266dab | 210 | memset(key, 0, keylen); |
58964a49 | 211 | |
58964a49 RE |
212 | if (out == NULL) |
213 | out=btmp; | |
214 | else | |
215 | BIO_push(out,btmp); | |
dfeab068 | 216 | btmp=NULL; |
58964a49 RE |
217 | } |
218 | ||
8484721a | 219 | if (bio == NULL) { |
d02b48c6 RE |
220 | if (p7->detached) |
221 | bio=BIO_new(BIO_s_null()); | |
8484721a | 222 | else { |
d02b48c6 | 223 | if (PKCS7_type_is_signed(p7) && |
8484721a | 224 | PKCS7_type_is_data(p7->d.sign->contents)) { |
d02b48c6 | 225 | ASN1_OCTET_STRING *os; |
d02b48c6 | 226 | os=p7->d.sign->contents->d.data; |
8484721a DSH |
227 | if (os->length > 0) bio = |
228 | BIO_new_mem_buf(os->data, os->length); | |
91895a59 DSH |
229 | } |
230 | if(bio == NULL) { | |
8484721a DSH |
231 | bio=BIO_new(BIO_s_mem()); |
232 | BIO_set_mem_eof_return(bio,0); | |
d02b48c6 RE |
233 | } |
234 | } | |
8484721a | 235 | } |
d02b48c6 | 236 | BIO_push(out,bio); |
dfeab068 RE |
237 | bio=NULL; |
238 | if (0) | |
239 | { | |
240 | err: | |
241 | if (out != NULL) | |
242 | BIO_free_all(out); | |
243 | if (btmp != NULL) | |
244 | BIO_free_all(btmp); | |
245 | out=NULL; | |
246 | } | |
d02b48c6 | 247 | return(out); |
dfeab068 RE |
248 | } |
249 | ||
250 | /* int */ | |
84fa704c | 251 | BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert) |
dfeab068 RE |
252 | { |
253 | int i,j; | |
254 | BIO *out=NULL,*btmp=NULL,*etmp=NULL,*bio=NULL; | |
9716a8f9 | 255 | unsigned char *tmp=NULL; |
dfeab068 RE |
256 | X509_ALGOR *xa; |
257 | ASN1_OCTET_STRING *data_body=NULL; | |
e778802f BL |
258 | const EVP_MD *evp_md; |
259 | const EVP_CIPHER *evp_cipher=NULL; | |
dfeab068 RE |
260 | EVP_CIPHER_CTX *evp_ctx=NULL; |
261 | X509_ALGOR *enc_alg=NULL; | |
426edadf | 262 | STACK_OF(X509_ALGOR) *md_sk=NULL; |
8f0edcd1 | 263 | STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL; |
dfeab068 RE |
264 | X509_ALGOR *xalg=NULL; |
265 | PKCS7_RECIP_INFO *ri=NULL; | |
9716a8f9 | 266 | char is_rc2 = 0; |
dfeab068 RE |
267 | /* EVP_PKEY *pkey; */ |
268 | #if 0 | |
269 | X509_STORE_CTX s_ctx; | |
270 | #endif | |
271 | ||
272 | i=OBJ_obj2nid(p7->type); | |
273 | p7->state=PKCS7_S_HEADER; | |
274 | ||
275 | switch (i) | |
276 | { | |
277 | case NID_pkcs7_signed: | |
278 | data_body=p7->d.sign->contents->d.data; | |
279 | md_sk=p7->d.sign->md_algs; | |
280 | break; | |
281 | case NID_pkcs7_signedAndEnveloped: | |
282 | rsk=p7->d.signed_and_enveloped->recipientinfo; | |
283 | md_sk=p7->d.signed_and_enveloped->md_algs; | |
284 | data_body=p7->d.signed_and_enveloped->enc_data->enc_data; | |
285 | enc_alg=p7->d.signed_and_enveloped->enc_data->algorithm; | |
286 | evp_cipher=EVP_get_cipherbyname(OBJ_nid2sn(OBJ_obj2nid(enc_alg->algorithm))); | |
287 | if (evp_cipher == NULL) | |
288 | { | |
84fa704c | 289 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE); |
dfeab068 RE |
290 | goto err; |
291 | } | |
292 | xalg=p7->d.signed_and_enveloped->enc_data->algorithm; | |
293 | break; | |
294 | case NID_pkcs7_enveloped: | |
295 | rsk=p7->d.enveloped->recipientinfo; | |
296 | enc_alg=p7->d.enveloped->enc_data->algorithm; | |
297 | data_body=p7->d.enveloped->enc_data->enc_data; | |
298 | evp_cipher=EVP_get_cipherbyname(OBJ_nid2sn(OBJ_obj2nid(enc_alg->algorithm))); | |
299 | if (evp_cipher == NULL) | |
300 | { | |
84fa704c | 301 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE); |
dfeab068 RE |
302 | goto err; |
303 | } | |
304 | xalg=p7->d.enveloped->enc_data->algorithm; | |
305 | break; | |
306 | default: | |
84fa704c | 307 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE); |
dfeab068 RE |
308 | goto err; |
309 | } | |
310 | ||
9716a8f9 DSH |
311 | if(EVP_CIPHER_nid(evp_cipher) == NID_rc2_cbc) is_rc2 = 1; |
312 | ||
dfeab068 RE |
313 | /* We will be checking the signature */ |
314 | if (md_sk != NULL) | |
315 | { | |
426edadf | 316 | for (i=0; i<sk_X509_ALGOR_num(md_sk); i++) |
dfeab068 | 317 | { |
426edadf | 318 | xa=sk_X509_ALGOR_value(md_sk,i); |
dfeab068 RE |
319 | if ((btmp=BIO_new(BIO_f_md())) == NULL) |
320 | { | |
84fa704c | 321 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB); |
dfeab068 RE |
322 | goto err; |
323 | } | |
324 | ||
325 | j=OBJ_obj2nid(xa->algorithm); | |
326 | evp_md=EVP_get_digestbyname(OBJ_nid2sn(j)); | |
327 | if (evp_md == NULL) | |
328 | { | |
84fa704c | 329 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNKNOWN_DIGEST_TYPE); |
dfeab068 RE |
330 | goto err; |
331 | } | |
332 | ||
333 | BIO_set_md(btmp,evp_md); | |
334 | if (out == NULL) | |
335 | out=btmp; | |
336 | else | |
337 | BIO_push(out,btmp); | |
338 | btmp=NULL; | |
339 | } | |
340 | } | |
341 | ||
342 | if (evp_cipher != NULL) | |
343 | { | |
344 | #if 0 | |
345 | unsigned char key[EVP_MAX_KEY_LENGTH]; | |
346 | unsigned char iv[EVP_MAX_IV_LENGTH]; | |
347 | unsigned char *p; | |
348 | int keylen,ivlen; | |
349 | int max; | |
350 | X509_OBJECT ret; | |
351 | #endif | |
352 | int jj; | |
353 | ||
354 | if ((etmp=BIO_new(BIO_f_cipher())) == NULL) | |
355 | { | |
84fa704c | 356 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB); |
dfeab068 RE |
357 | goto err; |
358 | } | |
359 | ||
360 | /* It was encrypted, we need to decrypt the secret key | |
361 | * with the private key */ | |
362 | ||
84fa704c DSH |
363 | /* Find the recipientInfo which matches the passed certificate |
364 | * (if any) | |
10243d97 DSH |
365 | */ |
366 | ||
8f0edcd1 BL |
367 | for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++) { |
368 | ri=sk_PKCS7_RECIP_INFO_value(rsk,i); | |
84fa704c DSH |
369 | if(!X509_NAME_cmp(ri->issuer_and_serial->issuer, |
370 | pcert->cert_info->issuer) && | |
08e9c1af | 371 | !M_ASN1_INTEGER_cmp(pcert->cert_info->serialNumber, |
84fa704c | 372 | ri->issuer_and_serial->serial)) break; |
dfeab068 | 373 | ri=NULL; |
84fa704c DSH |
374 | } |
375 | if (ri == NULL) { | |
376 | PKCS7err(PKCS7_F_PKCS7_DATADECODE, | |
377 | PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE); | |
dfeab068 | 378 | return(NULL); |
84fa704c | 379 | } |
dfeab068 RE |
380 | |
381 | jj=EVP_PKEY_size(pkey); | |
9716a8f9 | 382 | tmp=(unsigned char *)Malloc(jj+10); |
dfeab068 RE |
383 | if (tmp == NULL) |
384 | { | |
84fa704c | 385 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_MALLOC_FAILURE); |
dfeab068 RE |
386 | goto err; |
387 | } | |
388 | ||
9716a8f9 DSH |
389 | jj=EVP_PKEY_decrypt(tmp, M_ASN1_STRING_data(ri->enc_key), |
390 | M_ASN1_STRING_length(ri->enc_key), pkey); | |
dfeab068 RE |
391 | if (jj <= 0) |
392 | { | |
84fa704c | 393 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_EVP_LIB); |
dfeab068 RE |
394 | goto err; |
395 | } | |
396 | ||
397 | evp_ctx=NULL; | |
398 | BIO_get_cipher_ctx(etmp,&evp_ctx); | |
399 | EVP_CipherInit(evp_ctx,evp_cipher,NULL,NULL,0); | |
400 | if (EVP_CIPHER_asn1_to_param(evp_ctx,enc_alg->parameter) < 0) | |
401 | return(NULL); | |
402 | ||
9716a8f9 DSH |
403 | if (jj != EVP_CIPHER_CTX_key_length(evp_ctx)) { |
404 | /* HACK: some S/MIME clients don't use the same key | |
405 | * and effective key length. The key length is | |
406 | * determined by the size of the decrypted RSA key. | |
407 | * So we hack things to manually set the RC2 key | |
408 | * because we currently can't do this with the EVP | |
409 | * interface. | |
410 | */ | |
411 | if(is_rc2) RC2_set_key(&(evp_ctx->c.rc2_ks),jj, tmp, | |
412 | EVP_CIPHER_CTX_key_length(evp_ctx)*8); | |
413 | else { | |
414 | ||
415 | PKCS7err(PKCS7_F_PKCS7_DATADECODE, | |
84fa704c | 416 | PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH); |
9716a8f9 | 417 | goto err; |
dfeab068 | 418 | } |
9716a8f9 | 419 | } else EVP_CipherInit(evp_ctx,NULL,tmp,NULL,0); |
dfeab068 RE |
420 | |
421 | memset(tmp,0,jj); | |
422 | ||
423 | if (out == NULL) | |
424 | out=etmp; | |
425 | else | |
426 | BIO_push(out,etmp); | |
427 | etmp=NULL; | |
428 | } | |
429 | ||
430 | #if 1 | |
431 | if (p7->detached || (in_bio != NULL)) | |
432 | { | |
433 | bio=in_bio; | |
434 | } | |
435 | else | |
436 | { | |
8484721a | 437 | #if 0 |
dfeab068 RE |
438 | bio=BIO_new(BIO_s_mem()); |
439 | /* We need to set this so that when we have read all | |
440 | * the data, the encrypt BIO, if present, will read | |
441 | * EOF and encode the last few bytes */ | |
442 | BIO_set_mem_eof_return(bio,0); | |
443 | ||
444 | if (data_body->length > 0) | |
445 | BIO_write(bio,(char *)data_body->data,data_body->length); | |
8484721a DSH |
446 | #else |
447 | if (data_body->length > 0) | |
448 | bio = BIO_new_mem_buf(data_body->data,data_body->length); | |
449 | else { | |
450 | bio=BIO_new(BIO_s_mem()); | |
451 | BIO_set_mem_eof_return(bio,0); | |
452 | } | |
453 | #endif | |
dfeab068 RE |
454 | } |
455 | BIO_push(out,bio); | |
456 | bio=NULL; | |
457 | #endif | |
458 | if (0) | |
459 | { | |
d02b48c6 | 460 | err: |
dfeab068 RE |
461 | if (out != NULL) BIO_free_all(out); |
462 | if (btmp != NULL) BIO_free_all(btmp); | |
463 | if (etmp != NULL) BIO_free_all(etmp); | |
464 | if (bio != NULL) BIO_free_all(bio); | |
465 | out=NULL; | |
466 | } | |
467 | if (tmp != NULL) | |
468 | Free(tmp); | |
469 | return(out); | |
d02b48c6 RE |
470 | } |
471 | ||
6b691a5c | 472 | int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) |
d02b48c6 RE |
473 | { |
474 | int ret=0; | |
475 | int i,j; | |
476 | BIO *btmp; | |
477 | BUF_MEM *buf_mem=NULL; | |
478 | BUF_MEM *buf=NULL; | |
479 | PKCS7_SIGNER_INFO *si; | |
480 | EVP_MD_CTX *mdc,ctx_tmp; | |
b6436ff2 | 481 | STACK_OF(X509_ATTRIBUTE) *sk; |
b05b50e6 | 482 | STACK_OF(PKCS7_SIGNER_INFO) *si_sk=NULL; |
d02b48c6 RE |
483 | unsigned char *p,*pp=NULL; |
484 | int x; | |
58964a49 | 485 | ASN1_OCTET_STRING *os=NULL; |
d02b48c6 RE |
486 | |
487 | i=OBJ_obj2nid(p7->type); | |
488 | p7->state=PKCS7_S_HEADER; | |
489 | ||
490 | switch (i) | |
491 | { | |
58964a49 RE |
492 | case NID_pkcs7_signedAndEnveloped: |
493 | /* XXXXXXXXXXXXXXXX */ | |
494 | si_sk=p7->d.signed_and_enveloped->signer_info; | |
08e9c1af | 495 | os=M_ASN1_OCTET_STRING_new(); |
58964a49 RE |
496 | p7->d.signed_and_enveloped->enc_data->enc_data=os; |
497 | break; | |
dfeab068 RE |
498 | case NID_pkcs7_enveloped: |
499 | /* XXXXXXXXXXXXXXXX */ | |
08e9c1af | 500 | os=M_ASN1_OCTET_STRING_new(); |
dfeab068 RE |
501 | p7->d.enveloped->enc_data->enc_data=os; |
502 | break; | |
d02b48c6 | 503 | case NID_pkcs7_signed: |
58964a49 RE |
504 | si_sk=p7->d.sign->signer_info; |
505 | os=p7->d.sign->contents->d.data; | |
924acc54 DSH |
506 | /* If detached data then the content is excluded */ |
507 | if(p7->detached) { | |
08e9c1af | 508 | M_ASN1_OCTET_STRING_free(os); |
924acc54 DSH |
509 | p7->d.sign->contents->d.data = NULL; |
510 | } | |
58964a49 RE |
511 | break; |
512 | } | |
d02b48c6 | 513 | |
58964a49 RE |
514 | if (si_sk != NULL) |
515 | { | |
dfeab068 RE |
516 | if ((buf=BUF_MEM_new()) == NULL) |
517 | { | |
518 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_BIO_LIB); | |
519 | goto err; | |
520 | } | |
b05b50e6 | 521 | for (i=0; i<sk_PKCS7_SIGNER_INFO_num(si_sk); i++) |
d02b48c6 | 522 | { |
b05b50e6 | 523 | si=sk_PKCS7_SIGNER_INFO_value(si_sk,i); |
dfeab068 RE |
524 | if (si->pkey == NULL) continue; |
525 | ||
526 | j=OBJ_obj2nid(si->digest_alg->algorithm); | |
d02b48c6 RE |
527 | |
528 | btmp=bio; | |
529 | for (;;) | |
530 | { | |
531 | if ((btmp=BIO_find_type(btmp,BIO_TYPE_MD)) | |
532 | == NULL) | |
533 | { | |
58964a49 | 534 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST); |
d02b48c6 RE |
535 | goto err; |
536 | } | |
537 | BIO_get_md_ctx(btmp,&mdc); | |
538 | if (mdc == NULL) | |
539 | { | |
58964a49 | 540 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_INTERNAL_ERROR); |
d02b48c6 RE |
541 | goto err; |
542 | } | |
dfeab068 | 543 | if (EVP_MD_type(EVP_MD_CTX_type(mdc)) == j) |
d02b48c6 RE |
544 | break; |
545 | else | |
546 | btmp=btmp->next_bio; | |
547 | } | |
548 | ||
549 | /* We now have the EVP_MD_CTX, lets do the | |
550 | * signing. */ | |
551 | memcpy(&ctx_tmp,mdc,sizeof(ctx_tmp)); | |
552 | if (!BUF_MEM_grow(buf,EVP_PKEY_size(si->pkey))) | |
dfeab068 RE |
553 | { |
554 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_BIO_LIB); | |
d02b48c6 | 555 | goto err; |
dfeab068 | 556 | } |
d02b48c6 RE |
557 | |
558 | sk=si->auth_attr; | |
dfeab068 RE |
559 | |
560 | /* If there are attributes, we add the digest | |
561 | * attribute and only sign the attributes */ | |
b6436ff2 | 562 | if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0)) |
d02b48c6 | 563 | { |
dfeab068 RE |
564 | unsigned char md_data[EVP_MAX_MD_SIZE]; |
565 | unsigned int md_len; | |
566 | ASN1_OCTET_STRING *digest; | |
567 | ASN1_UTCTIME *sign_time; | |
e778802f | 568 | const EVP_MD *md_tmp; |
dfeab068 RE |
569 | |
570 | /* Add signing time */ | |
571 | sign_time=X509_gmtime_adj(NULL,0); | |
572 | PKCS7_add_signed_attribute(si, | |
573 | NID_pkcs9_signingTime, | |
c8b41850 | 574 | V_ASN1_UTCTIME,sign_time); |
dfeab068 RE |
575 | |
576 | /* Add digest */ | |
577 | md_tmp=EVP_MD_CTX_type(&ctx_tmp); | |
578 | EVP_DigestFinal(&ctx_tmp,md_data,&md_len); | |
08e9c1af DSH |
579 | digest=M_ASN1_OCTET_STRING_new(); |
580 | M_ASN1_OCTET_STRING_set(digest,md_data,md_len); | |
10243d97 DSH |
581 | PKCS7_add_signed_attribute(si, |
582 | NID_pkcs9_messageDigest, | |
c8b41850 | 583 | V_ASN1_OCTET_STRING,digest); |
dfeab068 RE |
584 | |
585 | /* Now sign the mess */ | |
586 | EVP_SignInit(&ctx_tmp,md_tmp); | |
b6436ff2 BL |
587 | x=i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,NULL, |
588 | i2d_X509_ATTRIBUTE, | |
589 | V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET); | |
dfeab068 | 590 | pp=(unsigned char *)Malloc(x); |
d02b48c6 | 591 | p=pp; |
b6436ff2 BL |
592 | i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,&p, |
593 | i2d_X509_ATTRIBUTE, | |
594 | V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET); | |
d02b48c6 RE |
595 | EVP_SignUpdate(&ctx_tmp,pp,x); |
596 | Free(pp); | |
dfeab068 | 597 | pp=NULL; |
d02b48c6 RE |
598 | } |
599 | ||
dfeab068 RE |
600 | if (si->pkey->type == EVP_PKEY_DSA) |
601 | ctx_tmp.digest=EVP_dss1(); | |
602 | ||
58964a49 | 603 | if (!EVP_SignFinal(&ctx_tmp,(unsigned char *)buf->data, |
d02b48c6 | 604 | (unsigned int *)&buf->length,si->pkey)) |
dfeab068 RE |
605 | { |
606 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_EVP_LIB); | |
d02b48c6 | 607 | goto err; |
dfeab068 | 608 | } |
d02b48c6 RE |
609 | if (!ASN1_STRING_set(si->enc_digest, |
610 | (unsigned char *)buf->data,buf->length)) | |
d02b48c6 | 611 | { |
dfeab068 | 612 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_ASN1_LIB); |
d02b48c6 RE |
613 | goto err; |
614 | } | |
d02b48c6 | 615 | } |
d02b48c6 RE |
616 | } |
617 | ||
924acc54 | 618 | if (!p7->detached) |
dfeab068 RE |
619 | { |
620 | btmp=BIO_find_type(bio,BIO_TYPE_MEM); | |
621 | if (btmp == NULL) | |
622 | { | |
623 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_UNABLE_TO_FIND_MEM_BIO); | |
624 | goto err; | |
625 | } | |
626 | BIO_get_mem_ptr(btmp,&buf_mem); | |
8484721a DSH |
627 | /* Mark the BIO read only then we can use its copy of the data |
628 | * instead of making an extra copy. | |
629 | */ | |
630 | BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY); | |
631 | BIO_set_mem_eof_return(btmp, 0); | |
632 | os->data = (unsigned char *)buf_mem->data; | |
633 | os->length = buf_mem->length; | |
634 | #if 0 | |
08e9c1af | 635 | M_ASN1_OCTET_STRING_set(os, |
dfeab068 | 636 | (unsigned char *)buf_mem->data,buf_mem->length); |
8484721a | 637 | #endif |
dfeab068 RE |
638 | } |
639 | if (pp != NULL) Free(pp); | |
640 | pp=NULL; | |
641 | ||
d02b48c6 RE |
642 | ret=1; |
643 | err: | |
644 | if (buf != NULL) BUF_MEM_free(buf); | |
645 | return(ret); | |
646 | } | |
647 | ||
6b691a5c UM |
648 | int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio, |
649 | PKCS7 *p7, PKCS7_SIGNER_INFO *si) | |
d02b48c6 | 650 | { |
d02b48c6 | 651 | PKCS7_ISSUER_AND_SERIAL *ias; |
dfeab068 | 652 | int ret=0,i; |
f73e07cf | 653 | STACK_OF(X509) *cert; |
d02b48c6 RE |
654 | X509 *x509; |
655 | ||
dfeab068 RE |
656 | if (PKCS7_type_is_signed(p7)) |
657 | { | |
658 | cert=p7->d.sign->cert; | |
659 | } | |
660 | else if (PKCS7_type_is_signedAndEnveloped(p7)) | |
661 | { | |
662 | cert=p7->d.signed_and_enveloped->cert; | |
663 | } | |
664 | else | |
665 | { | |
666 | PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_WRONG_PKCS7_TYPE); | |
667 | goto err; | |
668 | } | |
58964a49 | 669 | /* XXXXXXXXXXXXXXXXXXXXXXX */ |
d02b48c6 | 670 | ias=si->issuer_and_serial; |
d02b48c6 | 671 | |
dfeab068 | 672 | x509=X509_find_by_issuer_and_serial(cert,ias->issuer,ias->serial); |
d02b48c6 RE |
673 | |
674 | /* were we able to find the cert in passed to us */ | |
675 | if (x509 == NULL) | |
676 | { | |
677 | PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_UNABLE_TO_FIND_CERTIFICATE); | |
678 | goto err; | |
679 | } | |
680 | ||
681 | /* Lets verify */ | |
dfeab068 | 682 | X509_STORE_CTX_init(ctx,cert_store,x509,cert); |
d02b48c6 | 683 | i=X509_verify_cert(ctx); |
dfeab068 RE |
684 | if (i <= 0) |
685 | { | |
686 | PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB); | |
687 | goto err; | |
688 | } | |
d02b48c6 RE |
689 | X509_STORE_CTX_cleanup(ctx); |
690 | ||
170afce5 DSH |
691 | return PKCS7_signatureVerify(bio, p7, si, x509); |
692 | err: | |
693 | return ret; | |
694 | } | |
695 | ||
696 | int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, | |
697 | X509 *x509) | |
698 | { | |
699 | ASN1_OCTET_STRING *os; | |
700 | EVP_MD_CTX mdc_tmp,*mdc; | |
701 | unsigned char *pp,*p; | |
702 | int ret=0,i; | |
703 | int md_type; | |
704 | STACK_OF(X509_ATTRIBUTE) *sk; | |
705 | BIO *btmp; | |
706 | EVP_PKEY *pkey; | |
707 | ||
708 | if (!PKCS7_type_is_signed(p7) && | |
709 | !PKCS7_type_is_signedAndEnveloped(p7)) { | |
710 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, | |
711 | PKCS7_R_WRONG_PKCS7_TYPE); | |
712 | goto err; | |
713 | } | |
714 | ||
d02b48c6 RE |
715 | md_type=OBJ_obj2nid(si->digest_alg->algorithm); |
716 | ||
717 | btmp=bio; | |
718 | for (;;) | |
719 | { | |
720 | if ((btmp == NULL) || | |
721 | ((btmp=BIO_find_type(btmp,BIO_TYPE_MD)) == NULL)) | |
722 | { | |
170afce5 DSH |
723 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, |
724 | PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST); | |
d02b48c6 RE |
725 | goto err; |
726 | } | |
727 | BIO_get_md_ctx(btmp,&mdc); | |
728 | if (mdc == NULL) | |
729 | { | |
170afce5 DSH |
730 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, |
731 | PKCS7_R_INTERNAL_ERROR); | |
d02b48c6 RE |
732 | goto err; |
733 | } | |
734 | if (EVP_MD_type(EVP_MD_CTX_type(mdc)) == md_type) | |
735 | break; | |
736 | btmp=btmp->next_bio; | |
737 | } | |
738 | ||
dfeab068 RE |
739 | /* mdc is the digest ctx that we want, unless there are attributes, |
740 | * in which case the digest is the signed attributes */ | |
d02b48c6 RE |
741 | memcpy(&mdc_tmp,mdc,sizeof(mdc_tmp)); |
742 | ||
743 | sk=si->auth_attr; | |
b6436ff2 | 744 | if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0)) |
d02b48c6 | 745 | { |
dfeab068 | 746 | unsigned char md_dat[EVP_MAX_MD_SIZE]; |
0b415fb0 | 747 | unsigned int md_len; |
dfeab068 RE |
748 | ASN1_OCTET_STRING *message_digest; |
749 | ||
750 | EVP_DigestFinal(&mdc_tmp,md_dat,&md_len); | |
751 | message_digest=PKCS7_digest_from_attributes(sk); | |
752 | if (!message_digest) | |
753 | { | |
170afce5 DSH |
754 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, |
755 | PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST); | |
dfeab068 RE |
756 | goto err; |
757 | } | |
0b415fb0 | 758 | if ((message_digest->length != (int)md_len) || |
dfeab068 RE |
759 | (memcmp(message_digest->data,md_dat,md_len))) |
760 | { | |
761 | #if 0 | |
762 | { | |
763 | int ii; | |
764 | for (ii=0; ii<message_digest->length; ii++) | |
765 | printf("%02X",message_digest->data[ii]); printf(" sent\n"); | |
766 | for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n"); | |
767 | } | |
768 | #endif | |
170afce5 DSH |
769 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, |
770 | PKCS7_R_DIGEST_FAILURE); | |
dfeab068 RE |
771 | ret= -1; |
772 | goto err; | |
773 | } | |
774 | ||
775 | EVP_VerifyInit(&mdc_tmp,EVP_get_digestbynid(md_type)); | |
924acc54 DSH |
776 | /* Note: when forming the encoding of the attributes we |
777 | * shouldn't reorder them or this will break the signature. | |
778 | * This is done by using the IS_SEQUENCE flag. | |
779 | */ | |
b6436ff2 | 780 | i=i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,NULL,i2d_X509_ATTRIBUTE, |
924acc54 | 781 | V_ASN1_SET,V_ASN1_UNIVERSAL, IS_SEQUENCE); |
b6436ff2 | 782 | pp=Malloc(i); |
d02b48c6 | 783 | p=pp; |
b6436ff2 | 784 | i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,&p,i2d_X509_ATTRIBUTE, |
924acc54 | 785 | V_ASN1_SET,V_ASN1_UNIVERSAL, IS_SEQUENCE); |
d02b48c6 | 786 | EVP_VerifyUpdate(&mdc_tmp,pp,i); |
924acc54 | 787 | |
dfeab068 | 788 | Free(pp); |
d02b48c6 RE |
789 | } |
790 | ||
791 | os=si->enc_digest; | |
924acc54 DSH |
792 | pkey = X509_get_pubkey(x509); |
793 | if(pkey->type == EVP_PKEY_DSA) mdc_tmp.digest=EVP_dss1(); | |
dfeab068 | 794 | |
924acc54 DSH |
795 | i=EVP_VerifyFinal(&mdc_tmp,os->data,os->length, pkey); |
796 | EVP_PKEY_free(pkey); | |
d02b48c6 RE |
797 | if (i <= 0) |
798 | { | |
170afce5 DSH |
799 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, |
800 | PKCS7_R_SIGNATURE_FAILURE); | |
d02b48c6 RE |
801 | ret= -1; |
802 | goto err; | |
803 | } | |
804 | else | |
805 | ret=1; | |
806 | err: | |
807 | return(ret); | |
808 | } | |
809 | ||
6b691a5c | 810 | PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx) |
dfeab068 | 811 | { |
8f0edcd1 | 812 | STACK_OF(PKCS7_RECIP_INFO) *rsk; |
dfeab068 RE |
813 | PKCS7_RECIP_INFO *ri; |
814 | int i; | |
815 | ||
816 | i=OBJ_obj2nid(p7->type); | |
817 | if (i != NID_pkcs7_signedAndEnveloped) return(NULL); | |
818 | rsk=p7->d.signed_and_enveloped->recipientinfo; | |
8f0edcd1 BL |
819 | ri=sk_PKCS7_RECIP_INFO_value(rsk,0); |
820 | if (sk_PKCS7_RECIP_INFO_num(rsk) <= idx) return(NULL); | |
821 | ri=sk_PKCS7_RECIP_INFO_value(rsk,idx); | |
dfeab068 RE |
822 | return(ri->issuer_and_serial); |
823 | } | |
824 | ||
6b691a5c | 825 | ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid) |
dfeab068 RE |
826 | { |
827 | return(get_attribute(si->auth_attr,nid)); | |
828 | } | |
829 | ||
6b691a5c | 830 | ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid) |
dfeab068 RE |
831 | { |
832 | return(get_attribute(si->unauth_attr,nid)); | |
833 | } | |
834 | ||
b6436ff2 | 835 | static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid) |
dfeab068 RE |
836 | { |
837 | int i; | |
838 | X509_ATTRIBUTE *xa; | |
839 | ASN1_OBJECT *o; | |
840 | ||
841 | o=OBJ_nid2obj(nid); | |
10243d97 | 842 | if (!o || !sk) return(NULL); |
b6436ff2 | 843 | for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++) |
dfeab068 | 844 | { |
b6436ff2 | 845 | xa=sk_X509_ATTRIBUTE_value(sk,i); |
dfeab068 RE |
846 | if (OBJ_cmp(xa->object,o) == 0) |
847 | { | |
d35ea5b0 BL |
848 | if (xa->set && sk_ASN1_TYPE_num(xa->value.set)) |
849 | return(sk_ASN1_TYPE_value(xa->value.set,0)); | |
dfeab068 RE |
850 | else |
851 | return(NULL); | |
852 | } | |
853 | } | |
854 | return(NULL); | |
855 | } | |
856 | ||
b6436ff2 | 857 | ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk) |
10243d97 | 858 | { |
dfeab068 | 859 | ASN1_TYPE *astype; |
10243d97 DSH |
860 | if(!(astype = get_attribute(sk, NID_pkcs9_messageDigest))) return NULL; |
861 | return astype->value.octet_string; | |
862 | } | |
dfeab068 | 863 | |
b6436ff2 BL |
864 | int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si, |
865 | STACK_OF(X509_ATTRIBUTE) *sk) | |
dfeab068 RE |
866 | { |
867 | int i; | |
868 | ||
869 | if (p7si->auth_attr != NULL) | |
b6436ff2 BL |
870 | sk_X509_ATTRIBUTE_pop_free(p7si->auth_attr,X509_ATTRIBUTE_free); |
871 | p7si->auth_attr=sk_X509_ATTRIBUTE_dup(sk); | |
872 | for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++) | |
dfeab068 | 873 | { |
b6436ff2 BL |
874 | if ((sk_X509_ATTRIBUTE_set(p7si->auth_attr,i, |
875 | X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i)))) | |
876 | == NULL) | |
dfeab068 RE |
877 | return(0); |
878 | } | |
879 | return(1); | |
880 | } | |
881 | ||
b6436ff2 | 882 | int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk) |
dfeab068 RE |
883 | { |
884 | int i; | |
885 | ||
886 | if (p7si->unauth_attr != NULL) | |
b6436ff2 BL |
887 | sk_X509_ATTRIBUTE_pop_free(p7si->unauth_attr, |
888 | X509_ATTRIBUTE_free); | |
889 | p7si->unauth_attr=sk_X509_ATTRIBUTE_dup(sk); | |
890 | for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++) | |
dfeab068 | 891 | { |
b6436ff2 BL |
892 | if ((sk_X509_ATTRIBUTE_set(p7si->unauth_attr,i, |
893 | X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i)))) | |
894 | == NULL) | |
dfeab068 RE |
895 | return(0); |
896 | } | |
897 | return(1); | |
898 | } | |
899 | ||
6b691a5c | 900 | int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, |
c8b41850 | 901 | void *value) |
dfeab068 RE |
902 | { |
903 | return(add_attribute(&(p7si->auth_attr),nid,atrtype,value)); | |
904 | } | |
905 | ||
6b691a5c | 906 | int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, |
c8b41850 | 907 | void *value) |
dfeab068 RE |
908 | { |
909 | return(add_attribute(&(p7si->unauth_attr),nid,atrtype,value)); | |
910 | } | |
911 | ||
b6436ff2 BL |
912 | static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype, |
913 | void *value) | |
dfeab068 RE |
914 | { |
915 | X509_ATTRIBUTE *attr=NULL; | |
dfeab068 RE |
916 | |
917 | if (*sk == NULL) | |
918 | { | |
b6436ff2 | 919 | *sk = sk_X509_ATTRIBUTE_new(NULL); |
dfeab068 RE |
920 | new_attrib: |
921 | attr=X509_ATTRIBUTE_create(nid,atrtype,value); | |
b6436ff2 | 922 | sk_X509_ATTRIBUTE_push(*sk,attr); |
dfeab068 RE |
923 | } |
924 | else | |
925 | { | |
926 | int i; | |
927 | ||
b6436ff2 | 928 | for (i=0; i<sk_X509_ATTRIBUTE_num(*sk); i++) |
dfeab068 | 929 | { |
b6436ff2 | 930 | attr=sk_X509_ATTRIBUTE_value(*sk,i); |
dfeab068 RE |
931 | if (OBJ_obj2nid(attr->object) == nid) |
932 | { | |
933 | X509_ATTRIBUTE_free(attr); | |
934 | attr=X509_ATTRIBUTE_create(nid,atrtype,value); | |
b6436ff2 | 935 | sk_X509_ATTRIBUTE_set(*sk,i,attr); |
dfeab068 RE |
936 | goto end; |
937 | } | |
938 | } | |
939 | goto new_attrib; | |
940 | } | |
941 | end: | |
942 | return(1); | |
943 | } | |
944 |