Try to fix openssl use on Windows.

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 61ec8de5e07f3fae30830ab77d3fdf6b6585f19f..47b97baecc0816b96db472ea26864e355a4c5780 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -231,3 +231,22 @@ mount_info ()
 
        return m;
 }
+
+boost::filesystem::path
+openssl_path ()
+{
+#ifdef DCPOMATIC_WINDOWS
+
+       wchar_t dir[512];
+       GetModuleFileName (GetModuleHandle (0), dir, sizeof (dir));
+       PathRemoveFileSpec (dir);
+       
+       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
+
+}

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 58fa821c7276aba3a96fb0a8996b6f224ca3b2e2..c3bb20b47ba6fcb07f1425d1f2068d07ca2ceb2a 100644 (file)
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -29,3 +29,4 @@ void dcpomatic_sleep (int);
 extern std::string cpu_info ();
 extern void run_ffprobe (boost::filesystem::path, boost::filesystem::path, boost::shared_ptr<Log>);
 extern std::list<std::pair<std::string, std::string> > mount_info ();
+extern boost::filesystem::path openssl_path ();

diff --git a/src/lib/util.cc b/src/lib/util.cc
index ae3de2d6b1e68b1ef5a31022bd62f17cc262420a..e0495f18b495e5e16eb0e828e8318f765d455aa9 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -65,6 +65,7 @@ extern "C" {
 #include "config.h"
 #include "ratio.h"
 #include "job.h"
+#include "cross.h"
 #ifdef DCPOMATIC_WINDOWS
 #include "stack.hpp"
 #endif
@@ -824,7 +825,7 @@ make_signer ()
 {
        boost::filesystem::path const sd = Config::instance()->signer_chain_directory ();
        if (boost::filesystem::is_empty (sd)) {
-               libdcp::make_signer_chain (sd);
+               libdcp::make_signer_chain (sd, openssl_path ());
        }
 
        libdcp::CertificateChain chain;