July 2007 - Wine-Commits - list.winehq.org

James Hawkins : msiexec: Implement a stub MSIServer service.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 43bc08ddefec949ea856977e60b01854005fe2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bc08ddefec949ea856977e6… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 30 11:53:16 2007 -0700 msiexec: Implement a stub MSIServer service. --- programs/msiexec/Makefile.in | 3 +- programs/msiexec/msiexec.c | 13 +++- programs/msiexec/service.c | 174 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 2 deletions(-) diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index c2bd981..0d09c4c 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -7,7 +7,8 @@ APPMODE = -mconsole IMPORTS = msi ole32 advapi32 user32 kernel32 C_SRCS = \ - msiexec.c + msiexec.c \ + service.c RC_SRCS = rsrc.rc RC_BINSRC = rsrc.rc diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index e4ff579..71e81c8 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msiexec); typedef HRESULT (WINAPI *DLLREGISTERSERVER)(void); typedef HRESULT (WINAPI *DLLUNREGISTERSERVER)(void); +DWORD DoService(void); + struct string_list { struct string_list *next; @@ -350,7 +352,7 @@ static DWORD DoRegServer(void) } GetSystemDirectory(path, MAX_PATH); - lstrcatA(path, "\\msiexec.exe"); + lstrcatA(path, "\\msiexec.exe /V"); service = CreateServiceA(scm, "MSIServer", "MSIServer", GENERIC_ALL, SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, @@ -502,6 +504,7 @@ int main(int argc, char **argv) BOOL FunctionDllUnregisterServer = FALSE; BOOL FunctionRegServer = FALSE; BOOL FunctionUnregServer = FALSE; + BOOL FunctionServer = FALSE; BOOL FunctionUnknown = FALSE; LPWSTR PackageName = NULL; @@ -905,6 +908,10 @@ int main(int argc, char **argv) FunctionUnknown = TRUE; WINE_FIXME("Unknown parameter /D\n"); } + else if (msi_option_equal(argvW[i], "V")) + { + FunctionServer = TRUE; + } else StringListAppend(&property_list, argvW[i]); } @@ -957,6 +964,10 @@ int main(int argc, char **argv) { WINE_FIXME( "/unregserver not implemented yet, ignoring\n" ); } + else if (FunctionServer) + { + ReturnCode = DoService(); + } else if (FunctionUnknown) { WINE_FIXME( "Unknown function, ignoring\n" ); diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c new file mode 100644 index 0000000..64618b8 --- /dev/null +++ b/programs/msiexec/service.c @@ -0,0 +1,174 @@ +/* + * msiexec.exe implementation + * + * Copyright 2007 Google (James Hawkins) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include <stdio.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msiexec); + +static SERVICE_STATUS_HANDLE hstatus; + +static HANDLE thread; +static HANDLE kill_event; + +void KillService(void) +{ + WINE_TRACE("Killing service\n"); + SetEvent(kill_event); +} + +static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, + DWORD dwServiceSpecificExitCode) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + status.dwCurrentState = dwCurrentState; + + if (dwCurrentState == SERVICE_START_PENDING) + status.dwControlsAccepted = 0; + else + { + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | + SERVICE_ACCEPT_PAUSE_CONTINUE | + SERVICE_ACCEPT_SHUTDOWN; + } + + if (dwServiceSpecificExitCode == 0) + { + status.dwWin32ExitCode = dwWin32ExitCode; + } + else + { + status.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; + } + + status.dwServiceSpecificExitCode = dwServiceSpecificExitCode; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + if (!SetServiceStatus(hstatus, &status)) + { + fprintf(stderr, "Failed to set service status\n"); + KillService(); + return FALSE; + } + + return TRUE; +} + +static void WINAPI ServiceCtrlHandler(DWORD code) +{ + WINE_TRACE("%d\n", code); + + switch (code) + { + case SERVICE_CONTROL_SHUTDOWN: + case SERVICE_CONTROL_STOP: + UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); + KillService(); + return; + default: + fprintf(stderr, "Unhandled service control code: %d\n", code); + break; + } + + UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); +} + +static DWORD WINAPI ServiceExecutionThread(LPVOID param) +{ + while (TRUE) + { + /* do nothing */ + } + + return 0; +} + +static BOOL StartServiceThread(void) +{ + DWORD id; + + thread = CreateThread(0, 0, ServiceExecutionThread, 0, 0, &id); + if (!thread) + { + fprintf(stderr, "Failed to create thread\n"); + return FALSE; + } + + return TRUE; +} + +static void WINAPI ServiceMain(DWORD argc, LPSTR *argv) +{ + hstatus = RegisterServiceCtrlHandlerA("MSIServer", ServiceCtrlHandler); + if (!hstatus) + { + fprintf(stderr, "Failed to register service ctrl handler\n"); + return; + } + + UpdateSCMStatus(SERVICE_START_PENDING, NO_ERROR, 0); + + kill_event = CreateEvent(0, TRUE, FALSE, 0); + if (!kill_event) + { + fprintf(stderr, "Failed to create event\n"); + KillService(); + return; + } + + if (!StartServiceThread()) + { + KillService(); + return; + } + + UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); + + WaitForSingleObject(kill_event, INFINITE); + KillService(); +} + +DWORD DoService(void) +{ + char service_name[] = "MSIServer"; + + const SERVICE_TABLE_ENTRY service[] = + { + {service_name, ServiceMain}, + {NULL, NULL}, + }; + + WINE_TRACE("Starting MSIServer service\n"); + + if (!StartServiceCtrlDispatcher(service)) + { + fprintf(stderr, "Failed to start MSIServer service\n"); + return 1; + } + + return 0; +}

1 0

Juan Lang : crypt32: Get rid of attribute certs from signed info, they' re not supported anyway.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 014467031e3a6f18a3c214c2aab1d95ff49584d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=014467031e3a6f18a3c214c2a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 30 12:09:39 2007 -0700 crypt32: Get rid of attribute certs from signed info, they're not supported anyway. --- dlls/crypt32/crypt32_private.h | 2 -- dlls/crypt32/encode.c | 2 -- dlls/crypt32/msg.c | 15 ++++++--------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 14f081f..a7bd2b3 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -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; diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index b653a0d..f01b322 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -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; diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 388821b..54f0636 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -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;

1 0

Jacek Caban : mshtml.tlb: Fixed a typo in copyright header.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: fe6d6661ab881e9672d71a441fb83cf75bd1ce39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6d6661ab881e9672d71a441… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 31 00:51:13 2007 +0200 mshtml.tlb: Fixed a typo in copyright header. --- dlls/mshtml.tlb/rsrc.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml.tlb/rsrc.rc b/dlls/mshtml.tlb/rsrc.rc index af530e8..2115860 100644 --- a/dlls/mshtml.tlb/rsrc.rc +++ b/dlls/mshtml.tlb/rsrc.rc @@ -1,5 +1,5 @@ /* - * Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Juan Lang : crypt32: Add a few traces.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: a50d8dc1dda877863e1356c36a476bfbbc8f48ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50d8dc1dda877863e1356c36… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 30 12:08:57 2007 -0700 crypt32: Add a few traces. --- dlls/crypt32/decode.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 846f6e1..022c912 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -318,6 +318,9 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, DWORD i, decoded = 0; const BYTE *ptr = pbEncoded; + TRACE("%p, %d, %p, %d, %08x, %p, %p, %p\n", items, cItem, pbEncoded, + cbEncoded, dwFlags, pvStructInfo, nextData, cbDecoded); + for (i = 0, ret = TRUE; ret && i < cItem; i++) { if (cbEncoded - (ptr - pbEncoded) != 0) @@ -355,6 +358,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, if (items[i].size % sizeof(DWORD)) items[i].size += sizeof(DWORD) - items[i].size % sizeof(DWORD); + TRACE("item %d size: %d\n", i, items[i].size); if (nextData && items[i].hasPointer && items[i].size > items[i].minSize) nextData += items[i].size - items[i].minSize; @@ -412,6 +416,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, } if (ret) *cbDecoded = decoded; + TRACE("returning %d\n", ret); return ret; } @@ -2330,10 +2335,15 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSContentInfoInternal( sizeof(CRYPT_DER_BLOB), TRUE, TRUE, offsetof(CRYPT_CONTENT_INFO, Content.pbData), 0 }, }; + BOOL ret; + + TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, *pcbStructInfo); - return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, info ? info->pszObjId : NULL); + return ret; } static BOOL WINAPI CRYPT_AsnDecodePKCSContentInfo(DWORD dwCertEncodingType,

1 0

Juan Lang : crypt32: Add missing definitions.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 5270b3233045f751d042ac15b1c762e035e0af3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5270b3233045f751d042ac15b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 30 12:07:35 2007 -0700 crypt32: Add missing definitions. --- include/wincrypt.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 8ae00d6..46bc094 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3230,6 +3230,13 @@ typedef struct _CMSG_ENCRYPTED_ENCODE_INFO #define CMSG_CTRL_DEL_CERT 11 #define CMSG_CTRL_ADD_CRL 12 #define CMSG_CTRL_DEL_CRL 13 +#define CMSG_CTRL_ADD_ATTR_CERT 14 +#define CMSG_CTRL_DEL_ATTR_CERT 15 +#define CMSG_CTRL_KEY_TRANS_DECRYPT 16 +#define CMSG_CTRL_KEY_AGREE_DECRYPT 17 +#define CMSG_CTRL_MAIL_LIST_DECRYPT 18 +#define CMSG_CTRL_VERIFY_SIGNATURE_EX 19 +#define CMSG_CTRL_ADD_CMS_SIGNER_INFO 20 typedef struct _CMSG_CTRL_DECRYPT_PARA { @@ -3255,6 +3262,19 @@ typedef struct _CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA } CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA, *PCMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA; +typedef struct _CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA { + DWORD cbSize; + HCRYPTPROV hCryptProv; + DWORD dwSignerIndex; + DWORD dwSignerType; + void *pvSigner; +} CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA, *PCMSG_CTRL_VERIFY_SIGNATURE_EX_PARA; + +#define CMSG_VERIFY_SIGNER_PUBKEY 1 +#define CMSG_VERIFY_SIGNER_CERT 2 +#define CMSG_VERIFY_SIGNER_CHAIN 3 +#define CMSG_VERIFY_SIGNER_NULL 4 + #define CMSG_TYPE_PARAM 1 #define CMSG_CONTENT_PARAM 2 #define CMSG_BARE_CONTENT_PARAM 3

1 0

Juan Lang : crypt32: Add CryptMsgControl stub.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 04ef3c05f17d7ee289553ddc2c937869dec61cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ef3c05f17d7ee289553ddc2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 30 12:07:19 2007 -0700 crypt32: Add CryptMsgControl stub. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/msg.c | 8 ++++++++ include/wincrypt.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index cf85e7b..c7c3c8d 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -141,7 +141,7 @@ @ stdcall CryptMemRealloc(ptr long) @ stub CryptMsgCalculateEncodedLength @ stdcall CryptMsgClose(ptr) -@ stub CryptMsgControl +@ stdcall CryptMsgControl(ptr long long ptr) @ stub CryptMsgCountersign @ stub CryptMsgCountersignEncoded @ stdcall CryptMsgDuplicate(ptr) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 7e5a080..388821b 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1994,3 +1994,11 @@ BOOL WINAPI CryptMsgGetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, pvData, pcbData); return msg->get_param(hCryptMsg, dwParamType, dwIndex, pvData, pcbData); } + +BOOL WINAPI CryptMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, + DWORD dwCtrlType, const void *pvCtrlPara) +{ + FIXME("(%p, %08x, %d, %p): stub\n", hCryptMsg, dwFlags, dwCtrlType, + pvCtrlPara); + return TRUE; +} diff --git a/include/wincrypt.h b/include/wincrypt.h index eb0cd16..8ae00d6 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3822,7 +3822,7 @@ DWORD WINAPI CryptMsgCalculateEncodedLength(DWORD dwMsgEncodingType, BOOL WINAPI CryptMsgClose(HCRYPTMSG hCryptMsg); -DWORD WINAPI CryptMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, +BOOL WINAPI CryptMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, DWORD dwCtrlType, const void *pvCtrlPara); BOOL WINAPI CryptMsgCountersign(HCRYPTMSG hCryptMsg, DWORD dwIndex,

1 0

Juan Lang : crypt32: Implement getting the signer cert info from a decoded signed message.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 7e10d48c60a36dd266ef3e00f8ee8981278a13c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e10d48c60a36dd266ef3e00f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 30 12:06:23 2007 -0700 crypt32: Implement getting the signer cert info from a decoded signed message. --- dlls/crypt32/msg.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index aca6a03..7e5a080 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1697,6 +1697,38 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, return ret; } +static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, + const CMSG_SIGNER_INFO *in) +{ + DWORD size = sizeof(CERT_INFO); + BOOL ret; + + size += in->Issuer.cbData; + size += in->SerialNumber.cbData; + if (!pvData) + { + *pcbData = size; + ret = TRUE; + } + else if (*pcbData < size) + { + *pcbData = size; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPBYTE nextData = (BYTE *)pvData + sizeof(CERT_INFO); + CERT_INFO *out = (CERT_INFO *)pvData; + + memset(out, 0, sizeof(CERT_INFO)); + CRYPT_CopyBlob(&out->Issuer, &in->Issuer, &nextData); + CRYPT_CopyBlob(&out->SerialNumber, &in->SerialNumber, &nextData); + ret = TRUE; + } + return ret; +} + static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { @@ -1747,6 +1779,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_SIGNER_CERT_INFO_PARAM: + if (msg->u.signedInfo) + { + if (dwIndex >= msg->u.signedInfo->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopySignerCertInfo(pvData, pcbData, + &msg->u.signedInfo->rgSignerInfo[dwIndex]); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_CERT_COUNT_PARAM: if (msg->u.signedInfo) ret = CRYPT_CopyParam(pvData, pcbData,

1 0

Juan Lang : crypt32: Implement getting inner content of a decoded signed message.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: d6150a7974ed9f2d3e96d674e84189f9bb4c7552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6150a7974ed9f2d3e96d674e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 30 12:00:23 2007 -0700 crypt32: Implement getting inner content of a decoded signed message. --- dlls/crypt32/msg.c | 21 +++++++++++++++++++++ dlls/crypt32/tests/msg.c | 1 - 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f554c78..0f33382 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1570,6 +1570,27 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, case CMSG_TYPE_PARAM: ret = CRYPT_CopyParam(pvData, pcbData, &msg->type, sizeof(msg->type)); break; + case CMSG_CONTENT_PARAM: + if (msg->u.signedInfo) + { + CRYPT_DATA_BLOB *blob; + DWORD size; + + /* FIXME: does this depend on inner content type? */ + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, + msg->u.signedInfo->content.Content.pbData, + msg->u.signedInfo->content.Content.cbData, CRYPT_DECODE_ALLOC_FLAG, + NULL, (LPBYTE)&blob, &size); + if (ret) + { + ret = CRYPT_CopyParam(pvData, pcbData, blob->pbData, + blob->cbData); + LocalFree(blob); + } + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_SIGNER_COUNT_PARAM: if (msg->u.signedInfo) ret = CRYPT_CopyParam(pvData, pcbData, diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 327fc43..0e863f0 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1976,7 +1976,6 @@ static void test_decode_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, signedContent, sizeof(signedContent), TRUE); ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); - todo_wine check_param("signed content", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); todo_wine

