From: tb <tb@openbsd.org>
Date: Sun, 16 Apr 2023 18:42:30 +0000 (+0000)
Subject: Move X509_VERIFY_PARAM_st from vpm_int.h to x509_local.h
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a02f008bcd964d96aae24fbe8e94e1e754399a6b;p=openbsd

Move X509_VERIFY_PARAM_st from vpm_int.h to x509_local.h
---

diff --git a/lib/libcrypto/x509/vpm_int.h b/lib/libcrypto/x509/vpm_int.h
index 7fc9fef761b..d50c5e46fd9 100644
--- a/lib/libcrypto/x509/vpm_int.h
+++ b/lib/libcrypto/x509/vpm_int.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vpm_int.h,v 1.4 2018/04/06 07:08:20 beck Exp $ */
+/* $OpenBSD: vpm_int.h,v 1.5 2023/04/16 18:42:30 tb Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 2013.
@@ -61,15 +61,4 @@ __BEGIN_HIDDEN_DECLS
 
 /* internal only structure to hold additional X509_VERIFY_PARAM data */
 
-struct X509_VERIFY_PARAM_ID_st {
-	STACK_OF(OPENSSL_STRING) *hosts; /* Set of acceptable names */
-	unsigned int hostflags;     /* Flags to control matching features */
-	char *peername;             /* Matching hostname in peer certificate */
-	char *email;                /* If not NULL email address to match */
-	size_t emaillen;
-	unsigned char *ip;          /* If not NULL IP address to match */
-	size_t iplen;               /* Length of IP address */
-	int poisoned;
-};
-
 __END_HIDDEN_DECLS
diff --git a/lib/libcrypto/x509/x509_local.h b/lib/libcrypto/x509/x509_local.h
index 6792a3c5b81..043fc2dacf2 100644
--- a/lib/libcrypto/x509/x509_local.h
+++ b/lib/libcrypto/x509/x509_local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: x509_local.h,v 1.3 2023/04/16 08:08:34 tb Exp $ */
+/*	$OpenBSD: x509_local.h,v 1.4 2023/04/16 18:42:30 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2013.
  */
@@ -370,6 +370,17 @@ struct x509_store_ctx_st {
 	CRYPTO_EX_DATA ex_data;
 } /* X509_STORE_CTX */;
 
+struct X509_VERIFY_PARAM_ID_st {
+	STACK_OF(OPENSSL_STRING) *hosts; /* Set of acceptable names */
+	unsigned int hostflags;     /* Flags to control matching features */
+	char *peername;             /* Matching hostname in peer certificate */
+	char *email;                /* If not NULL email address to match */
+	size_t emaillen;
+	unsigned char *ip;          /* If not NULL IP address to match */
+	size_t iplen;               /* Length of IP address */
+	int poisoned;
+};
+
 int x509_check_cert_time(X509_STORE_CTX *ctx, X509 *x, int quiet);
 
 int name_cmp(const char *name, const char *cmp);