Rename openssl flags to libcrypto.

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

10 files changed, 39 insertions, 39 deletions

diff --git a/Makefile b/Makefile
index 920f3c6c..886a0176 100644
--- a/Makefile
+++ b/Makefile
@@ -23,22 +23,22 @@ LIBS += $(HARFBUZZ_LIBS)
 LIBS += $(JBIG2DEC_LIBS)
 LIBS += $(JPEG_LIBS)
 LIBS += $(JPEGXR_LIB)
+LIBS += $(LIBCRYPTO_LIBS)
+LIBS += $(LURATECH_LIBS)
 LIBS += $(MUJS_LIBS)
 LIBS += $(OPENJPEG_LIBS)
-LIBS += $(OPENSSL_LIBS)
 LIBS += $(ZLIB_LIBS)
-LIBS += $(LURATECH_LIBS)
 
 CFLAGS += $(FREETYPE_CFLAGS)
 CFLAGS += $(HARFBUZZ_CFLAGS)
 CFLAGS += $(JBIG2DEC_CFLAGS)
 CFLAGS += $(JPEG_CFLAGS)
 CFLAGS += $(JPEGXR_CFLAGS)
+CFLAGS += $(LIBCRYPTO_CFLAGS)
+CFLAGS += $(LURATECH_CFLAGS)
 CFLAGS += $(MUJS_CFLAGS)
 CFLAGS += $(OPENJPEG_CFLAGS)
-CFLAGS += $(OPENSSL_CFLAGS)
 CFLAGS += $(ZLIB_CFLAGS)
-CFLAGS += $(LURATECH_CFLAGS)
 
 # --- Commands ---
 
diff --git a/Makerules b/Makerules
index a038ff8f..fdee2d88 100644
--- a/Makerules
+++ b/Makerules
@@ -76,13 +76,13 @@ else ifeq "$(OS)" "MACOS"
 HAVE_X11 ?= no
 HAVE_PTHREADS ?= yes
 
-# Mac OS X deprecated openssl, so the default is to not include it.
-HAVE_OPENSSL ?= no
-SYS_OPENSSL_CFLAGS =
-SYS_OPENSSL_LIBS =
-ifeq "$(HAVE_OPENSSL)" "yes"
-SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL
-SYS_OPENSSL_LIBS = -lcrypto
+# Mac OS X deprecated libcrypto, so the default is to not include it.
+HAVE_LIBCRYTO ?= no
+SYS_LIBCRYPTO_CFLAGS =
+SYS_LIBCRYPTO_LIBS =
+ifeq "$(HAVE_LIBCRYPTO)" "yes"
+SYS_LIBCRYPTO_CFLAGS = -DHAVE_LIBCRYPTO
+SYS_LIBCRYPTO_LIBS = -lcrypto
 endif
 
 SYS_CURL_DEPS = -lpthread
@@ -108,9 +108,9 @@ else ifeq "$(OS)" "Linux"
 HAVE_PTHREADS ?= yes
 
 ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
-HAVE_OPENSSL = yes
-SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto)
-SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto)
+HAVE_LIBCRYPTO = yes
+SYS_LIBCRYPTO_CFLAGS = -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
+SYS_LIBCRYPTO_LIBS = $(shell pkg-config --libs libcrypto)
 endif
 
 ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
diff --git a/Makethird b/Makethird
index 34595623..d4c8dc3a 100644
--- a/Makethird
+++ b/Makethird
@@ -766,7 +766,7 @@ endif
 
 # --- OpenSSL ---
 
-ifeq "$(HAVE_OPENSSL)" "yes"
-OPENSSL_CFLAGS := $(SYS_OPENSSL_CFLAGS)
-OPENSSL_LIBS := $(SYS_OPENSSL_LIBS)
+ifeq "$(HAVE_LIBCRYPTO)" "yes"
+LIBCRYPTO_CFLAGS := $(SYS_LIBCRYPTO_CFLAGS)
+LIBCRYPTO_LIBS := $(SYS_LIBCRYPTO_LIBS)
 endif
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"
diff --git a/source/pdf/pdf-pkcs7.c b/source/pdf/pdf-pkcs7.c
index 9fa15970..738a4df4 100644
--- a/source/pdf/pdf-pkcs7.c
+++ b/source/pdf/pdf-pkcs7.c
@@ -1,6 +1,6 @@
 #include "mupdf/pdf.h" // TODO: move this file to pdf module
 
-#ifdef HAVE_OPENSSL
+#ifdef HAVE_LIBCRYPTO
 
 #include "openssl/err.h"
 #include "openssl/bio.h"
@@ -770,7 +770,7 @@ int pdf_signatures_supported(fz_context *ctx)
 	return 1;
 }
 
-#else /* HAVE_OPENSSL */
+#else /* HAVE_LIBCRYPTO */
 
 int pdf_check_signature(fz_context *ctx, pdf_document *doc, pdf_widget *widget, char *file, char *ebuf, int ebufsize)
 {
@@ -800,4 +800,4 @@ int pdf_signatures_supported(fz_context *ctx)
 	return 0;
 }
 
-#endif /* HAVE_OPENSSL */
+#endif /* HAVE_LIBCRYPTO */