diff --git a/reactos/dll/win32/schannel/CMakeLists.txt b/reactos/dll/win32/schannel/CMakeLists.txt index 6abf3049d34..b823a69e35d 100644 --- a/reactos/dll/win32/schannel/CMakeLists.txt +++ b/reactos/dll/win32/schannel/CMakeLists.txt @@ -25,6 +25,6 @@ add_library(schannel SHARED set_module_type(schannel win32dll) target_link_libraries(schannel wine) -add_importlibs(schannel crypt32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(schannel crypt32 secur32 advapi32 msvcrt kernel32 ntdll) add_pch(schannel precomp.h SOURCE) add_cd_file(TARGET schannel DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/schannel/schannel.spec b/reactos/dll/win32/schannel/schannel.spec index c230f4a2d4b..b6f452d64f0 100644 --- a/reactos/dll/win32/schannel/schannel.spec +++ b/reactos/dll/win32/schannel/schannel.spec @@ -15,14 +15,14 @@ @ stdcall InitSecurityInterfaceW() schan_InitSecurityInterfaceW @ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) schan_InitializeSecurityContextA @ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) schan_InitializeSecurityContextW -@ stdcall MakeSignature(ptr long ptr long) schan_MakeSignature +@ stdcall MakeSignature(ptr long ptr long) secur32.MakeSignature @ stub OpenSslPerformanceData -@ stdcall QueryContextAttributesA(ptr long ptr) schan_QueryContextAttributesA -@ stdcall QueryContextAttributesW(ptr long ptr) schan_QueryContextAttributesW -@ stdcall QuerySecurityPackageInfoA(str ptr) schan_QuerySecurityPackageInfoA -@ stdcall QuerySecurityPackageInfoW(wstr ptr) schan_QuerySecurityPackageInfoW -@ stdcall RevertSecurityContext(ptr) schan_RevertSecurityContext -@ stdcall SealMessage(ptr long ptr long) schan_EncryptMessage +@ stdcall QueryContextAttributesA(ptr long ptr) secur32.QueryContextAttributesA +@ stdcall QueryContextAttributesW(ptr long ptr) secur32.QueryContextAttributesW +@ stdcall QuerySecurityPackageInfoA(str ptr) secur32.QuerySecurityPackageInfoA +@ stdcall QuerySecurityPackageInfoW(wstr ptr) secur32.QuerySecurityPackageInfoW +@ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext +@ stdcall SealMessage(ptr long ptr long) secur32.SealMessage @ stdcall SpLsaModeInitialize(long ptr ptr ptr) @ stdcall SpUserModeInitialize(long ptr ptr ptr) @ stub SslCrackCertificate @@ -33,5 +33,5 @@ @ stub SslGenerateRandomBits @ stub SslGetMaximumKeySize @ stub SslLoadCertificate -@ stdcall UnsealMessage(ptr ptr long ptr) schan_DecryptMessage -@ stdcall VerifySignature(ptr ptr long ptr) schan_VerifySignature +@ stdcall UnsealMessage(ptr ptr long ptr) secur32.UnsealMessage +@ stdcall VerifySignature(ptr ptr long ptr) secur32.VerifySignature diff --git a/reactos/dll/win32/schannel/schannel_wine.c b/reactos/dll/win32/schannel/schannel_wine.c index 0fceb7e543d..c31a47cb440 100644 --- a/reactos/dll/win32/schannel/schannel_wine.c +++ b/reactos/dll/win32/schannel/schannel_wine.c @@ -932,6 +932,7 @@ SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextA( return ret; } +static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( PCtxtHandle context_handle, ULONG attribute, PVOID buffer) { @@ -1002,6 +1003,7 @@ SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( } } +static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( PCtxtHandle context_handle, ULONG attribute, PVOID buffer) { @@ -1068,7 +1070,7 @@ static int schan_encrypt_message_get_next_buffer_token(const struct schan_transp return -1; } -SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle, +static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle, ULONG quality, PSecBufferDesc message, ULONG message_seq_no) { struct schan_transport transport; @@ -1190,7 +1192,7 @@ static void schan_decrypt_fill_buffer(PSecBufferDesc message, ULONG buffer_type, buffer->cbBuffer = size; } -SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, +static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, PSecBufferDesc message, ULONG message_seq_no, PULONG quality) { struct schan_transport transport; diff --git a/reactos/dll/win32/schannel/stubs.c b/reactos/dll/win32/schannel/stubs.c index 7f14512ad10..dd6fe1ab592 100644 --- a/reactos/dll/win32/schannel/stubs.c +++ b/reactos/dll/win32/schannel/stubs.c @@ -25,32 +25,3 @@ SECURITY_STATUS WINAPI schan_ImpersonateSecurityContext(PCtxtHandle phContext) { return SEC_E_UNSUPPORTED_FUNCTION; } - -SECURITY_STATUS WINAPI schan_MakeSignature(PCtxtHandle phContext, ULONG fQOP, - PSecBufferDesc pMessage, ULONG MessageSeqNo) -{ - return SEC_E_UNSUPPORTED_FUNCTION; -} - -SECURITY_STATUS WINAPI schan_QuerySecurityPackageInfoA(SEC_CHAR *pszPackageName, - PSecPkgInfoA *ppPackageInfo) -{ - return SEC_E_UNSUPPORTED_FUNCTION; -} - -SECURITY_STATUS WINAPI schan_QuerySecurityPackageInfoW(SEC_WCHAR *pszPackageName, - PSecPkgInfoW *ppPackageInfo) -{ - return SEC_E_UNSUPPORTED_FUNCTION; -} - -SECURITY_STATUS WINAPI schan_RevertSecurityContext(PCtxtHandle phContext) -{ - return SEC_E_UNSUPPORTED_FUNCTION; -} - -SECURITY_STATUS WINAPI schan_VerifySignature(PCtxtHandle phContext, - PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - return SEC_E_UNSUPPORTED_FUNCTION; -}