moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-12 04:25:08 -05:00
Code Issues Releases Wiki Activity

openssl: Remove SSLEAY leftovers

Browse Source 
Commit 709cf76f6b deprecated USE_SSLEAY, as curl since long isn't
compatible with the SSLeay library. This removes the few leftovers that
were omitted in the less frequently used platform targets.

Closes #3270
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
This commit is contained in:
Daniel Gustafsson 2018-11-17 21:36:10 +01:00
parent 07ebaf8378
commit 1cccf2f945
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.Watcom
View File

@ -157,7 +157,7 @@ CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H -I"$(LIBSSH2_ROOT)/include" -I"$(LIBSSH
!endif !endif
!ifdef %use_ssl !ifdef %use_ssl
CFLAGS += -wcd=138 -dUSE_OPENSSL -dUSE_SSLEAY -I"$(OPENSSL_ROOT)/inc32" CFLAGS += -wcd=138 -dUSE_OPENSSL -I"$(OPENSSL_ROOT)/inc32"
!endif !endif
!ifdef %use_ares !ifdef %use_ares

2
lib/Makefile.netware
View File

@ -632,7 +632,6 @@ ifdef WITH_ZLIB
@echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@ @echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@
endif endif
ifdef WITH_SSL ifdef WITH_SSL
@echo $(DL)#define USE_SSLEAY 1$(DL) >> $@
@echo $(DL)#define USE_OPENSSL 1$(DL) >> $@ @echo $(DL)#define USE_OPENSSL 1$(DL) >> $@
@echo $(DL)#define HAVE_OPENSSL_X509_H 1$(DL) >> $@ @echo $(DL)#define HAVE_OPENSSL_X509_H 1$(DL) >> $@
@echo $(DL)#define HAVE_OPENSSL_SSL_H 1$(DL) >> $@ @echo $(DL)#define HAVE_OPENSSL_SSL_H 1$(DL) >> $@
@ -645,7 +644,6 @@ ifdef WITH_SSL
@echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@ @echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@
@echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@ @echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@
ifdef WITH_SRP ifdef WITH_SRP
@echo $(DL)#define HAVE_SSLEAY_SRP 1$(DL) >> $@
@echo $(DL)#define USE_TLS_SRP 1$(DL) >> $@ @echo $(DL)#define USE_TLS_SRP 1$(DL) >> $@
endif endif
ifdef WITH_SPNEGO ifdef WITH_SPNEGO

2
packages/DOS/common.dj
View File

@ -96,7 +96,7 @@ CFLAGS = -g -O2 -I. -I$(TOPDIR)/include -I$(TOPDIR)/lib \
-I$(WATT32_ROOT)/inc -Wall -DHAVE_CONFIG_H -I$(WATT32_ROOT)/inc -Wall -DHAVE_CONFIG_H
ifeq ($(USE_SSL),1) ifeq ($(USE_SSL),1)
CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL -I$(OPENSSL_ROOT) CFLAGS += -DUSE_OPENSSL -I$(OPENSSL_ROOT)
endif endif
ifeq ($(USE_ZLIB),1) ifeq ($(USE_ZLIB),1)

3
packages/vms/generate_config_vms_h_curl.com
View File

@ -404,9 +404,6 @@ $!
$ write cvh "#ifndef USE_OPENSSL" $ write cvh "#ifndef USE_OPENSSL"
$ write cvh "#define USE_OPENSSL 1" $ write cvh "#define USE_OPENSSL 1"
$ write cvh "#endif" $ write cvh "#endif"
$ write cvh "#ifndef USE_SSLEAY"
$ write cvh "#define USE_SSLEAY 1"
$ write cvh "#endif"
$ if arch_name .eqs. "VAX" $ if arch_name .eqs. "VAX"
$ then $ then
$ old_mes = f$enviroment("message") $ old_mes = f$enviroment("message")