summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-12-03 21:47:27 +0100
committerCarl Hetherington <cth@carlh.net>2019-12-04 22:49:40 +0100
commitd386392e79d59f0c5647b0d778348b72d7cd7069 (patch)
treef44c52ffbee819924114592e00c91b73b09347c8 /src/lib
parentb2743153dde1355d13d9c3ab3a7e85cd76ea61f7 (diff)
Package a patched openssl which creates certificates with
a validity period starting a week before now; fixes #1422.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/cross.cc14
1 files changed, 11 insertions, 3 deletions
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
}