ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Correct loading OID functions from the registry.

This commit is contained in:
Juan Lang 2007-08-09 13:18:05 -07:00 committed by Alexandre Julliard
parent 6ac0816109
commit 8778b9f506
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/crypt32/oid.c
View File

@ -177,7 +177,8 @@ static char *CRYPT_GetKeyName(DWORD dwEncodingType, LPCSTR pszFuncName,
len = sizeof(szEncodingTypeFmt) + lstrlenA(pszFuncName) + lstrlenA(oid); len = sizeof(szEncodingTypeFmt) + lstrlenA(pszFuncName) + lstrlenA(oid);
szKey = CryptMemAlloc(len); szKey = CryptMemAlloc(len);
if (szKey) if (szKey)
sprintf(szKey, szEncodingTypeFmt, dwEncodingType, pszFuncName, oid); sprintf(szKey, szEncodingTypeFmt,
GET_CERT_ENCODING_TYPE(dwEncodingType), pszFuncName, oid);
return szKey; return szKey;
} }
@ -250,7 +251,7 @@ BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule,
func = CryptMemAlloc(sizeof(struct OIDFunction)); func = CryptMemAlloc(sizeof(struct OIDFunction));
if (func) if (func)
{ {
func->encoding = dwEncodingType; func->encoding = GET_CERT_ENCODING_TYPE(dwEncodingType);
if (HIWORD(rgFuncEntry[i].pszOID)) if (HIWORD(rgFuncEntry[i].pszOID))
{ {
LPSTR oid; LPSTR oid;
@ -290,7 +291,7 @@ static BOOL CRYPT_GetFuncFromReg(DWORD dwEncodingType, LPCSTR pszOID,
DWORD type, size = 0; DWORD type, size = 0;
rc = RegQueryValueExA(key, "FuncName", NULL, &type, NULL, &size); rc = RegQueryValueExA(key, "FuncName", NULL, &type, NULL, &size);
if (rc == ERROR_MORE_DATA && type == REG_SZ) if ((!rc || rc == ERROR_MORE_DATA) && type == REG_SZ)
{ {
funcName = CryptMemAlloc(size); funcName = CryptMemAlloc(size);
rc = RegQueryValueExA(key, "FuncName", NULL, &type, rc = RegQueryValueExA(key, "FuncName", NULL, &type,
@ -299,7 +300,7 @@ static BOOL CRYPT_GetFuncFromReg(DWORD dwEncodingType, LPCSTR pszOID,
else else
funcName = szFuncName; funcName = szFuncName;
rc = RegQueryValueExW(key, DllW, NULL, &type, NULL, &size); rc = RegQueryValueExW(key, DllW, NULL, &type, NULL, &size);
if (rc == ERROR_MORE_DATA && type == REG_SZ) if ((!rc || rc == ERROR_MORE_DATA) && type == REG_SZ)
{ {
LPWSTR dllName = CryptMemAlloc(size); LPWSTR dllName = CryptMemAlloc(size);
@ -318,7 +319,7 @@ static BOOL CRYPT_GetFuncFromReg(DWORD dwEncodingType, LPCSTR pszOID,
lib = LoadLibraryW(dllName); lib = LoadLibraryW(dllName);
if (lib) if (lib)
{ {
*ppvFuncAddr = GetProcAddress(lib, szFuncName); *ppvFuncAddr = GetProcAddress(lib, funcName);
if (*ppvFuncAddr) if (*ppvFuncAddr)
{ {
*phFuncAddr = (HCRYPTOIDFUNCADDR)lib; *phFuncAddr = (HCRYPTOIDFUNCADDR)lib;
@ -368,7 +369,7 @@ BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet,
EnterCriticalSection(&set->cs); EnterCriticalSection(&set->cs);
LIST_FOR_EACH_ENTRY(function, &set->functions, struct OIDFunction, next) LIST_FOR_EACH_ENTRY(function, &set->functions, struct OIDFunction, next)
{ {
if (function->encoding == dwEncodingType) if (function->encoding == GET_CERT_ENCODING_TYPE(dwEncodingType))
{ {
if (HIWORD(pszOID)) if (HIWORD(pszOID))
{ {
@ -395,6 +396,7 @@ BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet,
if (!*ppvFuncAddr) if (!*ppvFuncAddr)
ret = CRYPT_GetFuncFromReg(dwEncodingType, pszOID, set->name, ret = CRYPT_GetFuncFromReg(dwEncodingType, pszOID, set->name,
ppvFuncAddr, phFuncAddr); ppvFuncAddr, phFuncAddr);
TRACE("returning %d\n", ret);
return ret; return ret;
} }