From a8a136033476a0f4820d5b9c11b6dd56c8ababcd Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Sat, 2 Mar 2024 10:50:26 +0000
Subject: [PATCH] Remove X509_TRUST from the public API

With API and other users internal, this struct can now go.

ok jsing
---
 lib/libcrypto/x509/x509.h     | 13 +------------
 lib/libcrypto/x509/x509_trs.c | 11 ++++++++++-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib/libcrypto/x509/x509.h b/lib/libcrypto/x509/x509.h
index cd332a986b8..c89e8fc7579 100644
--- a/lib/libcrypto/x509/x509.h
+++ b/lib/libcrypto/x509/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.108 2024/03/02 10:49:03 tb Exp $ */
+/* $OpenBSD: x509.h,v 1.109 2024/03/02 10:50:26 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -155,17 +155,6 @@ typedef struct x509_cinf_st X509_CINF;
 
 DECLARE_STACK_OF(X509)
 
-/* This is used for a table of trust checking functions */
-
-typedef struct x509_trust_st {
-	int trust;
-	int flags;
-	int (*check_trust)(struct x509_trust_st *, X509 *, int);
-	char *name;
-	int arg1;
-	void *arg2;
-} X509_TRUST;
-
 /* standard trust ids */
 
 /* OpenSSL changed this to 0 */
diff --git a/lib/libcrypto/x509/x509_trs.c b/lib/libcrypto/x509/x509_trs.c
index 774ce584b83..2f4cbba387b 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.41 2024/03/02 10:48:17 tb Exp $ */
+/* $OpenBSD: x509_trs.c,v 1.42 2024/03/02 10:50:26 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -67,6 +67,15 @@
 #include "crypto_internal.h"
 #include "x509_local.h"
 
+typedef struct x509_trust_st {
+	int trust;
+	int flags;
+	int (*check_trust)(struct x509_trust_st *, X509 *, int);
+	char *name;
+	int arg1;
+	void *arg2;
+} X509_TRUST;
+
 static int
 obj_trust(int id, X509 *x, int flags)
 {
-- 
2.20.1