From 9d171d4ad05975716b751cb2faaa795daeb02173 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Sat, 7 Mar 2015 12:03:56 -0800 Subject: [PATCH] Disable OpenSSL by default A while back, we found that using OpenSSL's SHA-1 implementation rather than our usual one resulted in a significant speedup of maketx. I've done some retimings, now that a lot else has changed about maketx's internals (including adopting the practice of hashing blocks of scanlines, making it amenable to multithreading), and found that the speedup we get by using OpenSLL's SHA-1 is barely measurable. The minuscule speedup doesn't seem worth the trouble of imposing OpenSSL as a dependency. In light of this, I propose this patch to change the default to using the SHA-1 implementation that's compiled in, thus removing OpenSSL as a dependency. Now it's still an option, mainly so I can continue to compare the two methods. But it's possible that in the future, we may remove the potential for using OpenSSL altogether. --- CMakeLists.txt | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd45a32402..3053a19577 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ set (USE_FFMPEG ON CACHE BOOL "Use FFmpeg if found") set (USE_OPENJPEG ON CACHE BOOL "Use OpenJpeg if found") set (USE_OCIO ON CACHE BOOL "Use OpenColorIO for color management if found") set (USE_OPENCV ON CACHE BOOL "Use OpenCV if found") -set (USE_OPENSSL ON CACHE BOOL "Use OpenSSL if found") +set (USE_OPENSSL OFF CACHE BOOL "Use OpenSSL if found (for faster SHA-1)") set (USE_FREETYPE ON CACHE BOOL "Use Freetype if found") set (USE_GIF ON CACHE BOOL "Use GIF if found") set (USE_LIBRAW ON CACHE BOOL "Use LibRaw if found") diff --git a/Makefile b/Makefile index 56a0d95227..9406cb6f5d 100644 --- a/Makefile +++ b/Makefile @@ -381,7 +381,7 @@ help: @echo " USE_NUKE=0 Don't build Nuke plugins" @echo " NUKE_HOME=path Custom Nuke installation" @echo " NUKE_VERSION=ver Custom Nuke version" - @echo " USE_OPENSSL=0 Don't use OpenSSL even if found" +# @echo " USE_OPENSSL=1 Use OpenSSL's SHA-1 implementation" @echo " USE_LIBRAW=0 Don't use LibRaw, even if found" @echo " LIBRAW_PATH=path Custom LibRaw installation" @echo " FIELD3D_HOME=path Custom Field3D installation"