Skip to content

W
wine-cw
Commit ae133b80 authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

wintrust: Fix encoding OIDs with only two components.

parent 84d9b2c0
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
dlls/wintrust/asn.c
View file @ ae133b80
...@@ -532,7 +532,7 @@ static BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType, ...@@ -532,7 +532,7 @@ static BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType,
const char *ptr; const char *ptr;
int val1, val2; int val1, val2;
if (sscanf(pszObjId, "%d.%d.%n", &val1, &val2, &firstPos) != 2) if (sscanf(pszObjId, "%d.%d%n", &val1, &val2, &firstPos) != 2)
{ {
SetLastError(CRYPT_E_ASN1_ERROR); SetLastError(CRYPT_E_ASN1_ERROR);
return FALSE; return FALSE;
...@@ -540,6 +540,11 @@ static BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType, ...@@ -540,6 +540,11 @@ static BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType,
bytesNeeded++; bytesNeeded++;
firstByte = val1 * 40 + val2; firstByte = val1 * 40 + val2;
ptr = pszObjId + firstPos; ptr = pszObjId + firstPos;
if (*ptr == '.')
{
ptr++;
firstPos++;
}
while (ret && *ptr) while (ret && *ptr)
{ {
int pos; int pos;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment