diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_vfy.h')
-rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/lib/libcrypto/x509/x509_vfy.h b/src/lib/libcrypto/x509/x509_vfy.h index 9e3c263a06..f5b103a0e7 100644 --- a/src/lib/libcrypto/x509/x509_vfy.h +++ b/src/lib/libcrypto/x509/x509_vfy.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_vfy.h,v 1.58 2023/03/10 16:44:07 tb Exp $ */ | 1 | /* $OpenBSD: x509_vfy.h,v 1.59 2023/04/16 08:21:12 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 | * |
@@ -416,8 +416,12 @@ X509_STORE_CTX_verify_fn X509_STORE_get_verify(X509_STORE *ctx); | |||
416 | #define X509_STORE_set_verify_func(ctx, func) \ | 416 | #define X509_STORE_set_verify_func(ctx, func) \ |
417 | X509_STORE_set_verify((ctx), (func)) | 417 | X509_STORE_set_verify((ctx), (func)) |
418 | 418 | ||
419 | /* Remove in next bump. */ | ||
420 | #if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) | ||
419 | X509_POLICY_TREE *X509_STORE_CTX_get0_policy_tree(X509_STORE_CTX *ctx); | 421 | X509_POLICY_TREE *X509_STORE_CTX_get0_policy_tree(X509_STORE_CTX *ctx); |
420 | int X509_STORE_CTX_get_explicit_policy(X509_STORE_CTX *ctx); | 422 | int X509_STORE_CTX_get_explicit_policy(X509_STORE_CTX *ctx); |
423 | #endif | ||
424 | |||
421 | int X509_STORE_CTX_get_num_untrusted(X509_STORE_CTX *ctx); | 425 | int X509_STORE_CTX_get_num_untrusted(X509_STORE_CTX *ctx); |
422 | 426 | ||
423 | X509_VERIFY_PARAM *X509_STORE_CTX_get0_param(X509_STORE_CTX *ctx); | 427 | X509_VERIFY_PARAM *X509_STORE_CTX_get0_param(X509_STORE_CTX *ctx); |
@@ -468,13 +472,21 @@ int X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param); | |||
468 | const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name); | 472 | const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name); |
469 | void X509_VERIFY_PARAM_table_cleanup(void); | 473 | void X509_VERIFY_PARAM_table_cleanup(void); |
470 | 474 | ||
475 | /* Move to x509_local.h in next bump - needed by x509_vfy.c. */ | ||
476 | #if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) | ||
471 | int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy, | 477 | int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy, |
472 | STACK_OF(X509) *certs, | 478 | STACK_OF(X509) *certs, |
473 | STACK_OF(ASN1_OBJECT) *policy_oids, | 479 | STACK_OF(ASN1_OBJECT) *policy_oids, |
474 | unsigned int flags); | 480 | unsigned int flags); |
475 | 481 | ||
476 | void X509_policy_tree_free(X509_POLICY_TREE *tree); | 482 | void X509_policy_tree_free(X509_POLICY_TREE *tree); |
483 | #endif | ||
477 | 484 | ||
485 | /* | ||
486 | * Move these to pcy_int.h in next bump - X509_policy_tree_get0_user_policies() | ||
487 | * is actually used, the rest can be deleted. | ||
488 | */ | ||
489 | #if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) | ||
478 | int X509_policy_tree_level_count(const X509_POLICY_TREE *tree); | 490 | int X509_policy_tree_level_count(const X509_POLICY_TREE *tree); |
479 | X509_POLICY_LEVEL * | 491 | X509_POLICY_LEVEL * |
480 | X509_policy_tree_get0_level(const X509_POLICY_TREE *tree, int i); | 492 | X509_policy_tree_get0_level(const X509_POLICY_TREE *tree, int i); |
@@ -496,8 +508,9 @@ STACK_OF(POLICYQUALINFO) * | |||
496 | const X509_POLICY_NODE * | 508 | const X509_POLICY_NODE * |
497 | X509_policy_node_get0_parent(const X509_POLICY_NODE *node); | 509 | X509_policy_node_get0_parent(const X509_POLICY_NODE *node); |
498 | 510 | ||
511 | #endif | ||
512 | |||
499 | #ifdef __cplusplus | 513 | #ifdef __cplusplus |
500 | } | 514 | } |
501 | #endif | 515 | #endif |
502 | #endif | 516 | #endif |
503 | |||