wintrust: Don't hardcode supported OIDs, let CryptDecodeObject handle it directly.
This commit is contained in:
parent
dc34bb9eb0
commit
04841e1f35
|
@ -198,10 +198,25 @@ static DWORD SOFTPUB_DecodeInnerContent(CRYPT_PROVIDER_DATA *data)
|
||||||
{
|
{
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
DWORD size;
|
DWORD size;
|
||||||
|
LPSTR oid = NULL;
|
||||||
LPBYTE buf = NULL;
|
LPBYTE buf = NULL;
|
||||||
|
|
||||||
ret = CryptMsgGetParam(data->hMsg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, NULL,
|
ret = CryptMsgGetParam(data->hMsg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, NULL,
|
||||||
&size);
|
&size);
|
||||||
|
if (!ret)
|
||||||
|
goto error;
|
||||||
|
oid = data->psPfns->pfnAlloc(size);
|
||||||
|
if (!oid)
|
||||||
|
{
|
||||||
|
SetLastError(ERROR_OUTOFMEMORY);
|
||||||
|
ret = FALSE;
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
ret = CryptMsgGetParam(data->hMsg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, oid,
|
||||||
|
&size);
|
||||||
|
if (!ret)
|
||||||
|
goto error;
|
||||||
|
ret = CryptMsgGetParam(data->hMsg, CMSG_CONTENT_PARAM, 0, NULL, &size);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
goto error;
|
goto error;
|
||||||
buf = data->psPfns->pfnAlloc(size);
|
buf = data->psPfns->pfnAlloc(size);
|
||||||
|
@ -211,51 +226,26 @@ static DWORD SOFTPUB_DecodeInnerContent(CRYPT_PROVIDER_DATA *data)
|
||||||
ret = FALSE;
|
ret = FALSE;
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
ret = CryptMsgGetParam(data->hMsg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, buf,
|
ret = CryptMsgGetParam(data->hMsg, CMSG_CONTENT_PARAM, 0, buf, &size);
|
||||||
&size);
|
|
||||||
if (!ret)
|
if (!ret)
|
||||||
goto error;
|
goto error;
|
||||||
if (!strcmp((LPCSTR)buf, SPC_INDIRECT_DATA_OBJID))
|
ret = CryptDecodeObject(data->dwEncoding, oid, buf, size, 0, NULL, &size);
|
||||||
|
if (!ret)
|
||||||
|
goto error;
|
||||||
|
data->u.pPDSip->psIndirectData = data->psPfns->pfnAlloc(size);
|
||||||
|
if (!data->u.pPDSip->psIndirectData)
|
||||||
{
|
{
|
||||||
data->psPfns->pfnFree(buf);
|
SetLastError(ERROR_OUTOFMEMORY);
|
||||||
buf = NULL;
|
|
||||||
ret = CryptMsgGetParam(data->hMsg, CMSG_CONTENT_PARAM, 0, NULL, &size);
|
|
||||||
if (!ret)
|
|
||||||
goto error;
|
|
||||||
buf = data->psPfns->pfnAlloc(size);
|
|
||||||
if (!buf)
|
|
||||||
{
|
|
||||||
SetLastError(ERROR_OUTOFMEMORY);
|
|
||||||
ret = FALSE;
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
ret = CryptMsgGetParam(data->hMsg, CMSG_CONTENT_PARAM, 0, buf, &size);
|
|
||||||
if (!ret)
|
|
||||||
goto error;
|
|
||||||
ret = CryptDecodeObject(data->dwEncoding,
|
|
||||||
SPC_INDIRECT_DATA_CONTENT_STRUCT, buf, size, 0, NULL, &size);
|
|
||||||
if (!ret)
|
|
||||||
goto error;
|
|
||||||
data->u.pPDSip->psIndirectData = data->psPfns->pfnAlloc(size);
|
|
||||||
if (!data->u.pPDSip->psIndirectData)
|
|
||||||
{
|
|
||||||
SetLastError(ERROR_OUTOFMEMORY);
|
|
||||||
ret = FALSE;
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
ret = CryptDecodeObject(data->dwEncoding,
|
|
||||||
SPC_INDIRECT_DATA_CONTENT_STRUCT, buf, size, 0,
|
|
||||||
data->u.pPDSip->psIndirectData, &size);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
FIXME("unimplemented for OID %s\n", (LPCSTR)buf);
|
|
||||||
SetLastError(TRUST_E_SUBJECT_FORM_UNKNOWN);
|
|
||||||
ret = FALSE;
|
ret = FALSE;
|
||||||
|
goto error;
|
||||||
}
|
}
|
||||||
|
ret = CryptDecodeObject(data->dwEncoding, oid, buf, size, 0,
|
||||||
|
data->u.pPDSip->psIndirectData, &size);
|
||||||
|
|
||||||
error:
|
error:
|
||||||
TRACE("returning %d\n", ret);
|
TRACE("returning %d\n", ret);
|
||||||
|
data->psPfns->pfnFree(oid);
|
||||||
|
data->psPfns->pfnFree(buf);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue