summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs7
diff options
context:
space:
mode:
authorcvs2svn <admin@example.com>1999-10-10 21:32:03 +0000
committercvs2svn <admin@example.com>1999-10-10 21:32:03 +0000
commit14e61fef302fbc25ab63e38bd35445637ca68139 (patch)
treedae5e50679bccd1ed8d7d4041fbb9f3d96bbc98c /src/lib/libcrypto/pkcs7
parent3ef9529fbf0c1f8f1c9da1172e92ad3370d5fcfe (diff)
downloadopenbsd-OPENBSD_2_6_BASE.tar.gz
openbsd-OPENBSD_2_6_BASE.tar.bz2
openbsd-OPENBSD_2_6_BASE.zip
This commit was manufactured by cvs2git to create tag 'OPENBSD_2_6_BASE'.OPENBSD_2_6_BASE
Diffstat (limited to 'src/lib/libcrypto/pkcs7')
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_doit.c922
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_lib.c449
-rw-r--r--src/lib/libcrypto/pkcs7/pkcs7.h417
-rw-r--r--src/lib/libcrypto/pkcs7/pkcs7err.c121
4 files changed, 0 insertions, 1909 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
deleted file mode 100644
index dee81b547a..0000000000
--- a/src/lib/libcrypto/pkcs7/pk7_doit.c
+++ /dev/null
@@ -1,922 +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
65static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
66 void *value);
67static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid);
68
69BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
70 {
71 int i,j;
72 BIO *out=NULL,*btmp=NULL;
73 X509_ALGOR *xa;
74 const EVP_MD *evp_md;
75 const EVP_CIPHER *evp_cipher=NULL;
76 STACK_OF(X509_ALGOR) *md_sk=NULL;
77 STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL;
78 X509_ALGOR *xalg=NULL;
79 PKCS7_RECIP_INFO *ri=NULL;
80 EVP_PKEY *pkey;
81
82 i=OBJ_obj2nid(p7->type);
83 p7->state=PKCS7_S_HEADER;
84
85 switch (i)
86 {
87 case NID_pkcs7_signed:
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;
93 xalg=p7->d.signed_and_enveloped->enc_data->algorithm;
94 evp_cipher=p7->d.signed_and_enveloped->enc_data->cipher;
95 if (evp_cipher == NULL)
96 {
97 PKCS7err(PKCS7_F_PKCS7_DATAINIT,
98 PKCS7_R_CIPHER_NOT_INITIALIZED);
99 goto err;
100 }
101 break;
102 case NID_pkcs7_enveloped:
103 rsk=p7->d.enveloped->recipientinfo;
104 xalg=p7->d.enveloped->enc_data->algorithm;
105 evp_cipher=p7->d.enveloped->enc_data->cipher;
106 if (evp_cipher == NULL)
107 {
108 PKCS7err(PKCS7_F_PKCS7_DATAINIT,
109 PKCS7_R_CIPHER_NOT_INITIALIZED);
110 goto err;
111 }
112 break;
113 default:
114 PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
115 goto err;
116 }
117
118 if (md_sk != NULL)
119 {
120 for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
121 {
122 xa=sk_X509_ALGOR_value(md_sk,i);
123 if ((btmp=BIO_new(BIO_f_md())) == NULL)
124 {
125 PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_BIO_LIB);
126 goto err;
127 }
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);
142 btmp=NULL;
143 }
144 }
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;
153 EVP_CIPHER_CTX *ctx;
154
155 if ((btmp=BIO_new(BIO_f_cipher())) == NULL)
156 {
157 PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_BIO_LIB);
158 goto err;
159 }
160 BIO_get_cipher_ctx(btmp, &ctx);
161 keylen=EVP_CIPHER_key_length(evp_cipher);
162 ivlen=EVP_CIPHER_iv_length(evp_cipher);
163 RAND_bytes(key,keylen);
164 xalg->algorithm = OBJ_nid2obj(EVP_CIPHER_type(evp_cipher));
165 if (ivlen > 0) RAND_bytes(iv,ivlen);
166 EVP_CipherInit(ctx, evp_cipher, key, iv, 1);
167
168 if (ivlen > 0) {
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 }
174
175 /* Lets do the pub key stuff :-) */
176 max=0;
177 for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++)
178 {
179 ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
180 if (ri->cert == NULL)
181 {
182 PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_MISSING_CERIPEND_INFO);
183 goto err;
184 }
185 pkey=X509_get_pubkey(ri->cert);
186 jj=EVP_PKEY_size(pkey);
187 EVP_PKEY_free(pkey);
188 if (max < jj) max=jj;
189 }
190 if ((tmp=(unsigned char *)Malloc(max)) == NULL)
191 {
192 PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_MALLOC_FAILURE);
193 goto err;
194 }
195 for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++)
196 {
197 ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
198 pkey=X509_get_pubkey(ri->cert);
199 jj=EVP_PKEY_encrypt(tmp,key,keylen,pkey);
200 EVP_PKEY_free(pkey);
201 if (jj <= 0)
202 {
203 PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_EVP_LIB);
204 Free(tmp);
205 goto err;
206 }
207 ASN1_OCTET_STRING_set(ri->enc_key,tmp,jj);
208 }
209 Free(tmp);
210 memset(key, 0, keylen);
211
212 if (out == NULL)
213 out=btmp;
214 else
215 BIO_push(out,btmp);
216 btmp=NULL;
217 }
218
219 if (bio == NULL) /* ??????????? */
220 {
221 if (p7->detached)
222 bio=BIO_new(BIO_s_null());
223 else
224 {
225 bio=BIO_new(BIO_s_mem());
226 /* We need to set this so that when we have read all
227 * the data, the encrypt BIO, if present, will read
228 * EOF and encode the last few bytes */
229 BIO_set_mem_eof_return(bio,0);
230
231 if (PKCS7_type_is_signed(p7) &&
232 PKCS7_type_is_data(p7->d.sign->contents))
233 {
234 ASN1_OCTET_STRING *os;
235
236 os=p7->d.sign->contents->d.data;
237 if (os->length > 0)
238 BIO_write(bio,(char *)os->data,
239 os->length);
240 }
241 }
242 }
243 BIO_push(out,bio);
244 bio=NULL;
245 if (0)
246 {
247err:
248 if (out != NULL)
249 BIO_free_all(out);
250 if (btmp != NULL)
251 BIO_free_all(btmp);
252 out=NULL;
253 }
254 return(out);
255 }
256
257/* int */
258BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
259 {
260 int i,j;
261 BIO *out=NULL,*btmp=NULL,*etmp=NULL,*bio=NULL;
262 char *tmp=NULL;
263 X509_ALGOR *xa;
264 ASN1_OCTET_STRING *data_body=NULL;
265 const EVP_MD *evp_md;
266 const EVP_CIPHER *evp_cipher=NULL;
267 EVP_CIPHER_CTX *evp_ctx=NULL;
268 X509_ALGOR *enc_alg=NULL;
269 STACK_OF(X509_ALGOR) *md_sk=NULL;
270 STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL;
271 X509_ALGOR *xalg=NULL;
272 PKCS7_RECIP_INFO *ri=NULL;
273/* EVP_PKEY *pkey; */
274#if 0
275 X509_STORE_CTX s_ctx;
276#endif
277
278 i=OBJ_obj2nid(p7->type);
279 p7->state=PKCS7_S_HEADER;
280
281 switch (i)
282 {
283 case NID_pkcs7_signed:
284 data_body=p7->d.sign->contents->d.data;
285 md_sk=p7->d.sign->md_algs;
286 break;
287 case NID_pkcs7_signedAndEnveloped:
288 rsk=p7->d.signed_and_enveloped->recipientinfo;
289 md_sk=p7->d.signed_and_enveloped->md_algs;
290 data_body=p7->d.signed_and_enveloped->enc_data->enc_data;
291 enc_alg=p7->d.signed_and_enveloped->enc_data->algorithm;
292 evp_cipher=EVP_get_cipherbyname(OBJ_nid2sn(OBJ_obj2nid(enc_alg->algorithm)));
293 if (evp_cipher == NULL)
294 {
295 PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE);
296 goto err;
297 }
298 xalg=p7->d.signed_and_enveloped->enc_data->algorithm;
299 break;
300 case NID_pkcs7_enveloped:
301 rsk=p7->d.enveloped->recipientinfo;
302 enc_alg=p7->d.enveloped->enc_data->algorithm;
303 data_body=p7->d.enveloped->enc_data->enc_data;
304 evp_cipher=EVP_get_cipherbyname(OBJ_nid2sn(OBJ_obj2nid(enc_alg->algorithm)));
305 if (evp_cipher == NULL)
306 {
307 PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE);
308 goto err;
309 }
310 xalg=p7->d.enveloped->enc_data->algorithm;
311 break;
312 default:
313 PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
314 goto err;
315 }
316
317 /* We will be checking the signature */
318 if (md_sk != NULL)
319 {
320 for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
321 {
322 xa=sk_X509_ALGOR_value(md_sk,i);
323 if ((btmp=BIO_new(BIO_f_md())) == NULL)
324 {
325 PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB);
326 goto err;
327 }
328
329 j=OBJ_obj2nid(xa->algorithm);
330 evp_md=EVP_get_digestbyname(OBJ_nid2sn(j));
331 if (evp_md == NULL)
332 {
333 PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNKNOWN_DIGEST_TYPE);
334 goto err;
335 }
336
337 BIO_set_md(btmp,evp_md);
338 if (out == NULL)
339 out=btmp;
340 else
341 BIO_push(out,btmp);
342 btmp=NULL;
343 }
344 }
345
346 if (evp_cipher != NULL)
347 {
348#if 0
349 unsigned char key[EVP_MAX_KEY_LENGTH];
350 unsigned char iv[EVP_MAX_IV_LENGTH];
351 unsigned char *p;
352 int keylen,ivlen;
353 int max;
354 X509_OBJECT ret;
355#endif
356 int jj;
357
358 if ((etmp=BIO_new(BIO_f_cipher())) == NULL)
359 {
360 PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB);
361 goto err;
362 }
363
364 /* It was encrypted, we need to decrypt the secret key
365 * with the private key */
366
367 /* Find the recipientInfo which matches the passed certificate
368 * (if any)
369 */
370
371 for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++) {
372 ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
373 if(!X509_NAME_cmp(ri->issuer_and_serial->issuer,
374 pcert->cert_info->issuer) &&
375 !ASN1_INTEGER_cmp(pcert->cert_info->serialNumber,
376 ri->issuer_and_serial->serial)) break;
377 ri=NULL;
378 }
379 if (ri == NULL) {
380 PKCS7err(PKCS7_F_PKCS7_DATADECODE,
381 PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE);
382 return(NULL);
383 }
384
385 jj=EVP_PKEY_size(pkey);
386 tmp=Malloc(jj+10);
387 if (tmp == NULL)
388 {
389 PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_MALLOC_FAILURE);
390 goto err;
391 }
392
393 jj=EVP_PKEY_decrypt((unsigned char *)tmp,
394 ASN1_STRING_data(ri->enc_key),
395 ASN1_STRING_length(ri->enc_key),
396 pkey);
397 if (jj <= 0)
398 {
399 PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_EVP_LIB);
400 goto err;
401 }
402
403 evp_ctx=NULL;
404 BIO_get_cipher_ctx(etmp,&evp_ctx);
405 EVP_CipherInit(evp_ctx,evp_cipher,NULL,NULL,0);
406 if (EVP_CIPHER_asn1_to_param(evp_ctx,enc_alg->parameter) < 0)
407 return(NULL);
408
409 if (jj != EVP_CIPHER_CTX_key_length(evp_ctx))
410 {
411 PKCS7err(PKCS7_F_PKCS7_DATADECODE,
412 PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH);
413 goto err;
414 }
415 EVP_CipherInit(evp_ctx,NULL,(unsigned char *)tmp,NULL,0);
416
417 memset(tmp,0,jj);
418
419 if (out == NULL)
420 out=etmp;
421 else
422 BIO_push(out,etmp);
423 etmp=NULL;
424 }
425
426#if 1
427 if (p7->detached || (in_bio != NULL))
428 {
429 bio=in_bio;
430 }
431 else
432 {
433 bio=BIO_new(BIO_s_mem());
434 /* We need to set this so that when we have read all
435 * the data, the encrypt BIO, if present, will read
436 * EOF and encode the last few bytes */
437 BIO_set_mem_eof_return(bio,0);
438
439 if (data_body->length > 0)
440 BIO_write(bio,(char *)data_body->data,data_body->length);
441 }
442 BIO_push(out,bio);
443 bio=NULL;
444#endif
445 if (0)
446 {
447err:
448 if (out != NULL) BIO_free_all(out);
449 if (btmp != NULL) BIO_free_all(btmp);
450 if (etmp != NULL) BIO_free_all(etmp);
451 if (bio != NULL) BIO_free_all(bio);
452 out=NULL;
453 }
454 if (tmp != NULL)
455 Free(tmp);
456 return(out);
457 }
458
459int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
460 {
461 int ret=0;
462 int i,j;
463 BIO *btmp;
464 BUF_MEM *buf_mem=NULL;
465 BUF_MEM *buf=NULL;
466 PKCS7_SIGNER_INFO *si;
467 EVP_MD_CTX *mdc,ctx_tmp;
468 STACK_OF(X509_ATTRIBUTE) *sk;
469 STACK_OF(PKCS7_SIGNER_INFO) *si_sk=NULL;
470 unsigned char *p,*pp=NULL;
471 int x;
472 ASN1_OCTET_STRING *os=NULL;
473
474 i=OBJ_obj2nid(p7->type);
475 p7->state=PKCS7_S_HEADER;
476
477 switch (i)
478 {
479 case NID_pkcs7_signedAndEnveloped:
480 /* XXXXXXXXXXXXXXXX */
481 si_sk=p7->d.signed_and_enveloped->signer_info;
482 os=ASN1_OCTET_STRING_new();
483 p7->d.signed_and_enveloped->enc_data->enc_data=os;
484 break;
485 case NID_pkcs7_enveloped:
486 /* XXXXXXXXXXXXXXXX */
487 os=ASN1_OCTET_STRING_new();
488 p7->d.enveloped->enc_data->enc_data=os;
489 break;
490 case NID_pkcs7_signed:
491 si_sk=p7->d.sign->signer_info;
492 os=p7->d.sign->contents->d.data;
493 /* If detached data then the content is excluded */
494 if(p7->detached) {
495 ASN1_OCTET_STRING_free(os);
496 p7->d.sign->contents->d.data = NULL;
497 }
498 break;
499 }
500
501 if (si_sk != NULL)
502 {
503 if ((buf=BUF_MEM_new()) == NULL)
504 {
505 PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_BIO_LIB);
506 goto err;
507 }
508 for (i=0; i<sk_PKCS7_SIGNER_INFO_num(si_sk); i++)
509 {
510 si=sk_PKCS7_SIGNER_INFO_value(si_sk,i);
511 if (si->pkey == NULL) continue;
512
513 j=OBJ_obj2nid(si->digest_alg->algorithm);
514
515 btmp=bio;
516 for (;;)
517 {
518 if ((btmp=BIO_find_type(btmp,BIO_TYPE_MD))
519 == NULL)
520 {
521 PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
522 goto err;
523 }
524 BIO_get_md_ctx(btmp,&mdc);
525 if (mdc == NULL)
526 {
527 PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_INTERNAL_ERROR);
528 goto err;
529 }
530 if (EVP_MD_type(EVP_MD_CTX_type(mdc)) == j)
531 break;
532 else
533 btmp=btmp->next_bio;
534 }
535
536 /* We now have the EVP_MD_CTX, lets do the
537 * signing. */
538 memcpy(&ctx_tmp,mdc,sizeof(ctx_tmp));
539 if (!BUF_MEM_grow(buf,EVP_PKEY_size(si->pkey)))
540 {
541 PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_BIO_LIB);
542 goto err;
543 }
544
545 sk=si->auth_attr;
546
547 /* If there are attributes, we add the digest
548 * attribute and only sign the attributes */
549 if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0))
550 {
551 unsigned char md_data[EVP_MAX_MD_SIZE];
552 unsigned int md_len;
553 ASN1_OCTET_STRING *digest;
554 ASN1_UTCTIME *sign_time;
555 const EVP_MD *md_tmp;
556
557 /* Add signing time */
558 sign_time=X509_gmtime_adj(NULL,0);
559 PKCS7_add_signed_attribute(si,
560 NID_pkcs9_signingTime,
561 V_ASN1_UTCTIME,sign_time);
562
563 /* Add digest */
564 md_tmp=EVP_MD_CTX_type(&ctx_tmp);
565 EVP_DigestFinal(&ctx_tmp,md_data,&md_len);
566 digest=ASN1_OCTET_STRING_new();
567 ASN1_OCTET_STRING_set(digest,md_data,md_len);
568 PKCS7_add_signed_attribute(si,
569 NID_pkcs9_messageDigest,
570 V_ASN1_OCTET_STRING,digest);
571
572 /* Now sign the mess */
573 EVP_SignInit(&ctx_tmp,md_tmp);
574 x=i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,NULL,
575 i2d_X509_ATTRIBUTE,
576 V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET);
577 pp=(unsigned char *)Malloc(x);
578 p=pp;
579 i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,&p,
580 i2d_X509_ATTRIBUTE,
581 V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET);
582 EVP_SignUpdate(&ctx_tmp,pp,x);
583 Free(pp);
584 pp=NULL;
585 }
586
587 if (si->pkey->type == EVP_PKEY_DSA)
588 ctx_tmp.digest=EVP_dss1();
589
590 if (!EVP_SignFinal(&ctx_tmp,(unsigned char *)buf->data,
591 (unsigned int *)&buf->length,si->pkey))
592 {
593 PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_EVP_LIB);
594 goto err;
595 }
596 if (!ASN1_STRING_set(si->enc_digest,
597 (unsigned char *)buf->data,buf->length))
598 {
599 PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_ASN1_LIB);
600 goto err;
601 }
602 }
603 }
604
605 if (!p7->detached)
606 {
607 btmp=BIO_find_type(bio,BIO_TYPE_MEM);
608 if (btmp == NULL)
609 {
610 PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
611 goto err;
612 }
613 BIO_get_mem_ptr(btmp,&buf_mem);
614 ASN1_OCTET_STRING_set(os,
615 (unsigned char *)buf_mem->data,buf_mem->length);
616 }
617 if (pp != NULL) Free(pp);
618 pp=NULL;
619
620 ret=1;
621err:
622 if (buf != NULL) BUF_MEM_free(buf);
623 return(ret);
624 }
625
626int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
627 PKCS7 *p7, PKCS7_SIGNER_INFO *si)
628 {
629 PKCS7_ISSUER_AND_SERIAL *ias;
630 int ret=0,i;
631 STACK_OF(X509) *cert;
632 X509 *x509;
633
634 if (PKCS7_type_is_signed(p7))
635 {
636 cert=p7->d.sign->cert;
637 }
638 else if (PKCS7_type_is_signedAndEnveloped(p7))
639 {
640 cert=p7->d.signed_and_enveloped->cert;
641 }
642 else
643 {
644 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_WRONG_PKCS7_TYPE);
645 goto err;
646 }
647 /* XXXXXXXXXXXXXXXXXXXXXXX */
648 ias=si->issuer_and_serial;
649
650 x509=X509_find_by_issuer_and_serial(cert,ias->issuer,ias->serial);
651
652 /* were we able to find the cert in passed to us */
653 if (x509 == NULL)
654 {
655 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_UNABLE_TO_FIND_CERTIFICATE);
656 goto err;
657 }
658
659 /* Lets verify */
660 X509_STORE_CTX_init(ctx,cert_store,x509,cert);
661 i=X509_verify_cert(ctx);
662 if (i <= 0)
663 {
664 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB);
665 goto err;
666 }
667 X509_STORE_CTX_cleanup(ctx);
668
669 return PKCS7_signatureVerify(bio, p7, si, x509);
670 err:
671 return ret;
672 }
673
674int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
675 X509 *x509)
676 {
677 ASN1_OCTET_STRING *os;
678 EVP_MD_CTX mdc_tmp,*mdc;
679 unsigned char *pp,*p;
680 int ret=0,i;
681 int md_type;
682 STACK_OF(X509_ATTRIBUTE) *sk;
683 BIO *btmp;
684 EVP_PKEY *pkey;
685
686 if (!PKCS7_type_is_signed(p7) &&
687 !PKCS7_type_is_signedAndEnveloped(p7)) {
688 PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
689 PKCS7_R_WRONG_PKCS7_TYPE);
690 goto err;
691 }
692
693 md_type=OBJ_obj2nid(si->digest_alg->algorithm);
694
695 btmp=bio;
696 for (;;)
697 {
698 if ((btmp == NULL) ||
699 ((btmp=BIO_find_type(btmp,BIO_TYPE_MD)) == NULL))
700 {
701 PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
702 PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
703 goto err;
704 }
705 BIO_get_md_ctx(btmp,&mdc);
706 if (mdc == NULL)
707 {
708 PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
709 PKCS7_R_INTERNAL_ERROR);
710 goto err;
711 }
712 if (EVP_MD_type(EVP_MD_CTX_type(mdc)) == md_type)
713 break;
714 btmp=btmp->next_bio;
715 }
716
717 /* mdc is the digest ctx that we want, unless there are attributes,
718 * in which case the digest is the signed attributes */
719 memcpy(&mdc_tmp,mdc,sizeof(mdc_tmp));
720
721 sk=si->auth_attr;
722 if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0))
723 {
724 unsigned char md_dat[EVP_MAX_MD_SIZE];
725 unsigned int md_len;
726 ASN1_OCTET_STRING *message_digest;
727
728 EVP_DigestFinal(&mdc_tmp,md_dat,&md_len);
729 message_digest=PKCS7_digest_from_attributes(sk);
730 if (!message_digest)
731 {
732 PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
733 PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
734 goto err;
735 }
736 if ((message_digest->length != (int)md_len) ||
737 (memcmp(message_digest->data,md_dat,md_len)))
738 {
739#if 0
740{
741int ii;
742for (ii=0; ii<message_digest->length; ii++)
743 printf("%02X",message_digest->data[ii]); printf(" sent\n");
744for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n");
745}
746#endif
747 PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
748 PKCS7_R_DIGEST_FAILURE);
749 ret= -1;
750 goto err;
751 }
752
753 EVP_VerifyInit(&mdc_tmp,EVP_get_digestbynid(md_type));
754 /* Note: when forming the encoding of the attributes we
755 * shouldn't reorder them or this will break the signature.
756 * This is done by using the IS_SEQUENCE flag.
757 */
758 i=i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,NULL,i2d_X509_ATTRIBUTE,
759 V_ASN1_SET,V_ASN1_UNIVERSAL, IS_SEQUENCE);
760 pp=Malloc(i);
761 p=pp;
762 i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,&p,i2d_X509_ATTRIBUTE,
763 V_ASN1_SET,V_ASN1_UNIVERSAL, IS_SEQUENCE);
764 EVP_VerifyUpdate(&mdc_tmp,pp,i);
765
766 Free(pp);
767 }
768
769 os=si->enc_digest;
770 pkey = X509_get_pubkey(x509);
771 if(pkey->type == EVP_PKEY_DSA) mdc_tmp.digest=EVP_dss1();
772
773 i=EVP_VerifyFinal(&mdc_tmp,os->data,os->length, pkey);
774 EVP_PKEY_free(pkey);
775 if (i <= 0)
776 {
777 PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
778 PKCS7_R_SIGNATURE_FAILURE);
779 ret= -1;
780 goto err;
781 }
782 else
783 ret=1;
784err:
785 return(ret);
786 }
787
788PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx)
789 {
790 STACK_OF(PKCS7_RECIP_INFO) *rsk;
791 PKCS7_RECIP_INFO *ri;
792 int i;
793
794 i=OBJ_obj2nid(p7->type);
795 if (i != NID_pkcs7_signedAndEnveloped) return(NULL);
796 rsk=p7->d.signed_and_enveloped->recipientinfo;
797 ri=sk_PKCS7_RECIP_INFO_value(rsk,0);
798 if (sk_PKCS7_RECIP_INFO_num(rsk) <= idx) return(NULL);
799 ri=sk_PKCS7_RECIP_INFO_value(rsk,idx);
800 return(ri->issuer_and_serial);
801 }
802
803ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid)
804 {
805 return(get_attribute(si->auth_attr,nid));
806 }
807
808ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid)
809 {
810 return(get_attribute(si->unauth_attr,nid));
811 }
812
813static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid)
814 {
815 int i;
816 X509_ATTRIBUTE *xa;
817 ASN1_OBJECT *o;
818
819 o=OBJ_nid2obj(nid);
820 if (!o || !sk) return(NULL);
821 for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
822 {
823 xa=sk_X509_ATTRIBUTE_value(sk,i);
824 if (OBJ_cmp(xa->object,o) == 0)
825 {
826 if (xa->set && sk_ASN1_TYPE_num(xa->value.set))
827 return(sk_ASN1_TYPE_value(xa->value.set,0));
828 else
829 return(NULL);
830 }
831 }
832 return(NULL);
833 }
834
835ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk)
836{
837 ASN1_TYPE *astype;
838 if(!(astype = get_attribute(sk, NID_pkcs9_messageDigest))) return NULL;
839 return astype->value.octet_string;
840}
841
842int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
843 STACK_OF(X509_ATTRIBUTE) *sk)
844 {
845 int i;
846
847 if (p7si->auth_attr != NULL)
848 sk_X509_ATTRIBUTE_pop_free(p7si->auth_attr,X509_ATTRIBUTE_free);
849 p7si->auth_attr=sk_X509_ATTRIBUTE_dup(sk);
850 for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
851 {
852 if ((sk_X509_ATTRIBUTE_set(p7si->auth_attr,i,
853 X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i))))
854 == NULL)
855 return(0);
856 }
857 return(1);
858 }
859
860int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk)
861 {
862 int i;
863
864 if (p7si->unauth_attr != NULL)
865 sk_X509_ATTRIBUTE_pop_free(p7si->unauth_attr,
866 X509_ATTRIBUTE_free);
867 p7si->unauth_attr=sk_X509_ATTRIBUTE_dup(sk);
868 for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
869 {
870 if ((sk_X509_ATTRIBUTE_set(p7si->unauth_attr,i,
871 X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i))))
872 == NULL)
873 return(0);
874 }
875 return(1);
876 }
877
878int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
879 void *value)
880 {
881 return(add_attribute(&(p7si->auth_attr),nid,atrtype,value));
882 }
883
884int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
885 void *value)
886 {
887 return(add_attribute(&(p7si->unauth_attr),nid,atrtype,value));
888 }
889
890static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
891 void *value)
892 {
893 X509_ATTRIBUTE *attr=NULL;
894
895 if (*sk == NULL)
896 {
897 *sk = sk_X509_ATTRIBUTE_new(NULL);
898new_attrib:
899 attr=X509_ATTRIBUTE_create(nid,atrtype,value);
900 sk_X509_ATTRIBUTE_push(*sk,attr);
901 }
902 else
903 {
904 int i;
905
906 for (i=0; i<sk_X509_ATTRIBUTE_num(*sk); i++)
907 {
908 attr=sk_X509_ATTRIBUTE_value(*sk,i);
909 if (OBJ_obj2nid(attr->object) == nid)
910 {
911 X509_ATTRIBUTE_free(attr);
912 attr=X509_ATTRIBUTE_create(nid,atrtype,value);
913 sk_X509_ATTRIBUTE_set(*sk,i,attr);
914 goto end;
915 }
916 }
917 goto new_attrib;
918 }
919end:
920 return(1);
921 }
922
diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c
deleted file mode 100644
index 8b863d0558..0000000000
--- a/src/lib/libcrypto/pkcs7/pk7_lib.c
+++ /dev/null
@@ -1,449 +0,0 @@
1/* crypto/pkcs7/pk7_lib.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/objects.h>
62#include <openssl/x509.h>
63
64long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
65 {
66 int nid;
67 long ret;
68
69 nid=OBJ_obj2nid(p7->type);
70
71 switch (cmd)
72 {
73 case PKCS7_OP_SET_DETACHED_SIGNATURE:
74 if (nid == NID_pkcs7_signed)
75 {
76 ret=p7->detached=(int)larg;
77 }
78 else
79 {
80 PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
81 ret=0;
82 }
83 break;
84 case PKCS7_OP_GET_DETACHED_SIGNATURE:
85 if (nid == NID_pkcs7_signed)
86 {
87 ret=p7->detached;
88 }
89 else
90 {
91 PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
92 ret=0;
93 }
94
95 break;
96 default:
97 PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_UNKNOWN_OPERATION);
98 ret=0;
99 }
100 return(ret);
101 }
102
103int PKCS7_content_new(PKCS7 *p7, int type)
104 {
105 PKCS7 *ret=NULL;
106
107 if ((ret=PKCS7_new()) == NULL) goto err;
108 if (!PKCS7_set_type(ret,type)) goto err;
109 if (!PKCS7_set_content(p7,ret)) goto err;
110
111 return(1);
112err:
113 if (ret != NULL) PKCS7_free(ret);
114 return(0);
115 }
116
117int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
118 {
119 int i;
120
121 i=OBJ_obj2nid(p7->type);
122 switch (i)
123 {
124 case NID_pkcs7_signed:
125 if (p7->d.sign->contents != NULL)
126 PKCS7_content_free(p7->d.sign->contents);
127 p7->d.sign->contents=p7_data;
128 break;
129 case NID_pkcs7_digest:
130 case NID_pkcs7_data:
131 case NID_pkcs7_enveloped:
132 case NID_pkcs7_signedAndEnveloped:
133 case NID_pkcs7_encrypted:
134 default:
135 PKCS7err(PKCS7_F_PKCS7_SET_CONTENT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
136 goto err;
137 }
138 return(1);
139err:
140 return(0);
141 }
142
143int PKCS7_set_type(PKCS7 *p7, int type)
144 {
145 ASN1_OBJECT *obj;
146
147 PKCS7_content_free(p7);
148 obj=OBJ_nid2obj(type); /* will not fail */
149
150 switch (type)
151 {
152 case NID_pkcs7_signed:
153 p7->type=obj;
154 if ((p7->d.sign=PKCS7_SIGNED_new()) == NULL)
155 goto err;
156 ASN1_INTEGER_set(p7->d.sign->version,1);
157 break;
158 case NID_pkcs7_data:
159 p7->type=obj;
160 if ((p7->d.data=ASN1_OCTET_STRING_new()) == NULL)
161 goto err;
162 break;
163 case NID_pkcs7_signedAndEnveloped:
164 p7->type=obj;
165 if ((p7->d.signed_and_enveloped=PKCS7_SIGN_ENVELOPE_new())
166 == NULL) goto err;
167 ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1);
168/* p7->d.signed_and_enveloped->enc_data->content_type=
169 OBJ_nid2obj(NID_pkcs7_encrypted);*/
170
171 break;
172 case NID_pkcs7_enveloped:
173 p7->type=obj;
174 if ((p7->d.enveloped=PKCS7_ENVELOPE_new())
175 == NULL) goto err;
176 ASN1_INTEGER_set(p7->d.enveloped->version,0);
177 break;
178 case NID_pkcs7_digest:
179 case NID_pkcs7_encrypted:
180 default:
181 PKCS7err(PKCS7_F_PKCS7_SET_TYPE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
182 goto err;
183 }
184 return(1);
185err:
186 return(0);
187 }
188
189int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
190 {
191 int i,j,nid;
192 X509_ALGOR *alg;
193 STACK_OF(PKCS7_SIGNER_INFO) *signer_sk;
194 STACK_OF(X509_ALGOR) *md_sk;
195
196 i=OBJ_obj2nid(p7->type);
197 switch (i)
198 {
199 case NID_pkcs7_signed:
200 signer_sk= p7->d.sign->signer_info;
201 md_sk= p7->d.sign->md_algs;
202 break;
203 case NID_pkcs7_signedAndEnveloped:
204 signer_sk= p7->d.signed_and_enveloped->signer_info;
205 md_sk= p7->d.signed_and_enveloped->md_algs;
206 break;
207 default:
208 PKCS7err(PKCS7_F_PKCS7_ADD_SIGNER,PKCS7_R_WRONG_CONTENT_TYPE);
209 return(0);
210 }
211
212 nid=OBJ_obj2nid(psi->digest_alg->algorithm);
213
214 /* If the digest is not currently listed, add it */
215 j=0;
216 for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
217 {
218 alg=sk_X509_ALGOR_value(md_sk,i);
219 if (OBJ_obj2nid(alg->algorithm) == nid)
220 {
221 j=1;
222 break;
223 }
224 }
225 if (!j) /* we need to add another algorithm */
226 {
227 alg=X509_ALGOR_new();
228 alg->algorithm=OBJ_nid2obj(nid);
229 sk_X509_ALGOR_push(md_sk,alg);
230 }
231
232 sk_PKCS7_SIGNER_INFO_push(signer_sk,psi);
233 return(1);
234 }
235
236int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
237 {
238 int i;
239 STACK_OF(X509) **sk;
240
241 i=OBJ_obj2nid(p7->type);
242 switch (i)
243 {
244 case NID_pkcs7_signed:
245 sk= &(p7->d.sign->cert);
246 break;
247 case NID_pkcs7_signedAndEnveloped:
248 sk= &(p7->d.signed_and_enveloped->cert);
249 break;
250 default:
251 PKCS7err(PKCS7_F_PKCS7_ADD_CERTIFICATE,PKCS7_R_WRONG_CONTENT_TYPE);
252 return(0);
253 }
254
255 if (*sk == NULL)
256 *sk=sk_X509_new_null();
257 CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
258 sk_X509_push(*sk,x509);
259 return(1);
260 }
261
262int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
263 {
264 int i;
265 STACK_OF(X509_CRL) **sk;
266
267 i=OBJ_obj2nid(p7->type);
268 switch (i)
269 {
270 case NID_pkcs7_signed:
271 sk= &(p7->d.sign->crl);
272 break;
273 case NID_pkcs7_signedAndEnveloped:
274 sk= &(p7->d.signed_and_enveloped->crl);
275 break;
276 default:
277 PKCS7err(PKCS7_F_PKCS7_ADD_CRL,PKCS7_R_WRONG_CONTENT_TYPE);
278 return(0);
279 }
280
281 if (*sk == NULL)
282 *sk=sk_X509_CRL_new_null();
283
284 CRYPTO_add(&crl->references,1,CRYPTO_LOCK_X509_CRL);
285 sk_X509_CRL_push(*sk,crl);
286 return(1);
287 }
288
289int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
290 EVP_MD *dgst)
291 {
292 /* We now need to add another PKCS7_SIGNER_INFO entry */
293 ASN1_INTEGER_set(p7i->version,1);
294 X509_NAME_set(&p7i->issuer_and_serial->issuer,
295 X509_get_issuer_name(x509));
296
297 /* because ASN1_INTEGER_set is used to set a 'long' we will do
298 * things the ugly way. */
299 ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
300 p7i->issuer_and_serial->serial=
301 ASN1_INTEGER_dup(X509_get_serialNumber(x509));
302
303 /* lets keep the pkey around for a while */
304 CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
305 p7i->pkey=pkey;
306
307 /* Set the algorithms */
308 if (pkey->type == EVP_PKEY_DSA)
309 p7i->digest_alg->algorithm=OBJ_nid2obj(NID_sha1);
310 else
311 p7i->digest_alg->algorithm=OBJ_nid2obj(EVP_MD_type(dgst));
312
313 if (p7i->digest_alg->parameter != NULL)
314 ASN1_TYPE_free(p7i->digest_alg->parameter);
315 if ((p7i->digest_alg->parameter=ASN1_TYPE_new()) == NULL)
316 goto err;
317 p7i->digest_alg->parameter->type=V_ASN1_NULL;
318
319 p7i->digest_enc_alg->algorithm=OBJ_nid2obj(EVP_PKEY_type(pkey->type));
320
321 if (p7i->digest_enc_alg->parameter != NULL)
322 ASN1_TYPE_free(p7i->digest_enc_alg->parameter);
323 if ((p7i->digest_enc_alg->parameter=ASN1_TYPE_new()) == NULL)
324 goto err;
325 p7i->digest_enc_alg->parameter->type=V_ASN1_NULL;
326
327 return(1);
328err:
329 return(0);
330 }
331
332PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
333 EVP_MD *dgst)
334 {
335 PKCS7_SIGNER_INFO *si;
336
337 if ((si=PKCS7_SIGNER_INFO_new()) == NULL) goto err;
338 if (!PKCS7_SIGNER_INFO_set(si,x509,pkey,dgst)) goto err;
339 if (!PKCS7_add_signer(p7,si)) goto err;
340 return(si);
341err:
342 return(NULL);
343 }
344
345STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
346 {
347 if (PKCS7_type_is_signed(p7))
348 {
349 return(p7->d.sign->signer_info);
350 }
351 else if (PKCS7_type_is_signedAndEnveloped(p7))
352 {
353 return(p7->d.signed_and_enveloped->signer_info);
354 }
355 else
356 return(NULL);
357 }
358
359PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509)
360 {
361 PKCS7_RECIP_INFO *ri;
362
363 if ((ri=PKCS7_RECIP_INFO_new()) == NULL) goto err;
364 if (!PKCS7_RECIP_INFO_set(ri,x509)) goto err;
365 if (!PKCS7_add_recipient_info(p7,ri)) goto err;
366 return(ri);
367err:
368 return(NULL);
369 }
370
371int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri)
372 {
373 int i;
374 STACK_OF(PKCS7_RECIP_INFO) *sk;
375
376 i=OBJ_obj2nid(p7->type);
377 switch (i)
378 {
379 case NID_pkcs7_signedAndEnveloped:
380 sk= p7->d.signed_and_enveloped->recipientinfo;
381 break;
382 case NID_pkcs7_enveloped:
383 sk= p7->d.enveloped->recipientinfo;
384 break;
385 default:
386 PKCS7err(PKCS7_F_PKCS7_ADD_RECIPIENT_INFO,PKCS7_R_WRONG_CONTENT_TYPE);
387 return(0);
388 }
389
390 sk_PKCS7_RECIP_INFO_push(sk,ri);
391 return(1);
392 }
393
394int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
395 {
396 ASN1_INTEGER_set(p7i->version,0);
397 X509_NAME_set(&p7i->issuer_and_serial->issuer,
398 X509_get_issuer_name(x509));
399
400 ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
401 p7i->issuer_and_serial->serial=
402 ASN1_INTEGER_dup(X509_get_serialNumber(x509));
403
404 X509_ALGOR_free(p7i->key_enc_algor);
405 p7i->key_enc_algor=(X509_ALGOR *)ASN1_dup(i2d_X509_ALGOR,
406 (char *(*)())d2i_X509_ALGOR,
407 (char *)x509->cert_info->key->algor);
408
409 CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
410 p7i->cert=x509;
411
412 return(1);
413 }
414
415X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
416 {
417 if (PKCS7_type_is_signed(p7))
418 return(X509_find_by_issuer_and_serial(p7->d.sign->cert,
419 si->issuer_and_serial->issuer,
420 si->issuer_and_serial->serial));
421 else
422 return(NULL);
423 }
424
425int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
426 {
427 int i;
428 PKCS7_ENC_CONTENT *ec;
429
430 i=OBJ_obj2nid(p7->type);
431 switch (i)
432 {
433 case NID_pkcs7_signedAndEnveloped:
434 ec=p7->d.signed_and_enveloped->enc_data;
435 break;
436 case NID_pkcs7_enveloped:
437 ec=p7->d.enveloped->enc_data;
438 break;
439 default:
440 PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_WRONG_CONTENT_TYPE);
441 return(0);
442 }
443
444 /* Setup cipher OID */
445
446 ec->cipher = cipher;
447 return 1;
448 }
449
diff --git a/src/lib/libcrypto/pkcs7/pkcs7.h b/src/lib/libcrypto/pkcs7/pkcs7.h
deleted file mode 100644
index c42bd6d391..0000000000
--- a/src/lib/libcrypto/pkcs7/pkcs7.h
+++ /dev/null
@@ -1,417 +0,0 @@
1/* crypto/pkcs7/pkcs7.h */
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#ifndef HEADER_PKCS7_H
60#define HEADER_PKCS7_H
61
62#ifdef __cplusplus
63extern "C" {
64#endif
65
66#include <openssl/bio.h>
67#include <openssl/x509.h>
68
69#ifdef VMS
70#include <openssl/vms_idhacks.h>
71#endif
72
73#ifdef WIN32
74/* Under Win32 this is defined in wincrypt.h */
75#undef PKCS7_ISSUER_AND_SERIAL
76#endif
77
78/*
79Encryption_ID DES-CBC
80Digest_ID MD5
81Digest_Encryption_ID rsaEncryption
82Key_Encryption_ID rsaEncryption
83*/
84
85typedef struct pkcs7_issuer_and_serial_st
86 {
87 X509_NAME *issuer;
88 ASN1_INTEGER *serial;
89 } PKCS7_ISSUER_AND_SERIAL;
90
91typedef struct pkcs7_signer_info_st
92 {
93 ASN1_INTEGER *version; /* version 1 */
94 PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
95 X509_ALGOR *digest_alg;
96 STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */
97 X509_ALGOR *digest_enc_alg;
98 ASN1_OCTET_STRING *enc_digest;
99 STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */
100
101 /* The private key to sign with */
102 EVP_PKEY *pkey;
103 } PKCS7_SIGNER_INFO;
104
105DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
106DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO)
107
108typedef struct pkcs7_recip_info_st
109 {
110 ASN1_INTEGER *version; /* version 0 */
111 PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
112 X509_ALGOR *key_enc_algor;
113 ASN1_OCTET_STRING *enc_key;
114 X509 *cert; /* get the pub-key from this */
115 } PKCS7_RECIP_INFO;
116
117DECLARE_STACK_OF(PKCS7_RECIP_INFO)
118DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO)
119
120typedef struct pkcs7_signed_st
121 {
122 ASN1_INTEGER *version; /* version 1 */
123 STACK_OF(X509_ALGOR) *md_algs; /* md used */
124 STACK_OF(X509) *cert; /* [ 0 ] */
125 STACK_OF(X509_CRL) *crl; /* [ 1 ] */
126 STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
127
128 struct pkcs7_st *contents;
129 } PKCS7_SIGNED;
130/* The above structure is very very similar to PKCS7_SIGN_ENVELOPE.
131 * How about merging the two */
132
133typedef struct pkcs7_enc_content_st
134 {
135 ASN1_OBJECT *content_type;
136 X509_ALGOR *algorithm;
137 ASN1_OCTET_STRING *enc_data; /* [ 0 ] */
138 const EVP_CIPHER *cipher;
139 } PKCS7_ENC_CONTENT;
140
141typedef struct pkcs7_enveloped_st
142 {
143 ASN1_INTEGER *version; /* version 0 */
144 STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
145 PKCS7_ENC_CONTENT *enc_data;
146 } PKCS7_ENVELOPE;
147
148typedef struct pkcs7_signedandenveloped_st
149 {
150 ASN1_INTEGER *version; /* version 1 */
151 STACK_OF(X509_ALGOR) *md_algs; /* md used */
152 STACK_OF(X509) *cert; /* [ 0 ] */
153 STACK_OF(X509_CRL) *crl; /* [ 1 ] */
154 STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
155
156 PKCS7_ENC_CONTENT *enc_data;
157 STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
158 } PKCS7_SIGN_ENVELOPE;
159
160typedef struct pkcs7_digest_st
161 {
162 ASN1_INTEGER *version; /* version 0 */
163 X509_ALGOR *md; /* md used */
164 struct pkcs7_st *contents;
165 ASN1_OCTET_STRING *digest;
166 } PKCS7_DIGEST;
167
168typedef struct pkcs7_encrypted_st
169 {
170 ASN1_INTEGER *version; /* version 0 */
171 PKCS7_ENC_CONTENT *enc_data;
172 } PKCS7_ENCRYPT;
173
174typedef struct pkcs7_st
175 {
176 /* The following is non NULL if it contains ASN1 encoding of
177 * this structure */
178 unsigned char *asn1;
179 long length;
180
181#define PKCS7_S_HEADER 0
182#define PKCS7_S_BODY 1
183#define PKCS7_S_TAIL 2
184 int state; /* used during processing */
185
186 int detached;
187
188 ASN1_OBJECT *type;
189 /* content as defined by the type */
190 /* all encryption/message digests are applied to the 'contents',
191 * leaving out the 'type' field. */
192 union {
193 char *ptr;
194
195 /* NID_pkcs7_data */
196 ASN1_OCTET_STRING *data;
197
198 /* NID_pkcs7_signed */
199 PKCS7_SIGNED *sign;
200
201 /* NID_pkcs7_enveloped */
202 PKCS7_ENVELOPE *enveloped;
203
204 /* NID_pkcs7_signedAndEnveloped */
205 PKCS7_SIGN_ENVELOPE *signed_and_enveloped;
206
207 /* NID_pkcs7_digest */
208 PKCS7_DIGEST *digest;
209
210 /* NID_pkcs7_encrypted */
211 PKCS7_ENCRYPT *encrypted;
212 } d;
213 } PKCS7;
214
215#define PKCS7_OP_SET_DETACHED_SIGNATURE 1
216#define PKCS7_OP_GET_DETACHED_SIGNATURE 2
217
218#define PKCS7_get_signed_attributes(si) ((si)->auth_attr)
219#define PKCS7_get_attributes(si) ((si)->unauth_attr)
220
221#define PKCS7_type_is_signed(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_signed)
222#define PKCS7_type_is_signedAndEnveloped(a) \
223 (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped)
224#define PKCS7_type_is_data(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_data)
225
226#define PKCS7_set_detached(p,v) \
227 PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)
228#define PKCS7_get_detached(p) \
229 PKCS7_ctrl(p,PKCS7_OP_GET_DETACHED_SIGNATURE,0,NULL)
230
231#ifdef SSLEAY_MACROS
232#ifndef PKCS7_ISSUER_AND_SERIAL_digest
233#define PKCS7_ISSUER_AND_SERIAL_digest(data,type,md,len) \
234 ASN1_digest((int (*)())i2d_PKCS7_ISSUER_AND_SERIAL,type,\
235 (char *)data,md,len)
236#endif
237#endif
238
239
240PKCS7_ISSUER_AND_SERIAL *PKCS7_ISSUER_AND_SERIAL_new(void );
241void PKCS7_ISSUER_AND_SERIAL_free(
242 PKCS7_ISSUER_AND_SERIAL *a);
243int i2d_PKCS7_ISSUER_AND_SERIAL(
244 PKCS7_ISSUER_AND_SERIAL *a,unsigned char **pp);
245PKCS7_ISSUER_AND_SERIAL *d2i_PKCS7_ISSUER_AND_SERIAL(
246 PKCS7_ISSUER_AND_SERIAL **a,
247 unsigned char **pp, long length);
248
249#ifndef SSLEAY_MACROS
250int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,EVP_MD *type,
251 unsigned char *md,unsigned int *len);
252#ifndef NO_FP_API
253PKCS7 *d2i_PKCS7_fp(FILE *fp,PKCS7 **p7);
254int i2d_PKCS7_fp(FILE *fp,PKCS7 *p7);
255#endif
256PKCS7 *PKCS7_dup(PKCS7 *p7);
257PKCS7 *d2i_PKCS7_bio(BIO *bp,PKCS7 **p7);
258int i2d_PKCS7_bio(BIO *bp,PKCS7 *p7);
259#endif
260
261PKCS7_SIGNER_INFO *PKCS7_SIGNER_INFO_new(void);
262void PKCS7_SIGNER_INFO_free(PKCS7_SIGNER_INFO *a);
263int i2d_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO *a,
264 unsigned char **pp);
265PKCS7_SIGNER_INFO *d2i_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO **a,
266 unsigned char **pp,long length);
267
268PKCS7_RECIP_INFO *PKCS7_RECIP_INFO_new(void);
269void PKCS7_RECIP_INFO_free(PKCS7_RECIP_INFO *a);
270int i2d_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO *a,
271 unsigned char **pp);
272PKCS7_RECIP_INFO *d2i_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO **a,
273 unsigned char **pp,long length);
274
275PKCS7_SIGNED *PKCS7_SIGNED_new(void);
276void PKCS7_SIGNED_free(PKCS7_SIGNED *a);
277int i2d_PKCS7_SIGNED(PKCS7_SIGNED *a,
278 unsigned char **pp);
279PKCS7_SIGNED *d2i_PKCS7_SIGNED(PKCS7_SIGNED **a,
280 unsigned char **pp,long length);
281
282PKCS7_ENC_CONTENT *PKCS7_ENC_CONTENT_new(void);
283void PKCS7_ENC_CONTENT_free(PKCS7_ENC_CONTENT *a);
284int i2d_PKCS7_ENC_CONTENT(PKCS7_ENC_CONTENT *a,
285 unsigned char **pp);
286PKCS7_ENC_CONTENT *d2i_PKCS7_ENC_CONTENT(PKCS7_ENC_CONTENT **a,
287 unsigned char **pp,long length);
288
289PKCS7_ENVELOPE *PKCS7_ENVELOPE_new(void);
290void PKCS7_ENVELOPE_free(PKCS7_ENVELOPE *a);
291int i2d_PKCS7_ENVELOPE(PKCS7_ENVELOPE *a,
292 unsigned char **pp);
293PKCS7_ENVELOPE *d2i_PKCS7_ENVELOPE(PKCS7_ENVELOPE **a,
294 unsigned char **pp,long length);
295
296PKCS7_SIGN_ENVELOPE *PKCS7_SIGN_ENVELOPE_new(void);
297void PKCS7_SIGN_ENVELOPE_free(PKCS7_SIGN_ENVELOPE *a);
298int i2d_PKCS7_SIGN_ENVELOPE(PKCS7_SIGN_ENVELOPE *a,
299 unsigned char **pp);
300PKCS7_SIGN_ENVELOPE *d2i_PKCS7_SIGN_ENVELOPE(PKCS7_SIGN_ENVELOPE **a,
301 unsigned char **pp,long length);
302
303PKCS7_DIGEST *PKCS7_DIGEST_new(void);
304void PKCS7_DIGEST_free(PKCS7_DIGEST *a);
305int i2d_PKCS7_DIGEST(PKCS7_DIGEST *a,
306 unsigned char **pp);
307PKCS7_DIGEST *d2i_PKCS7_DIGEST(PKCS7_DIGEST **a,
308 unsigned char **pp,long length);
309
310PKCS7_ENCRYPT *PKCS7_ENCRYPT_new(void);
311void PKCS7_ENCRYPT_free(PKCS7_ENCRYPT *a);
312int i2d_PKCS7_ENCRYPT(PKCS7_ENCRYPT *a,
313 unsigned char **pp);
314PKCS7_ENCRYPT *d2i_PKCS7_ENCRYPT(PKCS7_ENCRYPT **a,
315 unsigned char **pp,long length);
316
317PKCS7 *PKCS7_new(void);
318void PKCS7_free(PKCS7 *a);
319void PKCS7_content_free(PKCS7 *a);
320int i2d_PKCS7(PKCS7 *a,
321 unsigned char **pp);
322PKCS7 *d2i_PKCS7(PKCS7 **a,
323 unsigned char **pp,long length);
324
325void ERR_load_PKCS7_strings(void);
326
327
328long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);
329
330int PKCS7_set_type(PKCS7 *p7, int type);
331int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);
332int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
333 EVP_MD *dgst);
334int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i);
335int PKCS7_add_certificate(PKCS7 *p7, X509 *x509);
336int PKCS7_add_crl(PKCS7 *p7, X509_CRL *x509);
337int PKCS7_content_new(PKCS7 *p7, int nid);
338int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx,
339 BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si);
340int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
341 X509 *x509);
342
343BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio);
344int PKCS7_dataFinal(PKCS7 *p7, BIO *bio);
345BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert);
346
347
348PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509,
349 EVP_PKEY *pkey, EVP_MD *dgst);
350X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
351STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7);
352
353PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509);
354int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri);
355int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509);
356int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher);
357
358PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx);
359ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk);
360int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si,int nid,int type,
361 void *data);
362int PKCS7_add_attribute (PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
363 void *value);
364ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid);
365ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid);
366int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
367 STACK_OF(X509_ATTRIBUTE) *sk);
368int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,STACK_OF(X509_ATTRIBUTE) *sk);
369
370
371
372/* BEGIN ERROR CODES */
373/* The following lines are auto generated by the script mkerr.pl. Any changes
374 * made after this point may be overwritten when the script is next run.
375 */
376
377/* Error codes for the PKCS7 functions. */
378
379/* Function codes. */
380#define PKCS7_F_PKCS7_ADD_CERTIFICATE 100
381#define PKCS7_F_PKCS7_ADD_CRL 101
382#define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO 102
383#define PKCS7_F_PKCS7_ADD_SIGNER 103
384#define PKCS7_F_PKCS7_CTRL 104
385#define PKCS7_F_PKCS7_DATADECODE 112
386#define PKCS7_F_PKCS7_DATAINIT 105
387#define PKCS7_F_PKCS7_DATASIGN 106
388#define PKCS7_F_PKCS7_DATAVERIFY 107
389#define PKCS7_F_PKCS7_SET_CIPHER 108
390#define PKCS7_F_PKCS7_SET_CONTENT 109
391#define PKCS7_F_PKCS7_SET_TYPE 110
392#define PKCS7_F_PKCS7_SIGNATUREVERIFY 113
393
394/* Reason codes. */
395#define PKCS7_R_CIPHER_NOT_INITIALIZED 116
396#define PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH 100
397#define PKCS7_R_DIGEST_FAILURE 101
398#define PKCS7_R_INTERNAL_ERROR 102
399#define PKCS7_R_MISSING_CERIPEND_INFO 103
400#define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE 115
401#define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE 104
402#define PKCS7_R_SIGNATURE_FAILURE 105
403#define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE 106
404#define PKCS7_R_UNABLE_TO_FIND_MEM_BIO 107
405#define PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST 108
406#define PKCS7_R_UNKNOWN_DIGEST_TYPE 109
407#define PKCS7_R_UNKNOWN_OPERATION 110
408#define PKCS7_R_UNSUPPORTED_CIPHER_TYPE 111
409#define PKCS7_R_UNSUPPORTED_CONTENT_TYPE 112
410#define PKCS7_R_WRONG_CONTENT_TYPE 113
411#define PKCS7_R_WRONG_PKCS7_TYPE 114
412
413#ifdef __cplusplus
414}
415#endif
416#endif
417
diff --git a/src/lib/libcrypto/pkcs7/pkcs7err.c b/src/lib/libcrypto/pkcs7/pkcs7err.c
deleted file mode 100644
index 82be3c2ca1..0000000000
--- a/src/lib/libcrypto/pkcs7/pkcs7err.c
+++ /dev/null
@@ -1,121 +0,0 @@
1/* crypto/pkcs7/pkcs7err.c */
2/* ====================================================================
3 * Copyright (c) 1999 The OpenSSL Project. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 *
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in
14 * the documentation and/or other materials provided with the
15 * distribution.
16 *
17 * 3. All advertising materials mentioning features or use of this
18 * software must display the following acknowledgment:
19 * "This product includes software developed by the OpenSSL Project
20 * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
21 *
22 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
23 * endorse or promote products derived from this software without
24 * prior written permission. For written permission, please contact
25 * openssl-core@OpenSSL.org.
26 *
27 * 5. Products derived from this software may not be called "OpenSSL"
28 * nor may "OpenSSL" appear in their names without prior written
29 * permission of the OpenSSL Project.
30 *
31 * 6. Redistributions of any form whatsoever must retain the following
32 * acknowledgment:
33 * "This product includes software developed by the OpenSSL Project
34 * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
35 *
36 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
37 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
38 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
39 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
40 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
41 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
42 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
43 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
44 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
45 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
46 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
47 * OF THE POSSIBILITY OF SUCH DAMAGE.
48 * ====================================================================
49 *
50 * This product includes cryptographic software written by Eric Young
51 * (eay@cryptsoft.com). This product includes software written by Tim
52 * Hudson (tjh@cryptsoft.com).
53 *
54 */
55
56/* NOTE: this file was auto generated by the mkerr.pl script: any changes
57 * made to it will be overwritten when the script next updates this file.
58 */
59
60#include <stdio.h>
61#include <openssl/err.h>
62#include <openssl/pkcs7.h>
63
64/* BEGIN ERROR CODES */
65#ifndef NO_ERR
66static ERR_STRING_DATA PKCS7_str_functs[]=
67 {
68{ERR_PACK(0,PKCS7_F_PKCS7_ADD_CERTIFICATE,0), "PKCS7_add_certificate"},
69{ERR_PACK(0,PKCS7_F_PKCS7_ADD_CRL,0), "PKCS7_add_crl"},
70{ERR_PACK(0,PKCS7_F_PKCS7_ADD_RECIPIENT_INFO,0), "PKCS7_add_recipient_info"},
71{ERR_PACK(0,PKCS7_F_PKCS7_ADD_SIGNER,0), "PKCS7_add_signer"},
72{ERR_PACK(0,PKCS7_F_PKCS7_CTRL,0), "PKCS7_ctrl"},
73{ERR_PACK(0,PKCS7_F_PKCS7_DATADECODE,0), "PKCS7_dataDecode"},
74{ERR_PACK(0,PKCS7_F_PKCS7_DATAINIT,0), "PKCS7_dataInit"},
75{ERR_PACK(0,PKCS7_F_PKCS7_DATASIGN,0), "PKCS7_DATASIGN"},
76{ERR_PACK(0,PKCS7_F_PKCS7_DATAVERIFY,0), "PKCS7_dataVerify"},
77{ERR_PACK(0,PKCS7_F_PKCS7_SET_CIPHER,0), "PKCS7_set_cipher"},
78{ERR_PACK(0,PKCS7_F_PKCS7_SET_CONTENT,0), "PKCS7_set_content"},
79{ERR_PACK(0,PKCS7_F_PKCS7_SET_TYPE,0), "PKCS7_set_type"},
80{ERR_PACK(0,PKCS7_F_PKCS7_SIGNATUREVERIFY,0), "PKCS7_signatureVerify"},
81{0,NULL}
82 };
83
84static ERR_STRING_DATA PKCS7_str_reasons[]=
85 {
86{PKCS7_R_CIPHER_NOT_INITIALIZED ,"cipher not initialized"},
87{PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH ,"decrypted key is wrong length"},
88{PKCS7_R_DIGEST_FAILURE ,"digest failure"},
89{PKCS7_R_INTERNAL_ERROR ,"internal error"},
90{PKCS7_R_MISSING_CERIPEND_INFO ,"missing ceripend info"},
91{PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE,"no recipient matches certificate"},
92{PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE,"operation not supported on this type"},
93{PKCS7_R_SIGNATURE_FAILURE ,"signature failure"},
94{PKCS7_R_UNABLE_TO_FIND_CERTIFICATE ,"unable to find certificate"},
95{PKCS7_R_UNABLE_TO_FIND_MEM_BIO ,"unable to find mem bio"},
96{PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST ,"unable to find message digest"},
97{PKCS7_R_UNKNOWN_DIGEST_TYPE ,"unknown digest type"},
98{PKCS7_R_UNKNOWN_OPERATION ,"unknown operation"},
99{PKCS7_R_UNSUPPORTED_CIPHER_TYPE ,"unsupported cipher type"},
100{PKCS7_R_UNSUPPORTED_CONTENT_TYPE ,"unsupported content type"},
101{PKCS7_R_WRONG_CONTENT_TYPE ,"wrong content type"},
102{PKCS7_R_WRONG_PKCS7_TYPE ,"wrong pkcs7 type"},
103{0,NULL}
104 };
105
106#endif
107
108void ERR_load_PKCS7_strings(void)
109 {
110 static int init=1;
111
112 if (init)
113 {
114 init=0;
115#ifndef NO_ERR
116 ERR_load_strings(ERR_LIB_PKCS7,PKCS7_str_functs);
117 ERR_load_strings(ERR_LIB_PKCS7,PKCS7_str_reasons);
118#endif
119
120 }
121 }
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-19 21:50:50 +0000