diff options
author | beck <> | 2021-08-19 03:44:00 +0000 |
---|---|---|
committer | beck <> | 2021-08-19 03:44:00 +0000 |
commit | 252cbe4493634e4a70789ca96794482ba219de91 (patch) | |
tree | 1329511d1aa6b33cd3f48ec007990cdf78af765f /src/lib/libcrypto/x509/x509_vfy.c | |
parent | a5c89764af8f7a72f1c0ddb9d42ec39de836d700 (diff) | |
download | openbsd-252cbe4493634e4a70789ca96794482ba219de91.tar.gz openbsd-252cbe4493634e4a70789ca96794482ba219de91.tar.bz2 openbsd-252cbe4493634e4a70789ca96794482ba219de91.zip |
Pull roots out of the trust store in the legacy xsc when building chains
to handly by_dir and fun things correctly. - fixes dlg@'s case and
by_dir regress in openssl-ruby
ok jsing@
Diffstat (limited to 'src/lib/libcrypto/x509/x509_vfy.c')
-rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c index 9577040d9d..233c95c408 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.86 2021/02/25 17:29:22 tb Exp $ */ | 1 | /* $OpenBSD: x509_vfy.c,v 1.87 2021/08/19 03:44:00 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 | * |
@@ -942,6 +942,15 @@ lookup_cert_match(X509_STORE_CTX *ctx, X509 *x) | |||
942 | return xtmp; | 942 | return xtmp; |
943 | } | 943 | } |
944 | 944 | ||
945 | X509 * | ||
946 | x509_vfy_lookup_cert_match(X509_STORE_CTX *ctx, X509 *x) | ||
947 | { | ||
948 | if (ctx->lookup_certs == NULL || ctx->ctx == NULL || | ||
949 | ctx->ctx->objs == NULL) | ||
950 | return NULL; | ||
951 | return lookup_cert_match(ctx, x); | ||
952 | } | ||
953 | |||
945 | static int | 954 | static int |
946 | check_trust(X509_STORE_CTX *ctx) | 955 | check_trust(X509_STORE_CTX *ctx) |
947 | { | 956 | { |