Print this page
4853 illumos-gate is not lint-clean when built with openssl 1.0
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/lib/openssl/libsunw_crypto/cms/cms_io.c
+++ new/usr/src/lib/openssl/libsunw_crypto/cms/cms_io.c
1 1 /* crypto/cms/cms_io.c */
2 2 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 3 * project.
4 4 */
5 5 /* ====================================================================
6 6 * Copyright (c) 2008 The OpenSSL Project. All rights reserved.
7 7 *
8 8 * Redistribution and use in source and binary forms, with or without
9 9 * modification, are permitted provided that the following conditions
10 10 * are met:
11 11 *
12 12 * 1. Redistributions of source code must retain the above copyright
13 13 * notice, this list of conditions and the following disclaimer.
14 14 *
15 15 * 2. Redistributions in binary form must reproduce the above copyright
16 16 * notice, this list of conditions and the following disclaimer in
17 17 * the documentation and/or other materials provided with the
18 18 * distribution.
19 19 *
20 20 * 3. All advertising materials mentioning features or use of this
21 21 * software must display the following acknowledgment:
22 22 * "This product includes software developed by the OpenSSL Project
23 23 * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
24 24 *
25 25 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
26 26 * endorse or promote products derived from this software without
27 27 * prior written permission. For written permission, please contact
28 28 * licensing@OpenSSL.org.
29 29 *
30 30 * 5. Products derived from this software may not be called "OpenSSL"
31 31 * nor may "OpenSSL" appear in their names without prior written
32 32 * permission of the OpenSSL Project.
33 33 *
34 34 * 6. Redistributions of any form whatsoever must retain the following
35 35 * acknowledgment:
36 36 * "This product includes software developed by the OpenSSL Project
37 37 * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
38 38 *
39 39 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
40 40 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41 41 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
42 42 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
43 43 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44 44 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
45 45 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
46 46 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
47 47 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
↓ open down ↓ |
47 lines elided |
↑ open up ↑ |
48 48 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
49 49 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50 50 * OF THE POSSIBILITY OF SUCH DAMAGE.
51 51 * ====================================================================
52 52 */
53 53
54 54 #include <openssl/asn1t.h>
55 55 #include <openssl/x509.h>
56 56 #include <openssl/err.h>
57 57 #include <openssl/pem.h>
58 -#include "cms.h"
59 -#include "cms_lcl.h"
58 +#include <openssl/cms.h>
59 +#include <cms_lcl.h>
60 60
61 61 int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms)
62 62 {
63 63 ASN1_OCTET_STRING **pos;
64 64 pos = CMS_get0_content(cms);
65 65 if (!pos)
66 66 return 0;
67 67 if (!*pos)
68 68 *pos = ASN1_OCTET_STRING_new();
69 69 if (*pos)
70 70 {
71 71 (*pos)->flags |= ASN1_STRING_FLAG_NDEF;
72 72 (*pos)->flags &= ~ASN1_STRING_FLAG_CONT;
73 73 *boundary = &(*pos)->data;
74 74 return 1;
75 75 }
76 76 CMSerr(CMS_F_CMS_STREAM, ERR_R_MALLOC_FAILURE);
77 77 return 0;
78 78 }
79 79
80 80 CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms)
81 81 {
82 82 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(CMS_ContentInfo), bp, cms);
83 83 }
84 84
85 85 int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms)
86 86 {
87 87 return ASN1_item_i2d_bio(ASN1_ITEM_rptr(CMS_ContentInfo), bp, cms);
88 88 }
89 89
90 90 IMPLEMENT_PEM_rw_const(CMS, CMS_ContentInfo, PEM_STRING_CMS, CMS_ContentInfo)
91 91
92 92 BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms)
93 93 {
94 94 return BIO_new_NDEF(out, (ASN1_VALUE *)cms,
95 95 ASN1_ITEM_rptr(CMS_ContentInfo));
96 96 }
97 97
98 98 /* CMS wrappers round generalised stream and MIME routines */
99 99
100 100 int i2d_CMS_bio_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags)
101 101 {
102 102 return i2d_ASN1_bio_stream(out, (ASN1_VALUE *)cms, in, flags,
103 103 ASN1_ITEM_rptr(CMS_ContentInfo));
104 104 }
105 105
106 106 int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags)
107 107 {
108 108 return PEM_write_bio_ASN1_stream(out, (ASN1_VALUE *) cms, in, flags,
109 109 "CMS",
110 110 ASN1_ITEM_rptr(CMS_ContentInfo));
111 111 }
112 112
113 113 int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags)
114 114 {
115 115 STACK_OF(X509_ALGOR) *mdalgs;
116 116 int ctype_nid = OBJ_obj2nid(cms->contentType);
117 117 int econt_nid = OBJ_obj2nid(CMS_get0_eContentType(cms));
118 118 if (ctype_nid == NID_pkcs7_signed)
119 119 mdalgs = cms->d.signedData->digestAlgorithms;
120 120 else
121 121 mdalgs = NULL;
122 122
123 123 return SMIME_write_ASN1(bio, (ASN1_VALUE *)cms, data, flags,
124 124 ctype_nid, econt_nid, mdalgs,
125 125 ASN1_ITEM_rptr(CMS_ContentInfo));
126 126 }
127 127
128 128 CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont)
129 129 {
130 130 return (CMS_ContentInfo *)SMIME_read_ASN1(bio, bcont,
131 131 ASN1_ITEM_rptr(CMS_ContentInfo));
132 132 }
|
↓ open down ↓ |
63 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX