From b2b19236004c1c5a3baf0622074a3ddf7dbc7d69 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Wed, 5 Jul 2023 13:37:32 -0600 Subject: Add hidden/openssl/chacha.h --- crypto/Makefile.am | 1 + patches/libcrypto.hidden.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 258da67..811946a 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -721,6 +721,7 @@ noinst_HEADERS += gost/gost_local.h # hidden noinst_HEADERS += hidden/crypto_namespace.h +noinst_HEADERS += hidden/openssl/chacha.h noinst_HEADERS += hidden/openssl/hmac.h noinst_HEADERS += hidden/openssl/pkcs12.h noinst_HEADERS += hidden/openssl/pkcs7.h diff --git a/patches/libcrypto.hidden.patch b/patches/libcrypto.hidden.patch index f29ce83..f786576 100644 --- a/patches/libcrypto.hidden.patch +++ b/patches/libcrypto.hidden.patch @@ -118,3 +118,17 @@ diff -u openbsd/src/lib/libcrypto/hidden/openssl/x509_vfy.h crypto/hidden/openss #include "crypto_namespace.h" LCRYPTO_USED(X509_STORE_set_depth); +--- crypto/hidden/openssl/chacha.h.orig Wed Jul 5 13:42:44 2023 ++++ crypto/hidden/openssl/chacha.h Wed Jul 5 13:44:17 2023 +@@ -18,7 +18,11 @@ + #ifndef _LIBCRYPTO_CHACHA_H + #define _LIBCRYPTO_CHACHA_H + ++#ifdef _MSC_VER ++#include <../include/openssl/chacha.h> ++#else + #include_next ++#endif + #include "crypto_namespace.h" + + LCRYPTO_USED(ChaCha_set_key); -- cgit v1.2.3-55-g6feb