Author: akhaldi Date: Tue Mar 1 19:20:47 2016 New Revision: 70851
URL: http://svn.reactos.org/svn/reactos?rev=70851&view=rev Log: [CRYPT32] Sync with Wine Staging 1.9.4. CORE-10912
Modified: trunk/reactos/dll/win32/crypt32/chain.c trunk/reactos/dll/win32/crypt32/str.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?r... ============================================================================== --- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Tue Mar 1 19:20:47 2016 @@ -2286,7 +2286,10 @@ chain->context.dwRevocationFreshnessTime = 0; } else + { + CRYPT_FreeSimpleChain(simpleChain); ret = FALSE; + } *ppChain = chain; } return ret;
Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?rev... ============================================================================== --- trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] Tue Mar 1 19:20:47 2016 @@ -760,7 +760,7 @@ { WCHAR buf[10]; /* big enough for L"GivenName" */ LPWSTR keyName; /* usually = buf, but may be allocated */ - DWORD keyLen; + DWORD keyLen; /* full available buffer size in WCHARs */ };
static void CRYPT_InitializeKeynameKeeper(struct KeynameKeeper *keeper) @@ -786,17 +786,13 @@ { DWORD len = key->end - key->start;
- if (len > keeper->keyLen) - { - if (keeper->keyName == keeper->buf) - keeper->keyName = CryptMemAlloc(len * sizeof(WCHAR)); - else - keeper->keyName = CryptMemRealloc(keeper->keyName, - len * sizeof(WCHAR)); - keeper->keyLen = len; - } - memcpy(keeper->keyName, key->start, (key->end - key->start) * - sizeof(WCHAR)); + if (len >= keeper->keyLen) + { + CRYPT_FreeKeynameKeeper( keeper ); + keeper->keyLen = len + 1; + keeper->keyName = CryptMemAlloc(keeper->keyLen * sizeof(WCHAR)); + } + memcpy(keeper->keyName, key->start, len * sizeof(WCHAR)); keeper->keyName[len] = '\0'; TRACE("Keyname is %s\n", debugstr_w(keeper->keyName)); }
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Mar 1 19:20:47 2016 @@ -58,7 +58,7 @@ reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.4 reactos/dll/win32/compstui # Synced to WineStaging-1.7.55 reactos/dll/win32/credui # Synced to WineStaging-1.7.55 -reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.4 reactos/dll/win32/cryptdlg # Synced to WineStaging-1.7.55 reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.55 reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.55