diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_vpm.c')
-rw-r--r-- | src/lib/libcrypto/x509/x509_vpm.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c index 724a28fc1b..cb13267b75 100644 --- a/src/lib/libcrypto/x509/x509_vpm.c +++ b/src/lib/libcrypto/x509/x509_vpm.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_vpm.c,v 1.32 2022/11/26 16:08:55 tb Exp $ */ | 1 | /* $OpenBSD: x509_vpm.c,v 1.33 2023/02/16 08:38:17 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2004. | 3 | * project 2004. |
4 | */ | 4 | */ |
@@ -218,7 +218,7 @@ X509_VERIFY_PARAM_new(void) | |||
218 | x509_verify_param_zero(param); | 218 | x509_verify_param_zero(param); |
219 | return param; | 219 | return param; |
220 | } | 220 | } |
221 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_new) | 221 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_new); |
222 | 222 | ||
223 | void | 223 | void |
224 | X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param) | 224 | X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param) |
@@ -229,7 +229,7 @@ X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param) | |||
229 | free(param->id); | 229 | free(param->id); |
230 | free(param); | 230 | free(param); |
231 | } | 231 | } |
232 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_free) | 232 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_free); |
233 | 233 | ||
234 | /* | 234 | /* |
235 | * This function determines how parameters are "inherited" from one structure | 235 | * This function determines how parameters are "inherited" from one structure |
@@ -358,7 +358,7 @@ X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest, const X509_VERIFY_PARAM *src) | |||
358 | 358 | ||
359 | return 1; | 359 | return 1; |
360 | } | 360 | } |
361 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_inherit) | 361 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_inherit); |
362 | 362 | ||
363 | int | 363 | int |
364 | X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to, const X509_VERIFY_PARAM *from) | 364 | X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to, const X509_VERIFY_PARAM *from) |
@@ -371,7 +371,7 @@ X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to, const X509_VERIFY_PARAM *from) | |||
371 | to->inh_flags = save_flags; | 371 | to->inh_flags = save_flags; |
372 | return ret; | 372 | return ret; |
373 | } | 373 | } |
374 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1) | 374 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1); |
375 | 375 | ||
376 | static int | 376 | static int |
377 | x509_param_set1_internal(char **pdest, size_t *pdestlen, const char *src, | 377 | x509_param_set1_internal(char **pdest, size_t *pdestlen, const char *src, |
@@ -416,7 +416,7 @@ X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name) | |||
416 | return 1; | 416 | return 1; |
417 | return 0; | 417 | return 0; |
418 | } | 418 | } |
419 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_name) | 419 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_name); |
420 | 420 | ||
421 | int | 421 | int |
422 | X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param, unsigned long flags) | 422 | X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param, unsigned long flags) |
@@ -426,7 +426,7 @@ X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param, unsigned long flags) | |||
426 | param->flags |= X509_V_FLAG_POLICY_CHECK; | 426 | param->flags |= X509_V_FLAG_POLICY_CHECK; |
427 | return 1; | 427 | return 1; |
428 | } | 428 | } |
429 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_flags) | 429 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_flags); |
430 | 430 | ||
431 | int | 431 | int |
432 | X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, unsigned long flags) | 432 | X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, unsigned long flags) |
@@ -434,49 +434,49 @@ X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, unsigned long flags) | |||
434 | param->flags &= ~flags; | 434 | param->flags &= ~flags; |
435 | return 1; | 435 | return 1; |
436 | } | 436 | } |
437 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_clear_flags) | 437 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_clear_flags); |
438 | 438 | ||
439 | unsigned long | 439 | unsigned long |
440 | X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param) | 440 | X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param) |
441 | { | 441 | { |
442 | return param->flags; | 442 | return param->flags; |
443 | } | 443 | } |
444 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get_flags) | 444 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get_flags); |
445 | 445 | ||
446 | int | 446 | int |
447 | X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose) | 447 | X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose) |
448 | { | 448 | { |
449 | return X509_PURPOSE_set(¶m->purpose, purpose); | 449 | return X509_PURPOSE_set(¶m->purpose, purpose); |
450 | } | 450 | } |
451 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_purpose) | 451 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_purpose); |
452 | 452 | ||
453 | int | 453 | int |
454 | X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust) | 454 | X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust) |
455 | { | 455 | { |
456 | return X509_TRUST_set(¶m->trust, trust); | 456 | return X509_TRUST_set(¶m->trust, trust); |
457 | } | 457 | } |
458 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_trust) | 458 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_trust); |
459 | 459 | ||
460 | void | 460 | void |
461 | X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth) | 461 | X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth) |
462 | { | 462 | { |
463 | param->depth = depth; | 463 | param->depth = depth; |
464 | } | 464 | } |
465 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_depth) | 465 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_depth); |
466 | 466 | ||
467 | void | 467 | void |
468 | X509_VERIFY_PARAM_set_auth_level(X509_VERIFY_PARAM *param, int auth_level) | 468 | X509_VERIFY_PARAM_set_auth_level(X509_VERIFY_PARAM *param, int auth_level) |
469 | { | 469 | { |
470 | param->security_level = auth_level; | 470 | param->security_level = auth_level; |
471 | } | 471 | } |
472 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_auth_level) | 472 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_auth_level); |
473 | 473 | ||
474 | time_t | 474 | time_t |
475 | X509_VERIFY_PARAM_get_time(const X509_VERIFY_PARAM *param) | 475 | X509_VERIFY_PARAM_get_time(const X509_VERIFY_PARAM *param) |
476 | { | 476 | { |
477 | return param->check_time; | 477 | return param->check_time; |
478 | } | 478 | } |
479 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get_time) | 479 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get_time); |
480 | 480 | ||
481 | void | 481 | void |
482 | X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t) | 482 | X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t) |
@@ -484,7 +484,7 @@ X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t) | |||
484 | param->check_time = t; | 484 | param->check_time = t; |
485 | param->flags |= X509_V_FLAG_USE_CHECK_TIME; | 485 | param->flags |= X509_V_FLAG_USE_CHECK_TIME; |
486 | } | 486 | } |
487 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_time) | 487 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_time); |
488 | 488 | ||
489 | int | 489 | int |
490 | X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, ASN1_OBJECT *policy) | 490 | X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, ASN1_OBJECT *policy) |
@@ -498,7 +498,7 @@ X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, ASN1_OBJECT *policy) | |||
498 | return 0; | 498 | return 0; |
499 | return 1; | 499 | return 1; |
500 | } | 500 | } |
501 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_add0_policy) | 501 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_add0_policy); |
502 | 502 | ||
503 | int | 503 | int |
504 | X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, | 504 | X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, |
@@ -534,7 +534,7 @@ X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, | |||
534 | param->flags |= X509_V_FLAG_POLICY_CHECK; | 534 | param->flags |= X509_V_FLAG_POLICY_CHECK; |
535 | return 1; | 535 | return 1; |
536 | } | 536 | } |
537 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_policies) | 537 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_policies); |
538 | 538 | ||
539 | int | 539 | int |
540 | X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *param, | 540 | X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *param, |
@@ -545,7 +545,7 @@ X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *param, | |||
545 | param->id->poisoned = 1; | 545 | param->id->poisoned = 1; |
546 | return 0; | 546 | return 0; |
547 | } | 547 | } |
548 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_host) | 548 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_host); |
549 | 549 | ||
550 | int | 550 | int |
551 | X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param, | 551 | X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param, |
@@ -556,21 +556,21 @@ X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param, | |||
556 | param->id->poisoned = 1; | 556 | param->id->poisoned = 1; |
557 | return 0; | 557 | return 0; |
558 | } | 558 | } |
559 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_add1_host) | 559 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_add1_host); |
560 | 560 | ||
561 | void | 561 | void |
562 | X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, unsigned int flags) | 562 | X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, unsigned int flags) |
563 | { | 563 | { |
564 | param->id->hostflags = flags; | 564 | param->id->hostflags = flags; |
565 | } | 565 | } |
566 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_hostflags) | 566 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set_hostflags); |
567 | 567 | ||
568 | char * | 568 | char * |
569 | X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param) | 569 | X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param) |
570 | { | 570 | { |
571 | return param->id->peername; | 571 | return param->id->peername; |
572 | } | 572 | } |
573 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get0_peername) | 573 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get0_peername); |
574 | 574 | ||
575 | int | 575 | int |
576 | X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, const char *email, | 576 | X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, const char *email, |
@@ -582,7 +582,7 @@ X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, const char *email, | |||
582 | param->id->poisoned = 1; | 582 | param->id->poisoned = 1; |
583 | return 0; | 583 | return 0; |
584 | } | 584 | } |
585 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_email) | 585 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_email); |
586 | 586 | ||
587 | int | 587 | int |
588 | X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param, const unsigned char *ip, | 588 | X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param, const unsigned char *ip, |
@@ -597,7 +597,7 @@ X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param, const unsigned char *ip, | |||
597 | param->id->poisoned = 1; | 597 | param->id->poisoned = 1; |
598 | return 0; | 598 | return 0; |
599 | } | 599 | } |
600 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_ip) | 600 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_ip); |
601 | 601 | ||
602 | int | 602 | int |
603 | X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *param, const char *ipasc) | 603 | X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *param, const char *ipasc) |
@@ -608,21 +608,21 @@ X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *param, const char *ipasc) | |||
608 | iplen = (size_t)a2i_ipadd(ipout, ipasc); | 608 | iplen = (size_t)a2i_ipadd(ipout, ipasc); |
609 | return X509_VERIFY_PARAM_set1_ip(param, ipout, iplen); | 609 | return X509_VERIFY_PARAM_set1_ip(param, ipout, iplen); |
610 | } | 610 | } |
611 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_ip_asc) | 611 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_set1_ip_asc); |
612 | 612 | ||
613 | int | 613 | int |
614 | X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *param) | 614 | X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *param) |
615 | { | 615 | { |
616 | return param->depth; | 616 | return param->depth; |
617 | } | 617 | } |
618 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get_depth) | 618 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get_depth); |
619 | 619 | ||
620 | const char * | 620 | const char * |
621 | X509_VERIFY_PARAM_get0_name(const X509_VERIFY_PARAM *param) | 621 | X509_VERIFY_PARAM_get0_name(const X509_VERIFY_PARAM *param) |
622 | { | 622 | { |
623 | return param->name; | 623 | return param->name; |
624 | } | 624 | } |
625 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get0_name) | 625 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get0_name); |
626 | 626 | ||
627 | static const X509_VERIFY_PARAM_ID _empty_id = { NULL }; | 627 | static const X509_VERIFY_PARAM_ID _empty_id = { NULL }; |
628 | 628 | ||
@@ -704,7 +704,7 @@ X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param) | |||
704 | return 0; | 704 | return 0; |
705 | return 1; | 705 | return 1; |
706 | } | 706 | } |
707 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_add0_table) | 707 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_add0_table); |
708 | 708 | ||
709 | int | 709 | int |
710 | X509_VERIFY_PARAM_get_count(void) | 710 | X509_VERIFY_PARAM_get_count(void) |
@@ -714,7 +714,7 @@ X509_VERIFY_PARAM_get_count(void) | |||
714 | num += sk_X509_VERIFY_PARAM_num(param_table); | 714 | num += sk_X509_VERIFY_PARAM_num(param_table); |
715 | return num; | 715 | return num; |
716 | } | 716 | } |
717 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get_count) | 717 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get_count); |
718 | 718 | ||
719 | const X509_VERIFY_PARAM * | 719 | const X509_VERIFY_PARAM * |
720 | X509_VERIFY_PARAM_get0(int id) | 720 | X509_VERIFY_PARAM_get0(int id) |
@@ -724,7 +724,7 @@ X509_VERIFY_PARAM_get0(int id) | |||
724 | return default_table + id; | 724 | return default_table + id; |
725 | return sk_X509_VERIFY_PARAM_value(param_table, id - num); | 725 | return sk_X509_VERIFY_PARAM_value(param_table, id - num); |
726 | } | 726 | } |
727 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get0) | 727 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get0); |
728 | 728 | ||
729 | const X509_VERIFY_PARAM * | 729 | const X509_VERIFY_PARAM * |
730 | X509_VERIFY_PARAM_lookup(const char *name) | 730 | X509_VERIFY_PARAM_lookup(const char *name) |
@@ -747,7 +747,7 @@ X509_VERIFY_PARAM_lookup(const char *name) | |||
747 | } | 747 | } |
748 | return NULL; | 748 | return NULL; |
749 | } | 749 | } |
750 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_lookup) | 750 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_lookup); |
751 | 751 | ||
752 | void | 752 | void |
753 | X509_VERIFY_PARAM_table_cleanup(void) | 753 | X509_VERIFY_PARAM_table_cleanup(void) |
@@ -757,4 +757,4 @@ X509_VERIFY_PARAM_table_cleanup(void) | |||
757 | X509_VERIFY_PARAM_free); | 757 | X509_VERIFY_PARAM_free); |
758 | param_table = NULL; | 758 | param_table = NULL; |
759 | } | 759 | } |
760 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_table_cleanup) | 760 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_table_cleanup); |