diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_att.c')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_att.c | 40 |
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 | } |
| 76 | LCRYPTO_ALIAS(X509at_get_attr_count) | 76 | LCRYPTO_ALIAS(X509at_get_attr_count); |
| 77 | 77 | ||
| 78 | int | 78 | int |
| 79 | X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid, int lastpos) | 79 | X509at_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 | } |
| 88 | LCRYPTO_ALIAS(X509at_get_attr_by_NID) | 88 | LCRYPTO_ALIAS(X509at_get_attr_by_NID); |
| 89 | 89 | ||
| 90 | int | 90 | int |
| 91 | X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk, | 91 | X509at_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 | } |
| 110 | LCRYPTO_ALIAS(X509at_get_attr_by_OBJ) | 110 | LCRYPTO_ALIAS(X509at_get_attr_by_OBJ); |
| 111 | 111 | ||
| 112 | X509_ATTRIBUTE * | 112 | X509_ATTRIBUTE * |
| 113 | X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc) | 113 | X509at_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 | } |
| 120 | LCRYPTO_ALIAS(X509at_get_attr) | 120 | LCRYPTO_ALIAS(X509at_get_attr); |
| 121 | 121 | ||
| 122 | X509_ATTRIBUTE * | 122 | X509_ATTRIBUTE * |
| 123 | X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc) | 123 | X509at_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 | } |
| 132 | LCRYPTO_ALIAS(X509at_delete_attr) | 132 | LCRYPTO_ALIAS(X509at_delete_attr); |
| 133 | 133 | ||
| 134 | STACK_OF(X509_ATTRIBUTE) * | 134 | STACK_OF(X509_ATTRIBUTE) * |
| 135 | X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, X509_ATTRIBUTE *attr) | 135 | X509at_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 | } |
| 168 | LCRYPTO_ALIAS(X509at_add1_attr) | 168 | LCRYPTO_ALIAS(X509at_add1_attr); |
| 169 | 169 | ||
| 170 | STACK_OF(X509_ATTRIBUTE) * | 170 | STACK_OF(X509_ATTRIBUTE) * |
| 171 | X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x, const ASN1_OBJECT *obj, | 171 | X509at_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 | } |
| 184 | LCRYPTO_ALIAS(X509at_add1_attr_by_OBJ) | 184 | LCRYPTO_ALIAS(X509at_add1_attr_by_OBJ); |
| 185 | 185 | ||
| 186 | STACK_OF(X509_ATTRIBUTE) * | 186 | STACK_OF(X509_ATTRIBUTE) * |
| 187 | X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, int nid, int type, | 187 | X509at_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 | } |
| 200 | LCRYPTO_ALIAS(X509at_add1_attr_by_NID) | 200 | LCRYPTO_ALIAS(X509at_add1_attr_by_NID); |
| 201 | 201 | ||
| 202 | STACK_OF(X509_ATTRIBUTE) * | 202 | STACK_OF(X509_ATTRIBUTE) * |
| 203 | X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, const char *attrname, | 203 | X509at_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 | } |
| 216 | LCRYPTO_ALIAS(X509at_add1_attr_by_txt) | 216 | LCRYPTO_ALIAS(X509at_add1_attr_by_txt); |
| 217 | 217 | ||
| 218 | void * | 218 | void * |
| 219 | X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, const ASN1_OBJECT *obj, | 219 | X509at_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 | } |
| 235 | LCRYPTO_ALIAS(X509at_get0_data_by_OBJ) | 235 | LCRYPTO_ALIAS(X509at_get0_data_by_OBJ); |
| 236 | 236 | ||
| 237 | X509_ATTRIBUTE * | 237 | X509_ATTRIBUTE * |
| 238 | X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid, int atrtype, | 238 | X509_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 | } |
| 254 | LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_NID) | 254 | LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_NID); |
| 255 | 255 | ||
| 256 | X509_ATTRIBUTE * | 256 | X509_ATTRIBUTE * |
| 257 | X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr, const ASN1_OBJECT *obj, | 257 | X509_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 | } |
| 284 | LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_OBJ) | 284 | LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_OBJ); |
| 285 | 285 | ||
| 286 | X509_ATTRIBUTE * | 286 | X509_ATTRIBUTE * |
| 287 | X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr, const char *atrname, | 287 | X509_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 | } |
| 303 | LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_txt) | 303 | LCRYPTO_ALIAS(X509_ATTRIBUTE_create_by_txt); |
| 304 | 304 | ||
| 305 | int | 305 | int |
| 306 | X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj) | 306 | X509_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 | } |
| 314 | LCRYPTO_ALIAS(X509_ATTRIBUTE_set1_object) | 314 | LCRYPTO_ALIAS(X509_ATTRIBUTE_set1_object); |
| 315 | 315 | ||
| 316 | int | 316 | int |
| 317 | X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data, | 317 | X509_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 | } |
| 368 | LCRYPTO_ALIAS(X509_ATTRIBUTE_set1_data) | 368 | LCRYPTO_ALIAS(X509_ATTRIBUTE_set1_data); |
| 369 | 369 | ||
| 370 | int | 370 | int |
| 371 | X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr) | 371 | X509_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 | } |
| 378 | LCRYPTO_ALIAS(X509_ATTRIBUTE_count) | 378 | LCRYPTO_ALIAS(X509_ATTRIBUTE_count); |
| 379 | 379 | ||
| 380 | ASN1_OBJECT * | 380 | ASN1_OBJECT * |
| 381 | X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr) | 381 | X509_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 | } |
| 387 | LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_object) | 387 | LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_object); |
| 388 | 388 | ||
| 389 | void * | 389 | void * |
| 390 | X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, int atrtype, void *data) | 390 | X509_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 | } |
| 403 | LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_data) | 403 | LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_data); |
| 404 | 404 | ||
| 405 | ASN1_TYPE * | 405 | ASN1_TYPE * |
| 406 | X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx) | 406 | X509_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 | } |
| 413 | LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_type) | 413 | LCRYPTO_ALIAS(X509_ATTRIBUTE_get0_type); |
