diff options
Diffstat (limited to 'src/lib/libcrypto/cms/cms_att.c')
-rw-r--r-- | src/lib/libcrypto/cms/cms_att.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/lib/libcrypto/cms/cms_att.c b/src/lib/libcrypto/cms/cms_att.c index 0fb077f7d9..62362ad3f9 100644 --- a/src/lib/libcrypto/cms/cms_att.c +++ b/src/lib/libcrypto/cms/cms_att.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms_att.c,v 1.10 2022/11/26 16:08:51 tb Exp $ */ | 1 | /* $OpenBSD: cms_att.c,v 1.11 2023/07/08 08:26:26 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
4 | * project. | 4 | * project. |
@@ -66,12 +66,14 @@ CMS_signed_get_attr_count(const CMS_SignerInfo *si) | |||
66 | { | 66 | { |
67 | return X509at_get_attr_count(si->signedAttrs); | 67 | return X509at_get_attr_count(si->signedAttrs); |
68 | } | 68 | } |
69 | LCRYPTO_ALIAS(CMS_signed_get_attr_count); | ||
69 | 70 | ||
70 | int | 71 | int |
71 | CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid, int lastpos) | 72 | CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid, int lastpos) |
72 | { | 73 | { |
73 | return X509at_get_attr_by_NID(si->signedAttrs, nid, lastpos); | 74 | return X509at_get_attr_by_NID(si->signedAttrs, nid, lastpos); |
74 | } | 75 | } |
76 | LCRYPTO_ALIAS(CMS_signed_get_attr_by_NID); | ||
75 | 77 | ||
76 | int | 78 | int |
77 | CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj, | 79 | CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj, |
@@ -79,18 +81,21 @@ CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj, | |||
79 | { | 81 | { |
80 | return X509at_get_attr_by_OBJ(si->signedAttrs, obj, lastpos); | 82 | return X509at_get_attr_by_OBJ(si->signedAttrs, obj, lastpos); |
81 | } | 83 | } |
84 | LCRYPTO_ALIAS(CMS_signed_get_attr_by_OBJ); | ||
82 | 85 | ||
83 | X509_ATTRIBUTE * | 86 | X509_ATTRIBUTE * |
84 | CMS_signed_get_attr(const CMS_SignerInfo *si, int loc) | 87 | CMS_signed_get_attr(const CMS_SignerInfo *si, int loc) |
85 | { | 88 | { |
86 | return X509at_get_attr(si->signedAttrs, loc); | 89 | return X509at_get_attr(si->signedAttrs, loc); |
87 | } | 90 | } |
91 | LCRYPTO_ALIAS(CMS_signed_get_attr); | ||
88 | 92 | ||
89 | X509_ATTRIBUTE * | 93 | X509_ATTRIBUTE * |
90 | CMS_signed_delete_attr(CMS_SignerInfo *si, int loc) | 94 | CMS_signed_delete_attr(CMS_SignerInfo *si, int loc) |
91 | { | 95 | { |
92 | return X509at_delete_attr(si->signedAttrs, loc); | 96 | return X509at_delete_attr(si->signedAttrs, loc); |
93 | } | 97 | } |
98 | LCRYPTO_ALIAS(CMS_signed_delete_attr); | ||
94 | 99 | ||
95 | int | 100 | int |
96 | CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr) | 101 | CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr) |
@@ -99,6 +104,7 @@ CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr) | |||
99 | return 1; | 104 | return 1; |
100 | return 0; | 105 | return 0; |
101 | } | 106 | } |
107 | LCRYPTO_ALIAS(CMS_signed_add1_attr); | ||
102 | 108 | ||
103 | int | 109 | int |
104 | CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *obj, int type, | 110 | CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *obj, int type, |
@@ -108,6 +114,7 @@ CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *obj, int type | |||
108 | return 1; | 114 | return 1; |
109 | return 0; | 115 | return 0; |
110 | } | 116 | } |
117 | LCRYPTO_ALIAS(CMS_signed_add1_attr_by_OBJ); | ||
111 | 118 | ||
112 | int | 119 | int |
113 | CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si, int nid, int type, | 120 | CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si, int nid, int type, |
@@ -117,6 +124,7 @@ CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si, int nid, int type, | |||
117 | return 1; | 124 | return 1; |
118 | return 0; | 125 | return 0; |
119 | } | 126 | } |
127 | LCRYPTO_ALIAS(CMS_signed_add1_attr_by_NID); | ||
120 | 128 | ||
121 | int | 129 | int |
122 | CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname, int type, | 130 | CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname, int type, |
@@ -126,6 +134,7 @@ CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname, int type, | |||
126 | return 1; | 134 | return 1; |
127 | return 0; | 135 | return 0; |
128 | } | 136 | } |
137 | LCRYPTO_ALIAS(CMS_signed_add1_attr_by_txt); | ||
129 | 138 | ||
130 | void * | 139 | void * |
131 | CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *oid, | 140 | CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *oid, |
@@ -133,18 +142,21 @@ CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *oid, | |||
133 | { | 142 | { |
134 | return X509at_get0_data_by_OBJ(si->signedAttrs, oid, lastpos, type); | 143 | return X509at_get0_data_by_OBJ(si->signedAttrs, oid, lastpos, type); |
135 | } | 144 | } |
145 | LCRYPTO_ALIAS(CMS_signed_get0_data_by_OBJ); | ||
136 | 146 | ||
137 | int | 147 | int |
138 | CMS_unsigned_get_attr_count(const CMS_SignerInfo *si) | 148 | CMS_unsigned_get_attr_count(const CMS_SignerInfo *si) |
139 | { | 149 | { |
140 | return X509at_get_attr_count(si->unsignedAttrs); | 150 | return X509at_get_attr_count(si->unsignedAttrs); |
141 | } | 151 | } |
152 | LCRYPTO_ALIAS(CMS_unsigned_get_attr_count); | ||
142 | 153 | ||
143 | int | 154 | int |
144 | CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid, int lastpos) | 155 | CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid, int lastpos) |
145 | { | 156 | { |
146 | return X509at_get_attr_by_NID(si->unsignedAttrs, nid, lastpos); | 157 | return X509at_get_attr_by_NID(si->unsignedAttrs, nid, lastpos); |
147 | } | 158 | } |
159 | LCRYPTO_ALIAS(CMS_unsigned_get_attr_by_NID); | ||
148 | 160 | ||
149 | int | 161 | int |
150 | CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj, | 162 | CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj, |
@@ -152,18 +164,21 @@ CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj, | |||
152 | { | 164 | { |
153 | return X509at_get_attr_by_OBJ(si->unsignedAttrs, obj, lastpos); | 165 | return X509at_get_attr_by_OBJ(si->unsignedAttrs, obj, lastpos); |
154 | } | 166 | } |
167 | LCRYPTO_ALIAS(CMS_unsigned_get_attr_by_OBJ); | ||
155 | 168 | ||
156 | X509_ATTRIBUTE * | 169 | X509_ATTRIBUTE * |
157 | CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc) | 170 | CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc) |
158 | { | 171 | { |
159 | return X509at_get_attr(si->unsignedAttrs, loc); | 172 | return X509at_get_attr(si->unsignedAttrs, loc); |
160 | } | 173 | } |
174 | LCRYPTO_ALIAS(CMS_unsigned_get_attr); | ||
161 | 175 | ||
162 | X509_ATTRIBUTE * | 176 | X509_ATTRIBUTE * |
163 | CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc) | 177 | CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc) |
164 | { | 178 | { |
165 | return X509at_delete_attr(si->unsignedAttrs, loc); | 179 | return X509at_delete_attr(si->unsignedAttrs, loc); |
166 | } | 180 | } |
181 | LCRYPTO_ALIAS(CMS_unsigned_delete_attr); | ||
167 | 182 | ||
168 | int | 183 | int |
169 | CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr) | 184 | CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr) |
@@ -172,6 +187,7 @@ CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr) | |||
172 | return 1; | 187 | return 1; |
173 | return 0; | 188 | return 0; |
174 | } | 189 | } |
190 | LCRYPTO_ALIAS(CMS_unsigned_add1_attr); | ||
175 | 191 | ||
176 | int | 192 | int |
177 | CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *obj, | 193 | CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *obj, |
@@ -181,6 +197,7 @@ CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *obj, | |||
181 | return 1; | 197 | return 1; |
182 | return 0; | 198 | return 0; |
183 | } | 199 | } |
200 | LCRYPTO_ALIAS(CMS_unsigned_add1_attr_by_OBJ); | ||
184 | 201 | ||
185 | int | 202 | int |
186 | CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si, int nid, int type, | 203 | CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si, int nid, int type, |
@@ -190,6 +207,7 @@ CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si, int nid, int type, | |||
190 | return 1; | 207 | return 1; |
191 | return 0; | 208 | return 0; |
192 | } | 209 | } |
210 | LCRYPTO_ALIAS(CMS_unsigned_add1_attr_by_NID); | ||
193 | 211 | ||
194 | int | 212 | int |
195 | CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname, | 213 | CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname, |
@@ -200,6 +218,7 @@ CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname, | |||
200 | return 1; | 218 | return 1; |
201 | return 0; | 219 | return 0; |
202 | } | 220 | } |
221 | LCRYPTO_ALIAS(CMS_unsigned_add1_attr_by_txt); | ||
203 | 222 | ||
204 | void * | 223 | void * |
205 | CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid, int lastpos, | 224 | CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid, int lastpos, |
@@ -207,5 +226,6 @@ CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid, int lastpos, | |||
207 | { | 226 | { |
208 | return X509at_get0_data_by_OBJ(si->unsignedAttrs, oid, lastpos, type); | 227 | return X509at_get0_data_by_OBJ(si->unsignedAttrs, oid, lastpos, type); |
209 | } | 228 | } |
229 | LCRYPTO_ALIAS(CMS_unsigned_get0_data_by_OBJ); | ||
210 | 230 | ||
211 | /* Specific attribute cases */ | 231 | /* Specific attribute cases */ |