diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509name.c')
| -rw-r--r-- | src/lib/libcrypto/x509/x509name.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c index 878d787846..88f4efa149 100644 --- a/src/lib/libcrypto/x509/x509name.c +++ b/src/lib/libcrypto/x509/x509name.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509name.c,v 1.27 2021/11/01 20:53:08 tb Exp $ */ | 1 | /* $OpenBSD: x509name.c,v 1.28 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 | * |
| @@ -78,6 +78,7 @@ X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len) | |||
| 78 | return (-1); | 78 | return (-1); |
| 79 | return (X509_NAME_get_text_by_OBJ(name, obj, buf, len)); | 79 | return (X509_NAME_get_text_by_OBJ(name, obj, buf, len)); |
| 80 | } | 80 | } |
| 81 | LCRYPTO_ALIAS(X509_NAME_get_text_by_NID) | ||
| 81 | 82 | ||
| 82 | int | 83 | int |
| 83 | X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, char *buf, | 84 | X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, char *buf, |
| @@ -99,6 +100,7 @@ X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, char *buf, | |||
| 99 | } | 100 | } |
| 100 | return (i); | 101 | return (i); |
| 101 | } | 102 | } |
| 103 | LCRYPTO_ALIAS(X509_NAME_get_text_by_OBJ) | ||
| 102 | 104 | ||
| 103 | int | 105 | int |
| 104 | X509_NAME_entry_count(const X509_NAME *name) | 106 | X509_NAME_entry_count(const X509_NAME *name) |
| @@ -107,6 +109,7 @@ X509_NAME_entry_count(const X509_NAME *name) | |||
| 107 | return (0); | 109 | return (0); |
| 108 | return (sk_X509_NAME_ENTRY_num(name->entries)); | 110 | return (sk_X509_NAME_ENTRY_num(name->entries)); |
| 109 | } | 111 | } |
| 112 | LCRYPTO_ALIAS(X509_NAME_entry_count) | ||
| 110 | 113 | ||
| 111 | int | 114 | int |
| 112 | X509_NAME_get_index_by_NID(const X509_NAME *name, int nid, int lastpos) | 115 | X509_NAME_get_index_by_NID(const X509_NAME *name, int nid, int lastpos) |
| @@ -118,6 +121,7 @@ X509_NAME_get_index_by_NID(const X509_NAME *name, int nid, int lastpos) | |||
| 118 | return (-2); | 121 | return (-2); |
| 119 | return (X509_NAME_get_index_by_OBJ(name, obj, lastpos)); | 122 | return (X509_NAME_get_index_by_OBJ(name, obj, lastpos)); |
| 120 | } | 123 | } |
| 124 | LCRYPTO_ALIAS(X509_NAME_get_index_by_NID) | ||
| 121 | 125 | ||
| 122 | /* NOTE: you should be passsing -1, not 0 as lastpos */ | 126 | /* NOTE: you should be passsing -1, not 0 as lastpos */ |
| 123 | int | 127 | int |
| @@ -141,6 +145,7 @@ X509_NAME_get_index_by_OBJ(const X509_NAME *name, const ASN1_OBJECT *obj, | |||
| 141 | } | 145 | } |
| 142 | return (-1); | 146 | return (-1); |
| 143 | } | 147 | } |
| 148 | LCRYPTO_ALIAS(X509_NAME_get_index_by_OBJ) | ||
| 144 | 149 | ||
| 145 | X509_NAME_ENTRY * | 150 | X509_NAME_ENTRY * |
| 146 | X509_NAME_get_entry(const X509_NAME *name, int loc) | 151 | X509_NAME_get_entry(const X509_NAME *name, int loc) |
| @@ -151,6 +156,7 @@ X509_NAME_get_entry(const X509_NAME *name, int loc) | |||
| 151 | else | 156 | else |
| 152 | return (sk_X509_NAME_ENTRY_value(name->entries, loc)); | 157 | return (sk_X509_NAME_ENTRY_value(name->entries, loc)); |
| 153 | } | 158 | } |
| 159 | LCRYPTO_ALIAS(X509_NAME_get_entry) | ||
| 154 | 160 | ||
| 155 | X509_NAME_ENTRY * | 161 | X509_NAME_ENTRY * |
| 156 | X509_NAME_delete_entry(X509_NAME *name, int loc) | 162 | X509_NAME_delete_entry(X509_NAME *name, int loc) |
| @@ -189,6 +195,7 @@ X509_NAME_delete_entry(X509_NAME *name, int loc) | |||
| 189 | sk_X509_NAME_ENTRY_value(sk, i)->set--; | 195 | sk_X509_NAME_ENTRY_value(sk, i)->set--; |
| 190 | return (ret); | 196 | return (ret); |
| 191 | } | 197 | } |
| 198 | LCRYPTO_ALIAS(X509_NAME_delete_entry) | ||
| 192 | 199 | ||
| 193 | int | 200 | int |
| 194 | X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type, | 201 | X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type, |
| @@ -204,6 +211,7 @@ X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type, | |||
| 204 | X509_NAME_ENTRY_free(ne); | 211 | X509_NAME_ENTRY_free(ne); |
| 205 | return ret; | 212 | return ret; |
| 206 | } | 213 | } |
| 214 | LCRYPTO_ALIAS(X509_NAME_add_entry_by_OBJ) | ||
| 207 | 215 | ||
| 208 | int | 216 | int |
| 209 | X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type, | 217 | X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type, |
| @@ -219,6 +227,7 @@ X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type, | |||
| 219 | X509_NAME_ENTRY_free(ne); | 227 | X509_NAME_ENTRY_free(ne); |
| 220 | return ret; | 228 | return ret; |
| 221 | } | 229 | } |
| 230 | LCRYPTO_ALIAS(X509_NAME_add_entry_by_NID) | ||
| 222 | 231 | ||
| 223 | int | 232 | int |
| 224 | X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, | 233 | X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, |
| @@ -234,6 +243,7 @@ X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, | |||
| 234 | X509_NAME_ENTRY_free(ne); | 243 | X509_NAME_ENTRY_free(ne); |
| 235 | return ret; | 244 | return ret; |
| 236 | } | 245 | } |
| 246 | LCRYPTO_ALIAS(X509_NAME_add_entry_by_txt) | ||
| 237 | 247 | ||
| 238 | /* if set is -1, append to previous set, 0 'a new one', and 1, | 248 | /* if set is -1, append to previous set, 0 'a new one', and 1, |
| 239 | * prepend to the guy we are about to stomp on. */ | 249 | * prepend to the guy we are about to stomp on. */ |
| @@ -292,6 +302,7 @@ err: | |||
| 292 | X509_NAME_ENTRY_free(new_name); | 302 | X509_NAME_ENTRY_free(new_name); |
| 293 | return (0); | 303 | return (0); |
| 294 | } | 304 | } |
| 305 | LCRYPTO_ALIAS(X509_NAME_add_entry) | ||
| 295 | 306 | ||
| 296 | X509_NAME_ENTRY * | 307 | X509_NAME_ENTRY * |
| 297 | X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, | 308 | X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, |
| @@ -310,6 +321,7 @@ X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, | |||
| 310 | ASN1_OBJECT_free(obj); | 321 | ASN1_OBJECT_free(obj); |
| 311 | return nentry; | 322 | return nentry; |
| 312 | } | 323 | } |
| 324 | LCRYPTO_ALIAS(X509_NAME_ENTRY_create_by_txt) | ||
| 313 | 325 | ||
| 314 | X509_NAME_ENTRY * | 326 | X509_NAME_ENTRY * |
| 315 | X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type, | 327 | X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type, |
| @@ -327,6 +339,7 @@ X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type, | |||
| 327 | ASN1_OBJECT_free(obj); | 339 | ASN1_OBJECT_free(obj); |
| 328 | return nentry; | 340 | return nentry; |
| 329 | } | 341 | } |
| 342 | LCRYPTO_ALIAS(X509_NAME_ENTRY_create_by_NID) | ||
| 330 | 343 | ||
| 331 | X509_NAME_ENTRY * | 344 | X509_NAME_ENTRY * |
| 332 | X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, const ASN1_OBJECT *obj, | 345 | X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, const ASN1_OBJECT *obj, |
| @@ -354,6 +367,7 @@ err: | |||
| 354 | X509_NAME_ENTRY_free(ret); | 367 | X509_NAME_ENTRY_free(ret); |
| 355 | return (NULL); | 368 | return (NULL); |
| 356 | } | 369 | } |
| 370 | LCRYPTO_ALIAS(X509_NAME_ENTRY_create_by_OBJ) | ||
| 357 | 371 | ||
| 358 | int | 372 | int |
| 359 | X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj) | 373 | X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj) |
| @@ -366,6 +380,7 @@ X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj) | |||
| 366 | ne->object = OBJ_dup(obj); | 380 | ne->object = OBJ_dup(obj); |
| 367 | return ((ne->object == NULL) ? 0 : 1); | 381 | return ((ne->object == NULL) ? 0 : 1); |
| 368 | } | 382 | } |
| 383 | LCRYPTO_ALIAS(X509_NAME_ENTRY_set_object) | ||
| 369 | 384 | ||
| 370 | int | 385 | int |
| 371 | X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, | 386 | X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, |
| @@ -391,6 +406,7 @@ X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, | |||
| 391 | } | 406 | } |
| 392 | return (1); | 407 | return (1); |
| 393 | } | 408 | } |
| 409 | LCRYPTO_ALIAS(X509_NAME_ENTRY_set_data) | ||
| 394 | 410 | ||
| 395 | ASN1_OBJECT * | 411 | ASN1_OBJECT * |
| 396 | X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne) | 412 | X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne) |
| @@ -399,6 +415,7 @@ X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne) | |||
| 399 | return (NULL); | 415 | return (NULL); |
| 400 | return (ne->object); | 416 | return (ne->object); |
| 401 | } | 417 | } |
| 418 | LCRYPTO_ALIAS(X509_NAME_ENTRY_get_object) | ||
| 402 | 419 | ||
| 403 | ASN1_STRING * | 420 | ASN1_STRING * |
| 404 | X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne) | 421 | X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne) |
| @@ -407,9 +424,11 @@ X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne) | |||
| 407 | return (NULL); | 424 | return (NULL); |
| 408 | return (ne->value); | 425 | return (ne->value); |
| 409 | } | 426 | } |
| 427 | LCRYPTO_ALIAS(X509_NAME_ENTRY_get_data) | ||
| 410 | 428 | ||
| 411 | int | 429 | int |
| 412 | X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) | 430 | X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) |
| 413 | { | 431 | { |
| 414 | return (ne->set); | 432 | return (ne->set); |
| 415 | } | 433 | } |
| 434 | LCRYPTO_ALIAS(X509_NAME_ENTRY_set) | ||
