strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

curl: use WNT native Schannel SSL/TLS implementation

Browse source 
This should give better OS integration for things like adding CAs.

Change-Id: I53fbfad402618e98d4116a0fecf0bf59e905e292
This commit is contained in:
Michael Stahl 2013-11-19 00:06:50 +01:00
parent ef08919107
commit 460d6ce526
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
external/curl/UnpackedTarball_curl.mk vendored
View file

@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-freebsd.patch.1 \
external/curl/curl-msvc.patch.1 \
external/curl/curl-msvc-schannel.patch.1 \
external/curl/curl-7.26.0_mingw.patch \
external/curl/curl-7.26.0_win-proxy.patch \
))

22
external/curl/curl-msvc-schannel.patch.1 vendored Normal file
View file

@ -0,0 +1,22 @@
MSVC: use WNT native Schannel SSL/TLS implementation
--- curl/lib/Makefile.vc10.old 2013-11-19 00:00:29.044499752 +0100
+++ curl/lib/Makefile.vc10 2013-11-19 00:01:29.135499684 +0100
@@ -260,7 +260,7 @@
TARGET = $(LIBCURL_DYN_LIB_REL)
DIROBJ = $(CFG)
LNK = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)
-CC = $(CCNODBG) $(RTLIB)
+CC = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL)
CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF
@@ -411,7 +411,7 @@
TARGET = $(LIBCURL_DYN_LIB_DBG)
DIROBJ = $(CFG)
LNK = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB)
-CC = $(CCDEBUG) $(RTLIBD)
+CC = $(CCDEBUG) $(RTLIBD) $(CFLAGSWINSSL)
CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF