From 1bc9781ddefe01ace97e3ef8397f822d8296a1d9 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Sat, 19 Oct 2024 14:45:41 +0100
Subject: [PATCH] openssl: only include necessary headers

Avoid #include'ing the openssl_dynamic.h headers, which allows a user to
exclude them from their source tree, in case they have odd license
requirements.
---
 src/libgit2/streams/openssl.c        |  2 --
 src/libgit2/streams/openssl.h        | 10 ++++++++--
 src/libgit2/streams/openssl_legacy.h |  4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/libgit2/streams/openssl.c b/src/libgit2/streams/openssl.c
index f531d1bc8..b19a10ae0 100644
--- a/src/libgit2/streams/openssl.c
+++ b/src/libgit2/streams/openssl.c
@@ -6,8 +6,6 @@
  */
 
 #include "streams/openssl.h"
-#include "streams/openssl_legacy.h"
-#include "streams/openssl_dynamic.h"
 
 #ifdef GIT_OPENSSL
 
diff --git a/src/libgit2/streams/openssl.h b/src/libgit2/streams/openssl.h
index a3ef1a933..06bbca62c 100644
--- a/src/libgit2/streams/openssl.h
+++ b/src/libgit2/streams/openssl.h
@@ -8,8 +8,14 @@
 #define INCLUDE_streams_openssl_h__
 
 #include "common.h"
-#include "streams/openssl_legacy.h"
-#include "streams/openssl_dynamic.h"
+
+#if defined(GIT_OPENSSL_LEGACY)
+# include "streams/openssl_legacy.h"
+#endif
+
+#if defined(GIT_OPENSSL_DYNAMIC)
+# include "streams/openssl_dynamic.h"
+#endif
 
 #include "git2/sys/stream.h"
 
diff --git a/src/libgit2/streams/openssl_legacy.h b/src/libgit2/streams/openssl_legacy.h
index e6dae9572..9dfe720d9 100644
--- a/src/libgit2/streams/openssl_legacy.h
+++ b/src/libgit2/streams/openssl_legacy.h
@@ -7,7 +7,9 @@
 #ifndef INCLUDE_streams_openssl_legacy_h__
 #define INCLUDE_streams_openssl_legacy_h__
 
-#include "streams/openssl_dynamic.h"
+#ifdef GIT_OPENSSL_DYNAMIC
+# include "streams/openssl_dynamic.h"
+#endif
 
 #if defined(GIT_OPENSSL) && !defined(GIT_OPENSSL_DYNAMIC)
 # include <openssl/ssl.h>