summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509/x509_att.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/x509/x509_att.c')
-rw-r--r--src/lib/libcrypto/x509/x509_att.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/lib/libcrypto/x509/x509_att.c b/src/lib/libcrypto/x509/x509_att.c
index 8d369df900..bff412173b 100644
--- a/src/lib/libcrypto/x509/x509_att.c
+++ b/src/lib/libcrypto/x509/x509_att.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_att.c,v 1.19 2022/05/09 19:19:33 jsing Exp $ */ 1/* $OpenBSD: x509_att.c,v 1.20 2022/11/14 17:48:50 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -73,6 +73,7 @@ X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x)
73{ 73{
74 return sk_X509_ATTRIBUTE_num(x); 74 return sk_X509_ATTRIBUTE_num(x);
75} 75}
76LCRYPTO_ALIAS(X509at_get_attr_count)
76 77
77int 78int
78X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid, int lastpos) 79X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid, int lastpos)
@@ -84,6 +85,7 @@ X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid, int lastpos)
84 return (-2); 85 return (-2);
85 return (X509at_get_attr_by_OBJ(x, obj, lastpos)); 86 return (X509at_get_attr_by_OBJ(x, obj, lastpos));
86} 87}
88LCRYPTO_ALIAS(X509at_get_attr_by_NID)
87 89
88int 90int
89X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk, 91X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
@@ -105,6 +107,7 @@ X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
105 } 107 }
106 return (-1); 108 return (-1);
107} 109}
110LCRYPTO_ALIAS(X509at_get_attr_by_OBJ)
108 111
109X509_ATTRIBUTE * 112X509_ATTRIBUTE *
110X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc) 113X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc)
@@ -114,6 +117,7 @@ X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc)
114 else 117 else
115 return sk_X509_ATTRIBUTE_value(x, loc); 118 return sk_X509_ATTRIBUTE_value(x, loc);
116} 119}
120LCRYPTO_ALIAS(X509at_get_attr)
117 121
118X509_ATTRIBUTE * 122X509_ATTRIBUTE *
119X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc) 123X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc)
@@ -125,6 +129,7 @@ X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc)
125 ret = sk_X509_ATTRIBUTE_delete(x, loc); 129 ret = sk_X509_ATTRIBUTE_delete(x, loc);
126 return (ret); 130 return (ret);
127} 131}
132LCRYPTO_ALIAS(X509at_delete_attr)
128 133
129STACK_OF(X509_ATTRIBUTE) * 134STACK_OF(X509_ATTRIBUTE) *
130X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, X509_ATTRIBUTE *attr) 135X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, X509_ATTRIBUTE *attr)
@@ -160,6 +165,7 @@ err2:
160 sk_X509_ATTRIBUTE_free(sk); 165 sk_X509_ATTRIBUTE_free(sk);
161 return (NULL); 166 return (NULL);
162} 167}
168LCRYPTO_ALIAS(X509at_add1_attr)
163 169
164STACK_OF(X509_ATTRIBUTE) * 170STACK_OF(X509_ATTRIBUTE) *
165X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x, const ASN1_OBJECT *obj, 171X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x, const ASN1_OBJECT *obj,
@@ -175,6 +181,7 @@ X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x, const ASN1_OBJECT *obj,
175 X509_ATTRIBUTE_free(attr); 181 X509_ATTRIBUTE_free(attr);
176 return ret; 182 return ret;
177} 183}
184LCRYPTO_ALIAS(X509at_add1_attr_by_OBJ)
178 185
179STACK_OF(X509_ATTRIBUTE) * 186STACK_OF(X509_ATTRIBUTE) *
180X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, int nid, int type, 187X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, int nid, int type,
@@ -190,6 +197,7 @@ X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, int nid, int type,
190 X509_ATTRIBUTE_free(attr); 197 X509_ATTRIBUTE_free(attr);
191 return ret; 198 return ret;
192} 199}
200LCRYPTO_ALIAS(X509at_add1_attr_by_NID)
193 201
194STACK_OF(X509_ATTRIBUTE) * 202STACK_OF(X509_ATTRIBUTE) *
195X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, const char *attrname, 203X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, const char *attrname,
@@ -205,6 +213,7 @@ X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, const char *attrname,
205 X509_ATTRIBUTE_free(attr); 213 X509_ATTRIBUTE_free(attr);
206 return ret; 214 return ret;
207} 215}
216LCRYPTO_ALIAS(X509at_add1_attr_by_txt)
208 217
209void * 218void *
210X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, const ASN1_OBJECT *obj, 219X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, const ASN1_OBJECT *obj,
@@ -223,6 +232,7 @@ X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, const ASN1_OBJECT *obj,
223 return NULL; 232 return NULL;
224 return X509_ATTRIBUTE_get0_data(at, 0, type, NULL); 233 return X509_ATTRIBUTE_get0_data(at, 0, type, NULL);
225} 234}
235LCRYPTO_ALIAS(X509at_get0_data_by_OBJ)
226 236
227X509_ATTRIBUTE * 237X509_ATTRIBUTE *
228X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid, int atrtype, 238X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid, int atrtype,
@@ -241,6 +251,7 @@ X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid, int atrtype,
241 ASN1_OBJECT_free(obj); 251 ASN1_OBJECT_free(obj);
242 return (ret); 252 return (ret);
243} 253}
254LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_NID)
244 255
245X509_ATTRIBUTE * 256X509_ATTRIBUTE *
246X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr, const ASN1_OBJECT *obj, 257X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr, const ASN1_OBJECT *obj,
@@ -270,6 +281,7 @@ err:
270 X509_ATTRIBUTE_free(ret); 281 X509_ATTRIBUTE_free(ret);
271 return (NULL); 282 return (NULL);
272} 283}
284LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_OBJ)
273 285
274X509_ATTRIBUTE * 286X509_ATTRIBUTE *
275X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr, const char *atrname, 287X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr, const char *atrname,
@@ -288,6 +300,7 @@ X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr, const char *atrname,
288 ASN1_OBJECT_free(obj); 300 ASN1_OBJECT_free(obj);
289 return nattr; 301 return nattr;
290} 302}
303LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_txt)
291 304
292int 305int
293X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj) 306X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj)
@@ -298,6 +311,7 @@ X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj)
298 attr->object = OBJ_dup(obj); 311 attr->object = OBJ_dup(obj);
299 return attr->object != NULL; 312 return attr->object != NULL;
300} 313}
314LCRYPTO_ALIAS(X509_ATTRIBUTE_set1_object)
301 315
302int 316int
303X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data, 317X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
@@ -351,6 +365,7 @@ err:
351 X509error(ERR_R_MALLOC_FAILURE); 365 X509error(ERR_R_MALLOC_FAILURE);
352 return 0; 366 return 0;
353} 367}
368LCRYPTO_ALIAS(X509_ATTRIBUTE_set1_data)
354 369
355int 370int
356X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr) 371X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr)
@@ -360,6 +375,7 @@ X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr)
360 375
361 return sk_ASN1_TYPE_num(attr->set); 376 return sk_ASN1_TYPE_num(attr->set);
362} 377}
378LCRYPTO_ALIAS(X509_ATTRIBUTE_count)
363 379
364ASN1_OBJECT * 380ASN1_OBJECT *
365X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr) 381X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr)
@@ -368,6 +384,7 @@ X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr)
368 return (NULL); 384 return (NULL);
369 return (attr->object); 385 return (attr->object);
370} 386}
387LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_object)
371 388
372void * 389void *
373X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, int atrtype, void *data) 390X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, int atrtype, void *data)
@@ -383,6 +400,7 @@ X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, int atrtype, void *data)
383 } 400 }
384 return ttmp->value.ptr; 401 return ttmp->value.ptr;
385} 402}
403LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_data)
386 404
387ASN1_TYPE * 405ASN1_TYPE *
388X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx) 406X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx)
@@ -392,3 +410,4 @@ X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx)
392 410
393 return sk_ASN1_TYPE_value(attr->set, idx); 411 return sk_ASN1_TYPE_value(attr->set, idx);
394} 412}
413LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_type)