crypt32: Get rid of attribute certs from signed info, they're not supported anyway.
This commit is contained in:
parent
a50d8dc1dd
commit
014467031e
|
@ -89,8 +89,6 @@ typedef struct _CRYPT_SIGNED_INFO
|
|||
PCERT_BLOB rgCertEncoded;
|
||||
DWORD cCrlEncoded;
|
||||
PCRL_BLOB rgCrlEncoded;
|
||||
DWORD cAttrCertEncoded;
|
||||
PCERT_BLOB rgAttrCertEncoded;
|
||||
CRYPT_CONTENT_INFO content;
|
||||
DWORD cSignerInfo;
|
||||
PCMSG_SIGNER_INFO rgSignerInfo;
|
||||
|
|
|
@ -3255,8 +3255,6 @@ BOOL CRYPT_AsnEncodePKCSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData,
|
|||
DWORD cItem = 1, cSwapped = 0;
|
||||
BOOL ret = TRUE;
|
||||
|
||||
if (signedInfo->cAttrCertEncoded)
|
||||
FIXME("unimplemented for attr certs\n");
|
||||
if (signedInfo->cSignerInfo)
|
||||
{
|
||||
digestAlgorithmsSet.cItems = signedInfo->cSignerInfo;
|
||||
|
|
|
@ -1833,21 +1833,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType,
|
|||
break;
|
||||
case CMSG_ATTR_CERT_COUNT_PARAM:
|
||||
if (msg->u.signedInfo)
|
||||
{
|
||||
DWORD attrCertCount = 0;
|
||||
|
||||
ret = CRYPT_CopyParam(pvData, pcbData,
|
||||
&msg->u.signedInfo->cAttrCertEncoded, sizeof(DWORD));
|
||||
&attrCertCount, sizeof(DWORD));
|
||||
}
|
||||
else
|
||||
SetLastError(CRYPT_E_INVALID_MSG_TYPE);
|
||||
break;
|
||||
case CMSG_ATTR_CERT_PARAM:
|
||||
if (msg->u.signedInfo)
|
||||
{
|
||||
if (dwIndex >= msg->u.signedInfo->cAttrCertEncoded)
|
||||
SetLastError(CRYPT_E_INVALID_INDEX);
|
||||
else
|
||||
ret = CRYPT_CopyParam(pvData, pcbData,
|
||||
msg->u.signedInfo->rgAttrCertEncoded[dwIndex].pbData,
|
||||
msg->u.signedInfo->rgAttrCertEncoded[dwIndex].cbData);
|
||||
}
|
||||
SetLastError(CRYPT_E_INVALID_INDEX);
|
||||
else
|
||||
SetLastError(CRYPT_E_INVALID_MSG_TYPE);
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue