ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Make a signed message data type.

This commit is contained in:
Juan Lang 2007-08-20 17:41:23 -07:00 committed by Alexandre Julliard
parent 3e88838b60
commit 7748905743
1 changed files with 89 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
dlls/crypt32/msg.c
View File

@ -792,12 +792,17 @@ static void CSignerInfo_Free(CMSG_SIGNER_INFO *info)
CryptMemFree(info->UnauthAttrs.rgAttr); CryptMemFree(info->UnauthAttrs.rgAttr);
} }
typedef struct _CSignedMsgData
{
CRYPT_SIGNED_INFO *info;
CSignerHandles *signerHandles;
} CSignedMsgData;
typedef struct _CSignedEncodeMsg typedef struct _CSignedEncodeMsg
{ {
CryptMsgBase base; CryptMsgBase base;
CRYPT_DATA_BLOB data; CRYPT_DATA_BLOB data;
CRYPT_SIGNED_INFO info; CSignedMsgData msg_data;
CSignerHandles *signerHandles;
} CSignedEncodeMsg; } CSignedEncodeMsg;
static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg)
@ -806,18 +811,19 @@ static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg)
DWORD i; DWORD i;
CryptMemFree(msg->data.pbData); CryptMemFree(msg->data.pbData);
CRYPT_FreeBlobArray((BlobArray *)&msg->info.cCertEncoded); CRYPT_FreeBlobArray((BlobArray *)&msg->msg_data.info->cCertEncoded);
CRYPT_FreeBlobArray((BlobArray *)&msg->info.cCrlEncoded); CRYPT_FreeBlobArray((BlobArray *)&msg->msg_data.info->cCrlEncoded);
for (i = 0; i < msg->info.cSignerInfo; i++) for (i = 0; i < msg->msg_data.info->cSignerInfo; i++)
{ {
CSignerInfo_Free(&msg->info.rgSignerInfo[i]); CSignerInfo_Free(&msg->msg_data.info->rgSignerInfo[i]);
CryptDestroyKey(msg->signerHandles[i].key); CryptDestroyKey(msg->msg_data.signerHandles[i].key);
CryptDestroyHash(msg->signerHandles[i].contentHash); CryptDestroyHash(msg->msg_data.signerHandles[i].contentHash);
CryptDestroyHash(msg->signerHandles[i].authAttrHash); CryptDestroyHash(msg->msg_data.signerHandles[i].authAttrHash);
CryptReleaseContext(msg->signerHandles[i].prov, 0); CryptReleaseContext(msg->msg_data.signerHandles[i].prov, 0);
} }
CryptMemFree(msg->signerHandles); CryptMemFree(msg->msg_data.signerHandles);
CryptMemFree(msg->info.rgSignerInfo); CryptMemFree(msg->msg_data.info->rgSignerInfo);
CryptMemFree(msg->msg_data.info);
} }
static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType,
@ -861,7 +867,7 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType,
CRYPT_SIGNED_INFO info; CRYPT_SIGNED_INFO info;
char oid_rsa_data[] = szOID_RSA_data; char oid_rsa_data[] = szOID_RSA_data;
memcpy(&info, &msg->info, sizeof(info)); memcpy(&info, msg->msg_data.info, sizeof(info));
/* Quirk: OID is only encoded messages if an update has happened */ /* Quirk: OID is only encoded messages if an update has happened */
if (msg->base.state != MsgStateInit) if (msg->base.state != MsgStateInit)
info.content.pszObjId = oid_rsa_data; info.content.pszObjId = oid_rsa_data;
@ -889,23 +895,24 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType,
break; break;
} }
case CMSG_COMPUTED_HASH_PARAM: case CMSG_COMPUTED_HASH_PARAM:
if (dwIndex >= msg->info.cSignerInfo) if (dwIndex >= msg->msg_data.info->cSignerInfo)
SetLastError(CRYPT_E_INVALID_INDEX); SetLastError(CRYPT_E_INVALID_INDEX);
else else
ret = CryptGetHashParam(msg->signerHandles[dwIndex].contentHash, ret = CryptGetHashParam(
HP_HASHVAL, pvData, pcbData, 0); msg->msg_data.signerHandles[dwIndex].contentHash, HP_HASHVAL,
pvData, pcbData, 0);
break; break;
case CMSG_ENCODED_SIGNER: case CMSG_ENCODED_SIGNER:
if (dwIndex >= msg->info.cSignerInfo) if (dwIndex >= msg->msg_data.info->cSignerInfo)
SetLastError(CRYPT_E_INVALID_INDEX); SetLastError(CRYPT_E_INVALID_INDEX);
else else
ret = CryptEncodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, ret = CryptEncodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
PKCS7_SIGNER_INFO, &msg->info.rgSignerInfo[dwIndex], 0, NULL, PKCS7_SIGNER_INFO, &msg->msg_data.info->rgSignerInfo[dwIndex], 0,
pvData, pcbData); NULL, pvData, pcbData);
break; break;
case CMSG_VERSION_PARAM: case CMSG_VERSION_PARAM:
ret = CRYPT_CopyParam(pvData, pcbData, &msg->info.version, ret = CRYPT_CopyParam(pvData, pcbData, &msg->msg_data.info->version,
sizeof(msg->info.version)); sizeof(msg->msg_data.info->version));
break; break;
default: default:
SetLastError(CRYPT_E_INVALID_MSG_TYPE); SetLastError(CRYPT_E_INVALID_MSG_TYPE);
@ -921,9 +928,9 @@ static BOOL CSignedEncodeMsg_UpdateHash(CSignedEncodeMsg *msg,
TRACE("(%p, %p, %d)\n", msg, pbData, cbData); TRACE("(%p, %p, %d)\n", msg, pbData, cbData);
for (i = 0; ret && i < msg->info.cSignerInfo; i++) for (i = 0; ret && i < msg->msg_data.info->cSignerInfo; i++)
ret = CryptHashData(msg->signerHandles[i].contentHash, pbData, cbData, ret = CryptHashData(msg->msg_data.signerHandles[i].contentHash, pbData,
0); cbData, 0);
return ret; return ret;
} }
@ -953,13 +960,15 @@ static BOOL CSignedEncodeMsg_AppendMessageDigestAttribute(CSignedEncodeMsg *msg,
CRYPT_ATTRIBUTE messageDigestAttr = { messageDigest, 1, &encodedHash }; CRYPT_ATTRIBUTE messageDigestAttr = { messageDigest, 1, &encodedHash };
size = sizeof(DWORD); size = sizeof(DWORD);
ret = CryptGetHashParam(msg->signerHandles[signerIndex].contentHash, ret = CryptGetHashParam(
HP_HASHSIZE, (LPBYTE)&hash.cbData, &size, 0); msg->msg_data.signerHandles[signerIndex].contentHash, HP_HASHSIZE,
(LPBYTE)&hash.cbData, &size, 0);
if (ret) if (ret)
{ {
hash.pbData = CryptMemAlloc(hash.cbData); hash.pbData = CryptMemAlloc(hash.cbData);
ret = CryptGetHashParam(msg->signerHandles[signerIndex].contentHash, ret = CryptGetHashParam(
HP_HASHVAL, hash.pbData, &hash.cbData, 0); msg->msg_data.signerHandles[signerIndex].contentHash, HP_HASHVAL,
hash.pbData, &hash.cbData, 0);
if (ret) if (ret)
{ {
ret = CRYPT_AsnEncodeOctets(0, NULL, &hash, CRYPT_ENCODE_ALLOC_FLAG, ret = CRYPT_AsnEncodeOctets(0, NULL, &hash, CRYPT_ENCODE_ALLOC_FLAG,
@ -967,7 +976,7 @@ static BOOL CSignedEncodeMsg_AppendMessageDigestAttribute(CSignedEncodeMsg *msg,
if (ret) if (ret)
{ {
ret = CRYPT_AppendAttribute( ret = CRYPT_AppendAttribute(
&msg->info.rgSignerInfo[signerIndex].AuthAttrs, &msg->msg_data.info->rgSignerInfo[signerIndex].AuthAttrs,
&messageDigestAttr); &messageDigestAttr);
LocalFree(encodedHash.pbData); LocalFree(encodedHash.pbData);
} }
@ -985,9 +994,9 @@ static BOOL CSignedEncodeMsg_UpdateAuthenticatedAttributes(
TRACE("(%p)\n", msg); TRACE("(%p)\n", msg);
for (i = 0; ret && i < msg->info.cSignerInfo; i++) for (i = 0; ret && i < msg->msg_data.info->cSignerInfo; i++)
{ {
if (msg->info.rgSignerInfo[i].AuthAttrs.cAttr) if (msg->msg_data.info->rgSignerInfo[i].AuthAttrs.cAttr)
{ {
BYTE oid_rsa_data_encoded[] = { 0x06,0x09,0x2a,0x86,0x48,0x86,0xf7, BYTE oid_rsa_data_encoded[] = { 0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,
0x0d,0x01,0x07,0x01 }; 0x0d,0x01,0x07,0x01 };
@ -997,8 +1006,8 @@ static BOOL CSignedEncodeMsg_UpdateAuthenticatedAttributes(
CRYPT_ATTRIBUTE contentTypeAttr = { contentType, 1, &content }; CRYPT_ATTRIBUTE contentTypeAttr = { contentType, 1, &content };
/* FIXME: does this depend on inner OID? */ /* FIXME: does this depend on inner OID? */
ret = CRYPT_AppendAttribute(&msg->info.rgSignerInfo[i].AuthAttrs, ret = CRYPT_AppendAttribute(
&contentTypeAttr); &msg->msg_data.info->rgSignerInfo[i].AuthAttrs, &contentTypeAttr);
if (ret) if (ret)
ret = CSignedEncodeMsg_AppendMessageDigestAttribute(msg, i); ret = CSignedEncodeMsg_AppendMessageDigestAttribute(msg, i);
if (ret) if (ret)
@ -1007,12 +1016,13 @@ static BOOL CSignedEncodeMsg_UpdateAuthenticatedAttributes(
DWORD size; DWORD size;
ret = CryptEncodeObjectEx(X509_ASN_ENCODING, PKCS_ATTRIBUTES, ret = CryptEncodeObjectEx(X509_ASN_ENCODING, PKCS_ATTRIBUTES,
&msg->info.rgSignerInfo[i].AuthAttrs, CRYPT_ENCODE_ALLOC_FLAG, &msg->msg_data.info->rgSignerInfo[i].AuthAttrs,
NULL, (LPBYTE)&encodedAttrs, &size); CRYPT_ENCODE_ALLOC_FLAG, NULL, (LPBYTE)&encodedAttrs, &size);
if (ret) if (ret)
{ {
ret = CryptHashData(msg->signerHandles[i].authAttrHash, ret = CryptHashData(
encodedAttrs, size, 0); msg->msg_data.signerHandles[i].authAttrHash, encodedAttrs,
size, 0);
LocalFree(encodedAttrs); LocalFree(encodedAttrs);
} }
} }
@ -1042,27 +1052,29 @@ static BOOL CSignedEncodeMsg_Sign(CSignedEncodeMsg *msg)
TRACE("(%p)\n", msg); TRACE("(%p)\n", msg);
for (i = 0; ret && i < msg->info.cSignerInfo; i++) for (i = 0; ret && i < msg->msg_data.info->cSignerInfo; i++)
{ {
HCRYPTHASH hash; HCRYPTHASH hash;
if (msg->info.rgSignerInfo[i].AuthAttrs.cAttr) if (msg->msg_data.info->rgSignerInfo[i].AuthAttrs.cAttr)
hash = msg->signerHandles[i].authAttrHash; hash = msg->msg_data.signerHandles[i].authAttrHash;
else else
hash = msg->signerHandles[i].contentHash; hash = msg->msg_data.signerHandles[i].contentHash;
ret = CryptSignHashW(hash, AT_SIGNATURE, NULL, 0, NULL, ret = CryptSignHashW(hash, AT_SIGNATURE, NULL, 0, NULL,
&msg->info.rgSignerInfo[i].EncryptedHash.cbData); &msg->msg_data.info->rgSignerInfo[i].EncryptedHash.cbData);
if (ret) if (ret)
{ {
msg->info.rgSignerInfo[i].EncryptedHash.pbData = msg->msg_data.info->rgSignerInfo[i].EncryptedHash.pbData =
CryptMemAlloc(msg->info.rgSignerInfo[i].EncryptedHash.cbData); CryptMemAlloc(
if (msg->info.rgSignerInfo[i].EncryptedHash.pbData) msg->msg_data.info->rgSignerInfo[i].EncryptedHash.cbData);
if (msg->msg_data.info->rgSignerInfo[i].EncryptedHash.pbData)
{ {
ret = CryptSignHashW(hash, AT_SIGNATURE, NULL, 0, ret = CryptSignHashW(hash, AT_SIGNATURE, NULL, 0,
msg->info.rgSignerInfo[i].EncryptedHash.pbData, msg->msg_data.info->rgSignerInfo[i].EncryptedHash.pbData,
&msg->info.rgSignerInfo[i].EncryptedHash.cbData); &msg->msg_data.info->rgSignerInfo[i].EncryptedHash.cbData);
if (ret) if (ret)
CRYPT_ReverseBytes(&msg->info.rgSignerInfo[i].EncryptedHash); CRYPT_ReverseBytes(
&msg->msg_data.info->rgSignerInfo[i].EncryptedHash);
} }
else else
ret = FALSE; ret = FALSE;
@ -1151,39 +1163,48 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags,
CSignedEncodeMsg_Update, CRYPT_DefaultMsgControl); CSignedEncodeMsg_Update, CRYPT_DefaultMsgControl);
msg->data.cbData = 0; msg->data.cbData = 0;
msg->data.pbData = NULL; msg->data.pbData = NULL;
memset(&msg->info, 0, sizeof(msg->info)); msg->msg_data.info = CryptMemAlloc(sizeof(CRYPT_SIGNED_INFO));
msg->info.version = CMSG_SIGNED_DATA_V1; if (msg->msg_data.info)
if (info->cSigners)
{ {
msg->signerHandles = memset(msg->msg_data.info, 0, sizeof(CRYPT_SIGNED_INFO));
msg->msg_data.info->version = CMSG_SIGNED_DATA_V1;
}
else
ret = FALSE;
if (ret && info->cSigners)
{
msg->msg_data.signerHandles =
CryptMemAlloc(info->cSigners * sizeof(CSignerHandles)); CryptMemAlloc(info->cSigners * sizeof(CSignerHandles));
if (msg->signerHandles) if (msg->msg_data.signerHandles)
msg->info.rgSignerInfo = msg->msg_data.info->rgSignerInfo =
CryptMemAlloc(info->cSigners * sizeof(CMSG_SIGNER_INFO)); CryptMemAlloc(info->cSigners * sizeof(CMSG_SIGNER_INFO));
else else
{ {
ret = FALSE; ret = FALSE;
msg->info.rgSignerInfo = NULL; msg->msg_data.info->rgSignerInfo = NULL;
} }
if (msg->info.rgSignerInfo) if (msg->msg_data.info->rgSignerInfo)
{ {
msg->info.cSignerInfo = info->cSigners; msg->msg_data.info->cSignerInfo = info->cSigners;
memset(msg->signerHandles, 0, memset(msg->msg_data.signerHandles, 0,
msg->info.cSignerInfo * sizeof(CSignerHandles)); msg->msg_data.info->cSignerInfo * sizeof(CSignerHandles));
memset(msg->info.rgSignerInfo, 0, memset(msg->msg_data.info->rgSignerInfo, 0,
msg->info.cSignerInfo * sizeof(CMSG_SIGNER_INFO)); msg->msg_data.info->cSignerInfo * sizeof(CMSG_SIGNER_INFO));
for (i = 0; ret && i < msg->info.cSignerInfo; i++) for (i = 0; ret && i < msg->msg_data.info->cSignerInfo; i++)
ret = CSignerInfo_Construct(&msg->signerHandles[i], ret = CSignerInfo_Construct(&msg->msg_data.signerHandles[i],
&msg->info.rgSignerInfo[i], &info->rgSigners[i], dwFlags); &msg->msg_data.info->rgSignerInfo[i],
&info->rgSigners[i], dwFlags);
} }
else else
ret = FALSE; ret = FALSE;
} }
if (ret) if (ret)
ret = CRYPT_ConstructBlobArray((BlobArray *)&msg->info.cCertEncoded, ret = CRYPT_ConstructBlobArray(
(BlobArray *)&msg->msg_data.info->cCertEncoded,
(const BlobArray *)&info->cCertEncoded); (const BlobArray *)&info->cCertEncoded);
if (ret) if (ret)
ret = CRYPT_ConstructBlobArray((BlobArray *)&msg->info.cCrlEncoded, ret = CRYPT_ConstructBlobArray(
(BlobArray *)&msg->msg_data.info->cCrlEncoded,
(const BlobArray *)&info->cCrlEncoded); (const BlobArray *)&info->cCrlEncoded);
if (!ret) if (!ret)
{ {