diff options
| author | beck <> | 2021-08-28 15:22:42 +0000 |
|---|---|---|
| committer | beck <> | 2021-08-28 15:22:42 +0000 |
| commit | 480921b20b6041e9bc8c752904c958b63cb91b33 (patch) | |
| tree | 2657c3b4dc8dbc196f3586c32eae2e989ba7d569 /src/lib/libcrypto/x509/x509_internal.h | |
| parent | 9a67589bb5e17849587c80865d013e5d534c653d (diff) | |
| download | openbsd-480921b20b6041e9bc8c752904c958b63cb91b33.tar.gz openbsd-480921b20b6041e9bc8c752904c958b63cb91b33.tar.bz2 openbsd-480921b20b6041e9bc8c752904c958b63cb91b33.zip | |
Get rid of historical code to extract the roots in the legacy case.
Due to the need to support by_dir, we use the get_issuer stuff when running
in x509_vfy compatibility mode amyway - so just use it any time we are
doing that. Removes a bunch of yukky stuff and a "Don't Look Ethel"
ok tb@ jsing@
Diffstat (limited to 'src/lib/libcrypto/x509/x509_internal.h')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_internal.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/x509/x509_internal.h b/src/lib/libcrypto/x509/x509_internal.h index f6ce78346e..7d3250d063 100644 --- a/src/lib/libcrypto/x509/x509_internal.h +++ b/src/lib/libcrypto/x509/x509_internal.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_internal.h,v 1.10 2021/08/28 07:49:00 beck Exp $ */ | 1 | /* $OpenBSD: x509_internal.h,v 1.11 2021/08/28 15:22:42 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> |
| 4 | * | 4 | * |
| @@ -96,8 +96,7 @@ X509 *x509_vfy_lookup_cert_match(X509_STORE_CTX *ctx, X509 *x); | |||
| 96 | int x509_verify_asn1_time_to_tm(const ASN1_TIME *atime, struct tm *tm, | 96 | int x509_verify_asn1_time_to_tm(const ASN1_TIME *atime, struct tm *tm, |
| 97 | int notafter); | 97 | int notafter); |
| 98 | 98 | ||
| 99 | struct x509_verify_ctx *x509_verify_ctx_new_from_xsc(X509_STORE_CTX *xsc, | 99 | struct x509_verify_ctx *x509_verify_ctx_new_from_xsc(X509_STORE_CTX *xsc); |
| 100 | STACK_OF(X509) *roots); | ||
| 101 | 100 | ||
| 102 | void x509_constraints_name_clear(struct x509_constraints_name *name); | 101 | void x509_constraints_name_clear(struct x509_constraints_name *name); |
| 103 | int x509_constraints_names_add(struct x509_constraints_names *names, | 102 | int x509_constraints_names_add(struct x509_constraints_names *names, |
