Rename openssl flags to libcrypto.

Only libcrypto is used to do checking of digital signatures.
The SSL library openssl is never used.

6 files changed, 19 insertions, 19 deletions

diff --git a/platform/android/viewer/jni/Android.mk b/platform/android/viewer/jni/Android.mk
index 4e6038d4..857c9ba1 100644
--- a/platform/android/viewer/jni/Android.mk
+++ b/platform/android/viewer/jni/Android.mk
@@ -35,8 +35,8 @@ LOCAL_CFLAGS += -DFZ_ENABLE_GPRF
 endif
 
 LOCAL_LDLIBS := -lm -llog -ljnigraphics
-ifdef SSL_BUILD
-LOCAL_LDLIBS += -L$(MUPDF_ROOT)/thirdparty/openssl/android -lcrypto -lssl
+ifdef CRYPTO_BUILD
+LOCAL_LDLIBS += -L$(MUPDF_ROOT)/thirdparty/openssl/android -lcrypto
 endif
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/platform/android/viewer/jni/Core.mk b/platform/android/viewer/jni/Core.mk
index ca35e2a7..9f11aa5a 100644
--- a/platform/android/viewer/jni/Core.mk
+++ b/platform/android/viewer/jni/Core.mk
@@ -26,8 +26,8 @@ LOCAL_CFLAGS += -DAA_BITS=8
 ifdef MEMENTO
 LOCAL_CFLAGS += -DMEMENTO -DMEMENTO_LEAKONLY
 endif
-ifdef SSL_BUILD
-LOCAL_CFLAGS += -DHAVE_OPENSSL
+ifdef CRYPTO_BUILD
+LOCAL_CFLAGS += -DHAVE_LIBCRYPTO
 endif
 
 LOCAL_C_INCLUDES := \
@@ -54,7 +54,7 @@ LOCAL_C_INCLUDES := \
 ifdef V8_BUILD
 LOCAL_C_INCLUDES += $(MY_ROOT)/thirdparty/$(V8)/include
 endif
-ifdef SSL_BUILD
+ifdef CRYPTO_BUILD
 LOCAL_C_INCLUDES += $(MY_ROOT)/thirdparty/openssl/include
 endif
 
diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj
index 18673108..a6e83c6f 100644
--- a/platform/win32/libmupdf.vcproj
+++ b/platform/win32/libmupdf.vcproj
@@ -420,7 +420,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src"
-				PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;HAVE_OPENSSL;USE_OUTPUT_DEBUG_STRING"
+				PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -483,7 +483,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src"
-				PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;HAVE_OPENSSL;USE_OUTPUT_DEBUG_STRING"
+				PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
diff --git a/platform/win32/mujstest.vcproj b/platform/win32/mujstest.vcproj
index 076cca6a..5af029de 100644
--- a/platform/win32/mujstest.vcproj
+++ b/platform/win32/mujstest.vcproj
@@ -484,7 +484,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL;USE_OUTPUT_DEBUG_STRING"
+				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -558,7 +558,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL;USE_OUTPUT_DEBUG_STRING"
+				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -633,7 +633,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="HAVE_OPENSSL"
+				PreprocessorDefinitions="HAVE_LIBCRYPTO"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -709,7 +709,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="HAVE_OPENSSL"
+				PreprocessorDefinitions="HAVE_LIBCRYPTO"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
diff --git a/platform/win32/mupdf-curl.vcproj b/platform/win32/mupdf-curl.vcproj
index c63c5136..07e9b403 100644
--- a/platform/win32/mupdf-curl.vcproj
+++ b/platform/win32/mupdf-curl.vcproj
@@ -490,7 +490,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
-				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
+				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -565,7 +565,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
-				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
+				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -641,7 +641,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
-				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_OPENSSL;HAVE_CURL=1"
+				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_LIBCRYPTO;HAVE_CURL=1"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -719,7 +719,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
-				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_OPENSSL;HAVE_CURL=1"
+				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_LIBCRYPTO;HAVE_CURL=1"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
diff --git a/platform/win32/mupdf.vcproj b/platform/win32/mupdf.vcproj
index 14c9ff33..d7082786 100644
--- a/platform/win32/mupdf.vcproj
+++ b/platform/win32/mupdf.vcproj
@@ -484,7 +484,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL;USE_OUTPUT_DEBUG_STRING"
+				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -559,7 +559,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL;USE_OUTPUT_DEBUG_STRING"
+				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -635,7 +635,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_OPENSSL"
+				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_LIBCRYPTO"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -713,7 +713,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_OPENSSL"
+				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_LIBCRYPTO"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"