wine-commits August 2008

wine-commits@winehq.org

2 participants
839 discussions

Juan Lang : crypt32: Reduce excessive indenting.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: a203640b5a44aad7b8fbf35db32d6e738faddd72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a203640b5a44aad7b8fbf35db… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:10:27 2008 -0700 crypt32: Reduce excessive indenting. --- dlls/crypt32/message.c | 87 ++++++++++++++++++++++------------------------- 1 files changed, 41 insertions(+), 46 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index fe4d4ec..2aeb3cf 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -131,6 +131,7 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, BOOL ret = FALSE; DWORD size; CRYPT_CONTENT_INFO *contentInfo; + HCRYPTMSG msg; TRACE("(%p, %d, %p, %d, %p, %p, %p)\n", pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob, @@ -149,66 +150,60 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, return FALSE; } - ret = CryptDecodeObjectEx(pVerifyPara->dwMsgAndCertEncodingType, + if (!CryptDecodeObjectEx(pVerifyPara->dwMsgAndCertEncodingType, PKCS_CONTENT_INFO, pbSignedBlob, cbSignedBlob, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - (LPBYTE)&contentInfo, &size); - if (ret) + (LPBYTE)&contentInfo, &size)) + return FALSE; + if (strcmp(contentInfo->pszObjId, szOID_RSA_signedData)) { - if (strcmp(contentInfo->pszObjId, szOID_RSA_signedData)) - { - SetLastError(CRYPT_E_UNEXPECTED_MSG_TYPE); - ret = FALSE; - } - else + LocalFree(contentInfo); + SetLastError(CRYPT_E_UNEXPECTED_MSG_TYPE); + return FALSE; + } + msg = CryptMsgOpenToDecode(pVerifyPara->dwMsgAndCertEncodingType, 0, + CMSG_SIGNED, pVerifyPara->hCryptProv, NULL, NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, contentInfo->Content.pbData, + contentInfo->Content.cbData, TRUE); + if (ret && pcbDecoded) + ret = CRYPT_CopyParam(pbDecoded, pcbDecoded, + contentInfo->Content.pbData, contentInfo->Content.cbData); + if (ret) { - HCRYPTMSG msg = CryptMsgOpenToDecode( - pVerifyPara->dwMsgAndCertEncodingType, 0, CMSG_SIGNED, - pVerifyPara->hCryptProv, NULL, NULL); + CERT_INFO *certInfo = CRYPT_GetSignerCertInfoFromMsg(msg, + dwSignerIndex); - if (msg) + ret = FALSE; + if (certInfo) { - ret = CryptMsgUpdate(msg, contentInfo->Content.pbData, - contentInfo->Content.cbData, TRUE); - if (ret && pcbDecoded) - ret = CRYPT_CopyParam(pbDecoded, pcbDecoded, - contentInfo->Content.pbData, contentInfo->Content.cbData); - if (ret) + HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MSG, + pVerifyPara->dwMsgAndCertEncodingType, + pVerifyPara->hCryptProv, 0, msg); + + if (store) { - CERT_INFO *certInfo = CRYPT_GetSignerCertInfoFromMsg(msg, - dwSignerIndex); + PCCERT_CONTEXT cert = CRYPT_GetSignerCertificate( + msg, pVerifyPara, certInfo, store); - ret = FALSE; - if (certInfo) + if (cert) { - HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MSG, - pVerifyPara->dwMsgAndCertEncodingType, - pVerifyPara->hCryptProv, 0, msg); - - if (store) - { - PCCERT_CONTEXT cert = CRYPT_GetSignerCertificate( - msg, pVerifyPara, certInfo, store); - - if (cert) - { - ret = CryptMsgControl(msg, 0, - CMSG_CTRL_VERIFY_SIGNATURE, cert->pCertInfo); - if (ret && ppSignerCert) - *ppSignerCert = cert; - else - CertFreeCertificateContext(cert); - } - CertCloseStore(store, 0); - } + ret = CryptMsgControl(msg, 0, + CMSG_CTRL_VERIFY_SIGNATURE, cert->pCertInfo); + if (ret && ppSignerCert) + *ppSignerCert = cert; + else + CertFreeCertificateContext(cert); } - CryptMemFree(certInfo); + CertCloseStore(store, 0); } - CryptMsgClose(msg); } + CryptMemFree(certInfo); } - LocalFree(contentInfo); + CryptMsgClose(msg); } + LocalFree(contentInfo); TRACE("returning %d\n", ret); return ret; }

1 0

Juan Lang : crypt32: Remove an unneeded helper.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: a36d8ce61160dd7895b1441b2ba6e1997132a0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36d8ce61160dd7895b1441b2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:07:29 2008 -0700 crypt32: Remove an unneeded helper. --- dlls/crypt32/msg.c | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 6c59845..8ac4b14 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1424,23 +1424,6 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, return msg; } -static inline const char *MSG_TYPE_STR(DWORD type) -{ - switch (type) - { -#define _x(x) case (x): return #x - _x(CMSG_DATA); - _x(CMSG_SIGNED); - _x(CMSG_ENVELOPED); - _x(CMSG_SIGNED_AND_ENVELOPED); - _x(CMSG_HASHED); - _x(CMSG_ENCRYPTED); -#undef _x - default: - return wine_dbg_sprintf("unknown (%d)", type); - } -} - HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, DWORD dwMsgType, const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo) @@ -1470,7 +1453,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, pszInnerContentObjID, pStreamInfo); break; case CMSG_ENVELOPED: - FIXME("unimplemented for type %s\n", MSG_TYPE_STR(dwMsgType)); + FIXME("unimplemented for type CMSG_ENVELOPED\n"); break; case CMSG_SIGNED_AND_ENVELOPED: case CMSG_ENCRYPTED: @@ -1720,7 +1703,7 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, msg->type = CMSG_HASHED; break; case CMSG_ENVELOPED: - FIXME("unimplemented for type %s\n", MSG_TYPE_STR(type)); + FIXME("unimplemented for type CMSG_ENVELOPED\n"); ret = TRUE; break; case CMSG_SIGNED:

1 0

Juan Lang : crypt32: Handle the detached portion of detached signed messages.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: aa265b4165d799aed483e12a043b0108f872adaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa265b4165d799aed483e12a0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:07:08 2008 -0700 crypt32: Handle the detached portion of detached signed messages. --- dlls/crypt32/msg.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index d657b87..6c59845 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1658,20 +1658,30 @@ static BOOL CDecodeMsg_DecodeSignedContent(CDecodeMsg *msg, msg->crypt_prov); if (ret) { + CRYPT_DATA_BLOB *content; + /* Now that we have all the content, update the hash handles with - * it. Have to decode it if the type is szOID_RSA_data. + * it. If the message is a detached message, the content is stored + * in msg->detached_data rather than in the signed message's + * content. */ - if (msg->u.signed_data.info->content.Content.cbData) + if (msg->base.open_flags & CMSG_DETACHED_FLAG) + content = &msg->detached_data; + else + content = &msg->u.signed_data.info->content.Content; + if (content->cbData) { - if (!strcmp(msg->u.signed_data.info->content.pszObjId, + /* If the message is not detached, have to decode the message's + * content if the type is szOID_RSA_data. + */ + if (!(msg->base.open_flags & CMSG_DETACHED_FLAG) && + !strcmp(msg->u.signed_data.info->content.pszObjId, szOID_RSA_data)) { CRYPT_DATA_BLOB *blob; ret = CryptDecodeObjectEx(X509_ASN_ENCODING, - X509_OCTET_STRING, - msg->u.signed_data.info->content.Content.pbData, - msg->u.signed_data.info->content.Content.cbData, + X509_OCTET_STRING, content->pbData, content->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, (LPBYTE)&blob, &size); if (ret) { @@ -1682,14 +1692,13 @@ static BOOL CDecodeMsg_DecodeSignedContent(CDecodeMsg *msg, } else ret = CSignedMsgData_Update(&msg->u.signed_data, - msg->u.signed_data.info->content.Content.pbData, - msg->u.signed_data.info->content.Content.cbData, TRUE, - Verify); + content->pbData, content->cbData, TRUE, Verify); } } } return ret; } + /* Decodes the content in blob as the type given, and updates the value * (type, parameters, etc.) of msg based on what blob contains. * It doesn't just use msg's type, to allow a recursive call from an implicitly

1 0

Juan Lang : crypt32: Rewrite CDecodeMsg_Update for better detached data handling.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 0a8d14c2e67d8e95c0057da1c996dbf103b047fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8d14c2e67d8e95c0057da1c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:03:37 2008 -0700 crypt32: Rewrite CDecodeMsg_Update for better detached data handling. --- dlls/crypt32/msg.c | 68 +++++++++++++++++++++++++++------------------- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index be12218..d657b87 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1491,6 +1491,7 @@ typedef struct _CDecodeMsg CSignedMsgData signed_data; } u; CRYPT_DATA_BLOB msg_data; + CRYPT_DATA_BLOB detached_data; PCONTEXT_PROPERTY_LIST properties; } CDecodeMsg; @@ -1515,6 +1516,7 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) break; } CryptMemFree(msg->msg_data.pbData); + CryptMemFree(msg->detached_data.pbData); ContextPropertyList_Free(msg->properties); } @@ -1763,30 +1765,38 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, { FIXME("(%p, %p, %d, %d): streamed update stub\n", hCryptMsg, pbData, cbData, fFinal); - if (fFinal) + switch (msg->base.state) { - if (msg->base.open_flags & CMSG_DETACHED_FLAG && - msg->base.state != MsgStateDataFinalized) + case MsgStateInit: + ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); + if (fFinal) { - ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); - msg->base.state = MsgStateDataFinalized; - if (ret) - ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, - msg->type); + if (msg->base.open_flags & CMSG_DETACHED_FLAG) + msg->base.state = MsgStateDataFinalized; + else + msg->base.state = MsgStateFinalized; } else + msg->base.state = MsgStateUpdated; + break; + case MsgStateUpdated: + ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); + if (fFinal) { - FIXME("(%p, %p, %d, %d): detached update stub\n", hCryptMsg, - pbData, cbData, fFinal); - ret = TRUE; - msg->base.state = MsgStateFinalized; + if (msg->base.open_flags & CMSG_DETACHED_FLAG) + msg->base.state = MsgStateDataFinalized; + else + msg->base.state = MsgStateFinalized; } - } - else - { - ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); - if (msg->base.state == MsgStateInit) - msg->base.state = MsgStateUpdated; + break; + case MsgStateDataFinalized: + ret = CDecodeMsg_CopyData(&msg->detached_data, pbData, cbData); + if (fFinal) + msg->base.state = MsgStateFinalized; + break; + default: + SetLastError(CRYPT_E_MSG_ERROR); + break; } } else @@ -1795,26 +1805,26 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, SetLastError(CRYPT_E_MSG_ERROR); else { - if (msg->base.state == MsgStateInit) + switch (msg->base.state) { + case MsgStateInit: ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); - if (ret) - ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, - msg->type); if (msg->base.open_flags & CMSG_DETACHED_FLAG) msg->base.state = MsgStateDataFinalized; else msg->base.state = MsgStateFinalized; - } - else if (msg->base.state == MsgStateDataFinalized) - { - FIXME("(%p, %p, %d, %d): detached update stub\n", hCryptMsg, - pbData, cbData, fFinal); - ret = TRUE; + break; + case MsgStateDataFinalized: + ret = CDecodeMsg_CopyData(&msg->detached_data, pbData, cbData); msg->base.state = MsgStateFinalized; + break; + default: + SetLastError(CRYPT_E_MSG_ERROR); } } } + if (ret && msg->base.state == MsgStateFinalized) + ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, msg->type); return ret; } @@ -2648,6 +2658,8 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, memset(&msg->u, 0, sizeof(msg->u)); msg->msg_data.cbData = 0; msg->msg_data.pbData = NULL; + msg->detached_data.cbData = 0; + msg->detached_data.pbData = NULL; msg->properties = ContextPropertyList_Create(); } return msg; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 410a180..369576d 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2080,7 +2080,6 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); CryptMsgClose(msg);

1 0

Juan Lang : crypt32: Pass address of blob to store data rather than message to CDecodeMsg_CopyData .
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: d3c8b59e027bda8f5eb06c31670db4e017eff500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c8b59e027bda8f5eb06c316… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:03:12 2008 -0700 crypt32: Pass address of blob to store data rather than message to CDecodeMsg_CopyData. --- dlls/crypt32/msg.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 22d740e..be12218 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1518,22 +1518,22 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) ContextPropertyList_Free(msg->properties); } -static BOOL CDecodeMsg_CopyData(CDecodeMsg *msg, const BYTE *pbData, +static BOOL CDecodeMsg_CopyData(CRYPT_DATA_BLOB *blob, const BYTE *pbData, DWORD cbData) { BOOL ret = TRUE; if (cbData) { - if (msg->msg_data.cbData) - msg->msg_data.pbData = CryptMemRealloc(msg->msg_data.pbData, - msg->msg_data.cbData + cbData); + if (blob->cbData) + blob->pbData = CryptMemRealloc(blob->pbData, + blob->cbData + cbData); else - msg->msg_data.pbData = CryptMemAlloc(cbData); - if (msg->msg_data.pbData) + blob->pbData = CryptMemAlloc(cbData); + if (blob->pbData) { - memcpy(msg->msg_data.pbData + msg->msg_data.cbData, pbData, cbData); - msg->msg_data.cbData += cbData; + memcpy(blob->pbData + blob->cbData, pbData, cbData); + blob->cbData += cbData; } else ret = FALSE; @@ -1768,7 +1768,7 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, if (msg->base.open_flags & CMSG_DETACHED_FLAG && msg->base.state != MsgStateDataFinalized) { - ret = CDecodeMsg_CopyData(msg, pbData, cbData); + ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); msg->base.state = MsgStateDataFinalized; if (ret) ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, @@ -1784,7 +1784,7 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, } else { - ret = CDecodeMsg_CopyData(msg, pbData, cbData); + ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); if (msg->base.state == MsgStateInit) msg->base.state = MsgStateUpdated; } @@ -1797,7 +1797,7 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, { if (msg->base.state == MsgStateInit) { - ret = CDecodeMsg_CopyData(msg, pbData, cbData); + ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); if (ret) ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, msg->type);

1 0

Juan Lang : crypt32: Support the KeyId type of signer in CMSG_SIGNER_CERT_INFO_PARAM.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 1b7121e7ad2ec9087547797c5b37e50aa0528c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b7121e7ad2ec9087547797c5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:02:46 2008 -0700 crypt32: Support the KeyId type of signer in CMSG_SIGNER_CERT_INFO_PARAM. --- dlls/crypt32/msg.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 0ec75af..22d740e 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2174,7 +2174,7 @@ static BOOL CRYPT_CopyCMSSignerInfo(void *pvData, DWORD *pcbData, static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) { - DWORD size = sizeof(CERT_INFO); + DWORD size = sizeof(CERT_INFO), rdnSize; BOOL ret; TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); @@ -2186,8 +2186,8 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, } else { - FIXME("unimplemented for key id\n"); - return FALSE; + rdnSize = CRYPT_SizeOfKeyIdAsIssuerAndSerial(&in->SignerId.KeyId); + size += rdnSize; } if (!pvData) { @@ -2206,11 +2206,17 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, CERT_INFO *out = (CERT_INFO *)pvData; memset(out, 0, sizeof(CERT_INFO)); - CRYPT_CopyBlob(&out->Issuer, - &in->SignerId.IssuerSerialNumber.Issuer, &nextData); - CRYPT_CopyBlob(&out->SerialNumber, - &in->SignerId.IssuerSerialNumber.SerialNumber, &nextData); - ret = TRUE; + if (in->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) + { + CRYPT_CopyBlob(&out->Issuer, + &in->SignerId.IssuerSerialNumber.Issuer, &nextData); + CRYPT_CopyBlob(&out->SerialNumber, + &in->SignerId.IssuerSerialNumber.SerialNumber, &nextData); + ret = TRUE; + } + else + ret = CRYPT_CopyKeyIdAsIssuerAndSerial(&out->Issuer, &out->SerialNumber, + &in->SignerId.KeyId, rdnSize, &nextData); } TRACE("returning %d\n", ret); return ret;

1 0

Juan Lang : crypt32: Support the KeyId type of signer in CMSG_SIGNER_INFO_PARAM.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 51b16fb85724c783f1afc109fc0e387a006315dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b16fb85724c783f1afc109f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:02:25 2008 -0700 crypt32: Support the KeyId type of signer in CMSG_SIGNER_INFO_PARAM. --- dlls/crypt32/msg.c | 82 ++++++++++++++++++++++++++++++++++++++-------- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 68 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 44e8a1f..0ec75af 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1977,10 +1977,58 @@ static DWORD CRYPT_SizeOfAttributes(const CRYPT_ATTRIBUTES *attr) return size; } +static DWORD CRYPT_SizeOfKeyIdAsIssuerAndSerial(const CRYPT_DATA_BLOB *keyId) +{ + static char oid_key_rdn[] = szOID_KEYID_RDN; + DWORD size = 0; + CERT_RDN_ATTR attr; + CERT_RDN rdn = { 1, &attr }; + CERT_NAME_INFO name = { 1, &rdn }; + + attr.pszObjId = oid_key_rdn; + attr.dwValueType = CERT_RDN_OCTET_STRING; + attr.Value.cbData = keyId->cbData; + attr.Value.pbData = keyId->pbData; + if (CryptEncodeObject(X509_ASN_ENCODING, X509_NAME, &name, NULL, &size)) + size++; /* Only include size of special zero serial number on success */ + return size; +} + +static BOOL CRYPT_CopyKeyIdAsIssuerAndSerial(CERT_NAME_BLOB *issuer, + CRYPT_INTEGER_BLOB *serialNumber, const CRYPT_DATA_BLOB *keyId, DWORD encodedLen, + LPBYTE *nextData) +{ + static char oid_key_rdn[] = szOID_KEYID_RDN; + CERT_RDN_ATTR attr; + CERT_RDN rdn = { 1, &attr }; + CERT_NAME_INFO name = { 1, &rdn }; + BOOL ret; + + /* Encode special zero serial number */ + serialNumber->cbData = 1; + serialNumber->pbData = *nextData; + **nextData = 0; + (*nextData)++; + /* Encode issuer */ + issuer->pbData = *nextData; + attr.pszObjId = oid_key_rdn; + attr.dwValueType = CERT_RDN_OCTET_STRING; + attr.Value.cbData = keyId->cbData; + attr.Value.pbData = keyId->pbData; + ret = CryptEncodeObject(X509_ASN_ENCODING, X509_NAME, &name, *nextData, + &encodedLen); + if (ret) + { + *nextData += encodedLen; + issuer->cbData = encodedLen; + } + return ret; +} + static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) { - DWORD size = sizeof(CMSG_SIGNER_INFO); + DWORD size = sizeof(CMSG_SIGNER_INFO), rdnSize; BOOL ret; TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); @@ -1992,8 +2040,8 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, } else { - FIXME("unsupported for key id\n"); - return FALSE; + rdnSize = CRYPT_SizeOfKeyIdAsIssuerAndSerial(&in->SignerId.KeyId); + size += rdnSize; } if (in->HashAlgorithm.pszObjId) size += strlen(in->HashAlgorithm.pszObjId) + 1; @@ -2023,6 +2071,7 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, LPBYTE nextData = (BYTE *)pvData + sizeof(CMSG_SIGNER_INFO); CMSG_SIGNER_INFO *out = (CMSG_SIGNER_INFO *)pvData; + ret = TRUE; out->dwVersion = in->dwVersion; if (in->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) { @@ -2031,17 +2080,22 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, CRYPT_CopyBlob(&out->SerialNumber, &in->SignerId.IssuerSerialNumber.SerialNumber, &nextData); } - CRYPT_CopyAlgorithmId(&out->HashAlgorithm, &in->HashAlgorithm, - &nextData); - CRYPT_CopyAlgorithmId(&out->HashEncryptionAlgorithm, - &in->HashEncryptionAlgorithm, &nextData); - CRYPT_CopyBlob(&out->EncryptedHash, &in->EncryptedHash, &nextData); - /* align pointer */ - if ((nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) - nextData += (nextData - (LPBYTE)0) % sizeof(DWORD_PTR); - CRYPT_CopyAttributes(&out->AuthAttrs, &in->AuthAttrs, &nextData); - CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); - ret = TRUE; + else + ret = CRYPT_CopyKeyIdAsIssuerAndSerial(&out->Issuer, &out->SerialNumber, + &in->SignerId.KeyId, rdnSize, &nextData); + if (ret) + { + CRYPT_CopyAlgorithmId(&out->HashAlgorithm, &in->HashAlgorithm, + &nextData); + CRYPT_CopyAlgorithmId(&out->HashEncryptionAlgorithm, + &in->HashEncryptionAlgorithm, &nextData); + CRYPT_CopyBlob(&out->EncryptedHash, &in->EncryptedHash, &nextData); + /* align pointer */ + if ((nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) + nextData += (nextData - (LPBYTE)0) % sizeof(DWORD_PTR); + CRYPT_CopyAttributes(&out->AuthAttrs, &in->AuthAttrs, &nextData); + CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); + } } TRACE("returning %d\n", ret); return ret; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8df7c69..410a180 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2469,7 +2469,6 @@ static void test_decode_msg_get_param(void) */ size = 0; ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); if (ret) buf = CryptMemAlloc(size);

