summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/cms/cms_att.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/cms/cms_att.c')
-rw-r--r--src/lib/libcrypto/cms/cms_att.c22
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}
69LCRYPTO_ALIAS(CMS_signed_get_attr_count);
69 70
70int 71int
71CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid, int lastpos) 72CMS_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}
76LCRYPTO_ALIAS(CMS_signed_get_attr_by_NID);
75 77
76int 78int
77CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj, 79CMS_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}
84LCRYPTO_ALIAS(CMS_signed_get_attr_by_OBJ);
82 85
83X509_ATTRIBUTE * 86X509_ATTRIBUTE *
84CMS_signed_get_attr(const CMS_SignerInfo *si, int loc) 87CMS_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}
91LCRYPTO_ALIAS(CMS_signed_get_attr);
88 92
89X509_ATTRIBUTE * 93X509_ATTRIBUTE *
90CMS_signed_delete_attr(CMS_SignerInfo *si, int loc) 94CMS_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}
98LCRYPTO_ALIAS(CMS_signed_delete_attr);
94 99
95int 100int
96CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr) 101CMS_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}
107LCRYPTO_ALIAS(CMS_signed_add1_attr);
102 108
103int 109int
104CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *obj, int type, 110CMS_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}
117LCRYPTO_ALIAS(CMS_signed_add1_attr_by_OBJ);
111 118
112int 119int
113CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si, int nid, int type, 120CMS_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}
127LCRYPTO_ALIAS(CMS_signed_add1_attr_by_NID);
120 128
121int 129int
122CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname, int type, 130CMS_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}
137LCRYPTO_ALIAS(CMS_signed_add1_attr_by_txt);
129 138
130void * 139void *
131CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *oid, 140CMS_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}
145LCRYPTO_ALIAS(CMS_signed_get0_data_by_OBJ);
136 146
137int 147int
138CMS_unsigned_get_attr_count(const CMS_SignerInfo *si) 148CMS_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}
152LCRYPTO_ALIAS(CMS_unsigned_get_attr_count);
142 153
143int 154int
144CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid, int lastpos) 155CMS_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}
159LCRYPTO_ALIAS(CMS_unsigned_get_attr_by_NID);
148 160
149int 161int
150CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj, 162CMS_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}
167LCRYPTO_ALIAS(CMS_unsigned_get_attr_by_OBJ);
155 168
156X509_ATTRIBUTE * 169X509_ATTRIBUTE *
157CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc) 170CMS_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}
174LCRYPTO_ALIAS(CMS_unsigned_get_attr);
161 175
162X509_ATTRIBUTE * 176X509_ATTRIBUTE *
163CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc) 177CMS_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}
181LCRYPTO_ALIAS(CMS_unsigned_delete_attr);
167 182
168int 183int
169CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr) 184CMS_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}
190LCRYPTO_ALIAS(CMS_unsigned_add1_attr);
175 191
176int 192int
177CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *obj, 193CMS_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}
200LCRYPTO_ALIAS(CMS_unsigned_add1_attr_by_OBJ);
184 201
185int 202int
186CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si, int nid, int type, 203CMS_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}
210LCRYPTO_ALIAS(CMS_unsigned_add1_attr_by_NID);
193 211
194int 212int
195CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname, 213CMS_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}
221LCRYPTO_ALIAS(CMS_unsigned_add1_attr_by_txt);
203 222
204void * 223void *
205CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid, int lastpos, 224CMS_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}
229LCRYPTO_ALIAS(CMS_unsigned_get0_data_by_OBJ);
210 230
211/* Specific attribute cases */ 231/* Specific attribute cases */