From d386392e79d59f0c5647b0d778348b72d7cd7069 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 3 Dec 2019 21:47:27 +0100
Subject: Package a patched openssl which creates certificates with a validity
 period starting a week before now; fixes #1422.

---
 src/lib/cross.cc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index dcd4ddfd8..8d82f7a51 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -300,9 +300,17 @@ openssl_path ()
 	boost::filesystem::path path = dir;
 	path /= "openssl.exe";
 	return path;
-#else
-	/* We assume that it's on the path for Linux and OS X */
-	return "openssl";
+#endif
+
+#ifdef DCPOMATIC_OSX
+	boost::filesystem::path path = app_contents();
+	path /= "MacOS";
+	path /= "openssl";
+	return path;
+#endif
+
+#ifdef DCPOMATIC_LINUX
+	return "dcpomatic2_openssl";
 #endif
 
 }
-- 
cgit v1.2.3