1 0

Juan Lang : crypt32: Implement CMSG_CMS_SIGNER_INFO_PARAM.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 57a85f0d6bf99eb7043d66bf5d307c266d579258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a85f0d6bf99eb7043d66bf5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:02:02 2008 -0700 crypt32: Implement CMSG_CMS_SIGNER_INFO_PARAM. --- dlls/crypt32/msg.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 2 - 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 1740135..44e8a1f 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2047,6 +2047,76 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, return ret; } +static BOOL CRYPT_CopyCMSSignerInfo(void *pvData, DWORD *pcbData, + const CMSG_CMS_SIGNER_INFO *in) +{ + DWORD size = sizeof(CMSG_CMS_SIGNER_INFO); + BOOL ret; + + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + + if (in->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) + { + size += in->SignerId.IssuerSerialNumber.Issuer.cbData; + size += in->SignerId.IssuerSerialNumber.SerialNumber.cbData; + } + else + size += in->SignerId.KeyId.cbData; + if (in->HashAlgorithm.pszObjId) + size += strlen(in->HashAlgorithm.pszObjId) + 1; + size += in->HashAlgorithm.Parameters.cbData; + if (in->HashEncryptionAlgorithm.pszObjId) + size += strlen(in->HashEncryptionAlgorithm.pszObjId) + 1; + size += in->HashEncryptionAlgorithm.Parameters.cbData; + size += in->EncryptedHash.cbData; + /* align pointer */ + if (size % sizeof(DWORD_PTR)) + size += size % sizeof(DWORD_PTR); + size += CRYPT_SizeOfAttributes(&in->AuthAttrs); + size += CRYPT_SizeOfAttributes(&in->UnauthAttrs); + if (!pvData) + { + *pcbData = size; + ret = TRUE; + } + else if (*pcbData < size) + { + *pcbData = size; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPBYTE nextData = (BYTE *)pvData + sizeof(CMSG_CMS_SIGNER_INFO); + CMSG_CMS_SIGNER_INFO *out = (CMSG_CMS_SIGNER_INFO *)pvData; + + out->dwVersion = in->dwVersion; + out->SignerId.dwIdChoice = in->SignerId.dwIdChoice; + if (in->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) + { + CRYPT_CopyBlob(&out->SignerId.IssuerSerialNumber.Issuer, + &in->SignerId.IssuerSerialNumber.Issuer, &nextData); + CRYPT_CopyBlob(&out->SignerId.IssuerSerialNumber.SerialNumber, + &in->SignerId.IssuerSerialNumber.SerialNumber, &nextData); + } + else + CRYPT_CopyBlob(&out->SignerId.KeyId, &in->SignerId.KeyId, &nextData); + CRYPT_CopyAlgorithmId(&out->HashAlgorithm, &in->HashAlgorithm, + &nextData); + CRYPT_CopyAlgorithmId(&out->HashEncryptionAlgorithm, + &in->HashEncryptionAlgorithm, &nextData); + CRYPT_CopyBlob(&out->EncryptedHash, &in->EncryptedHash, &nextData); + /* align pointer */ + if ((nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) + nextData += (nextData - (LPBYTE)0) % sizeof(DWORD_PTR); + CRYPT_CopyAttributes(&out->AuthAttrs, &in->AuthAttrs, &nextData); + CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); + ret = TRUE; + } + TRACE("returning %d\n", ret); + return ret; +} + static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) { @@ -2239,6 +2309,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_CMS_SIGNER_INFO_PARAM: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyCMSSignerInfo(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex]); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; default: FIXME("unimplemented for %d\n", dwParamType); SetLastError(CRYPT_E_INVALID_MSG_TYPE); diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 4b080ee..8df7c69 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2404,7 +2404,6 @@ static void test_decode_msg_get_param(void) /* Getting the CMS signer info of a PKCS7 message is possible. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); if (ret) buf = CryptMemAlloc(size); @@ -2498,7 +2497,6 @@ static void test_decode_msg_get_param(void) } size = 0; ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); if (ret) buf = CryptMemAlloc(size);

1 0

Juan Lang : crypt32: Add tests for CMSG_CMS_SIGNER_INFO_PARAM.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 6d9fc0f59d9b7dabe1b283186adc65e46103c2cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9fc0f59d9b7dabe1b283186… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:01:37 2008 -0700 crypt32: Add tests for CMSG_CMS_SIGNER_INFO_PARAM. --- dlls/crypt32/tests/msg.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 86ce6b1..4b080ee 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2265,9 +2265,56 @@ static void compare_signer_info(const CMSG_SIGNER_INFO *got, /* FIXME: check more things */ } +static void compare_cms_signer_info(const CMSG_CMS_SIGNER_INFO *got, + const CMSG_CMS_SIGNER_INFO *expected) +{ + ok(got->dwVersion == expected->dwVersion, "Expected version %d, got %d\n", + expected->dwVersion, got->dwVersion); + ok(got->SignerId.dwIdChoice == expected->SignerId.dwIdChoice, + "Expected id choice %d, got %d\n", expected->SignerId.dwIdChoice, + got->SignerId.dwIdChoice); + if (got->SignerId.dwIdChoice == expected->SignerId.dwIdChoice) + { + if (got->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) + { + ok(got->SignerId.IssuerSerialNumber.Issuer.cbData == + expected->SignerId.IssuerSerialNumber.Issuer.cbData, + "Expected issuer size %d, got %d\n", + expected->SignerId.IssuerSerialNumber.Issuer.cbData, + got->SignerId.IssuerSerialNumber.Issuer.cbData); + ok(!memcmp(got->SignerId.IssuerSerialNumber.Issuer.pbData, + expected->SignerId.IssuerSerialNumber.Issuer.pbData, + got->SignerId.IssuerSerialNumber.Issuer.cbData), + "Unexpected issuer\n"); + ok(got->SignerId.IssuerSerialNumber.SerialNumber.cbData == + expected->SignerId.IssuerSerialNumber.SerialNumber.cbData, + "Expected serial number size %d, got %d\n", + expected->SignerId.IssuerSerialNumber.SerialNumber.cbData, + got->SignerId.IssuerSerialNumber.SerialNumber.cbData); + ok(!memcmp(got->SignerId.IssuerSerialNumber.SerialNumber.pbData, + expected->SignerId.IssuerSerialNumber.SerialNumber.pbData, + got->SignerId.IssuerSerialNumber.SerialNumber.cbData), + "Unexpected serial number\n"); + } + else + { + ok(got->SignerId.KeyId.cbData == expected->SignerId.KeyId.cbData, + "expected key id size %d, got %d\n", + expected->SignerId.KeyId.cbData, got->SignerId.KeyId.cbData); + ok(!memcmp(expected->SignerId.KeyId.pbData, + got->SignerId.KeyId.pbData, got->SignerId.KeyId.cbData), + "unexpected key id\n"); + } + } + /* FIXME: check more things */ +} + static const BYTE signedWithCertAndCrlComputedHash[] = { 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26, 0x2f }; +static BYTE keyIdIssuer[] = { +0x30,0x13,0x31,0x11,0x30,0x0f,0x06,0x0a,0x2b,0x06,0x01,0x04,0x01,0x82,0x37, +0x0a,0x07,0x01,0x04,0x01,0x01 }; static void test_decode_msg_get_param(void) { @@ -2354,6 +2401,32 @@ static void test_decode_msg_get_param(void) compare_signer_info((CMSG_SIGNER_INFO *)buf, &signer); CryptMemFree(buf); } + /* Getting the CMS signer info of a PKCS7 message is possible. */ + size = 0; + ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); + todo_wine + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + if (ret) + buf = CryptMemAlloc(size); + else + buf = NULL; + if (buf) + { + CMSG_CMS_SIGNER_INFO signer = { 0 }; + + signer.dwVersion = 1; + signer.SignerId.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; + signer.SignerId.IssuerSerialNumber.Issuer.cbData = + sizeof(encodedCommonName); + signer.SignerId.IssuerSerialNumber.Issuer.pbData = encodedCommonName; + signer.SignerId.IssuerSerialNumber.SerialNumber.cbData = + sizeof(serialNum); + signer.SignerId.IssuerSerialNumber.SerialNumber.pbData = serialNum; + signer.HashAlgorithm.pszObjId = oid_rsa_md5; + CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, buf, &size); + compare_cms_signer_info((CMSG_CMS_SIGNER_INFO *)buf, &signer); + CryptMemFree(buf); + } /* index is ignored when getting signer count */ size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 1, &value, &size); @@ -2383,6 +2456,68 @@ static void test_decode_msg_get_param(void) CMSG_COMPUTED_HASH_PARAM, signedWithCertAndCrlComputedHash, sizeof(signedWithCertAndCrlComputedHash)); CryptMsgClose(msg); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + ret = CryptMsgUpdate(msg, signedKeyIdEmptyContent, + sizeof(signedKeyIdEmptyContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + size = sizeof(value); + ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 0, &value, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 1, "Expected 1 signer, got %d\n", value); + /* Getting the regular (non-CMS) signer info from a CMS message is also + * possible.. + */ + size = 0; + ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); + todo_wine + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + if (ret) + buf = CryptMemAlloc(size); + else + buf = NULL; + if (buf) + { + CMSG_SIGNER_INFO signer; + BYTE zero = 0; + + /* and here's the little oddity: for a CMS message using the key id + * variant of a SignerId, retrieving the CMSG_SIGNER_INFO param yields + * a signer with a zero (not empty) serial number, and whose issuer is + * an RDN with OID szOID_KEYID_RDN, value type CERT_RDN_OCTET_STRING, + * and value of the key id. + */ + signer.dwVersion = CMSG_SIGNED_DATA_V3; + signer.Issuer.cbData = sizeof(keyIdIssuer); + signer.Issuer.pbData = keyIdIssuer; + signer.SerialNumber.cbData = 1; + signer.SerialNumber.pbData = &zero; + CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, buf, &size); + compare_signer_info((CMSG_SIGNER_INFO *)buf, &signer); + CryptMemFree(buf); + } + size = 0; + ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); + todo_wine + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + if (ret) + buf = CryptMemAlloc(size); + else + buf = NULL; + if (buf) + { + CMSG_CMS_SIGNER_INFO signer = { 0 }; + + signer.dwVersion = CMSG_SIGNED_DATA_V3; + signer.SignerId.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + signer.SignerId.KeyId.cbData = sizeof(serialNum); + signer.SignerId.KeyId.pbData = (BYTE *)serialNum; + signer.HashAlgorithm.pszObjId = oid_rsa_md5; + CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, buf, &size); + compare_cms_signer_info((CMSG_CMS_SIGNER_INFO *)buf, &signer); + CryptMemFree(buf); + } + CryptMsgClose(msg); } static void test_decode_msg(void)

