[wintrust] Register WINTRUST_ACTION_GENERIC_VERIFY_V2
Paul Vriens
Paul.Vriens at xs4all.nl
Sun Sep 3 10:18:21 CDT 2006
Hi,
first shot at DllRegisterServer. It registers
WINTRUST_ACTION_GENERIC_VERIFY_V2.
I've also added wintrust.dll to the list of Dll's to register when
wineprefixcreate is run.
Although MSDN states to use WintrustAddActionID for adding Trust Providers it
doesn't do this for the Trust Providers of wintrust.dll itself. Most likely as
not all actions are provided and there is no way to tell WintrustAddActionID
that a particular action is not present.
Changelog
Register WINTRUST_ACTION_GENERIC_VERIFY_V2
Cheers,
Paul.
---
dlls/wintrust/register.c | 139 +++++++++++++++++++++++++++++++++++++++++++++-
tools/wine.inf | 1
2 files changed, 136 insertions(+), 4 deletions(-)
diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c
index 3b0da2e..ef0dc66 100644
--- a/dlls/wintrust/register.c
+++ b/dlls/wintrust/register.c
@@ -25,6 +25,7 @@ #include "winbase.h"
#include "winerror.h"
#include "winuser.h"
#include "winreg.h"
+#include "winnls.h"
#include "guiddef.h"
#include "wintrust.h"
@@ -34,6 +35,28 @@ #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
+static const CRYPT_TRUST_REG_ENTRY SoftpubInitialization = {sizeof(CRYPT_TRUST_REG_ENTRY),
+ (WCHAR*)SP_POLICY_PROVIDER_DLL_NAME,
+ (WCHAR*)SP_INIT_FUNCTION };
+static const CRYPT_TRUST_REG_ENTRY SoftpubMessage = {sizeof(CRYPT_TRUST_REG_ENTRY),
+ (WCHAR*)SP_POLICY_PROVIDER_DLL_NAME,
+ (WCHAR*)SP_OBJTRUST_FUNCTION };
+static const CRYPT_TRUST_REG_ENTRY SoftpubSignature = {sizeof(CRYPT_TRUST_REG_ENTRY),
+ (WCHAR*)SP_POLICY_PROVIDER_DLL_NAME,
+ (WCHAR*)SP_SIGTRUST_FUNCTION };
+static const CRYPT_TRUST_REG_ENTRY SoftpubCertficate = {sizeof(CRYPT_TRUST_REG_ENTRY),
+ (WCHAR*)SP_POLICY_PROVIDER_DLL_NAME,
+ (WCHAR*)WT_PROVIDER_CERTTRUST_FUNCTION };
+static const CRYPT_TRUST_REG_ENTRY SoftpubCertCheck = {sizeof(CRYPT_TRUST_REG_ENTRY),
+ (WCHAR*)SP_POLICY_PROVIDER_DLL_NAME,
+ (WCHAR*)SP_CHKCERT_FUNCTION };
+static const CRYPT_TRUST_REG_ENTRY SoftpubFinalPolicy = {sizeof(CRYPT_TRUST_REG_ENTRY),
+ (WCHAR*)SP_POLICY_PROVIDER_DLL_NAME,
+ (WCHAR*)SP_FINALPOLICY_FUNCTION };
+static const CRYPT_TRUST_REG_ENTRY SoftpubCleanup = {sizeof(CRYPT_TRUST_REG_ENTRY),
+ (WCHAR*)SP_POLICY_PROVIDER_DLL_NAME,
+ (WCHAR*)SP_CLEANUPPOLICY_FUNCTION };
+
static const WCHAR Trust[] = {'S','o','f','t','w','a','r','e','\\',
'M','i','c','r','o','s','o','f','t','\\',
'C','r','y','p','t','o','g','r','a','p','h','y','\\',
@@ -49,6 +72,8 @@ static const WCHAR FinalPolicy[] =
static const WCHAR DiagnosticPolicy[] = {'D','i','a','g','n','o','s','t','i','c','P','o','l','i','c','y','\\', 0};
static const WCHAR Cleanup[] = {'C','l','e','a','n','u','p','\\', 0};
+static const WCHAR DefaultId[] = {'D','e','f','a','u','l','t','I','d', 0};
+
/***********************************************************************
* WINTRUST_guid2wstr
*
@@ -155,7 +180,6 @@ BOOL WINAPI WintrustAddActionID( GUID* p
/* Create this string only once, instead of in the helper function */
WINTRUST_Guid2Wstr( pgActionID, GuidString);
-
/* Write the information to the registry */
Res = WINTRUST_WriteProviderToReg(GuidString, Initialization , psProvInfo->sInitProvider);
@@ -177,7 +201,6 @@ BOOL WINAPI WintrustAddActionID( GUID* p
/* Testing (by restricting access to the registry for some keys) shows that the last failing function
* will be used for last error.
- * an error is the one used to propagate the last error.
* If the flag WT_ADD_ACTION_ID_RET_RESULT_FLAG is set and there are errors when adding the action
* we have to return FALSE. Errors includes both invalid entries as well as registry errors.
* Testing also showed that one error doesn't stop the registry writes. Every action will be dealt with.
@@ -262,12 +285,120 @@ BOOL WINAPI WintrustRemoveActionID( GUID
}
/***********************************************************************
+ * WINTRUST_WriteSingleUsageEntry
+ *
+ * Write a singe value and it's data to:
+ *
+ * HKLM\Software\Microsoft\Cryptography\Trust\Usages\<OID>
+ */
+static LONG WINTRUST_WriteSingleUsageEntry(CHAR* OID,
+ const WCHAR* Value,
+ WCHAR* Data)
+{
+ static const WCHAR Usages[] = {'U','s','a','g','e','s','\\', 0};
+ WCHAR UsageKey[MAX_PATH];
+ HKEY Key;
+ LONG Res = ERROR_SUCCESS;
+ WCHAR* OIDW;
+ DWORD Len;
+
+ /* Create the needed key string */
+ UsageKey[0]='\0';
+ lstrcatW(UsageKey, Trust);
+ lstrcatW(UsageKey, Usages);
+
+ /* Turn OID into a wide-character string */
+ Len = MultiByteToWideChar( CP_ACP, 0, OID, -1, NULL, 0 );
+ OIDW = HeapAlloc( GetProcessHeap(), 0, Len * sizeof(WCHAR) );
+ MultiByteToWideChar( CP_ACP, 0, OID, -1, OIDW, Len );
+ lstrcatW(UsageKey, OIDW);
+
+ Res = RegCreateKeyExW(HKEY_LOCAL_MACHINE, UsageKey, 0, NULL, 0, KEY_WRITE, NULL, &Key, NULL);
+ if (Res != ERROR_SUCCESS) goto error_close_key;
+
+ /* Create the Value entry */
+ Res = RegSetValueExW(Key, Value, 0, REG_SZ, (BYTE*)Data,
+ (lstrlenW(Data) + 1)*sizeof(WCHAR));
+ if (Res != ERROR_SUCCESS) goto error_close_key;
+
+error_close_key:
+ RegCloseKey(Key);
+
+ HeapFree(GetProcessHeap(), 0, OIDW);
+
+ return Res;
+}
+
+/***************************************************************************
+ * WINTRUST_RegisterGenVerifyV2
+ *
+ * Register WINTRUST_ACTION_GENERIC_VERIFY_V2 actions and usages.
+ *
+ * NOTES
+ * WINTRUST_ACTION_GENERIC_VERIFY_V2 ({00AAC56B-CD44-11D0-8CC2-00C04FC295EE}
+ * is defined in softpub.h
+ * We don't care about failures (see comments in DllRegisterServer)
+ */
+static void WINTRUST_RegisterGenVerifyV2(void)
+{
+ GUID ProvGUID;
+ WCHAR GuidString[39];
+
+ ProvGUID = (GUID)WINTRUST_ACTION_GENERIC_VERIFY_V2;
+ WINTRUST_Guid2Wstr(&ProvGUID , GuidString);
+
+ TRACE("Going to register WINTRUST_ACTION_GENERIC_VERIFY_V2 : %s\n", wine_dbgstr_w(GuidString));
+
+ /* HKLM\Software\Microsoft\Cryptography\Trust\Usages\1.3.6.1.5.5.7.3.3 */
+ WINTRUST_WriteSingleUsageEntry((CHAR*)szOID_PKIX_KP_CODE_SIGNING, DefaultId, GuidString);
+
+ /* HKLM\Software\Microsoft\Cryptography\Trust\Provider\*\{00AAC56B-CD44-11D0-8CC2-00C04FC295EE} */
+ WINTRUST_WriteProviderToReg(GuidString, Initialization, SoftpubInitialization);
+ WINTRUST_WriteProviderToReg(GuidString, Message , SoftpubMessage);
+ WINTRUST_WriteProviderToReg(GuidString, Signature , SoftpubSignature);
+ WINTRUST_WriteProviderToReg(GuidString, Certificate , SoftpubCertficate);
+ WINTRUST_WriteProviderToReg(GuidString, CertCheck , SoftpubCertCheck);
+ WINTRUST_WriteProviderToReg(GuidString, FinalPolicy , SoftpubFinalPolicy);
+ WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup);
+}
+
+/***********************************************************************
* DllRegisterServer (WINTRUST.@)
*/
HRESULT WINAPI DllRegisterServer(void)
{
- FIXME("stub\n");
- return S_OK;
+ HRESULT Res = S_OK;
+ HKEY Key;
+
+ TRACE("\n");
+
+ /* FIXME:
+ *
+ * A short list of stuff that should be done here:
+ *
+ * - Several calls to CryptRegisterOIDFunction
+ * - Several action registrations (NOT through WintrustAddActionID)
+ * - Several calls to CryptSIPAddProvider
+ * - One call to CryptSIPRemoveProvider (do we need that?)
+ */
+
+ /* Testing on W2K3 shows:
+ * If we cannot open HKLM\Software\Microsoft\Cryptography\Providers\Trust
+ * for writing, DllRegisterServer returns S_FALSE. If the key can be opened
+ * there is no check whether the actions can be written in the registry.
+ * As the previous list shows, there are several calls after these registrations.
+ * If they fail they will overwrite the returnvalue of DllRegisterServer.
+ */
+
+ /* Check if we can open/create HKLM\Software\Microsoft\Cryptography\Providers\Trust */
+ if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, Trust, 0, NULL, 0, KEY_WRITE, NULL, &Key, NULL) != ERROR_SUCCESS)
+ Res = S_FALSE;
+ RegCloseKey(Key);
+
+ /* Register WINTRUST_ACTION_GENERIC_VERIFY_V2 */
+ WINTRUST_RegisterGenVerifyV2();
+
+ return Res;
}
/***********************************************************************
diff --git a/tools/wine.inf b/tools/wine.inf
index 49e8000..2af769c 100644
--- a/tools/wine.inf
+++ b/tools/wine.inf
@@ -2126,6 +2126,7 @@ HKLM,%CurrentVersion%\Telephony\Country
11,,shdocvw.dll,1
11,,shell32.dll,1
11,,urlmon.dll,1
+11,,wintrust.dll,1
[FakeDllsSection]
11,,explorer.exe
--
1.4.1.1
More information about the wine-patches
mailing list