From c0a0c0dcc929c8d0cdce8d424696ead0efd140cf Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Wed, 10 Jan 2024 21:14:14 +0000
Subject: [PATCH] X509_TRUST: hoist trust_compat() to the other end of the file

---
 lib/libcrypto/x509/x509_trs.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/libcrypto/x509/x509_trs.c b/lib/libcrypto/x509/x509_trs.c
index f42c34b0874..c1191b40ed2 100644
--- a/lib/libcrypto/x509/x509_trs.c
+++ b/lib/libcrypto/x509/x509_trs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_trs.c,v 1.36 2024/01/10 21:11:37 tb Exp $ */
+/* $OpenBSD: x509_trs.c,v 1.37 2024/01/10 21:14:14 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -66,7 +66,16 @@
 
 static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags);
 static int trust_1oid(X509_TRUST *trust, X509 *x, int flags);
-static int trust_compat(X509_TRUST *trust, X509 *x, int flags);
+
+static int
+trust_compat(X509_TRUST *trust, X509 *x, int flags)
+{
+	X509_check_purpose(x, -1, 0);
+	if (x->ex_flags & EXFLAG_SS)
+		return X509_TRUST_TRUSTED;
+	else
+		return X509_TRUST_UNTRUSTED;
+}
 
 static int
 obj_trust(int id, X509 *x, int flags)
@@ -296,13 +305,3 @@ trust_1oid(X509_TRUST *trust, X509 *x, int flags)
 		return obj_trust(trust->arg1, x, flags);
 	return X509_TRUST_UNTRUSTED;
 }
-
-static int
-trust_compat(X509_TRUST *trust, X509 *x, int flags)
-{
-	X509_check_purpose(x, -1, 0);
-	if (x->ex_flags & EXFLAG_SS)
-		return X509_TRUST_TRUSTED;
-	else
-		return X509_TRUST_UNTRUSTED;
-}
-- 
2.20.1