diff options
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
-rw-r--r-- | src/lib/libssl/ssl_cert.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index 8a333b4278..a288050269 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_cert.c,v 1.106 2023/05/26 13:44:05 tb Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.107 2023/07/08 16:40:13 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 | * |
@@ -157,6 +157,7 @@ SSL_get_ex_data_X509_STORE_CTX_idx(void) | |||
157 | 157 | ||
158 | return ssl_x509_store_ctx_idx; | 158 | return ssl_x509_store_ctx_idx; |
159 | } | 159 | } |
160 | LSSL_ALIAS(SSL_get_ex_data_X509_STORE_CTX_idx); | ||
160 | 161 | ||
161 | SSL_CERT * | 162 | SSL_CERT * |
162 | ssl_cert_new(void) | 163 | ssl_cert_new(void) |
@@ -487,24 +488,28 @@ SSL_dup_CA_list(const STACK_OF(X509_NAME) *sk) | |||
487 | sk_X509_NAME_pop_free(ret, X509_NAME_free); | 488 | sk_X509_NAME_pop_free(ret, X509_NAME_free); |
488 | return NULL; | 489 | return NULL; |
489 | } | 490 | } |
491 | LSSL_ALIAS(SSL_dup_CA_list); | ||
490 | 492 | ||
491 | void | 493 | void |
492 | SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list) | 494 | SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list) |
493 | { | 495 | { |
494 | set_client_CA_list(&(s->client_CA), name_list); | 496 | set_client_CA_list(&(s->client_CA), name_list); |
495 | } | 497 | } |
498 | LSSL_ALIAS(SSL_set_client_CA_list); | ||
496 | 499 | ||
497 | void | 500 | void |
498 | SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list) | 501 | SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list) |
499 | { | 502 | { |
500 | set_client_CA_list(&(ctx->client_CA), name_list); | 503 | set_client_CA_list(&(ctx->client_CA), name_list); |
501 | } | 504 | } |
505 | LSSL_ALIAS(SSL_CTX_set_client_CA_list); | ||
502 | 506 | ||
503 | STACK_OF(X509_NAME) * | 507 | STACK_OF(X509_NAME) * |
504 | SSL_CTX_get_client_CA_list(const SSL_CTX *ctx) | 508 | SSL_CTX_get_client_CA_list(const SSL_CTX *ctx) |
505 | { | 509 | { |
506 | return (ctx->client_CA); | 510 | return (ctx->client_CA); |
507 | } | 511 | } |
512 | LSSL_ALIAS(SSL_CTX_get_client_CA_list); | ||
508 | 513 | ||
509 | STACK_OF(X509_NAME) * | 514 | STACK_OF(X509_NAME) * |
510 | SSL_get_client_CA_list(const SSL *s) | 515 | SSL_get_client_CA_list(const SSL *s) |
@@ -522,6 +527,7 @@ SSL_get_client_CA_list(const SSL *s) | |||
522 | return (s->ctx->client_CA); | 527 | return (s->ctx->client_CA); |
523 | } | 528 | } |
524 | } | 529 | } |
530 | LSSL_ALIAS(SSL_get_client_CA_list); | ||
525 | 531 | ||
526 | static int | 532 | static int |
527 | add_client_CA(STACK_OF(X509_NAME) **sk, X509 *x) | 533 | add_client_CA(STACK_OF(X509_NAME) **sk, X509 *x) |
@@ -548,12 +554,14 @@ SSL_add_client_CA(SSL *ssl, X509 *x) | |||
548 | { | 554 | { |
549 | return (add_client_CA(&(ssl->client_CA), x)); | 555 | return (add_client_CA(&(ssl->client_CA), x)); |
550 | } | 556 | } |
557 | LSSL_ALIAS(SSL_add_client_CA); | ||
551 | 558 | ||
552 | int | 559 | int |
553 | SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x) | 560 | SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x) |
554 | { | 561 | { |
555 | return (add_client_CA(&(ctx->client_CA), x)); | 562 | return (add_client_CA(&(ctx->client_CA), x)); |
556 | } | 563 | } |
564 | LSSL_ALIAS(SSL_CTX_add_client_CA); | ||
557 | 565 | ||
558 | static int | 566 | static int |
559 | xname_cmp(const X509_NAME * const *a, const X509_NAME * const *b) | 567 | xname_cmp(const X509_NAME * const *a, const X509_NAME * const *b) |
@@ -628,6 +636,7 @@ SSL_load_client_CA_file(const char *file) | |||
628 | 636 | ||
629 | return (ret); | 637 | return (ret); |
630 | } | 638 | } |
639 | LSSL_ALIAS(SSL_load_client_CA_file); | ||
631 | 640 | ||
632 | /*! | 641 | /*! |
633 | * Add a file of certs to a stack. | 642 | * Add a file of certs to a stack. |
@@ -688,6 +697,7 @@ SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, | |||
688 | 697 | ||
689 | return ret; | 698 | return ret; |
690 | } | 699 | } |
700 | LSSL_ALIAS(SSL_add_file_cert_subjects_to_stack); | ||
691 | 701 | ||
692 | /*! | 702 | /*! |
693 | * Add a directory of certs to a stack. | 703 | * Add a directory of certs to a stack. |
@@ -728,3 +738,4 @@ SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, const char *dir) | |||
728 | } | 738 | } |
729 | return ret; | 739 | return ret; |
730 | } | 740 | } |
741 | LSSL_ALIAS(SSL_add_dir_cert_subjects_to_stack); | ||