config: fix building SMB with configure using Win32 Crypto - #6277
config: fix building SMB with configure using Win32 Crypto#6277mback2k wants to merge 2 commits into
Conversation
|
At the moment configure is not aware of Lines 5030 to 5042 in 753a2c7 Lines 5130 to 5140 in 753a2c7 vs: Lines 507 to 509 in 753a2c7 Lines 1333 to 1339 in 753a2c7 I would like to suggest to either make |
|
It seems like the SMB support detection and therefore also NTLM and for that Win32 Crypto detection will need to be moved into the configure scripts in order to make tests 1013 and 1014 work correctly. I will take a look at updating this PR accordingly. |
07ac5da to
1e8b97b
Compare
1e8b97b to
a757a48
Compare
a757a48 to
42680c2
Compare
|
This whole comment is obsolete, see #6277 (comment): Just pushed a new approach which aligns CMake and configure builds and leads to the following situation:
Previously @bagder is that okay, or is this kind of split-brain situation unwanted and the logic needs to be completely revamped? |
42680c2 to
83da2af
Compare
83da2af to
2194c11
Compare
2194c11 to
4d056da
Compare
4d056da to
5f1a6b5
Compare
|
TODO via separate PR once landed: update |
c5d329f to
deaaf99
Compare
|
@MarcelRaad I just updated this PR and #6277 (comment) is now obsolete. Instead everything should be as one would expect, e.g. |
deaaf99 to
a6226fa
Compare
|
Some CI tests are still failing, but in general this looks good to me. |
|
Autotools based builds are fully functional now, but CMake still does not work reliable. Adding some debug commits... |
bc0761d to
8ff51d2
Compare
8ff51d2 to
dfa4a74
Compare
dfa4a74 to
8356f7f
Compare
CMake builds now also correctly handle crypt32, NTLM and SMB support, but the fix to Largefile detection does not work, see #6277 (comment). Thinking about doing a separate PR for that one then. |
Move the detection of the restricted Windows App environment in curl_setup.h before the definition of USE_WIN32_CRYPTO via included config-win32.h in case no build system is used. Reviewed-by: Marcel Raad Part of curl#6277
Align conditions for NTLM features between CMake and configure builds by differentiating between USE_NTLM and USE_CURL_NTLM_CORE, just like curl_setup.h does internally to detect support of: - USE_NTLM: required for NTLM crypto authentication feature - USE_CURL_NTLM_CORE: required for SMB protocol Implement USE_WIN32_CRYPTO detection by checking for Crypt functions in wincrypt.h which are not available in the Windows App environment. Link advapi32 and crypt32 for Crypto API and Schannel SSL backend. Fix condition of Schannel SSL backend in CMake build accordingly. Reviewed-by: Marcel Raad Closes curl#6277
8356f7f to
fdeb031
Compare
Move the detection of the restricted Windows App environment in curl_setup.h before the definition of USE_WIN32_CRYPTO via included config-win32.h in case no build system is used. Reviewed-by: Marcel Raad Part of curl#6277
Align conditions for NTLM features between CMake and configure
builds by differentiating between
USE_NTLMandUSE_CURL_NTLM_CORE,just like
curl_setup.hdoes internally to detect support of:USE_NTLM: required for NTLM crypto authentication featureUSE_CURL_NTLM_CORE: required for SMB protocolImplement
USE_WIN32_CRYPTOdetection by checking for Crypt functionsin
wincrypt.hwhich are not available in the Windows App environment.Link
advapi32andcrypt32for Crypto API and Schannel SSL backend.Fix condition of Schannel SSL backend in CMake build.
Move the detection of the restricted Windows App environment
in
curl_setup.hbefore the definition ofUSE_WIN32_CRYPTOvia included
config-win32.hin case no build system is used.