From 39d2b79efbddcf036d7af1b6e392dc534fc581c7 Mon Sep 17 00:00:00 2001
From: bcook <bcook@openbsd.org>
Date: Wed, 5 Jul 2023 21:14:54 +0000
Subject: [PATCH] upstream hidden file #include_next workaround for MS C
 compilers

ok beck@, tb@
---
 lib/libcrypto/hidden/openssl/chacha.h   | 6 +++++-
 lib/libcrypto/hidden/openssl/hmac.h     | 6 +++++-
 lib/libcrypto/hidden/openssl/pkcs12.h   | 6 +++++-
 lib/libcrypto/hidden/openssl/pkcs7.h    | 6 +++++-
 lib/libcrypto/hidden/openssl/stack.h    | 6 +++++-
 lib/libcrypto/hidden/openssl/ui.h       | 6 +++++-
 lib/libcrypto/hidden/openssl/x509.h     | 6 +++++-
 lib/libcrypto/hidden/openssl/x509_vfy.h | 6 +++++-
 lib/libcrypto/hidden/openssl/x509v3.h   | 6 +++++-
 lib/libssl/hidden/openssl/ssl.h         | 6 +++++-
 10 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/lib/libcrypto/hidden/openssl/chacha.h b/lib/libcrypto/hidden/openssl/chacha.h
