summaryrefslogtreecommitdiff
path: root/winbuild/MakefileBuild.vc
Commit message (Collapse)AuthorAgeFilesLines
* TLS naming: fix more Winssl and Darwinssl leftoversDaniel Stenberg2020-08-081-10/+10
| | | | | | | | | | | | | The CMake option is now called CMAKE_USE_SCHANNEL The winbuild flag is USE_SCHANNEL The CI jobs and build scripts only use the new names and the new name options Tests now require 'Schannel' (when necessary) Closes #5795
* win32: Add Curl_verify_windows_version() to curlxCameron Cawley2020-08-021-1/+4
| | | | Closes https://github.com/curl/curl/pull/5754
* curl_multibyte: add to curlxMarcel Raad2020-05-141-1/+4
| | | | | | | This will also be needed in the tool and tests. Ref: https://github.com/curl/curl/pull/3758#issuecomment-482197512 Closes https://github.com/curl/curl/pull/3784
* copyright: fix out-of-date copyright ranges and missing headersDaniel Stenberg2020-03-241-1/+1
| | | | | | | | | Reported by the new script 'scripts/copyright.pl'. The script has a regex whitelist for the files that don't need copyright headers. Removed three (mostly usesless) README files from docs/ Closes #5141
* winbuild: Define CARES_STATICLIB when WITH_CARES=staticandrew_ishchuk2019-12-091-0/+3
| | | | | | | | When libcurl is built with MODE=static, c-ares is forced into static linkage too. That doesn't happen when MODE=dll so linker would break over undefined symbols. closes https://github.com/curl/curl/pull/4688
* build: Disable Visual Studio warning "conditional expression is constant"Jay Satiro2019-12-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Disable warning C4127 "conditional expression is constant" globally in curl_setup.h for when building with Microsoft's compiler. This mainly affects building with the Visual Studio project files found in the projects dir. Prior to this change the cmake and winbuild build systems already disabled 4127 globally for when building with Microsoft's compiler. Also, 4127 was already disabled for all build systems in the limited circumstance of the WHILE_FALSE macro which disabled the warning specifically for while(0). This commit removes the WHILE_FALSE macro and all other cruft in favor of disabling globally in curl_setup. Background: We have various macros that cause 0 or 1 to be evaluated, which would cause warning C4127 in Visual Studio. For example this causes it: #define Curl_resolver_asynch() 1 Full behavior is not clearly defined and inconsistent across versions. However it is documented that since VS 2015 Update 3 Microsoft has addressed this somewhat but not entirely, not warning on while(true) for example. Prior to this change some C4127 warnings occurred when I built with Visual Studio using the generated projects in the projects dir. Closes https://github.com/curl/curl/pull/4658
* winbuild: add ENABLE_UNICODE optionapique2019-10-041-0/+4
| | | | | Fixes https://github.com/curl/curl/issues/4308 Closes https://github.com/curl/curl/pull/4309
* winbuild: Add manifest to curl.exe for proper OS version detectionJoel Depooter2019-09-231-2/+2
| | | | | | | | | | This is a small fix to commit ebd213270a017a6830928ee2e1f4a9cabc799898 in pull request #1221. That commit added the CURL_EMBED_MANIFEST flag to CURL_RC_FLAGS. However, later in the file CURL_RC_FLAGS is overwritten. The fix is to append values to CURL_RC_FLAGS instead of overwriting Closes #4399
* winbuild/MakefileBuild.vc: Add vsshBernhard Walle2019-09-111-0/+4
| | | | | | | | | | Without that modification, the Windows build using the makefiles doesn't work. Signed-off-by: Bernhard Walle <bernhard.walle@posteo.eu> Fixes #4322 Closes #4323
* winbuild/MakefileBuild.vc: Fix line endingsBernhard Walle2019-09-111-7/+7
| | | | | | The file had mixed line endings. Signed-off-by: Bernhard Walle <bernhard.walle@posteo.eu>
* winbuild: add vquic to list of build directoriesDaniel Stenberg2019-07-291-0/+4
| | | | | | | | | This fixes the winbuild build method which broke several days ago when experimental quic support was added in 3af0e76. Reported-by: Michael Lee Fixes https://github.com/curl/curl/issues/4158
* winbuild: use WITH_PREFIX if givenThomas Gamper2019-06-171-2/+7
| | | | Closes #4031
* winbuild: Support MultiSSL buildsJan-E2019-04-131-0/+6
| | | | | | | | | | - Remove the lines in winbuild/Makefile.vc that generate an error with multiple SSL backends. - Add /DCURL_WITH_MULTI_SSL in winbuild/MakefileBuild.vc if multiple SSL backends are set. Closes https://github.com/curl/curl/pull/3772
* winbuild: conditionally use /DZLIB_WINAPIMarcel Raad2019-01-141-1/+3
| | | | | | | | | | | zlibwapi.lib (dynamic library) and zlibstat.lib (static library) have the ZLIB_WINAPI define set by default. Using them requires that define too. Ref: https://zlib.net/DLL_FAQ.txt Fixes https://github.com/curl/curl/issues/3133 Closes https://github.com/curl/curl/pull/3460
* whitespace fixesViktor Szakats2018-09-231-1/+0
| | | | | | | | | | | - replace tabs with spaces where possible - remove line ending spaces - remove double/triple newlines at EOF - fix a non-UTF-8 character - cleanup a few indentations/line continuations in manual examples Closes https://github.com/curl/curl/pull/3037
* configure: add option to disable automatic OpenSSL config loadingPhilipp Waehnert2018-09-071-0/+3
| | | | | | | | | | | | | | | Sometimes it may be considered a security risk to load an external OpenSSL configuration automatically inside curl_global_init(). The configuration option --disable-ssl-auto-load-config disables this automatism. The Windows build scripts winbuild/Makefile.vs provide a corresponding option ENABLE_SSL_AUTO_LOAD_CONFIG accepting a boolean value. Setting neither of these options corresponds to the previous behavior loading the external OpenSSL configuration automatically. Fixes #2724 Closes #2791
* curl.rc: embed manifest for correct Windows version detectionViktor Szakats2018-05-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | * enable it in `src/Makefile.m32` * enable it in `winbuild/MakefileBuild.vc` if a custom manifest is _not_ enabled via the existing `EMBED_MANIFEST` option * enable it for all Windows CMake builds (also disable the built-in minimal manifest, added by CMake by default.) For other build systems, add the `-DCURL_EMBED_MANIFEST` option to the list of RC (Resource Compiler) flags to enable the manifest included in `src/curl.rc`. This may require to disable whatever automatic or other means in which way another manifest is added to `curl.exe`. Notice that Borland C doesn't support this method due to a long-pending resource compiler bug. Watcom C may also not handle it correctly when the `-zm` `wrc` option is used (this option may be unnecessary though) and regardless of options in certain earlier revisions of the 2.0 beta version. Closes https://github.com/curl/curl/pull/1221 Fixes https://github.com/curl/curl/issues/2591
* winbuild: In MakefileBuild.vc fix typo DISTDIR->DIRDISTrichardthe3rd2018-05-271-1/+1
| | | | | | Change requirement from $(DISTDIR) to $(DIRDIST) closes #2603
* schannel: add support for CURLOPT_CAINFODan McNulty2018-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move verify_certificate functionality in schannel.c into a new file called schannel_verify.c. Additionally, some structure defintions from schannel.c have been moved to schannel.h to allow them to be used in schannel_verify.c. - Make verify_certificate functionality for Schannel available on all versions of Windows instead of just Windows CE. verify_certificate will be invoked on Windows CE or when the user specifies CURLOPT_CAINFO and CURLOPT_SSL_VERIFYPEER. - In verify_certificate, create a custom certificate chain engine that exclusively trusts the certificate store backed by the CURLOPT_CAINFO file. - doc updates of --cacert/CAINFO support for schannel - Use CERT_NAME_SEARCH_ALL_NAMES_FLAG when invoking CertGetNameString when available. This implements a TODO in schannel.c to improve handling of multiple SANs in a certificate. In particular, all SANs will now be searched instead of just the first name. - Update tool_operate.c to not search for the curl-ca-bundle.crt file when using Schannel to maintain backward compatibility. Previously, any curl-ca-bundle.crt file found in that search would have been ignored by Schannel. But, with CAINFO support, the file found by that search would have been used as the certificate store and could cause issues for any users that have curl-ca-bundle.crt in the search path. - Update url.c to not set the build time CURL_CA_BUNDLE if the selected SSL backend is Schannel. We allow setting CA location for schannel only when explicitly specified by the user via CURLOPT_CAINFO / --cacert. - Add new test cases 3000 and 3001. These test cases check that the first and last SAN, respectively, matches the connection hostname. New test certificates have been added for these cases. For 3000, the certificate prefix is Server-localhost-firstSAN and for 3001, the certificate prefix is Server-localhost-secondSAN. - Remove TODO 15.2 (Add support for custom server certificate validation), this commit addresses it. Closes https://github.com/curl/curl/pull/1325
* winbuild: Support custom devel paths for each dependencykdekker2018-04-171-46/+101
| | | | | | | | | | | | | | | | | | - Support custom devel paths for c-ares, mbedTLS, nghttp2, libSSH2, OpenSSL and zlib. Respectively: CARES_PATH, MBEDTLS_PATH, NGHTTP2_PATH, SSH2_PATH, SSL_PATH and ZLIB_PATH. - Use lib.exe for making the static library instead of link.exe /lib. The latter is undocumented and could cause problems as noted in the comments. - Remove a dangling URL that no longer worked. (I was not able to find the IDN download at MSDN/microsoft.com, so it seems to be removed.) - Remove custom override for release-ssh2-ssl-dll-zlib configuration. Nobody knows why it was there and as far as we can see is unnecessary. Closes https://github.com/curl/curl/pull/2474
* winbuild: make the clean target work without build-typekdekker2018-04-061-11/+15
| | | | | | | | | Due to the check in Makefile.vc and MakefileBuild.vc, no make call can be invoked unless a build-type was specified. However, a clean target only existed when a build type was specified. As a result, the clean target was unreachable. Made clean target unconditional. Closes #2455
* winbuild: prefer documented zlib library namesrichardthe3rd2018-03-041-0/+14
| | | | | | | | | | | | Check for existence of import and static libraries with documented names and use them if they do. Fallback to previous names. According to https://github.com/madler/zlib/blob/master/win32/README-WIN32.txt on Windows, the names of the import library is "zdll.lib" and static library is "zlib.lib". closes #2354
* winbuild: Use macros for the names of some build utilitiesRod Widdowson2018-02-231-2/+7
| | | | | | | | | | - Add macros to the top of the makefile for rc and mt utilities so that it is easier to change their locations. Bug: https://curl.haxx.se/mail/lib-2018-02/0075.html Reported-by: Stefan Kanthak Closes https://github.com/curl/curl/issues/2329
* build: fix windows build methods for curl_ctype.cJay Satiro2018-01-301-1/+4
| | | | | | | - Fix winbuild and the VS project generator to treat curl_ctype.{c,h} as curlx files since they are required by both src and lib. Follow-up to 4272a0b which added curl_ctype.
* winbuild: make linker generate proper PDBAdam Marcionek2018-01-301-1/+1
| | | | | | | Link.exe requires /DEBUG to properly generate a full pdb file on release builds. Closes #2274
* winbuild: Added support for VC15Steve Holme2017-12-221-2/+2
|
* winbuild: fix embedded manifest optiontheantigod2017-08-261-1/+1
| | | | | | Embedded manifest option didn't work due to incorrect path. Fixes https://github.com/curl/curl/issues/1832
* winbuild: re-enable warning C4127 for curl toolMarcel Raad2017-07-141-1/+1
| | | | | Disabled in cda19a345f6970e22fe8b7a808aeb8f086a21eac. It only needs to be disabled for libcurl.
* winbuild: build with warning level 4Marcel Raad2017-07-131-4/+4
| | | | | | | | | | This is consistent with 7bc64561a2e63ca93e4b0b31d350773ba80955c2, which changed the warning level from 3 to 4 for the Visual Studio project files. But disable the level 4 warning C4127 "conditional expression is constant", as that one is issued by older versions of the Windows SDK as well as curl itself under some circumstances. Closes https://github.com/curl/curl/pull/1667
* curl_setup: always define WIN32_LEAN_AND_MEAN on WindowsMarcel Raad2017-07-111-1/+1
| | | | | | | | | Make sure to always define WIN32_LEAN_AND_MEAN before including any Windows headers to avoid pulling in unnecessary headers. This avoids unnecessary macro clashes and compiler warnings. Ref: https://github.com/curl/curl/issues/1562 Closes https://github.com/curl/curl/pull/1672
* winbuild: fix boringssl buildHenrik S. Gaßmann2017-06-241-1/+4
| | | | | | | | | | | | Compile with `WIN32_LEAN_AND_MEAN` which prevents `windows.h` from including too much clutter including `wincrypt.h` which in turn contains some preprocessor macros that clash with boringssl symbols. Detect boringssl by checking the existance of `is_boringssl.h` and set the corresponding `HAVE_BORINGSSL` for compilation which is used in `ldap.c` to undefine the evil macros. Closes #1610
* winbuild: fix the nghttp2 buildAnatol Belski2017-05-241-12/+11
| | | | Closes #1321
* winbuild: add basic support for OpenSSL 1.1.xAnatol Belski2017-03-131-0/+8
| | | | | | - Auto-detect OpenSSL 1.1 libs Closes https://github.com/curl/curl/pull/1322
* winbuild: add config option ENABLE_NGHTTP2Jan-E2016-11-251-0/+15
| | | | Closes #1141
* winbuild: remove strcase.obj from curl buildDaniel Stenberg2016-11-021-3/+0
| | | | | | Reported-by: Bruce Stephens Fixes #1098
* msvc builds: s/rawstr/strcaseDaniel Stenberg2016-10-311-3/+3
| | | | Follow-up to 811a693b
* winbuild: Allow changing C compiler via environment variable CC (#952)Simon Warta2016-08-091-4/+10
| | | | | | | This makes it possible to use specific compilers or a cache. Sample use for clcache: set CC=clcache.bat nmake /f Makefile.vc DEBUG=no MODE=static VC=14 GEN_PDB=no
* winbuild: Free name $(CC) in Makefile (#950)Simon Warta2016-08-091-11/+7
| | | | | | | | In the old line number 290, CC and CURL_CC had the same value. After that, /DCURL_STATICLIB was added to CC but not CURL_CC (intended?). This gets rid of the CC variable entirely. It is a first step to make it possible to manualyl set a CC variable in order to be able to change the compiler.
* winbuild: Avoid setting redundant CFLAGS to compile commands (#949)Simon Warta2016-08-081-2/+0
| | | | $(CURL_CC) is always used with $(CURL_CFLAGS) appended, so before this, all arguments in CURL_CFLAGS have been added twice.
* winbuild: fix embedded manifest optionJay Satiro2016-07-211-1/+1
| | | | | | Embedded manifest option didn't work due to typo. Reported-by: Stefan Kanthak
* schannel: add CURLOPT_CERTINFO supportAndrew Kurushin2016-06-011-0/+1
| | | | Closes #822
* winbuild: add mbedtls supportHenrik Gaßmann2016-04-211-1/+14
| | | | | | | Add WITH_MBEDTLS option. Make WITH_SSL, WITH_MBEDTLS and ENABLE_WINSSL options mutual exclusive. Closes #606
* build: Updated all makefiles and project files for the new vauth directorySteve Holme2016-03-251-0/+4
| | | | | | Updated the makefiles and Visual Studio project files to support moving the authentication code to the new lib/vauth directory that was started in commit 0d04e859e1.
* URLs: change all http:// URLs to https://Daniel Stenberg2016-02-031-1/+1
|
* makefile: Added support for VC14Steve Holme2015-07-211-1/+1
|
* openssl: remove all uses of USE_SSLEAYDaniel Stenberg2015-03-051-2/+2
| | | | | | | SSLeay was the name of the library that was subsequently turned into OpenSSL many moons ago (1999). curl does not work with the old SSLeay library since years. This is now reflected by only using USE_OPENSSL in code that depends on OpenSSL.
* winbuild: Added option to build with c-aresSam Schanken2015-01-081-0/+27
| | | | | | | | Added support for a WITH_CARES option to be used when invoking nmake via Makefile.vc. This option enables linking against both the DLL and static versions of the c-ares libraries, as well as the debug and release varients, depending on the value of DEBUG. The USE_ARES preprocessor symbol is also defined.
* Remove all traces of FBOpenSSL SPNEGO supportDavid Woodhouse2014-07-161-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just fundamentally broken. SPNEGO (RFC4178) is a protocol which allows client and server to negotiate the underlying mechanism which will actually be used to authenticate. This is *often* Kerberos, and can also be NTLM and other things. And to complicate matters, there are various different OIDs which can be used to specify the Kerberos mechanism too. A SPNEGO exchange will identify *which* GSSAPI mechanism is being used, and will exchange GSSAPI tokens which are appropriate for that mechanism. But this SPNEGO implementation just strips the incoming SPNEGO packet and extracts the token, if any. And completely discards the information about *which* mechanism is being used. Then we *assume* it was Kerberos, and feed the token into gss_init_sec_context() with the default mechanism (GSS_S_NO_OID for the mech_type argument). Furthermore... broken as this code is, it was never even *used* for input tokens anyway, because higher layers of curl would just bail out if the server actually said anything *back* to us in the negotiation. We assume that we send a single token to the server, and it accepts it. If the server wants to continue the exchange (as is required for NTLM and for SPNEGO to do anything useful), then curl was broken anyway. So the only bit which actually did anything was the bit in Curl_output_negotiate(), which always generates an *initial* SPNEGO token saying "Hey, I support only the Kerberos mechanism and this is its token". You could have done that by manually just prefixing the Kerberos token with the appropriate bytes, if you weren't going to do any proper SPNEGO handling. There's no need for the FBOpenSSL library at all. The sane way to do SPNEGO is just to *ask* the GSSAPI library to do SPNEGO. That's what the 'mech_type' argument to gss_init_sec_context() is for. And then it should all Just Work™. That 'sane way' will be added in a subsequent patch, as will bug fixes for our failure to handle any exchange other than a single outbound token to the server which results in immediate success.
* winbuild: Fixed static OpenSSL builds following commit c50ce85918Steve Holme2014-06-051-1/+1
|
* winbuild: added warnless.c to fix buildCody Mack2014-03-281-1/+4
|
View Lorry Controller Status