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_att.c
+++ new/usr/src/lib/openssl/libsunw_crypto/cms/cms_att.c
1 1 /* crypto/cms/cms_att.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/pem.h>
56 56 #include <openssl/x509v3.h>
57 57 #include <openssl/err.h>
58 -#include "cms.h"
59 -#include "cms_lcl.h"
58 +#include <openssl/cms.h>
59 +#include <cms_lcl.h>
60 60
61 61 /* CMS SignedData Attribute utilities */
62 62
63 63 int CMS_signed_get_attr_count(const CMS_SignerInfo *si)
64 64 {
65 65 return X509at_get_attr_count(si->signedAttrs);
66 66 }
67 67
68 68 int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
69 69 int lastpos)
70 70 {
71 71 return X509at_get_attr_by_NID(si->signedAttrs, nid, lastpos);
72 72 }
73 73
74 74 int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
75 75 int lastpos)
76 76 {
77 77 return X509at_get_attr_by_OBJ(si->signedAttrs, obj, lastpos);
78 78 }
79 79
80 80 X509_ATTRIBUTE *CMS_signed_get_attr(const CMS_SignerInfo *si, int loc)
81 81 {
82 82 return X509at_get_attr(si->signedAttrs, loc);
83 83 }
84 84
85 85 X509_ATTRIBUTE *CMS_signed_delete_attr(CMS_SignerInfo *si, int loc)
86 86 {
87 87 return X509at_delete_attr(si->signedAttrs, loc);
88 88 }
89 89
90 90 int CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr)
91 91 {
92 92 if(X509at_add1_attr(&si->signedAttrs, attr)) return 1;
93 93 return 0;
94 94 }
95 95
96 96 int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,
97 97 const ASN1_OBJECT *obj, int type,
98 98 const void *bytes, int len)
99 99 {
100 100 if(X509at_add1_attr_by_OBJ(&si->signedAttrs, obj,
101 101 type, bytes, len)) return 1;
102 102 return 0;
103 103 }
104 104
105 105 int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,
106 106 int nid, int type,
107 107 const void *bytes, int len)
108 108 {
109 109 if(X509at_add1_attr_by_NID(&si->signedAttrs, nid,
110 110 type, bytes, len)) return 1;
111 111 return 0;
112 112 }
113 113
114 114 int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si,
115 115 const char *attrname, int type,
116 116 const void *bytes, int len)
117 117 {
118 118 if(X509at_add1_attr_by_txt(&si->signedAttrs, attrname,
119 119 type, bytes, len)) return 1;
120 120 return 0;
121 121 }
122 122
123 123 void *CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
124 124 int lastpos, int type)
125 125 {
126 126 return X509at_get0_data_by_OBJ(si->signedAttrs, oid, lastpos, type);
127 127 }
128 128
129 129 int CMS_unsigned_get_attr_count(const CMS_SignerInfo *si)
130 130 {
131 131 return X509at_get_attr_count(si->unsignedAttrs);
132 132 }
133 133
134 134 int CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
135 135 int lastpos)
136 136 {
137 137 return X509at_get_attr_by_NID(si->unsignedAttrs, nid, lastpos);
138 138 }
139 139
140 140 int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
141 141 int lastpos)
142 142 {
143 143 return X509at_get_attr_by_OBJ(si->unsignedAttrs, obj, lastpos);
144 144 }
145 145
146 146 X509_ATTRIBUTE *CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc)
147 147 {
148 148 return X509at_get_attr(si->unsignedAttrs, loc);
149 149 }
150 150
151 151 X509_ATTRIBUTE *CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc)
152 152 {
153 153 return X509at_delete_attr(si->unsignedAttrs, loc);
154 154 }
155 155
156 156 int CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr)
157 157 {
158 158 if(X509at_add1_attr(&si->unsignedAttrs, attr)) return 1;
159 159 return 0;
160 160 }
161 161
162 162 int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,
163 163 const ASN1_OBJECT *obj, int type,
164 164 const void *bytes, int len)
165 165 {
166 166 if(X509at_add1_attr_by_OBJ(&si->unsignedAttrs, obj,
167 167 type, bytes, len)) return 1;
168 168 return 0;
169 169 }
170 170
171 171 int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,
172 172 int nid, int type,
173 173 const void *bytes, int len)
174 174 {
175 175 if(X509at_add1_attr_by_NID(&si->unsignedAttrs, nid,
176 176 type, bytes, len)) return 1;
177 177 return 0;
178 178 }
179 179
180 180 int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
181 181 const char *attrname, int type,
182 182 const void *bytes, int len)
183 183 {
184 184 if(X509at_add1_attr_by_txt(&si->unsignedAttrs, attrname,
185 185 type, bytes, len)) return 1;
186 186 return 0;
187 187 }
188 188
189 189 void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
190 190 int lastpos, int type)
191 191 {
192 192 return X509at_get0_data_by_OBJ(si->unsignedAttrs, oid, lastpos, type);
193 193 }
194 194
195 195 /* Specific attribute cases */
|
↓ open down ↓ |
126 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX