diff options
author | tb <> | 2023-12-23 00:52:13 +0000 |
---|---|---|
committer | tb <> | 2023-12-23 00:52:13 +0000 |
commit | 21a1e7fee905de67c806420e9a84b1ee36df6881 (patch) | |
tree | 4c4aa48c642e07afc2f43c478336398182dc5952 /src/lib | |
parent | 338acfd5428f3cca06dcc3bd4ced76779286fa72 (diff) | |
download | openbsd-21a1e7fee905de67c806420e9a84b1ee36df6881.tar.gz openbsd-21a1e7fee905de67c806420e9a84b1ee36df6881.tar.bz2 openbsd-21a1e7fee905de67c806420e9a84b1ee36df6881.zip |
Prefix get_trusted_issuer() with x509_vfy_
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c index b61162a56a..d9b68109cd 100644 --- a/src/lib/libcrypto/x509/x509_vfy.c +++ b/src/lib/libcrypto/x509/x509_vfy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_vfy.c,v 1.134 2023/12/22 13:46:37 tb Exp $ */ | 1 | /* $OpenBSD: x509_vfy.c,v 1.135 2023/12/23 00:52:13 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 | * |
@@ -143,7 +143,6 @@ static int X509_cmp_time_internal(const ASN1_TIME *ctm, time_t *cmp_time, | |||
143 | int clamp_notafter); | 143 | int clamp_notafter); |
144 | 144 | ||
145 | static int internal_verify(X509_STORE_CTX *ctx); | 145 | static int internal_verify(X509_STORE_CTX *ctx); |
146 | static int get_trusted_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x); | ||
147 | static int check_key_level(X509_STORE_CTX *ctx, X509 *cert); | 146 | static int check_key_level(X509_STORE_CTX *ctx, X509 *cert); |
148 | static int verify_cb_cert(X509_STORE_CTX *ctx, X509 *x, int depth, int err); | 147 | static int verify_cb_cert(X509_STORE_CTX *ctx, X509 *x, int depth, int err); |
149 | 148 | ||
@@ -690,7 +689,7 @@ check_issued(X509_STORE_CTX *ctx, X509 *subject, X509 *issuer) | |||
690 | /* Alternative lookup method: look from a STACK stored in ctx->trusted */ | 689 | /* Alternative lookup method: look from a STACK stored in ctx->trusted */ |
691 | 690 | ||
692 | static int | 691 | static int |
693 | get_trusted_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x) | 692 | x509_vfy_get_trusted_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x) |
694 | { | 693 | { |
695 | *issuer = find_issuer(ctx, ctx->trusted, x, 1); | 694 | *issuer = find_issuer(ctx, ctx->trusted, x, 1); |
696 | if (*issuer) { | 695 | if (*issuer) { |
@@ -2352,7 +2351,7 @@ void | |||
2352 | X509_STORE_CTX_set0_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *trusted) | 2351 | X509_STORE_CTX_set0_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *trusted) |
2353 | { | 2352 | { |
2354 | ctx->trusted = trusted; | 2353 | ctx->trusted = trusted; |
2355 | ctx->get_issuer = get_trusted_issuer; | 2354 | ctx->get_issuer = x509_vfy_get_trusted_issuer; |
2356 | } | 2355 | } |
2357 | LCRYPTO_ALIAS(X509_STORE_CTX_set0_trusted_stack); | 2356 | LCRYPTO_ALIAS(X509_STORE_CTX_set0_trusted_stack); |
2358 | 2357 | ||