From abffca736d5ed1aaca940a97ae97979bc46699f8 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Mon, 16 Nov 2020 17:43:37 +0000 Subject: Use X509_V_OK instead of 0. ok beck@ tb@ --- src/lib/libcrypto/x509/x509_verify.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/libcrypto/x509/x509_verify.c b/src/lib/libcrypto/x509/x509_verify.c index 39f86d383e..763adda227 100644 --- a/src/lib/libcrypto/x509/x509_verify.c +++ b/src/lib/libcrypto/x509/x509_verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_verify.c,v 1.21 2020/11/16 17:42:35 jsing Exp $ */ +/* $OpenBSD: x509_verify.c,v 1.22 2020/11/16 17:43:37 jsing Exp $ */ /* * Copyright (c) 2020 Bob Beck <beck@openbsd.org> * @@ -1002,11 +1002,10 @@ x509_verify(struct x509_verify_ctx *ctx, X509 *leaf, char *name) * We could not find a validated chain, and for some reason do not * have an error set. */ - if (ctx->chains_count == 0 && ctx->error == 0) { + if (ctx->chains_count == 0 && ctx->error == X509_V_OK) { ctx->error = X509_V_ERR_UNSPECIFIED; - if (ctx->xsc != NULL && ctx->xsc->error != 0) + if (ctx->xsc != NULL && ctx->xsc->error != X509_V_OK) ctx->error = ctx->xsc->error; - } /* Clear whatever errors happened if we have any validated chain */ -- cgit v1.2.3-55-g6feb