[PATCH 1/2] secur32: Load the MSV1_0 provider instead of using builtin support for NTLM.
To apply after the last msv1_0 series. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/secur32.c | 1 - loader/wine.inf.in | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 8288286c615..4382ec55174 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -563,7 +563,6 @@ static void SECUR32_initializeProviders(void) TRACE("\n"); /* First load built-in providers */ SECUR32_initSchannelSP(); - SECUR32_initNTLMSP(); /* Load SSP/AP packages (Kerberos and others) */ load_auth_packages(); /* Load the Negotiate provider last so apps stumble over the working NTLM diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 6ae4e96e37f..a20efbcce3e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -750,6 +750,7 @@ HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\hivelist,,16 HKLM,System\CurrentControlSet\Control\Lsa,"Security Packages",0x10002,kerberos,schannel HKLM,System\CurrentControlSet\Control\Lsa\Kerberos,,16 +HKLM,System\CurrentControlSet\Control\Lsa\MSV1_0,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,"" -- 2.30.2
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=89650 Your paranoid android. === debiant2 (32 bit report) === secur32: negotiate.c:259: Test failed: server returned 80090302, more tests will fail ntlm.c:901: Test failed: pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned SEC_E_UNSUPPORTED_FUNCTION ntlm.c:904: Test failed: cbMaxToken should be 1904 or 2888 but is 0 ntlm.c:907: Test failed: cbMaxSignature should be 16 but is 3275880 ntlm.c:910: Test failed: cbSecurityTrailer should be 16 but is 4390912 ntlm.c:913: Test failed: cbBlockSize should be 0 but is 2076349658 ntlm.c:919: Test failed: QueryContextAttributesA returned 80090302 ntlm.c:923: Test failed: expected non-NULL PackageInfo ntlm.c:901: Test failed: pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned SEC_E_UNSUPPORTED_FUNCTION ntlm.c:904: Test failed: cbMaxToken should be 1904 or 2888 but is 0 ntlm.c:907: Test failed: cbMaxSignature should be 16 but is 3275880 ntlm.c:910: Test failed: cbSecurityTrailer should be 16 but is 4390912 ntlm.c:913: Test failed: cbBlockSize should be 0 but is 2076349658 ntlm.c:919: Test failed: QueryContextAttributesA returned 80090302 ntlm.c:923: Test failed: expected non-NULL PackageInfo ntlm.c:882: Test failed: Running the server returned SEC_E_UNSUPPORTED_FUNCTION, more tests will fail from now. ntlm.c:959: Test failed: DeleteSecurityContext(server) returned SEC_E_INVALID_HANDLE ntlm.c:882: Test failed: Running the server returned SEC_E_UNSUPPORTED_FUNCTION, more tests will fail from now. ntlm.c:959: Test failed: DeleteSecurityContext(server) returned SEC_E_INVALID_HANDLE === debiant2 (32 bit Chinese:China report) === secur32: negotiate.c:259: Test failed: server returned 80090302, more tests will fail ntlm.c:901: Test failed: pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned SEC_E_UNSUPPORTED_FUNCTION ntlm.c:904: Test failed: cbMaxToken should be 1904 or 2888 but is 0 ntlm.c:907: Test failed: cbMaxSignature should be 16 but is 3275880 ntlm.c:910: Test failed: cbSecurityTrailer should be 16 but is 4390912 ntlm.c:913: Test failed: cbBlockSize should be 0 but is 2076349658 ntlm.c:919: Test failed: QueryContextAttributesA returned 80090302 ntlm.c:923: Test failed: expected non-NULL PackageInfo ntlm.c:901: Test failed: pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned SEC_E_UNSUPPORTED_FUNCTION ntlm.c:904: Test failed: cbMaxToken should be 1904 or 2888 but is 0 ntlm.c:907: Test failed: cbMaxSignature should be 16 but is 3275880 ntlm.c:910: Test failed: cbSecurityTrailer should be 16 but is 4390912 ntlm.c:913: Test failed: cbBlockSize should be 0 but is 2076349658 ntlm.c:919: Test failed: QueryContextAttributesA returned 80090302 ntlm.c:923: Test failed: expected non-NULL PackageInfo ntlm.c:882: Test failed: Running the server returned SEC_E_UNSUPPORTED_FUNCTION, more tests will fail from now. ntlm.c:959: Test failed: DeleteSecurityContext(server) returned SEC_E_INVALID_HANDLE ntlm.c:882: Test failed: Running the server returned SEC_E_UNSUPPORTED_FUNCTION, more tests will fail from now. ntlm.c:959: Test failed: DeleteSecurityContext(server) returned SEC_E_INVALID_HANDLE === debiant2 (32 bit WoW report) === secur32: negotiate.c:259: Test failed: server returned 80090302, more tests will fail ntlm.c:901: Test failed: pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned SEC_E_UNSUPPORTED_FUNCTION ntlm.c:904: Test failed: cbMaxToken should be 1904 or 2888 but is 0 ntlm.c:907: Test failed: cbMaxSignature should be 16 but is 3275880 ntlm.c:910: Test failed: cbSecurityTrailer should be 16 but is 4390912 ntlm.c:913: Test failed: cbBlockSize should be 0 but is 2076349658 ntlm.c:919: Test failed: QueryContextAttributesA returned 80090302 ntlm.c:923: Test failed: expected non-NULL PackageInfo ntlm.c:901: Test failed: pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned SEC_E_UNSUPPORTED_FUNCTION ntlm.c:904: Test failed: cbMaxToken should be 1904 or 2888 but is 0 ntlm.c:907: Test failed: cbMaxSignature should be 16 but is 3275880 ntlm.c:910: Test failed: cbSecurityTrailer should be 16 but is 4390912 ntlm.c:913: Test failed: cbBlockSize should be 0 but is 2076349658 ntlm.c:919: Test failed: QueryContextAttributesA returned 80090302 ntlm.c:923: Test failed: expected non-NULL PackageInfo ntlm.c:882: Test failed: Running the server returned SEC_E_UNSUPPORTED_FUNCTION, more tests will fail from now. ntlm.c:959: Test failed: DeleteSecurityContext(server) returned SEC_E_INVALID_HANDLE ntlm.c:882: Test failed: Running the server returned SEC_E_UNSUPPORTED_FUNCTION, more tests will fail from now. ntlm.c:959: Test failed: DeleteSecurityContext(server) returned SEC_E_INVALID_HANDLE === debiant2 (64 bit WoW report) === secur32: negotiate.c:259: Test failed: server returned 80090302, more tests will fail ntlm.c:901: Test failed: pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned SEC_E_UNSUPPORTED_FUNCTION ntlm.c:904: Test failed: cbMaxToken should be 1904 or 2888 but is 6487056 ntlm.c:907: Test failed: cbMaxSignature should be 16 but is 0 ntlm.c:910: Test failed: cbSecurityTrailer should be 16 but is 0 ntlm.c:913: Test failed: cbBlockSize should be 0 but is 1779231552 ntlm.c:919: Test failed: QueryContextAttributesA returned 80090302 ntlm.c:923: Test failed: expected non-NULL PackageInfo ntlm.c:901: Test failed: pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned SEC_E_UNSUPPORTED_FUNCTION ntlm.c:904: Test failed: cbMaxToken should be 1904 or 2888 but is 6487056 ntlm.c:907: Test failed: cbMaxSignature should be 16 but is 0 ntlm.c:910: Test failed: cbSecurityTrailer should be 16 but is 0 ntlm.c:913: Test failed: cbBlockSize should be 0 but is 1779231552 ntlm.c:919: Test failed: QueryContextAttributesA returned 80090302 ntlm.c:923: Test failed: expected non-NULL PackageInfo ntlm.c:882: Test failed: Running the server returned SEC_E_UNSUPPORTED_FUNCTION, more tests will fail from now. ntlm.c:959: Test failed: DeleteSecurityContext(server) returned SEC_E_INVALID_HANDLE ntlm.c:882: Test failed: Running the server returned SEC_E_UNSUPPORTED_FUNCTION, more tests will fail from now. ntlm.c:959: Test failed: DeleteSecurityContext(server) returned SEC_E_INVALID_HANDLE
participants (2)
-
Hans Leidekker -
Marvin