1 0

Juan Lang : crypt32: Add more tests for the version of encoded signed CMS messages.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: ca94a1cc0d1bd84fbc52ac5cd028eed719c346a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca94a1cc0d1bd84fbc52ac5cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:01:05 2008 -0700 crypt32: Add more tests for the version of encoded signed CMS messages. --- dlls/crypt32/tests/msg.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 3c57f06..86ce6b1 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1884,6 +1884,87 @@ static void test_signed_msg_get_param(void) CryptMsgClose(msg); + /* Opening the message using the CMS fields.. */ + certInfo.SerialNumber.cbData = 0; + certInfo.Issuer.cbData = 0; + signer.SignerId.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; + signer.SignerId.IssuerSerialNumber.Issuer.cbData = + sizeof(encodedCommonName); + signer.SignerId.IssuerSerialNumber.Issuer.pbData = + (BYTE *)encodedCommonName; + signer.SignerId.IssuerSerialNumber.SerialNumber.cbData = + sizeof(serialNum); + signer.SignerId.IssuerSerialNumber.SerialNumber.pbData = (BYTE *)serialNum; + ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL, + PROV_RSA_FULL, CRYPT_NEWKEYSET); + if (!ret && GetLastError() == NTE_EXISTS) + ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL, + PROV_RSA_FULL, 0); + ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError()); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, + CMSG_CRYPT_RELEASE_CONTEXT_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + /* still results in the version being 1 when the issuer and serial number + * are used and no additional CMS fields are used. + */ + size = sizeof(value); + ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, (LPBYTE)&value, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == CMSG_SIGNED_DATA_V1, "expected version 1, got %d\n", value); + /* Apparently the encoded signer can be retrieved.. */ + ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + /* but the signer info, CMS signer info, and cert ID can't be. */ + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_SIGNER_CERT_ID_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + CryptMsgClose(msg); + + /* Using the KeyId field of the SignerId results in the version becoming + * the CMS version. + */ + signer.SignerId.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + signer.SignerId.KeyId.cbData = sizeof(serialNum); + signer.SignerId.KeyId.pbData = (BYTE *)serialNum; + ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, + PROV_RSA_FULL, CRYPT_NEWKEYSET); + if (!ret && GetLastError() == NTE_EXISTS) + ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, + PROV_RSA_FULL, 0); + ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError()); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, + CMSG_CRYPT_RELEASE_CONTEXT_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + size = sizeof(value); + ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, (LPBYTE)&value, &size); + ok(value == CMSG_SIGNED_DATA_V3, "expected version 3, got %d\n", value); + /* Even for a CMS message, the signer can be retrieved.. */ + ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + /* but the signer info, CMS signer info, and cert ID can't be. */ + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_SIGNER_CERT_ID_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + CryptMsgClose(msg); + CryptReleaseContext(signer.hCryptProv, 0); pCryptAcquireContextA(&signer.hCryptProv, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET);

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2008