From 29ea0b8ea69a13ce040f97327035f2714b055f71 Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 22 Dec 2023 13:36:20 +0000 Subject: [PATCH] Replace check_id() with its x509_vfy_check_id() wrapper --- lib/libcrypto/x509/x509_vfy.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/libcrypto/x509/x509_vfy.c b/lib/libcrypto/x509/x509_vfy.c index fb6c4167c10..ba5f92c87b7 100644 --- a/lib/libcrypto/x509/x509_vfy.c +++ b/lib/libcrypto/x509/x509_vfy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_vfy.c,v 1.130 2023/12/22 13:31:35 tb Exp $ */ +/* $OpenBSD: x509_vfy.c,v 1.131 2023/12/22 13:36:20 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -196,8 +196,8 @@ check_hosts(X509 *x, X509_VERIFY_PARAM *vpm) return n == 0; } -static int -check_id(X509_STORE_CTX *ctx) +int +x509_vfy_check_id(X509_STORE_CTX *ctx) { X509_VERIFY_PARAM *vpm = ctx->param; X509 *x = ctx->cert; @@ -218,11 +218,6 @@ check_id(X509_STORE_CTX *ctx) return 1; } -int -x509_vfy_check_id(X509_STORE_CTX *ctx) { - return check_id(ctx); -} - /* * This is the effectively broken legacy OpenSSL chain builder. It * might find an unvalidated chain and leave it sitting in @@ -557,7 +552,7 @@ X509_verify_cert_legacy(X509_STORE_CTX *ctx) goto end; #endif - ok = check_id(ctx); + ok = x509_vfy_check_id(ctx); if (!ok) goto end; -- 2.20.1