From 546fac75c026d32fb7fb87202c1b378520ab4c3e Mon Sep 17 00:00:00 2001 From: tb <> Date: Sun, 31 Oct 2021 08:27:15 +0000 Subject: Prepare regress for opaque structs in x509*.h --- src/regress/lib/libcrypto/x509/verify.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/regress/lib/libcrypto/x509/verify.c') diff --git a/src/regress/lib/libcrypto/x509/verify.c b/src/regress/lib/libcrypto/x509/verify.c index 3a3c9b0197..3b85280359 100644 --- a/src/regress/lib/libcrypto/x509/verify.c +++ b/src/regress/lib/libcrypto/x509/verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: verify.c,v 1.8 2021/09/30 18:28:38 jsing Exp $ */ +/* $OpenBSD: verify.c,v 1.9 2021/10/31 08:27:15 tb Exp $ */ /* * Copyright (c) 2020 Joel Sing * Copyright (c) 2020-2021 Bob Beck @@ -108,7 +108,6 @@ verify_cert(const char *roots_dir, const char *roots_file, X509_STORE_CTX *xsc = NULL; X509_STORE *store = NULL; int verify_err, use_dir; - unsigned long flags; X509 *leaf = NULL; *chains = 0; @@ -134,15 +133,11 @@ verify_cert(const char *roots_dir, const char *roots_file, if (!X509_STORE_load_locations(store, NULL, roots_dir)) errx(1, "failed to set by_dir directory of %s", roots_dir); } - if (mode == MODE_LEGACY_VFY) { - flags = X509_VERIFY_PARAM_get_flags(xsc->param); - flags |= X509_V_FLAG_LEGACY_VERIFY; - X509_VERIFY_PARAM_set_flags(xsc->param, flags); - } else { - flags = X509_VERIFY_PARAM_get_flags(xsc->param); - flags &= ~X509_V_FLAG_LEGACY_VERIFY; - X509_VERIFY_PARAM_set_flags(xsc->param, flags); - } + if (mode == MODE_LEGACY_VFY) + X509_STORE_CTX_set_flags(xsc, X509_V_FLAG_LEGACY_VERIFY); + else + X509_VERIFY_PARAM_clear_flags(X509_STORE_CTX_get0_param(xsc), + X509_V_FLAG_LEGACY_VERIFY); if (verbose) X509_STORE_CTX_set_verify_cb(xsc, verify_cert_cb); -- cgit v1.2.3-55-g6feb