index 7b2f50baef2..98108261ceb 100644
--- a/lib/libcrypto/hidden/openssl/chacha.h
+++ b/lib/libcrypto/hidden/openssl/chacha.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: chacha.h,v 1.1 2023/07/05 16:17:20 beck Exp $ */
+/* $OpenBSD: chacha.h,v 1.2 2023/07/05 21:14:54 bcook Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -18,7 +18,11 @@
 #ifndef _LIBCRYPTO_CHACHA_H
 #define _LIBCRYPTO_CHACHA_H
 
+#ifndef _MSC_VER
 #include_next <openssl/chacha.h>
+#else
+#include "../include/openssl/chacha.h"
+#endif
 #include "crypto_namespace.h"
 
 LCRYPTO_USED(ChaCha_set_key);
diff --git a/lib/libcrypto/hidden/openssl/hmac.h b/lib/libcrypto/hidden/openssl/hmac.h
index d8370945d05..ecf8aa99972 100644
--- a/lib/libcrypto/hidden/openssl/hmac.h
+++ b/lib/libcrypto/hidden/openssl/hmac.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hmac.h,v 1.1 2022/11/11 11:25:18 beck Exp $	*/
+/*	$OpenBSD: hmac.h,v 1.2 2023/07/05 21:14:54 bcook Exp $	*/
 /*
  * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org>
  *
@@ -18,7 +18,11 @@
 #ifndef _LIBCRYPTO_HMAC_H_
 #define _LIBCRYPTO_HMAC_H_
 
+#ifndef _MSC_VER
 #include_next <openssl/hmac.h>
+#else
+#include "../include/openssl/hmac.h"
+#endif
 #include "crypto_namespace.h"
 
 LCRYPTO_USED(HMAC_CTX_new);
diff --git a/lib/libcrypto/hidden/openssl/pkcs12.h b/lib/libcrypto/hidden/openssl/pkcs12.h
index c5f1f247227..9a2dffa3549 100644
--- a/lib/libcrypto/hidden/openssl/pkcs12.h
+++ b/lib/libcrypto/hidden/openssl/pkcs12.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs12.h,v 1.1 2022/11/12 13:03:28 beck Exp $ */
+/* $OpenBSD: pkcs12.h,v 1.2 2023/07/05 21:14:54 bcook Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -18,7 +18,11 @@
 #ifndef _LIBCRYPTO_PKCS12_H
 #define _LIBCRYPTO_PKCS12_H
 
+#ifndef _MSC_VER
 #include_next <openssl/pkcs12.h>
+#else
+#include "../include/openssl/pkcs12.h"
+#endif
 #include "crypto_namespace.h"
 
 LCRYPTO_USED(PKCS12_SAFEBAG_get0_attr);
diff --git a/lib/libcrypto/hidden/openssl/pkcs7.h b/lib/libcrypto/hidden/openssl/pkcs7.h
index cbee6c08877..f12b5df1787 100644
--- a/lib/libcrypto/hidden/openssl/pkcs7.h
+++ b/lib/libcrypto/hidden/openssl/pkcs7.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs7.h,v 1.2 2023/04/25 18:13:25 tb Exp $ */
+/* $OpenBSD: pkcs7.h,v 1.3 2023/07/05 21:14:54 bcook Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -18,7 +18,11 @@
 #ifndef _LIBCRYPTO_PKCS7_H
 #define _LIBCRYPTO_PKCS7_H
 
+#ifndef _MSC_VER
 #include_next <openssl/pkcs7.h>
+#else
+#include "../include/openssl/pkcs7.h"
+#endif
 #include "crypto_namespace.h"
 
 LCRYPTO_USED(PKCS7_ISSUER_AND_SERIAL_new);
diff --git a/lib/libcrypto/hidden/openssl/stack.h b/lib/libcrypto/hidden/openssl/stack.h
index 671735436fc..38bb02e8690 100644
--- a/lib/libcrypto/hidden/openssl/stack.h
+++ b/lib/libcrypto/hidden/openssl/stack.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stack.h,v 1.1 2022/11/11 19:18:55 beck Exp $ */
+/* $OpenBSD: stack.h,v 1.2 2023/07/05 21:14:54 bcook Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -18,7 +18,11 @@
 #ifndef _LIBCRYPTO_STACK_H
 #define _LIBCRYPTO_STACK_H
 
+#ifndef _MSC_VER
 #include_next <openssl/stack.h>
+#else
+#include "../include/openssl/stack.h"
+#endif
 #include "crypto_namespace.h"
 
 LCRYPTO_USED(sk_num);
diff --git a/lib/libcrypto/hidden/openssl/ui.h b/lib/libcrypto/hidden/openssl/ui.h
index 812714aa98c..f6c749f7b25 100644
--- a/lib/libcrypto/hidden/openssl/ui.h
+++ b/lib/libcrypto/hidden/openssl/ui.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui.h,v 1.2 2022/12/17 21:59:39 tb Exp $ */
+/* $OpenBSD: ui.h,v 1.3 2023/07/05 21:14:54 bcook Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -18,7 +18,11 @@
 #ifndef _LIBCRYPTO_UI_H
 #define _LIBCRYPTO_UI_H
 
+#ifndef _MSC_VER
 #include_next <openssl/ui.h>
+#else
+#include "../include/openssl/ui.h"
+#endif
 #include "crypto_namespace.h"
 
 LCRYPTO_USED(UI_new);
diff --git a/lib/libcrypto/hidden/openssl/x509.h b/lib/libcrypto/hidden/openssl/x509.h
index cdd09b40622..13bd5b533b1 100644
--- a/lib/libcrypto/hidden/openssl/x509.h
+++ b/lib/libcrypto/hidden/openssl/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.2 2023/02/23 18:12:32 job Exp $ */
+/* $OpenBSD: x509.h,v 1.3 2023/07/05 21:14:54 bcook Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -18,7 +18,11 @@
 #ifndef _LIBCRYPTO_X509_H
 #define _LIBCRYPTO_X509_H
 
+#ifndef _MSC_VER
 #include_next <openssl/x509.h>
+#else
+#include "../include/openssl/x509.h"
+#endif
 #include "crypto_namespace.h"
 
 LCRYPTO_USED(X509_CRL_up_ref);
diff --git a/lib/libcrypto/hidden/openssl/x509_vfy.h b/lib/libcrypto/hidden/openssl/x509_vfy.h
index ee008b097a6..b5f2ac1a853 100644
--- a/lib/libcrypto/hidden/openssl/x509_vfy.h
+++ b/lib/libcrypto/hidden/openssl/x509_vfy.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_vfy.h,v 1.5 2023/07/03 11:43:15 tobhe Exp $ */
+/* $OpenBSD: x509_vfy.h,v 1.6 2023/07/05 21:14:54 bcook Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -18,7 +18,11 @@
 #ifndef _LIBCRYPTO_X509_VFY_H
 #define _LIBCRYPTO_X509_VFY_H
 
+#ifndef _MSC_VER
 #include_next <openssl/x509_vfy.h>
+#else
+#include "../include/openssl/x509_vfy.h"
+#endif
 #include "crypto_namespace.h"
 
 LCRYPTO_USED(X509_STORE_set_depth);
diff --git a/lib/libcrypto/hidden/openssl/x509v3.h b/lib/libcrypto/hidden/openssl/x509v3.h
index 24aa1f22f65..a85c5c26aa2 100644
--- a/lib/libcrypto/hidden/openssl/x509v3.h
+++ b/lib/libcrypto/hidden/openssl/x509v3.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509v3.h,v 1.4 2023/04/30 19:31:05 tb Exp $ */
+/* $OpenBSD: x509v3.h,v 1.5 2023/07/05 21:14:54 bcook Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -18,7 +18,11 @@
 #ifndef _LIBCRYPTO_X509V3_H
 #define _LIBCRYPTO_X509V3_H
 
+#ifndef _MSC_VER
 #include_next <openssl/x509v3.h>
+#else
+#include "../include/openssl/x509v3.h"
+#endif
 #include "crypto_namespace.h"
 
 LCRYPTO_USED(BASIC_CONSTRAINTS_new);
diff --git a/lib/libssl/hidden/openssl/ssl.h b/lib/libssl/hidden/openssl/ssl.h
index 540c6e76527..3bd2eed748f 100644
--- a/lib/libssl/hidden/openssl/ssl.h
+++ b/lib/libssl/hidden/openssl/ssl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssl.h,v 1.1 2022/11/11 11:25:18 beck Exp $	*/
+/*	$OpenBSD: ssl.h,v 1.2 2023/07/05 21:14:54 bcook Exp $	*/
 /*
  * Copyright (c) 2022 Philip Guenther <guenther@openbsd.org>
  *
@@ -18,7 +18,11 @@
 #ifndef _LIBSSL_SSL_H_
 #define _LIBSSL_SSL_H_
 
+#ifndef _MSC_VER
 #include_next <openssl/ssl.h>
+#else
+#include "../include/openssl/ssl.h"
+#endif
 #include "ssl_namespace.h"
 
 LSSL_USED(BIO_f_ssl);
-- 
2.20.1