1 0

Juan Lang : crypt32: Test getting more parameters from a decoded signed message.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 2acb8a2dd2e28fa61c73c6c289c5c14d216534b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2acb8a2dd2e28fa61c73c6c28… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 30 11:59:39 2007 -0700 crypt32: Test getting more parameters from a decoded signed message. --- dlls/crypt32/tests/msg.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 85a9d62..327fc43 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1903,6 +1903,24 @@ static void test_decode_msg_update(void) static const BYTE hashParam[] = { 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1, 0xdf,0xeb,0x9d,0x2a,0x8f,0x26,0x2f }; +static void compare_signer_info(const CMSG_SIGNER_INFO *got, + const CMSG_SIGNER_INFO *expected) +{ + ok(got->dwVersion == expected->dwVersion, "Expected version %d, got %d\n", + expected->dwVersion, got->dwVersion); + ok(got->Issuer.cbData == expected->Issuer.cbData, + "Expected issuer size %d, got %d\n", expected->Issuer.cbData, + got->Issuer.cbData); + ok(!memcmp(got->Issuer.pbData, got->Issuer.pbData, got->Issuer.cbData), + "Unexpected issuer\n"); + ok(got->SerialNumber.cbData == expected->SerialNumber.cbData, + "Expected serial number size %d, got %d\n", expected->SerialNumber.cbData, + got->SerialNumber.cbData); + ok(!memcmp(got->SerialNumber.pbData, got->SerialNumber.pbData, + got->SerialNumber.cbData), "Unexpected serial number\n"); + /* FIXME: check more things */ +} + static void test_decode_msg_get_param(void) { HCRYPTMSG msg; @@ -1958,12 +1976,41 @@ static void test_decode_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, signedContent, sizeof(signedContent), TRUE); ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + todo_wine + check_param("signed content", msg, CMSG_CONTENT_PARAM, msgData, + sizeof(msgData)); + todo_wine + check_param("inner content", msg, CMSG_INNER_CONTENT_TYPE_PARAM, + (const BYTE *)szOID_RSA_data, strlen(szOID_RSA_data) + 1); size = sizeof(value); value = 2112; 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); + 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 = { 0 }; + + signer.dwVersion = 1; + signer.Issuer.cbData = sizeof(encodedCommonName); + signer.Issuer.pbData = encodedCommonName; + signer.SerialNumber.cbData = sizeof(serialNum); + signer.SerialNumber.pbData = serialNum; + signer.HashAlgorithm.pszObjId = oid_rsa_md5; + CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, buf, &size); + compare_signer_info((CMSG_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); ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 1, "Expected 1 signer, got %d\n", value);

