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.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/lib/libcrypto/x509/x509_att.c b/src/lib/libcrypto/x509/x509_att.c
index e769418fd3..0c9d55f74f 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.21 2022/11/26 16:08:54 tb Exp $ */ 1/* $OpenBSD: x509_att.c,v 1.22 2023/02/16 08:38:17 tb 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,7 +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) 76LCRYPTO_ALIAS(X509at_get_attr_count);
77 77
78int 78int
79X509at_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)
@@ -85,7 +85,7 @@ X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid, int lastpos)
85 return (-2); 85 return (-2);
86 return (X509at_get_attr_by_OBJ(x, obj, lastpos)); 86 return (X509at_get_attr_by_OBJ(x, obj, lastpos));
87} 87}
88LCRYPTO_ALIAS(X509at_get_attr_by_NID) 88LCRYPTO_ALIAS(X509at_get_attr_by_NID);
89 89
90int 90int
91X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk, 91X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
@@ -107,7 +107,7 @@ X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
107 } 107 }
108 return (-1); 108 return (-1);
109} 109}
110LCRYPTO_ALIAS(X509at_get_attr_by_OBJ) 110LCRYPTO_ALIAS(X509at_get_attr_by_OBJ);
111 111
112X509_ATTRIBUTE * 112X509_ATTRIBUTE *
113X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc) 113X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc)
@@ -117,7 +117,7 @@ X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc)
117 else 117 else
118 return sk_X509_ATTRIBUTE_value(x, loc); 118 return sk_X509_ATTRIBUTE_value(x, loc);
119} 119}
120LCRYPTO_ALIAS(X509at_get_attr) 120LCRYPTO_ALIAS(X509at_get_attr);
121 121
122X509_ATTRIBUTE * 122X509_ATTRIBUTE *
123X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc) 123X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc)
@@ -129,7 +129,7 @@ X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc)
129 ret = sk_X509_ATTRIBUTE_delete(x, loc); 129 ret = sk_X509_ATTRIBUTE_delete(x, loc);
130 return (ret); 130 return (ret);
131} 131}
132LCRYPTO_ALIAS(X509at_delete_attr) 132LCRYPTO_ALIAS(X509at_delete_attr);
133 133
134STACK_OF(X509_ATTRIBUTE) * 134STACK_OF(X509_ATTRIBUTE) *
135X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, X509_ATTRIBUTE *attr) 135X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, X509_ATTRIBUTE *attr)
@@ -165,7 +165,7 @@ err2:
165 sk_X509_ATTRIBUTE_free(sk); 165 sk_X509_ATTRIBUTE_free(sk);
166 return (NULL); 166 return (NULL);
167} 167}
168LCRYPTO_ALIAS(X509at_add1_attr) 168LCRYPTO_ALIAS(X509at_add1_attr);
169 169
170STACK_OF(X509_ATTRIBUTE) * 170STACK_OF(X509_ATTRIBUTE) *
171X509at_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,
@@ -181,7 +181,7 @@ X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x, const ASN1_OBJECT *obj,
181 X509_ATTRIBUTE_free(attr); 181 X509_ATTRIBUTE_free(attr);
182 return ret; 182 return ret;
183} 183}
184LCRYPTO_ALIAS(X509at_add1_attr_by_OBJ) 184LCRYPTO_ALIAS(X509at_add1_attr_by_OBJ);
185 185
186STACK_OF(X509_ATTRIBUTE) * 186STACK_OF(X509_ATTRIBUTE) *
187X509at_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,
@@ -197,7 +197,7 @@ X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, int nid, int type,
197 X509_ATTRIBUTE_free(attr); 197 X509_ATTRIBUTE_free(attr);
198 return ret; 198 return ret;
199} 199}
200LCRYPTO_ALIAS(X509at_add1_attr_by_NID) 200LCRYPTO_ALIAS(X509at_add1_attr_by_NID);
201 201
202STACK_OF(X509_ATTRIBUTE) * 202STACK_OF(X509_ATTRIBUTE) *
203X509at_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,
@@ -213,7 +213,7 @@ X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, const char *attrname,
213 X509_ATTRIBUTE_free(attr); 213 X509_ATTRIBUTE_free(attr);
214 return ret; 214 return ret;
215} 215}
216LCRYPTO_ALIAS(X509at_add1_attr_by_txt) 216LCRYPTO_ALIAS(X509at_add1_attr_by_txt);
217 217
218void * 218void *
219X509at_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,
@@ -232,7 +232,7 @@ X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, const ASN1_OBJECT *obj,
232 return NULL; 232 return NULL;
233 return X509_ATTRIBUTE_get0_data(at, 0, type, NULL); 233 return X509_ATTRIBUTE_get0_data(at, 0, type, NULL);
234} 234}
235LCRYPTO_ALIAS(X509at_get0_data_by_OBJ) 235LCRYPTO_ALIAS(X509at_get0_data_by_OBJ);
236 236
237X509_ATTRIBUTE * 237X509_ATTRIBUTE *
238X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid, int atrtype, 238X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid, int atrtype,
@@ -251,7 +251,7 @@ X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid, int atrtype,
251 ASN1_OBJECT_free(obj); 251 ASN1_OBJECT_free(obj);
252 return (ret); 252 return (ret);
253} 253}
254LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_NID) 254LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_NID);
255 255
256X509_ATTRIBUTE * 256X509_ATTRIBUTE *
257X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr, const ASN1_OBJECT *obj, 257X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr, const ASN1_OBJECT *obj,
@@ -281,7 +281,7 @@ err:
281 X509_ATTRIBUTE_free(ret); 281 X509_ATTRIBUTE_free(ret);
282 return (NULL); 282 return (NULL);
283} 283}
284LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_OBJ) 284LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_OBJ);
285 285
286X509_ATTRIBUTE * 286X509_ATTRIBUTE *
287X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr, const char *atrname, 287X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr, const char *atrname,
@@ -300,7 +300,7 @@ X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr, const char *atrname,
300 ASN1_OBJECT_free(obj); 300 ASN1_OBJECT_free(obj);
301 return nattr; 301 return nattr;
302} 302}
303LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_txt) 303LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_txt);
304 304
305int 305int
306X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj) 306X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj)
@@ -311,7 +311,7 @@ X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj)
311 attr->object = OBJ_dup(obj); 311 attr->object = OBJ_dup(obj);
312 return attr->object != NULL; 312 return attr->object != NULL;
313} 313}
314LCRYPTO_ALIAS(X509_ATTRIBUTE_set1_object) 314LCRYPTO_ALIAS(X509_ATTRIBUTE_set1_object);
315 315
316int 316int
317X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data, 317X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
@@ -365,7 +365,7 @@ err:
365 X509error(ERR_R_MALLOC_FAILURE); 365 X509error(ERR_R_MALLOC_FAILURE);
366 return 0; 366 return 0;
367} 367}
368LCRYPTO_ALIAS(X509_ATTRIBUTE_set1_data) 368LCRYPTO_ALIAS(X509_ATTRIBUTE_set1_data);
369 369
370int 370int
371X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr) 371X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr)
@@ -375,7 +375,7 @@ X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr)
375 375
376 return sk_ASN1_TYPE_num(attr->set); 376 return sk_ASN1_TYPE_num(attr->set);
377} 377}
378LCRYPTO_ALIAS(X509_ATTRIBUTE_count) 378LCRYPTO_ALIAS(X509_ATTRIBUTE_count);
379 379
380ASN1_OBJECT * 380ASN1_OBJECT *
381X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr) 381X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr)
@@ -384,7 +384,7 @@ X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr)
384 return (NULL); 384 return (NULL);
385 return (attr->object); 385 return (attr->object);
386} 386}
387LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_object) 387LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_object);
388 388
389void * 389void *
390X509_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)
@@ -400,7 +400,7 @@ X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, int atrtype, void *data)
400 } 400 }
401 return ttmp->value.ptr; 401 return ttmp->value.ptr;
402} 402}
403LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_data) 403LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_data);
404 404
405ASN1_TYPE * 405ASN1_TYPE *
406X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx) 406X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx)
@@ -410,4 +410,4 @@ X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx)
410 410
411 return sk_ASN1_TYPE_value(attr->set, idx); 411 return sk_ASN1_TYPE_value(attr->set, idx);
412} 412}
413LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_type) 413LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_type);