diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pk7_doit.c')
-rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_doit.c | 983 |
1 files changed, 0 insertions, 983 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c deleted file mode 100644 index b78e22819c..0000000000 --- a/src/lib/libcrypto/pkcs7/pk7_doit.c +++ /dev/null | |||
@@ -1,983 +0,0 @@ | |||
1 | /* crypto/pkcs7/pk7_doit.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
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" | ||
61 | #include <openssl/rand.h> | ||
62 | #include <openssl/objects.h> | ||
63 | #include <openssl/x509.h> | ||
64 | #include <openssl/x509v3.h> | ||
65 | |||
66 | static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype, | ||
67 | void *value); | ||
68 | static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid); | ||
69 | |||
70 | static int PKCS7_type_is_other(PKCS7* p7) | ||
71 | { | ||
72 | int isOther=1; | ||
73 | |||
74 | int nid=OBJ_obj2nid(p7->type); | ||
75 | |||
76 | switch( nid ) | ||
77 | { | ||
78 | case NID_pkcs7_data: | ||
79 | case NID_pkcs7_signed: | ||
80 | case NID_pkcs7_enveloped: | ||
81 | case NID_pkcs7_signedAndEnveloped: | ||
82 | case NID_pkcs7_digest: | ||
83 | case NID_pkcs7_encrypted: | ||
84 | isOther=0; | ||
85 | break; | ||
86 | default: | ||
87 | isOther=1; | ||
88 | } | ||
89 | |||
90 | return isOther; | ||
91 | |||
92 | } | ||
93 | |||
94 | static ASN1_OCTET_STRING *PKCS7_get_octet_string(PKCS7 *p7) | ||
95 | { | ||
96 | if ( PKCS7_type_is_data(p7)) | ||
97 | return p7->d.data; | ||
98 | if ( PKCS7_type_is_other(p7) && p7->d.other | ||
99 | && (p7->d.other->type == V_ASN1_OCTET_STRING)) | ||
100 | return p7->d.other->value.octet_string; | ||
101 | return NULL; | ||
102 | } | ||
103 | |||
104 | BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio) | ||
105 | { | ||
106 | int i; | ||
107 | BIO *out=NULL,*btmp=NULL; | ||
108 | X509_ALGOR *xa; | ||
109 | const EVP_MD *evp_md; | ||
110 | const EVP_CIPHER *evp_cipher=NULL; | ||
111 | STACK_OF(X509_ALGOR) *md_sk=NULL; | ||
112 | STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL; | ||
113 | X509_ALGOR *xalg=NULL; | ||
114 | PKCS7_RECIP_INFO *ri=NULL; | ||
115 | EVP_PKEY *pkey; | ||
116 | |||
117 | i=OBJ_obj2nid(p7->type); | ||
118 | p7->state=PKCS7_S_HEADER; | ||
119 | |||
120 | switch (i) | ||
121 | { | ||
122 | case NID_pkcs7_signed: | ||
123 | md_sk=p7->d.sign->md_algs; | ||
124 | break; | ||
125 | case NID_pkcs7_signedAndEnveloped: | ||
126 | rsk=p7->d.signed_and_enveloped->recipientinfo; | ||
127 | md_sk=p7->d.signed_and_enveloped->md_algs; | ||
128 | xalg=p7->d.signed_and_enveloped->enc_data->algorithm; | ||
129 | evp_cipher=p7->d.signed_and_enveloped->enc_data->cipher; | ||
130 | if (evp_cipher == NULL) | ||
131 | { | ||
132 | PKCS7err(PKCS7_F_PKCS7_DATAINIT, | ||
133 | PKCS7_R_CIPHER_NOT_INITIALIZED); | ||
134 | goto err; | ||
135 | } | ||
136 | break; | ||
137 | case NID_pkcs7_enveloped: | ||
138 | rsk=p7->d.enveloped->recipientinfo; | ||
139 | xalg=p7->d.enveloped->enc_data->algorithm; | ||
140 | evp_cipher=p7->d.enveloped->enc_data->cipher; | ||
141 | if (evp_cipher == NULL) | ||
142 | { | ||
143 | PKCS7err(PKCS7_F_PKCS7_DATAINIT, | ||
144 | PKCS7_R_CIPHER_NOT_INITIALIZED); | ||
145 | goto err; | ||
146 | } | ||
147 | break; | ||
148 | default: | ||
149 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE); | ||
150 | goto err; | ||
151 | } | ||
152 | |||
153 | if (md_sk != NULL) | ||
154 | { | ||
155 | for (i=0; i<sk_X509_ALGOR_num(md_sk); i++) | ||
156 | { | ||
157 | xa=sk_X509_ALGOR_value(md_sk,i); | ||
158 | if ((btmp=BIO_new(BIO_f_md())) == NULL) | ||
159 | { | ||
160 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_BIO_LIB); | ||
161 | goto err; | ||
162 | } | ||
163 | |||
164 | evp_md=EVP_get_digestbyobj(xa->algorithm); | ||
165 | if (evp_md == NULL) | ||
166 | { | ||
167 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNKNOWN_DIGEST_TYPE); | ||
168 | goto err; | ||
169 | } | ||
170 | |||
171 | BIO_set_md(btmp,evp_md); | ||
172 | if (out == NULL) | ||
173 | out=btmp; | ||
174 | else | ||
175 | BIO_push(out,btmp); | ||
176 | btmp=NULL; | ||
177 | } | ||
178 | } | ||
179 | |||
180 | if (evp_cipher != NULL) | ||
181 | { | ||
182 | unsigned char key[EVP_MAX_KEY_LENGTH]; | ||
183 | unsigned char iv[EVP_MAX_IV_LENGTH]; | ||
184 | int keylen,ivlen; | ||
185 | int jj,max; | ||
186 | unsigned char *tmp; | ||
187 | EVP_CIPHER_CTX *ctx; | ||
188 | |||
189 | if ((btmp=BIO_new(BIO_f_cipher())) == NULL) | ||
190 | { | ||
191 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_BIO_LIB); | ||
192 | goto err; | ||
193 | } | ||
194 | BIO_get_cipher_ctx(btmp, &ctx); | ||
195 | keylen=EVP_CIPHER_key_length(evp_cipher); | ||
196 | ivlen=EVP_CIPHER_iv_length(evp_cipher); | ||
197 | if (RAND_bytes(key,keylen) <= 0) | ||
198 | goto err; | ||
199 | xalg->algorithm = OBJ_nid2obj(EVP_CIPHER_type(evp_cipher)); | ||
200 | if (ivlen > 0) RAND_pseudo_bytes(iv,ivlen); | ||
201 | EVP_CipherInit_ex(ctx, evp_cipher, NULL, key, iv, 1); | ||
202 | |||
203 | if (ivlen > 0) { | ||
204 | if (xalg->parameter == NULL) | ||
205 | xalg->parameter=ASN1_TYPE_new(); | ||
206 | if(EVP_CIPHER_param_to_asn1(ctx, xalg->parameter) < 0) | ||
207 | goto err; | ||
208 | } | ||
209 | |||
210 | /* Lets do the pub key stuff :-) */ | ||
211 | max=0; | ||
212 | for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++) | ||
213 | { | ||
214 | ri=sk_PKCS7_RECIP_INFO_value(rsk,i); | ||
215 | if (ri->cert == NULL) | ||
216 | { | ||
217 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_MISSING_CERIPEND_INFO); | ||
218 | goto err; | ||
219 | } | ||
220 | pkey=X509_get_pubkey(ri->cert); | ||
221 | jj=EVP_PKEY_size(pkey); | ||
222 | EVP_PKEY_free(pkey); | ||
223 | if (max < jj) max=jj; | ||
224 | } | ||
225 | if ((tmp=(unsigned char *)OPENSSL_malloc(max)) == NULL) | ||
226 | { | ||
227 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_MALLOC_FAILURE); | ||
228 | goto err; | ||
229 | } | ||
230 | for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++) | ||
231 | { | ||
232 | ri=sk_PKCS7_RECIP_INFO_value(rsk,i); | ||
233 | pkey=X509_get_pubkey(ri->cert); | ||
234 | jj=EVP_PKEY_encrypt(tmp,key,keylen,pkey); | ||
235 | EVP_PKEY_free(pkey); | ||
236 | if (jj <= 0) | ||
237 | { | ||
238 | PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_EVP_LIB); | ||
239 | OPENSSL_free(tmp); | ||
240 | goto err; | ||
241 | } | ||
242 | M_ASN1_OCTET_STRING_set(ri->enc_key,tmp,jj); | ||
243 | } | ||
244 | OPENSSL_free(tmp); | ||
245 | OPENSSL_cleanse(key, keylen); | ||
246 | |||
247 | if (out == NULL) | ||
248 | out=btmp; | ||
249 | else | ||
250 | BIO_push(out,btmp); | ||
251 | btmp=NULL; | ||
252 | } | ||
253 | |||
254 | if (bio == NULL) | ||
255 | { | ||
256 | if (PKCS7_is_detached(p7)) | ||
257 | bio=BIO_new(BIO_s_null()); | ||
258 | else | ||
259 | { | ||
260 | if (PKCS7_type_is_signed(p7)) | ||
261 | { | ||
262 | ASN1_OCTET_STRING *os; | ||
263 | os = PKCS7_get_octet_string( | ||
264 | p7->d.sign->contents); | ||
265 | if (os && os->length > 0) | ||
266 | bio = BIO_new_mem_buf(os->data, | ||
267 | os->length); | ||
268 | } | ||
269 | if(bio == NULL) | ||
270 | { | ||
271 | bio=BIO_new(BIO_s_mem()); | ||
272 | BIO_set_mem_eof_return(bio,0); | ||
273 | } | ||
274 | } | ||
275 | } | ||
276 | BIO_push(out,bio); | ||
277 | bio=NULL; | ||
278 | if (0) | ||
279 | { | ||
280 | err: | ||
281 | if (out != NULL) | ||
282 | BIO_free_all(out); | ||
283 | if (btmp != NULL) | ||
284 | BIO_free_all(btmp); | ||
285 | out=NULL; | ||
286 | } | ||
287 | return(out); | ||
288 | } | ||
289 | |||
290 | /* int */ | ||
291 | BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert) | ||
292 | { | ||
293 | int i,j; | ||
294 | BIO *out=NULL,*btmp=NULL,*etmp=NULL,*bio=NULL; | ||
295 | unsigned char *tmp=NULL; | ||
296 | X509_ALGOR *xa; | ||
297 | ASN1_OCTET_STRING *data_body=NULL; | ||
298 | const EVP_MD *evp_md; | ||
299 | const EVP_CIPHER *evp_cipher=NULL; | ||
300 | EVP_CIPHER_CTX *evp_ctx=NULL; | ||
301 | X509_ALGOR *enc_alg=NULL; | ||
302 | STACK_OF(X509_ALGOR) *md_sk=NULL; | ||
303 | STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL; | ||
304 | X509_ALGOR *xalg=NULL; | ||
305 | PKCS7_RECIP_INFO *ri=NULL; | ||
306 | |||
307 | i=OBJ_obj2nid(p7->type); | ||
308 | p7->state=PKCS7_S_HEADER; | ||
309 | |||
310 | switch (i) | ||
311 | { | ||
312 | case NID_pkcs7_signed: | ||
313 | data_body=PKCS7_get_octet_string(p7->d.sign->contents); | ||
314 | md_sk=p7->d.sign->md_algs; | ||
315 | break; | ||
316 | case NID_pkcs7_signedAndEnveloped: | ||
317 | rsk=p7->d.signed_and_enveloped->recipientinfo; | ||
318 | md_sk=p7->d.signed_and_enveloped->md_algs; | ||
319 | data_body=p7->d.signed_and_enveloped->enc_data->enc_data; | ||
320 | enc_alg=p7->d.signed_and_enveloped->enc_data->algorithm; | ||
321 | evp_cipher=EVP_get_cipherbyobj(enc_alg->algorithm); | ||
322 | if (evp_cipher == NULL) | ||
323 | { | ||
324 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE); | ||
325 | goto err; | ||
326 | } | ||
327 | xalg=p7->d.signed_and_enveloped->enc_data->algorithm; | ||
328 | break; | ||
329 | case NID_pkcs7_enveloped: | ||
330 | rsk=p7->d.enveloped->recipientinfo; | ||
331 | enc_alg=p7->d.enveloped->enc_data->algorithm; | ||
332 | data_body=p7->d.enveloped->enc_data->enc_data; | ||
333 | evp_cipher=EVP_get_cipherbyobj(enc_alg->algorithm); | ||
334 | if (evp_cipher == NULL) | ||
335 | { | ||
336 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE); | ||
337 | goto err; | ||
338 | } | ||
339 | xalg=p7->d.enveloped->enc_data->algorithm; | ||
340 | break; | ||
341 | default: | ||
342 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE); | ||
343 | goto err; | ||
344 | } | ||
345 | |||
346 | /* We will be checking the signature */ | ||
347 | if (md_sk != NULL) | ||
348 | { | ||
349 | for (i=0; i<sk_X509_ALGOR_num(md_sk); i++) | ||
350 | { | ||
351 | xa=sk_X509_ALGOR_value(md_sk,i); | ||
352 | if ((btmp=BIO_new(BIO_f_md())) == NULL) | ||
353 | { | ||
354 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB); | ||
355 | goto err; | ||
356 | } | ||
357 | |||
358 | j=OBJ_obj2nid(xa->algorithm); | ||
359 | evp_md=EVP_get_digestbynid(j); | ||
360 | if (evp_md == NULL) | ||
361 | { | ||
362 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNKNOWN_DIGEST_TYPE); | ||
363 | goto err; | ||
364 | } | ||
365 | |||
366 | BIO_set_md(btmp,evp_md); | ||
367 | if (out == NULL) | ||
368 | out=btmp; | ||
369 | else | ||
370 | BIO_push(out,btmp); | ||
371 | btmp=NULL; | ||
372 | } | ||
373 | } | ||
374 | |||
375 | if (evp_cipher != NULL) | ||
376 | { | ||
377 | #if 0 | ||
378 | unsigned char key[EVP_MAX_KEY_LENGTH]; | ||
379 | unsigned char iv[EVP_MAX_IV_LENGTH]; | ||
380 | unsigned char *p; | ||
381 | int keylen,ivlen; | ||
382 | int max; | ||
383 | X509_OBJECT ret; | ||
384 | #endif | ||
385 | int jj; | ||
386 | |||
387 | if ((etmp=BIO_new(BIO_f_cipher())) == NULL) | ||
388 | { | ||
389 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB); | ||
390 | goto err; | ||
391 | } | ||
392 | |||
393 | /* It was encrypted, we need to decrypt the secret key | ||
394 | * with the private key */ | ||
395 | |||
396 | /* Find the recipientInfo which matches the passed certificate | ||
397 | * (if any) | ||
398 | */ | ||
399 | |||
400 | for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++) { | ||
401 | ri=sk_PKCS7_RECIP_INFO_value(rsk,i); | ||
402 | if(!X509_NAME_cmp(ri->issuer_and_serial->issuer, | ||
403 | pcert->cert_info->issuer) && | ||
404 | !M_ASN1_INTEGER_cmp(pcert->cert_info->serialNumber, | ||
405 | ri->issuer_and_serial->serial)) break; | ||
406 | ri=NULL; | ||
407 | } | ||
408 | if (ri == NULL) { | ||
409 | PKCS7err(PKCS7_F_PKCS7_DATADECODE, | ||
410 | PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE); | ||
411 | goto err; | ||
412 | } | ||
413 | |||
414 | jj=EVP_PKEY_size(pkey); | ||
415 | tmp=(unsigned char *)OPENSSL_malloc(jj+10); | ||
416 | if (tmp == NULL) | ||
417 | { | ||
418 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_MALLOC_FAILURE); | ||
419 | goto err; | ||
420 | } | ||
421 | |||
422 | jj=EVP_PKEY_decrypt(tmp, M_ASN1_STRING_data(ri->enc_key), | ||
423 | M_ASN1_STRING_length(ri->enc_key), pkey); | ||
424 | if (jj <= 0) | ||
425 | { | ||
426 | PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_EVP_LIB); | ||
427 | goto err; | ||
428 | } | ||
429 | |||
430 | evp_ctx=NULL; | ||
431 | BIO_get_cipher_ctx(etmp,&evp_ctx); | ||
432 | EVP_CipherInit_ex(evp_ctx,evp_cipher,NULL,NULL,NULL,0); | ||
433 | if (EVP_CIPHER_asn1_to_param(evp_ctx,enc_alg->parameter) < 0) | ||
434 | goto err; | ||
435 | |||
436 | if (jj != EVP_CIPHER_CTX_key_length(evp_ctx)) { | ||
437 | /* Some S/MIME clients don't use the same key | ||
438 | * and effective key length. The key length is | ||
439 | * determined by the size of the decrypted RSA key. | ||
440 | */ | ||
441 | if(!EVP_CIPHER_CTX_set_key_length(evp_ctx, jj)) | ||
442 | { | ||
443 | PKCS7err(PKCS7_F_PKCS7_DATADECODE, | ||
444 | PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH); | ||
445 | goto err; | ||
446 | } | ||
447 | } | ||
448 | EVP_CipherInit_ex(evp_ctx,NULL,NULL,tmp,NULL,0); | ||
449 | |||
450 | OPENSSL_cleanse(tmp,jj); | ||
451 | |||
452 | if (out == NULL) | ||
453 | out=etmp; | ||
454 | else | ||
455 | BIO_push(out,etmp); | ||
456 | etmp=NULL; | ||
457 | } | ||
458 | |||
459 | #if 1 | ||
460 | if (PKCS7_is_detached(p7) || (in_bio != NULL)) | ||
461 | { | ||
462 | bio=in_bio; | ||
463 | } | ||
464 | else | ||
465 | { | ||
466 | #if 0 | ||
467 | bio=BIO_new(BIO_s_mem()); | ||
468 | /* We need to set this so that when we have read all | ||
469 | * the data, the encrypt BIO, if present, will read | ||
470 | * EOF and encode the last few bytes */ | ||
471 | BIO_set_mem_eof_return(bio,0); | ||
472 | |||
473 | if (data_body->length > 0) | ||
474 | BIO_write(bio,(char *)data_body->data,data_body->length); | ||
475 | #else | ||
476 | if (data_body->length > 0) | ||
477 | bio = BIO_new_mem_buf(data_body->data,data_body->length); | ||
478 | else { | ||
479 | bio=BIO_new(BIO_s_mem()); | ||
480 | BIO_set_mem_eof_return(bio,0); | ||
481 | } | ||
482 | #endif | ||
483 | } | ||
484 | BIO_push(out,bio); | ||
485 | bio=NULL; | ||
486 | #endif | ||
487 | if (0) | ||
488 | { | ||
489 | err: | ||
490 | if (out != NULL) BIO_free_all(out); | ||
491 | if (btmp != NULL) BIO_free_all(btmp); | ||
492 | if (etmp != NULL) BIO_free_all(etmp); | ||
493 | if (bio != NULL) BIO_free_all(bio); | ||
494 | out=NULL; | ||
495 | } | ||
496 | if (tmp != NULL) | ||
497 | OPENSSL_free(tmp); | ||
498 | return(out); | ||
499 | } | ||
500 | |||
501 | int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) | ||
502 | { | ||
503 | int ret=0; | ||
504 | int i,j; | ||
505 | BIO *btmp; | ||
506 | BUF_MEM *buf_mem=NULL; | ||
507 | BUF_MEM *buf=NULL; | ||
508 | PKCS7_SIGNER_INFO *si; | ||
509 | EVP_MD_CTX *mdc,ctx_tmp; | ||
510 | STACK_OF(X509_ATTRIBUTE) *sk; | ||
511 | STACK_OF(PKCS7_SIGNER_INFO) *si_sk=NULL; | ||
512 | ASN1_OCTET_STRING *os=NULL; | ||
513 | |||
514 | EVP_MD_CTX_init(&ctx_tmp); | ||
515 | i=OBJ_obj2nid(p7->type); | ||
516 | p7->state=PKCS7_S_HEADER; | ||
517 | |||
518 | switch (i) | ||
519 | { | ||
520 | case NID_pkcs7_signedAndEnveloped: | ||
521 | /* XXXXXXXXXXXXXXXX */ | ||
522 | si_sk=p7->d.signed_and_enveloped->signer_info; | ||
523 | os=M_ASN1_OCTET_STRING_new(); | ||
524 | p7->d.signed_and_enveloped->enc_data->enc_data=os; | ||
525 | break; | ||
526 | case NID_pkcs7_enveloped: | ||
527 | /* XXXXXXXXXXXXXXXX */ | ||
528 | os=M_ASN1_OCTET_STRING_new(); | ||
529 | p7->d.enveloped->enc_data->enc_data=os; | ||
530 | break; | ||
531 | case NID_pkcs7_signed: | ||
532 | si_sk=p7->d.sign->signer_info; | ||
533 | os=PKCS7_get_octet_string(p7->d.sign->contents); | ||
534 | /* If detached data then the content is excluded */ | ||
535 | if(PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) { | ||
536 | M_ASN1_OCTET_STRING_free(os); | ||
537 | p7->d.sign->contents->d.data = NULL; | ||
538 | } | ||
539 | break; | ||
540 | } | ||
541 | |||
542 | if (si_sk != NULL) | ||
543 | { | ||
544 | if ((buf=BUF_MEM_new()) == NULL) | ||
545 | { | ||
546 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_BIO_LIB); | ||
547 | goto err; | ||
548 | } | ||
549 | for (i=0; i<sk_PKCS7_SIGNER_INFO_num(si_sk); i++) | ||
550 | { | ||
551 | si=sk_PKCS7_SIGNER_INFO_value(si_sk,i); | ||
552 | if (si->pkey == NULL) continue; | ||
553 | |||
554 | j=OBJ_obj2nid(si->digest_alg->algorithm); | ||
555 | |||
556 | btmp=bio; | ||
557 | for (;;) | ||
558 | { | ||
559 | if ((btmp=BIO_find_type(btmp,BIO_TYPE_MD)) | ||
560 | == NULL) | ||
561 | { | ||
562 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST); | ||
563 | goto err; | ||
564 | } | ||
565 | BIO_get_md_ctx(btmp,&mdc); | ||
566 | if (mdc == NULL) | ||
567 | { | ||
568 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_INTERNAL_ERROR); | ||
569 | goto err; | ||
570 | } | ||
571 | if (EVP_MD_CTX_type(mdc) == j) | ||
572 | break; | ||
573 | else | ||
574 | btmp=BIO_next(btmp); | ||
575 | } | ||
576 | |||
577 | /* We now have the EVP_MD_CTX, lets do the | ||
578 | * signing. */ | ||
579 | EVP_MD_CTX_copy_ex(&ctx_tmp,mdc); | ||
580 | if (!BUF_MEM_grow_clean(buf,EVP_PKEY_size(si->pkey))) | ||
581 | { | ||
582 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_BIO_LIB); | ||
583 | goto err; | ||
584 | } | ||
585 | |||
586 | sk=si->auth_attr; | ||
587 | |||
588 | /* If there are attributes, we add the digest | ||
589 | * attribute and only sign the attributes */ | ||
590 | if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0)) | ||
591 | { | ||
592 | unsigned char md_data[EVP_MAX_MD_SIZE], *abuf=NULL; | ||
593 | unsigned int md_len, alen; | ||
594 | ASN1_OCTET_STRING *digest; | ||
595 | ASN1_UTCTIME *sign_time; | ||
596 | const EVP_MD *md_tmp; | ||
597 | |||
598 | /* Add signing time if not already present */ | ||
599 | if (!PKCS7_get_signed_attribute(si, | ||
600 | NID_pkcs9_signingTime)) | ||
601 | { | ||
602 | sign_time=X509_gmtime_adj(NULL,0); | ||
603 | PKCS7_add_signed_attribute(si, | ||
604 | NID_pkcs9_signingTime, | ||
605 | V_ASN1_UTCTIME,sign_time); | ||
606 | } | ||
607 | |||
608 | /* Add digest */ | ||
609 | md_tmp=EVP_MD_CTX_md(&ctx_tmp); | ||
610 | EVP_DigestFinal_ex(&ctx_tmp,md_data,&md_len); | ||
611 | digest=M_ASN1_OCTET_STRING_new(); | ||
612 | M_ASN1_OCTET_STRING_set(digest,md_data,md_len); | ||
613 | PKCS7_add_signed_attribute(si, | ||
614 | NID_pkcs9_messageDigest, | ||
615 | V_ASN1_OCTET_STRING,digest); | ||
616 | |||
617 | /* Now sign the attributes */ | ||
618 | EVP_SignInit_ex(&ctx_tmp,md_tmp,NULL); | ||
619 | alen = ASN1_item_i2d((ASN1_VALUE *)sk,&abuf, | ||
620 | ASN1_ITEM_rptr(PKCS7_ATTR_SIGN)); | ||
621 | if(!abuf) goto err; | ||
622 | EVP_SignUpdate(&ctx_tmp,abuf,alen); | ||
623 | OPENSSL_free(abuf); | ||
624 | } | ||
625 | |||
626 | #ifndef OPENSSL_NO_DSA | ||
627 | if (si->pkey->type == EVP_PKEY_DSA) | ||
628 | ctx_tmp.digest=EVP_dss1(); | ||
629 | #endif | ||
630 | |||
631 | if (!EVP_SignFinal(&ctx_tmp,(unsigned char *)buf->data, | ||
632 | (unsigned int *)&buf->length,si->pkey)) | ||
633 | { | ||
634 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_EVP_LIB); | ||
635 | goto err; | ||
636 | } | ||
637 | if (!ASN1_STRING_set(si->enc_digest, | ||
638 | (unsigned char *)buf->data,buf->length)) | ||
639 | { | ||
640 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_ASN1_LIB); | ||
641 | goto err; | ||
642 | } | ||
643 | } | ||
644 | } | ||
645 | |||
646 | if (!PKCS7_is_detached(p7)) | ||
647 | { | ||
648 | btmp=BIO_find_type(bio,BIO_TYPE_MEM); | ||
649 | if (btmp == NULL) | ||
650 | { | ||
651 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_UNABLE_TO_FIND_MEM_BIO); | ||
652 | goto err; | ||
653 | } | ||
654 | BIO_get_mem_ptr(btmp,&buf_mem); | ||
655 | /* Mark the BIO read only then we can use its copy of the data | ||
656 | * instead of making an extra copy. | ||
657 | */ | ||
658 | BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY); | ||
659 | BIO_set_mem_eof_return(btmp, 0); | ||
660 | os->data = (unsigned char *)buf_mem->data; | ||
661 | os->length = buf_mem->length; | ||
662 | #if 0 | ||
663 | M_ASN1_OCTET_STRING_set(os, | ||
664 | (unsigned char *)buf_mem->data,buf_mem->length); | ||
665 | #endif | ||
666 | } | ||
667 | ret=1; | ||
668 | err: | ||
669 | EVP_MD_CTX_cleanup(&ctx_tmp); | ||
670 | if (buf != NULL) BUF_MEM_free(buf); | ||
671 | return(ret); | ||
672 | } | ||
673 | |||
674 | int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio, | ||
675 | PKCS7 *p7, PKCS7_SIGNER_INFO *si) | ||
676 | { | ||
677 | PKCS7_ISSUER_AND_SERIAL *ias; | ||
678 | int ret=0,i; | ||
679 | STACK_OF(X509) *cert; | ||
680 | X509 *x509; | ||
681 | |||
682 | if (PKCS7_type_is_signed(p7)) | ||
683 | { | ||
684 | cert=p7->d.sign->cert; | ||
685 | } | ||
686 | else if (PKCS7_type_is_signedAndEnveloped(p7)) | ||
687 | { | ||
688 | cert=p7->d.signed_and_enveloped->cert; | ||
689 | } | ||
690 | else | ||
691 | { | ||
692 | PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_WRONG_PKCS7_TYPE); | ||
693 | goto err; | ||
694 | } | ||
695 | /* XXXXXXXXXXXXXXXXXXXXXXX */ | ||
696 | ias=si->issuer_and_serial; | ||
697 | |||
698 | x509=X509_find_by_issuer_and_serial(cert,ias->issuer,ias->serial); | ||
699 | |||
700 | /* were we able to find the cert in passed to us */ | ||
701 | if (x509 == NULL) | ||
702 | { | ||
703 | PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_UNABLE_TO_FIND_CERTIFICATE); | ||
704 | goto err; | ||
705 | } | ||
706 | |||
707 | /* Lets verify */ | ||
708 | if(!X509_STORE_CTX_init(ctx,cert_store,x509,cert)) | ||
709 | { | ||
710 | PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB); | ||
711 | goto err; | ||
712 | } | ||
713 | X509_STORE_CTX_set_purpose(ctx, X509_PURPOSE_SMIME_SIGN); | ||
714 | i=X509_verify_cert(ctx); | ||
715 | if (i <= 0) | ||
716 | { | ||
717 | PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB); | ||
718 | X509_STORE_CTX_cleanup(ctx); | ||
719 | goto err; | ||
720 | } | ||
721 | X509_STORE_CTX_cleanup(ctx); | ||
722 | |||
723 | return PKCS7_signatureVerify(bio, p7, si, x509); | ||
724 | err: | ||
725 | return ret; | ||
726 | } | ||
727 | |||
728 | int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, | ||
729 | X509 *x509) | ||
730 | { | ||
731 | ASN1_OCTET_STRING *os; | ||
732 | EVP_MD_CTX mdc_tmp,*mdc; | ||
733 | int ret=0,i; | ||
734 | int md_type; | ||
735 | STACK_OF(X509_ATTRIBUTE) *sk; | ||
736 | BIO *btmp; | ||
737 | EVP_PKEY *pkey; | ||
738 | |||
739 | EVP_MD_CTX_init(&mdc_tmp); | ||
740 | |||
741 | if (!PKCS7_type_is_signed(p7) && | ||
742 | !PKCS7_type_is_signedAndEnveloped(p7)) { | ||
743 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, | ||
744 | PKCS7_R_WRONG_PKCS7_TYPE); | ||
745 | goto err; | ||
746 | } | ||
747 | |||
748 | md_type=OBJ_obj2nid(si->digest_alg->algorithm); | ||
749 | |||
750 | btmp=bio; | ||
751 | for (;;) | ||
752 | { | ||
753 | if ((btmp == NULL) || | ||
754 | ((btmp=BIO_find_type(btmp,BIO_TYPE_MD)) == NULL)) | ||
755 | { | ||
756 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, | ||
757 | PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST); | ||
758 | goto err; | ||
759 | } | ||
760 | BIO_get_md_ctx(btmp,&mdc); | ||
761 | if (mdc == NULL) | ||
762 | { | ||
763 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, | ||
764 | ERR_R_INTERNAL_ERROR); | ||
765 | goto err; | ||
766 | } | ||
767 | if (EVP_MD_CTX_type(mdc) == md_type) | ||
768 | break; | ||
769 | /* Workaround for some broken clients that put the signature | ||
770 | * OID instead of the digest OID in digest_alg->algorithm | ||
771 | */ | ||
772 | if (EVP_MD_pkey_type(EVP_MD_CTX_md(mdc)) == md_type) | ||
773 | break; | ||
774 | btmp=BIO_next(btmp); | ||
775 | } | ||
776 | |||
777 | /* mdc is the digest ctx that we want, unless there are attributes, | ||
778 | * in which case the digest is the signed attributes */ | ||
779 | EVP_MD_CTX_copy_ex(&mdc_tmp,mdc); | ||
780 | |||
781 | sk=si->auth_attr; | ||
782 | if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0)) | ||
783 | { | ||
784 | unsigned char md_dat[EVP_MAX_MD_SIZE], *abuf = NULL; | ||
785 | unsigned int md_len, alen; | ||
786 | ASN1_OCTET_STRING *message_digest; | ||
787 | |||
788 | EVP_DigestFinal_ex(&mdc_tmp,md_dat,&md_len); | ||
789 | message_digest=PKCS7_digest_from_attributes(sk); | ||
790 | if (!message_digest) | ||
791 | { | ||
792 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, | ||
793 | PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST); | ||
794 | goto err; | ||
795 | } | ||
796 | if ((message_digest->length != (int)md_len) || | ||
797 | (memcmp(message_digest->data,md_dat,md_len))) | ||
798 | { | ||
799 | #if 0 | ||
800 | { | ||
801 | int ii; | ||
802 | for (ii=0; ii<message_digest->length; ii++) | ||
803 | printf("%02X",message_digest->data[ii]); printf(" sent\n"); | ||
804 | for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n"); | ||
805 | } | ||
806 | #endif | ||
807 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, | ||
808 | PKCS7_R_DIGEST_FAILURE); | ||
809 | ret= -1; | ||
810 | goto err; | ||
811 | } | ||
812 | |||
813 | EVP_VerifyInit_ex(&mdc_tmp,EVP_get_digestbynid(md_type), NULL); | ||
814 | |||
815 | alen = ASN1_item_i2d((ASN1_VALUE *)sk, &abuf, | ||
816 | ASN1_ITEM_rptr(PKCS7_ATTR_VERIFY)); | ||
817 | EVP_VerifyUpdate(&mdc_tmp, abuf, alen); | ||
818 | |||
819 | OPENSSL_free(abuf); | ||
820 | } | ||
821 | |||
822 | os=si->enc_digest; | ||
823 | pkey = X509_get_pubkey(x509); | ||
824 | if (!pkey) | ||
825 | { | ||
826 | ret = -1; | ||
827 | goto err; | ||
828 | } | ||
829 | #ifndef OPENSSL_NO_DSA | ||
830 | if(pkey->type == EVP_PKEY_DSA) mdc_tmp.digest=EVP_dss1(); | ||
831 | #endif | ||
832 | |||
833 | i=EVP_VerifyFinal(&mdc_tmp,os->data,os->length, pkey); | ||
834 | EVP_PKEY_free(pkey); | ||
835 | if (i <= 0) | ||
836 | { | ||
837 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, | ||
838 | PKCS7_R_SIGNATURE_FAILURE); | ||
839 | ret= -1; | ||
840 | goto err; | ||
841 | } | ||
842 | else | ||
843 | ret=1; | ||
844 | err: | ||
845 | EVP_MD_CTX_cleanup(&mdc_tmp); | ||
846 | return(ret); | ||
847 | } | ||
848 | |||
849 | PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx) | ||
850 | { | ||
851 | STACK_OF(PKCS7_RECIP_INFO) *rsk; | ||
852 | PKCS7_RECIP_INFO *ri; | ||
853 | int i; | ||
854 | |||
855 | i=OBJ_obj2nid(p7->type); | ||
856 | if (i != NID_pkcs7_signedAndEnveloped) return(NULL); | ||
857 | rsk=p7->d.signed_and_enveloped->recipientinfo; | ||
858 | ri=sk_PKCS7_RECIP_INFO_value(rsk,0); | ||
859 | if (sk_PKCS7_RECIP_INFO_num(rsk) <= idx) return(NULL); | ||
860 | ri=sk_PKCS7_RECIP_INFO_value(rsk,idx); | ||
861 | return(ri->issuer_and_serial); | ||
862 | } | ||
863 | |||
864 | ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid) | ||
865 | { | ||
866 | return(get_attribute(si->auth_attr,nid)); | ||
867 | } | ||
868 | |||
869 | ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid) | ||
870 | { | ||
871 | return(get_attribute(si->unauth_attr,nid)); | ||
872 | } | ||
873 | |||
874 | static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid) | ||
875 | { | ||
876 | int i; | ||
877 | X509_ATTRIBUTE *xa; | ||
878 | ASN1_OBJECT *o; | ||
879 | |||
880 | o=OBJ_nid2obj(nid); | ||
881 | if (!o || !sk) return(NULL); | ||
882 | for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++) | ||
883 | { | ||
884 | xa=sk_X509_ATTRIBUTE_value(sk,i); | ||
885 | if (OBJ_cmp(xa->object,o) == 0) | ||
886 | { | ||
887 | if (!xa->single && sk_ASN1_TYPE_num(xa->value.set)) | ||
888 | return(sk_ASN1_TYPE_value(xa->value.set,0)); | ||
889 | else | ||
890 | return(NULL); | ||
891 | } | ||
892 | } | ||
893 | return(NULL); | ||
894 | } | ||
895 | |||
896 | ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk) | ||
897 | { | ||
898 | ASN1_TYPE *astype; | ||
899 | if(!(astype = get_attribute(sk, NID_pkcs9_messageDigest))) return NULL; | ||
900 | return astype->value.octet_string; | ||
901 | } | ||
902 | |||
903 | int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si, | ||
904 | STACK_OF(X509_ATTRIBUTE) *sk) | ||
905 | { | ||
906 | int i; | ||
907 | |||
908 | if (p7si->auth_attr != NULL) | ||
909 | sk_X509_ATTRIBUTE_pop_free(p7si->auth_attr,X509_ATTRIBUTE_free); | ||
910 | p7si->auth_attr=sk_X509_ATTRIBUTE_dup(sk); | ||
911 | for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++) | ||
912 | { | ||
913 | if ((sk_X509_ATTRIBUTE_set(p7si->auth_attr,i, | ||
914 | X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i)))) | ||
915 | == NULL) | ||
916 | return(0); | ||
917 | } | ||
918 | return(1); | ||
919 | } | ||
920 | |||
921 | int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk) | ||
922 | { | ||
923 | int i; | ||
924 | |||
925 | if (p7si->unauth_attr != NULL) | ||
926 | sk_X509_ATTRIBUTE_pop_free(p7si->unauth_attr, | ||
927 | X509_ATTRIBUTE_free); | ||
928 | p7si->unauth_attr=sk_X509_ATTRIBUTE_dup(sk); | ||
929 | for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++) | ||
930 | { | ||
931 | if ((sk_X509_ATTRIBUTE_set(p7si->unauth_attr,i, | ||
932 | X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i)))) | ||
933 | == NULL) | ||
934 | return(0); | ||
935 | } | ||
936 | return(1); | ||
937 | } | ||
938 | |||
939 | int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, | ||
940 | void *value) | ||
941 | { | ||
942 | return(add_attribute(&(p7si->auth_attr),nid,atrtype,value)); | ||
943 | } | ||
944 | |||
945 | int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, | ||
946 | void *value) | ||
947 | { | ||
948 | return(add_attribute(&(p7si->unauth_attr),nid,atrtype,value)); | ||
949 | } | ||
950 | |||
951 | static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype, | ||
952 | void *value) | ||
953 | { | ||
954 | X509_ATTRIBUTE *attr=NULL; | ||
955 | |||
956 | if (*sk == NULL) | ||
957 | { | ||
958 | *sk = sk_X509_ATTRIBUTE_new_null(); | ||
959 | new_attrib: | ||
960 | attr=X509_ATTRIBUTE_create(nid,atrtype,value); | ||
961 | sk_X509_ATTRIBUTE_push(*sk,attr); | ||
962 | } | ||
963 | else | ||
964 | { | ||
965 | int i; | ||
966 | |||
967 | for (i=0; i<sk_X509_ATTRIBUTE_num(*sk); i++) | ||
968 | { | ||
969 | attr=sk_X509_ATTRIBUTE_value(*sk,i); | ||
970 | if (OBJ_obj2nid(attr->object) == nid) | ||
971 | { | ||
972 | X509_ATTRIBUTE_free(attr); | ||
973 | attr=X509_ATTRIBUTE_create(nid,atrtype,value); | ||
974 | sk_X509_ATTRIBUTE_set(*sk,i,attr); | ||
975 | goto end; | ||
976 | } | ||
977 | } | ||
978 | goto new_attrib; | ||
979 | } | ||
980 | end: | ||
981 | return(1); | ||
982 | } | ||
983 | |||