[ros-diffs] [jgardou] 64023: [SCHANNEL] - Restore a few function forwarders to secur32 Noticed by Timo. Thanks!

Author: jgardou
Date: Mon Sep  1 16:32:26 2014
New Revision: 64023

URL: http://svn.reactos.org/svn/reactos?rev=64023&view=rev
Log:
[SCHANNEL]
 - Restore a few function forwarders to secur32
Noticed by Timo. Thanks!

Modified:
    trunk/reactos/dll/win32/schannel/CMakeLists.txt
    trunk/reactos/dll/win32/schannel/schannel.spec
    trunk/reactos/dll/win32/schannel/schannel_wine.c
    trunk/reactos/dll/win32/schannel/stubs.c

Modified: trunk/reactos/dll/win32/schannel/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/schannel/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/schannel/CMakeLists.txt	[iso-8859-1] Mon Sep  1 16:32:26 2014
@@ -25,6 +25,6 @@
 
 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)

Modified: trunk/reactos/dll/win32/schannel/schannel.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne…
==============================================================================
--- trunk/reactos/dll/win32/schannel/schannel.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/schannel/schannel.spec	[iso-8859-1] Mon Sep  1 16:32:26 2014
@@ -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

Modified: trunk/reactos/dll/win32/schannel/schannel_wine.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne…
==============================================================================
--- trunk/reactos/dll/win32/schannel/schannel_wine.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/schannel/schannel_wine.c	[iso-8859-1] Mon Sep  1 16:32:26
2014
@@ -932,6 +932,7 @@
     return ret;
 }
 
+static
 SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW(
         PCtxtHandle context_handle, ULONG attribute, PVOID buffer)
 {
@@ -1002,6 +1003,7 @@
     }
 }
 
+static
 SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA(
         PCtxtHandle context_handle, ULONG attribute, PVOID buffer)
 {
@@ -1068,7 +1070,7 @@
     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 @@
     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;

Modified: trunk/reactos/dll/win32/schannel/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/stubs.c…
==============================================================================
--- trunk/reactos/dll/win32/schannel/stubs.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/schannel/stubs.c	[iso-8859-1] Mon Sep  1 16:32:26 2014
@@ -25,32 +25,3 @@
 {
     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;
-}