system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 04:49:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypt32: Get rid of attribute certs from signed info, they're not supported anyway.

Browse source
This commit is contained in:
Juan Lang 2007-07-30 12:09:39 -07:00 committed by Alexandre Julliard
parent a50d8dc1dd
commit 014467031e
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/crypt32/crypt32_private.h
View file

@ -89,8 +89,6 @@ typedef struct _CRYPT_SIGNED_INFO
PCERT_BLOB rgCertEncoded; PCERT_BLOB rgCertEncoded;
DWORD cCrlEncoded; DWORD cCrlEncoded;
PCRL_BLOB rgCrlEncoded; PCRL_BLOB rgCrlEncoded;
DWORD cAttrCertEncoded;
PCERT_BLOB rgAttrCertEncoded;
CRYPT_CONTENT_INFO content; CRYPT_CONTENT_INFO content;
DWORD cSignerInfo; DWORD cSignerInfo;
PCMSG_SIGNER_INFO rgSignerInfo; PCMSG_SIGNER_INFO rgSignerInfo;

2
dlls/crypt32/encode.c
View file

@ -3255,8 +3255,6 @@ BOOL CRYPT_AsnEncodePKCSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData,
DWORD cItem = 1, cSwapped = 0; DWORD cItem = 1, cSwapped = 0;
BOOL ret = TRUE; BOOL ret = TRUE;
if (signedInfo->cAttrCertEncoded)
FIXME("unimplemented for attr certs\n");
if (signedInfo->cSignerInfo) if (signedInfo->cSignerInfo)
{ {
digestAlgorithmsSet.cItems = signedInfo->cSignerInfo; digestAlgorithmsSet.cItems = signedInfo->cSignerInfo;

15
dlls/crypt32/msg.c
View file

@ -1833,21 +1833,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType,
break; break;
case CMSG_ATTR_CERT_COUNT_PARAM: case CMSG_ATTR_CERT_COUNT_PARAM:
if (msg->u.signedInfo) if (msg->u.signedInfo)
{
DWORD attrCertCount = 0;
ret = CRYPT_CopyParam(pvData, pcbData, ret = CRYPT_CopyParam(pvData, pcbData,
&msg->u.signedInfo->cAttrCertEncoded, sizeof(DWORD)); &attrCertCount, sizeof(DWORD));
}
else else
SetLastError(CRYPT_E_INVALID_MSG_TYPE); SetLastError(CRYPT_E_INVALID_MSG_TYPE);
break; break;
case CMSG_ATTR_CERT_PARAM: case CMSG_ATTR_CERT_PARAM:
if (msg->u.signedInfo) if (msg->u.signedInfo)
{ SetLastError(CRYPT_E_INVALID_INDEX);
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);
}
else else
SetLastError(CRYPT_E_INVALID_MSG_TYPE); SetLastError(CRYPT_E_INVALID_MSG_TYPE);
break; break;