diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_local.h')
-rw-r--r-- | src/lib/libcrypto/x509/x509_local.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/lib/libcrypto/x509/x509_local.h b/src/lib/libcrypto/x509/x509_local.h index 1aa66d2440..374cba3d58 100644 --- a/src/lib/libcrypto/x509/x509_local.h +++ b/src/lib/libcrypto/x509/x509_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_local.h,v 1.6 2023/04/26 19:11:33 beck Exp $ */ | 1 | /* $OpenBSD: x509_local.h,v 1.7 2023/04/28 16:30:14 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 2013. | 3 | * project 2013. |
4 | */ | 4 | */ |
@@ -69,13 +69,6 @@ __BEGIN_HIDDEN_DECLS | |||
69 | #define X509_CRL_HASH_EVP EVP_sha512() | 69 | #define X509_CRL_HASH_EVP EVP_sha512() |
70 | #define X509_CRL_HASH_LEN SHA512_DIGEST_LENGTH | 70 | #define X509_CRL_HASH_LEN SHA512_DIGEST_LENGTH |
71 | 71 | ||
72 | #ifndef LIBRESSL_HAS_POLICY_DAG | ||
73 | typedef struct X509_POLICY_NODE_st X509_POLICY_NODE; | ||
74 | typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL; | ||
75 | typedef struct X509_POLICY_TREE_st X509_POLICY_TREE; | ||
76 | typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE; | ||
77 | #endif | ||
78 | |||
79 | struct X509_pubkey_st { | 72 | struct X509_pubkey_st { |
80 | X509_ALGOR *algor; | 73 | X509_ALGOR *algor; |
81 | ASN1_BIT_STRING *public_key; | 74 | ASN1_BIT_STRING *public_key; |
@@ -178,9 +171,6 @@ struct x509_st { | |||
178 | unsigned long ex_nscert; | 171 | unsigned long ex_nscert; |
179 | ASN1_OCTET_STRING *skid; | 172 | ASN1_OCTET_STRING *skid; |
180 | AUTHORITY_KEYID *akid; | 173 | AUTHORITY_KEYID *akid; |
181 | #ifndef LIBRESSL_HAS_POLICY_DAG | ||
182 | X509_POLICY_CACHE *policy_cache; | ||
183 | #endif | ||
184 | STACK_OF(DIST_POINT) *crldp; | 174 | STACK_OF(DIST_POINT) *crldp; |
185 | STACK_OF(GENERAL_NAME) *altname; | 175 | STACK_OF(GENERAL_NAME) *altname; |
186 | NAME_CONSTRAINTS *nc; | 176 | NAME_CONSTRAINTS *nc; |
@@ -360,9 +350,6 @@ struct x509_store_ctx_st { | |||
360 | int valid; /* if 0, rebuild chain */ | 350 | int valid; /* if 0, rebuild chain */ |
361 | int num_untrusted; /* number of untrusted certs in chain */ | 351 | int num_untrusted; /* number of untrusted certs in chain */ |
362 | STACK_OF(X509) *chain; /* chain of X509s - built up and trusted */ | 352 | STACK_OF(X509) *chain; /* chain of X509s - built up and trusted */ |
363 | #ifndef LIBRESSL_HAS_POLICY_DAG | ||
364 | X509_POLICY_TREE *tree; /* Valid policy tree */ | ||
365 | #endif | ||
366 | 353 | ||
367 | int explicit_policy; /* Require explicit policy value */ | 354 | int explicit_policy; /* Require explicit policy value */ |
368 | 355 | ||
@@ -396,17 +383,9 @@ int x509_check_cert_time(X509_STORE_CTX *ctx, X509 *x, int quiet); | |||
396 | 383 | ||
397 | int name_cmp(const char *name, const char *cmp); | 384 | int name_cmp(const char *name, const char *cmp); |
398 | 385 | ||
399 | #ifdef LIBRESSL_HAS_POLICY_DAG | ||
400 | int X509_policy_check(const STACK_OF(X509) *certs, | 386 | int X509_policy_check(const STACK_OF(X509) *certs, |
401 | const STACK_OF(ASN1_OBJECT) *user_policies, unsigned long flags, | 387 | const STACK_OF(ASN1_OBJECT) *user_policies, unsigned long flags, |
402 | X509 **out_current_cert); | 388 | X509 **out_current_cert); |
403 | #else | ||
404 | int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy, | ||
405 | STACK_OF(X509) *certs, STACK_OF(ASN1_OBJECT) *policy_oids, | ||
406 | unsigned int flags); | ||
407 | |||
408 | void X509_policy_tree_free(X509_POLICY_TREE *tree); | ||
409 | #endif | ||
410 | 389 | ||
411 | __END_HIDDEN_DECLS | 390 | __END_HIDDEN_DECLS |
412 | 391 | ||