1 0

Juan Lang : crypt32: Separate decoding PKCS signer info into internal and external versions.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 5900ab1437baacde49c2df1300ae08fdb291a80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5900ab1437baacde49c2df130… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 30 12:01:18 2007 -0700 crypt32: Separate decoding PKCS signer info into internal and external versions. --- dlls/crypt32/decode.c | 94 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 65 insertions(+), 29 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index de4de4a..2f589dc 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3800,6 +3800,49 @@ static BOOL WINAPI CRYPT_AsnDecodeIssuerSerialNumber(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfoInternal( + DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + CMSG_SIGNER_INFO *info = (CMSG_SIGNER_INFO *)pvStructInfo; + struct AsnDecodeSequenceItem items[] = { + { ASN_INTEGER, offsetof(CMSG_SIGNER_INFO, dwVersion), + CRYPT_AsnDecodeInt, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_SEQUENCEOF, offsetof(CMSG_SIGNER_INFO, Issuer), + CRYPT_AsnDecodeIssuerSerialNumber, sizeof(CERT_ISSUER_SERIAL_NUMBER), + FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, Issuer.pbData), 0 }, + { ASN_SEQUENCEOF, offsetof(CMSG_SIGNER_INFO, HashAlgorithm), + CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), + FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, HashAlgorithm.pszObjId), 0 }, + { ASN_CONSTRUCTOR | ASN_CONTEXT | 0, + offsetof(CMSG_SIGNER_INFO, AuthAttrs), + CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), + TRUE, TRUE, offsetof(CMSG_SIGNER_INFO, AuthAttrs.rgAttr), 0 }, + { ASN_SEQUENCEOF, offsetof(CMSG_SIGNER_INFO, HashEncryptionAlgorithm), + CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), + FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, + HashEncryptionAlgorithm.pszObjId), 0 }, + { ASN_OCTETSTRING, offsetof(CMSG_SIGNER_INFO, EncryptedHash), + CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_DER_BLOB), + FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, EncryptedHash.pbData), 0 }, + { ASN_CONSTRUCTOR | ASN_CONTEXT | 1, + offsetof(CMSG_SIGNER_INFO, UnauthAttrs), + CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), + TRUE, TRUE, offsetof(CMSG_SIGNER_INFO, UnauthAttrs.rgAttr), 0 }, + }; + BOOL ret; + + TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, *pcbStructInfo); + + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, + dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, + info ? info->Issuer.pbData : NULL); + return ret; +} + static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -3811,35 +3854,28 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, __TRY { - struct AsnDecodeSequenceItem items[] = { - { ASN_INTEGER, offsetof(CMSG_SIGNER_INFO, dwVersion), - CRYPT_AsnDecodeInt, sizeof(DWORD), FALSE, FALSE, 0, 0 }, - { ASN_SEQUENCEOF, offsetof(CMSG_SIGNER_INFO, Issuer), - CRYPT_AsnDecodeIssuerSerialNumber, sizeof(CERT_ISSUER_SERIAL_NUMBER), - FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, Issuer.pbData), 0 }, - { ASN_SEQUENCEOF, offsetof(CMSG_SIGNER_INFO, HashAlgorithm), - CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), - FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, HashAlgorithm.pszObjId), 0 }, - { ASN_CONSTRUCTOR | ASN_CONTEXT | 0, - offsetof(CMSG_SIGNER_INFO, AuthAttrs), - CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), - TRUE, TRUE, offsetof(CMSG_SIGNER_INFO, AuthAttrs.rgAttr), 0 }, - { ASN_SEQUENCEOF, offsetof(CMSG_SIGNER_INFO, HashEncryptionAlgorithm), - CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), - FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, - HashEncryptionAlgorithm.pszObjId), 0 }, - { ASN_OCTETSTRING, offsetof(CMSG_SIGNER_INFO, EncryptedHash), - CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_DER_BLOB), - FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, EncryptedHash.pbData), 0 }, - { ASN_CONSTRUCTOR | ASN_CONTEXT | 1, - offsetof(CMSG_SIGNER_INFO, UnauthAttrs), - CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), - TRUE, TRUE, offsetof(CMSG_SIGNER_INFO, UnauthAttrs.rgAttr), 0 }, - }; + ret = CRYPT_AsnDecodePKCSSignerInfoInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, pcbStructInfo); + if (ret && pvStructInfo) + { + ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo, *pcbStructInfo); + if (ret) + { + CMSG_SIGNER_INFO *info; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, - dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + info = (CMSG_SIGNER_INFO *)pvStructInfo; + info->Issuer.pbData = ((BYTE *)info + + sizeof(CMSG_SIGNER_INFO)); + ret = CRYPT_AsnDecodePKCSSignerInfoInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, + pcbStructInfo); + } + } } __EXCEPT_PAGE_FAULT { @@ -3856,7 +3892,7 @@ static BOOL WINAPI CRYPT_DecodeSignerArray(DWORD dwCertEncodingType, { BOOL ret; struct AsnArrayDescriptor arrayDesc = { ASN_CONSTRUCTOR | ASN_SETOF, - CRYPT_AsnDecodePKCSSignerInfo, sizeof(CMSG_SIGNER_INFO), TRUE, + CRYPT_AsnDecodePKCSSignerInfoInternal, sizeof(CMSG_SIGNER_INFO), TRUE, offsetof(CMSG_SIGNER_INFO, Issuer.pbData) }; struct GenericArray *array = (struct GenericArray *)pvStructInfo;

1 0