From f45080b311e62cff0f807aad3dda9ff2a99085cb Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Sat, 28 Jan 2023 19:12:20 +0000
Subject: [PATCH] Switch regress to using x509_verify.h from libcrypto instead
 of the one in /usr/include/openssl.

---
 regress/lib/libcrypto/x509/callback.c         | 5 +++--
 regress/lib/libcrypto/x509/callbackfailures.c | 5 +++--
 regress/lib/libcrypto/x509/expirecallback.c   | 5 +++--
 regress/lib/libcrypto/x509/verify.c           | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/regress/lib/libcrypto/x509/callback.c b/regress/lib/libcrypto/x509/callback.c
index b2531fe8192..a01ffd5d6f2 100644
--- a/regress/lib/libcrypto/x509/callback.c
+++ b/regress/lib/libcrypto/x509/callback.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: callback.c,v 1.3 2021/10/31 08:27:15 tb Exp $ */
+/* $OpenBSD: callback.c,v 1.4 2023/01/28 19:12:20 tb Exp $ */
 /*
  * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -24,7 +24,8 @@
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include <openssl/x509_verify.h>
+
+#include "x509_verify.h"
 
 #define MODE_MODERN_VFY		0
 #define MODE_MODERN_VFY_DIR	1
diff --git a/regress/lib/libcrypto/x509/callbackfailures.c b/regress/lib/libcrypto/x509/callbackfailures.c
index f714adffff8..53570e15325 100644
--- a/regress/lib/libcrypto/x509/callbackfailures.c
+++ b/regress/lib/libcrypto/x509/callbackfailures.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: callbackfailures.c,v 1.1 2022/06/28 07:56:34 beck Exp $ */
+/* $OpenBSD: callbackfailures.c,v 1.2 2023/01/28 19:12:20 tb Exp $ */
 /*
  * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -24,7 +24,8 @@
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include <openssl/x509_verify.h>
+
+#include "x509_verify.h"
 
 #define MODE_MODERN_VFY		0
 #define MODE_MODERN_VFY_DIR	1
diff --git a/regress/lib/libcrypto/x509/expirecallback.c b/regress/lib/libcrypto/x509/expirecallback.c
index f7dcff8e94c..88cef6fd019 100644
--- a/regress/lib/libcrypto/x509/expirecallback.c
+++ b/regress/lib/libcrypto/x509/expirecallback.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expirecallback.c,v 1.2 2022/10/17 18:44:36 jsing Exp $ */
+/* $OpenBSD: expirecallback.c,v 1.3 2023/01/28 19:12:20 tb Exp $ */
 /*
  * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -24,7 +24,8 @@
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include <openssl/x509_verify.h>
+
+#include "x509_verify.h"
 
 #define MODE_MODERN_VFY		0
 #define MODE_MODERN_VFY_DIR	1
diff --git a/regress/lib/libcrypto/x509/verify.c b/regress/lib/libcrypto/x509/verify.c
index 93a6e43c515..e49180f7f19 100644
--- a/regress/lib/libcrypto/x509/verify.c
+++ b/regress/lib/libcrypto/x509/verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: verify.c,v 1.10 2022/10/17 18:36:52 jsing Exp $ */
+/* $OpenBSD: verify.c,v 1.11 2023/01/28 19:12:20 tb Exp $ */
 /*
  * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -25,7 +25,8 @@
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include <openssl/x509_verify.h>
+
+#include "x509_verify.h"
 
 #define MODE_MODERN_VFY		0
 #define MODE_MODERN_VFY_DIR	1
-- 
2.20.1