diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/objects/obj_dat.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index 7516a6d09a..ff06177451 100644 --- a/src/lib/libcrypto/objects/obj_dat.c +++ b/src/lib/libcrypto/objects/obj_dat.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: obj_dat.c,v 1.53 2023/05/23 11:51:12 tb Exp $ */ | 1 | /* $OpenBSD: obj_dat.c,v 1.54 2023/07/08 12:27:51 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 | * |
| @@ -280,6 +280,7 @@ OBJ_cleanup(void) | |||
| 280 | lh_ADDED_OBJ_free(added); | 280 | lh_ADDED_OBJ_free(added); |
| 281 | added = NULL; | 281 | added = NULL; |
| 282 | } | 282 | } |
| 283 | LCRYPTO_ALIAS(OBJ_cleanup); | ||
| 283 | 284 | ||
| 284 | int | 285 | int |
| 285 | OBJ_new_nid(int num) | 286 | OBJ_new_nid(int num) |
| @@ -290,6 +291,7 @@ OBJ_new_nid(int num) | |||
| 290 | new_nid += num; | 291 | new_nid += num; |
| 291 | return (i); | 292 | return (i); |
| 292 | } | 293 | } |
| 294 | LCRYPTO_ALIAS(OBJ_new_nid); | ||
| 293 | 295 | ||
| 294 | int | 296 | int |
| 295 | OBJ_add_object(const ASN1_OBJECT *obj) | 297 | OBJ_add_object(const ASN1_OBJECT *obj) |
| @@ -338,6 +340,7 @@ OBJ_add_object(const ASN1_OBJECT *obj) | |||
| 338 | ASN1_OBJECT_free(o); | 340 | ASN1_OBJECT_free(o); |
| 339 | return (NID_undef); | 341 | return (NID_undef); |
| 340 | } | 342 | } |
| 343 | LCRYPTO_ALIAS(OBJ_add_object); | ||
| 341 | 344 | ||
| 342 | ASN1_OBJECT * | 345 | ASN1_OBJECT * |
| 343 | OBJ_nid2obj(int n) | 346 | OBJ_nid2obj(int n) |
| @@ -366,6 +369,7 @@ OBJ_nid2obj(int n) | |||
| 366 | } | 369 | } |
| 367 | } | 370 | } |
| 368 | } | 371 | } |
| 372 | LCRYPTO_ALIAS(OBJ_nid2obj); | ||
| 369 | 373 | ||
| 370 | const char * | 374 | const char * |
| 371 | OBJ_nid2sn(int n) | 375 | OBJ_nid2sn(int n) |
| @@ -394,6 +398,7 @@ OBJ_nid2sn(int n) | |||
| 394 | } | 398 | } |
| 395 | } | 399 | } |
| 396 | } | 400 | } |
| 401 | LCRYPTO_ALIAS(OBJ_nid2sn); | ||
| 397 | 402 | ||
| 398 | const char * | 403 | const char * |
| 399 | OBJ_nid2ln(int n) | 404 | OBJ_nid2ln(int n) |
| @@ -422,6 +427,7 @@ OBJ_nid2ln(int n) | |||
| 422 | } | 427 | } |
| 423 | } | 428 | } |
| 424 | } | 429 | } |
| 430 | LCRYPTO_ALIAS(OBJ_nid2ln); | ||
| 425 | 431 | ||
| 426 | static int | 432 | static int |
| 427 | obj_cmp(const ASN1_OBJECT * const *ap, const unsigned int *bp) | 433 | obj_cmp(const ASN1_OBJECT * const *ap, const unsigned int *bp) |
| @@ -475,6 +481,7 @@ OBJ_obj2nid(const ASN1_OBJECT *a) | |||
| 475 | return (NID_undef); | 481 | return (NID_undef); |
| 476 | return (nid_objs[*op].nid); | 482 | return (nid_objs[*op].nid); |
| 477 | } | 483 | } |
| 484 | LCRYPTO_ALIAS(OBJ_obj2nid); | ||
| 478 | 485 | ||
| 479 | /* Convert an object name into an ASN1_OBJECT | 486 | /* Convert an object name into an ASN1_OBJECT |
| 480 | * if "noname" is not set then search for short and long names first. | 487 | * if "noname" is not set then search for short and long names first. |
| @@ -495,12 +502,14 @@ OBJ_txt2obj(const char *s, int no_name) | |||
| 495 | 502 | ||
| 496 | return t2i_ASN1_OBJECT_internal(s); | 503 | return t2i_ASN1_OBJECT_internal(s); |
| 497 | } | 504 | } |
| 505 | LCRYPTO_ALIAS(OBJ_txt2obj); | ||
| 498 | 506 | ||
| 499 | int | 507 | int |
| 500 | OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *aobj, int no_name) | 508 | OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *aobj, int no_name) |
| 501 | { | 509 | { |
| 502 | return i2t_ASN1_OBJECT_internal(aobj, buf, buf_len, no_name); | 510 | return i2t_ASN1_OBJECT_internal(aobj, buf, buf_len, no_name); |
| 503 | } | 511 | } |
| 512 | LCRYPTO_ALIAS(OBJ_obj2txt); | ||
| 504 | 513 | ||
| 505 | int | 514 | int |
| 506 | OBJ_txt2nid(const char *s) | 515 | OBJ_txt2nid(const char *s) |
| @@ -513,6 +522,7 @@ OBJ_txt2nid(const char *s) | |||
| 513 | ASN1_OBJECT_free(obj); | 522 | ASN1_OBJECT_free(obj); |
| 514 | return nid; | 523 | return nid; |
| 515 | } | 524 | } |
| 525 | LCRYPTO_ALIAS(OBJ_txt2nid); | ||
| 516 | 526 | ||
| 517 | int | 527 | int |
| 518 | OBJ_ln2nid(const char *s) | 528 | OBJ_ln2nid(const char *s) |
| @@ -535,6 +545,7 @@ OBJ_ln2nid(const char *s) | |||
| 535 | return (NID_undef); | 545 | return (NID_undef); |
| 536 | return (nid_objs[*op].nid); | 546 | return (nid_objs[*op].nid); |
| 537 | } | 547 | } |
| 548 | LCRYPTO_ALIAS(OBJ_ln2nid); | ||
| 538 | 549 | ||
| 539 | int | 550 | int |
| 540 | OBJ_sn2nid(const char *s) | 551 | OBJ_sn2nid(const char *s) |
| @@ -557,6 +568,7 @@ OBJ_sn2nid(const char *s) | |||
| 557 | return (NID_undef); | 568 | return (NID_undef); |
| 558 | return (nid_objs[*op].nid); | 569 | return (nid_objs[*op].nid); |
| 559 | } | 570 | } |
| 571 | LCRYPTO_ALIAS(OBJ_sn2nid); | ||
| 560 | 572 | ||
| 561 | const void * | 573 | const void * |
| 562 | OBJ_bsearch_(const void *key, const void *base, int num, int size, | 574 | OBJ_bsearch_(const void *key, const void *base, int num, int size, |
| @@ -564,6 +576,7 @@ OBJ_bsearch_(const void *key, const void *base, int num, int size, | |||
| 564 | { | 576 | { |
| 565 | return OBJ_bsearch_ex_(key, base, num, size, cmp, 0); | 577 | return OBJ_bsearch_ex_(key, base, num, size, cmp, 0); |
| 566 | } | 578 | } |
| 579 | LCRYPTO_ALIAS(OBJ_bsearch_); | ||
| 567 | 580 | ||
| 568 | const void * | 581 | const void * |
| 569 | OBJ_bsearch_ex_(const void *key, const void *base_, int num, int size, | 582 | OBJ_bsearch_ex_(const void *key, const void *base_, int num, int size, |
| @@ -646,6 +659,7 @@ OBJ_create_objects(BIO *in) | |||
| 646 | } | 659 | } |
| 647 | /* return(num); */ | 660 | /* return(num); */ |
| 648 | } | 661 | } |
| 662 | LCRYPTO_ALIAS(OBJ_create_objects); | ||
| 649 | 663 | ||
| 650 | int | 664 | int |
| 651 | OBJ_create(const char *oid, const char *sn, const char *ln) | 665 | OBJ_create(const char *oid, const char *sn, const char *ln) |
| @@ -676,6 +690,7 @@ OBJ_create(const char *oid, const char *sn, const char *ln) | |||
| 676 | free(buf); | 690 | free(buf); |
| 677 | return (ok); | 691 | return (ok); |
| 678 | } | 692 | } |
| 693 | LCRYPTO_ALIAS(OBJ_create); | ||
| 679 | 694 | ||
| 680 | size_t | 695 | size_t |
| 681 | OBJ_length(const ASN1_OBJECT *obj) | 696 | OBJ_length(const ASN1_OBJECT *obj) |
| @@ -688,6 +703,7 @@ OBJ_length(const ASN1_OBJECT *obj) | |||
| 688 | 703 | ||
| 689 | return obj->length; | 704 | return obj->length; |
| 690 | } | 705 | } |
| 706 | LCRYPTO_ALIAS(OBJ_length); | ||
| 691 | 707 | ||
| 692 | const unsigned char * | 708 | const unsigned char * |
| 693 | OBJ_get0_data(const ASN1_OBJECT *obj) | 709 | OBJ_get0_data(const ASN1_OBJECT *obj) |
| @@ -697,3 +713,4 @@ OBJ_get0_data(const ASN1_OBJECT *obj) | |||
| 697 | 713 | ||
| 698 | return obj->data; | 714 | return obj->data; |
| 699 | } | 715 | } |
| 716 | LCRYPTO_ALIAS(OBJ_get0_data); | ||
