September 2007 - Wine-commits

Chris Morgan : Php5 improvements to table code. Add some accessor methods to classes so we can make class variables private .
by Chris Morgan 19 Sep '07

19 Sep '07

Module: appdb Branch: master Commit: 5c91961d12b88a9ea6952aedaa792b29f286bb04 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5c91961d12b88a9ea6952aed… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Tue Sep 18 21:22:43 2007 -0400 Php5 improvements to table code. Add some accessor methods to classes so we can make class variables private. --- include/bugs.php | 2 +- include/distribution.php | 2 +- include/objectManager.php | 7 +- include/table.php | 135 ++++++++++++++++++++++++++------------------- include/testData.php | 2 +- include/vendor.php | 2 +- 6 files changed, 86 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=5c91961d12b88a9ea695…

1 0

Alexander Nicolaysen Sørnes : bug: Fix unqueue mails
by Chris Morgan 19 Sep '07

19 Sep '07

Module: appdb Branch: master Commit: 27660a74d95288601c4b50c63c4d3d705fc03a69 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=27660a74d95288601c4b50c6… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Sep 18 14:53:25 2007 +0200 bug: Fix unqueue mails --- include/bugs.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 4f12624..51710bb 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -487,7 +487,8 @@ class Bug function outputEditor() { $this->display(); - echo '<input type="hidden" name="iBugLinkId" value="'.$this->iLinkId.'" >'; + echo '<input type="hidden" name="iBuglinkId" value="'.$this->iBug_id.'" />'; + echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" />'; } function getOutputEditorValues($aClean)

1 0

Chris Morgan : Stop script processing upon mysql error. Based on a patch by Alexander Sornes.
by Chris Morgan 19 Sep '07

19 Sep '07

Module: appdb Branch: master Commit: e0e19c26a7a6438debe8c3fd556166b0f55b22ea URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e0e19c26a7a6438debe8c3fd… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Tue Sep 18 20:51:28 2007 -0400 Stop script processing upon mysql error. Based on a patch by Alexander Sornes. --- include/query.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/query.php b/include/query.php index 1392fa3..bc1ab63 100644 --- a/include/query.php +++ b/include/query.php @@ -12,6 +12,8 @@ function query_appdb($sQuery, $sComment="") { // The last argument makes sure we are really opening a new connection $hAppdbLink = mysql_connect(APPS_DBHOST, APPS_DBUSER, APPS_DBPASS, true); + if(!$hAppdbLink) + die("Database error, please try again soon."); mysql_select_db(APPS_DB, $hAppdbLink); } @@ -125,7 +127,7 @@ function query_bugzilladb($sQuery,$sComment="") if(!is_resource($hBugzillaLink)) { // The last argument makes sure we are really opening a new connection - $hBugzillaLink = mysql_connect(BUGZILLA_DBHOST, BUGZILLA_DBUSER, BUGZILLA_DBPASS,true); + $hBugzillaLink = mysql_connect(BUGZILLA_DBHOST, BUGZILLA_DBUSER, BUGZILLA_DBPASS, true); if(!$hBugzillaLink) return; mysql_select_db(BUGZILLA_DB, $hBugzillaLink); }

1 0

Alexander Nicolaysen Sørnes : Prepare for viewing versions using objectManager
by Chris Morgan 19 Sep '07

19 Sep '07

Module: appdb Branch: master Commit: 93d71f630a49fc57938470c114e545367fefcb4c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=93d71f630a49fc57938470c1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Sep 18 12:28:37 2007 +0200 Prepare for viewing versions using objectManager --- appview.php | 4 +++- include/objectManager.php | 32 ++++++++++++++++++++++++++++++-- include/version.php | 23 ++++++++++++++++++----- objectManager.php | 2 +- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/appview.php b/appview.php index b0731d0..4ad6e8a 100644 --- a/appview.php +++ b/appview.php @@ -80,7 +80,9 @@ if( isset($aClean['iAppId']) ) { $oVersion = new Version($aClean['iVersionId']); $iTestingId = isset($aClean['iTestingId']) ? $aClean['iTestingId'] : null; - $oVersion->display($iTestingId); + // header + apidb_header("Viewing App: ".version::fullName($oVersion->iVersionId)); + $oVersion->display($aClean); } else { // Oops! Called with no params, bad llamah! diff --git a/include/objectManager.php b/include/objectManager.php index c0b61d3..0c1a3ea 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -699,14 +699,42 @@ class ObjectManager } } + /* Gets the custom variables, if any, from a class depending on + the action which is being taken, such as viewing an entry, + editing one etc. + Returns null if there are no custom vars, or a labelled array + with the variable contents otherwise */ + function get_custom_vars($aClean, $sAction) + { + $oObject = new $this->sClass($this->iId); + + if(!method_exists($oObject, "objectGetCustomVars")) + return null; /* No vars */ + + $aVars = array(); + + foreach($oObject->objectGetCustomVars($aClean, $sAction) as $sVar) + $aVars[$sVar] = $aClean[$sVar]; + + if(!sizeof($aVars)) + return null; /* No vars */ + else + return $aVars; + } + /* View an entry */ - function view($sBackLink) + function view($sBackLink, $aClean) { $this->checkMethods(array("display")); $oObject = new $this->sClass($this->iId); - $oObject->display(); + $aVars = $this->get_custom_vars($aClean, "display"); + + if(!$aVars) + $oObject->display(); + else + $oObject->display($aVars); // display the move children entry $this->displayMoveChildren($oObject); diff --git a/include/version.php b/include/version.php index 157c9c2..bba4efc 100644 --- a/include/version.php +++ b/include/version.php @@ -12,6 +12,7 @@ require_once(BASE."include/util.php"); require_once(BASE."include/testData.php"); require_once(BASE."include/downloadurl.php"); require_once(BASE."include/monitor.php"); +require_once(BASE."include/vote.php"); define("LICENSE_OPENSOURCE", "Open Source"); define("LICENSE_FREEWARE", "Freeware"); @@ -718,12 +719,28 @@ class version { $this->iObsoleteBy = 0; } - function display($iTestingId) + function objectGetCustomVars($aClean, $sAction) + { + switch($sAction) + { + case "display": + /* Allow the user to select which test report is + shown in the version view */ + return array("iTestingId"); + + default: + return null; + } + } + + function display($aVars) { /* is this user supposed to view this version? */ if(!$_SESSION['current']->canViewVersion($this)) util_show_error_page_and_exit("Something went wrong with the application or version id"); + $iTestingId = $aVars['iTestingId']; + $oApp = new Application($this->iAppId); // Oops! application not found or other error. do something @@ -738,10 +755,6 @@ class version { if($_SESSION['current']->isLoggedIn()) apidb_sidebar_add("vote_menu"); - - // header - apidb_header("Viewing App- ".$oApp->sName." Version - ".$this->sName); - // cat $oCategory = new Category($oApp->iCatId); $oCategory->display($oApp->iAppId, $this->iVersionId); diff --git a/objectManager.php b/objectManager.php index 1bfc96e..7052c62 100644 --- a/objectManager.php +++ b/objectManager.php @@ -103,7 +103,7 @@ if($oObject->iId) break; default: - $oObject->view($_SERVER['REQUEST_URI']); + $oObject->view($_SERVER['REQUEST_URI'], $aClean); break; } } else if (isset($aClean['sAction']) && $aClean['sAction'] == "add")

1 0

Juan Lang : crypt32: Use decode function' s returned decoded length to advance pointer when decoding an array.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 0bd29b124310e9797f66ddd162f574ecad237e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd29b124310e9797f66ddd16… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 18:02:26 2007 -0700 crypt32: Use decode function's returned decoded length to advance pointer when decoding an array. --- dlls/crypt32/decode.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index caf34cb..082c28a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -709,6 +709,8 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, i < cItems && ptr - pbEncoded - 1 - lenBytes < dataLen; i++) { + DWORD itemDecoded; + if (arrayDesc->hasPointer) *(BYTE **)(array->rgItems + i * arrayDesc->itemSize + arrayDesc->pointerOffset) = nextData; @@ -716,16 +718,11 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, itemSizes[i].encodedLen, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, array->rgItems + i * arrayDesc->itemSize, - &itemSizes[i].size, NULL); + &itemSizes[i].size, &itemDecoded); if (ret) { - DWORD nextLen; - nextData += itemSizes[i].size - arrayDesc->itemSize; - ret = CRYPT_GetLen(ptr, - cbEncoded - (ptr - pbEncoded), &nextLen); - if (ret) - ptr += nextLen + 1 + GET_LEN_BYTES(ptr[1]); + ptr += itemDecoded; } } }

1 0

Juan Lang : crypt32: ret is already true, don't retest it.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: ee28204fcf37c39786bcb865da55eed1e93a6160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee28204fcf37c39786bcb865d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:59:53 2007 -0700 crypt32: ret is already true, don't retest it. --- dlls/crypt32/decode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 0125fef..caf34cb 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -517,7 +517,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], bytesNeeded += items[i].size; structSize += items[i].minSize; } - if (ret && pcbDecoded) + if (pcbDecoded) *pcbDecoded = 1 + lenBytes + cbDecoded; if (!pvStructInfo) *pcbStructInfo = bytesNeeded;

1 0

Juan Lang : crypt32: Test and correct decoding indefinite-length-encoded PKCS content.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 7e475b4a774edf29d7c3ae5def5f0d0f5d159368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e475b4a774edf29d7c3ae5de… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:29:37 2007 -0700 crypt32: Test and correct decoding indefinite-length-encoded PKCS content. --- dlls/crypt32/decode.c | 38 ++++++++++++++++++++++++++++------- dlls/crypt32/tests/encode.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index f0fab24..8da7138 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2456,21 +2456,43 @@ static BOOL CRYPT_AsnDecodePKCSContent(const BYTE *pbEncoded, DWORD cbEncoded, pvStructInfo, *pcbStructInfo, pcbDecoded); /* The caller has already checked the tag, no need to check it again. - * Check the outer length is valid by calling CRYPT_GetLen: + * Check the outer length is valid: */ - if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + if ((ret = CRYPT_GetLengthIndefinite(pbEncoded, cbEncoded, &dataLen))) { BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); DWORD innerLen; pbEncoded += 1 + lenBytes; - /* Check the inner length is valid by calling CRYPT_GetLen again: */ - if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &innerLen))) + cbEncoded -= 1 + lenBytes; + if (dataLen == CMSG_INDEFINITE_LENGTH) + cbEncoded -= 2; /* space for 0 TLV */ + /* Check the inner length is valid: */ + if ((ret = CRYPT_GetLengthIndefinite(pbEncoded, cbEncoded, &innerLen))) { - ret = CRYPT_AsnDecodeCopyBytes(pbEncoded, dataLen, dwFlags, - pvStructInfo, pcbStructInfo, NULL); - if (pcbDecoded) - *pcbDecoded = 1 + lenBytes + dataLen; + DWORD decodedLen; + + ret = CRYPT_AsnDecodeCopyBytes(pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo, &decodedLen); + if (dataLen == CMSG_INDEFINITE_LENGTH) + { + if (*(pbEncoded + decodedLen) != 0 || + *(pbEncoded + decodedLen + 1) != 0) + { + TRACE("expected 0 TLV, got {%02x,%02x}\n", + *(pbEncoded + decodedLen), + *(pbEncoded + decodedLen + 1)); + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + else + decodedLen += 2; + } + if (ret && pcbDecoded) + { + *pcbDecoded = 1 + lenBytes + decodedLen; + TRACE("decoded %d bytes\n", *pcbDecoded); + } } } return ret; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 13d288b..3e29db0 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4799,6 +4799,36 @@ static void test_encodePKCSContentInfo(DWORD dwEncoding) } } +static const BYTE indefiniteSignedPKCSContent[] = { +0x30,0x80,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02,0xa0,0x80, +0x30,0x80,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x80,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7, +0x0d,0x01,0x07,0x01,0xa0,0x80,0x24,0x80,0x04,0x04,0x01,0x02,0x03,0x04,0x04, +0x04,0x01,0x02,0x03,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0x81,0xd2,0x30, +0x81,0xcf,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30, +0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30, +0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11,0x06, +0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67, +0x00,0x30,0x5c,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01, +0x01,0x05,0x00,0x03,0x4b,0x00,0x30,0x48,0x02,0x41,0x00,0xe2,0x54,0x3a,0xa7, +0x83,0xb1,0x27,0x14,0x3e,0x59,0xbb,0xb4,0x53,0xe6,0x1f,0xe7,0x5d,0xf1,0x21, +0x68,0xad,0x85,0x53,0xdb,0x6b,0x1e,0xeb,0x65,0x97,0x03,0x86,0x60,0xde,0xf3, +0x6c,0x38,0x75,0xe0,0x4c,0x61,0xbb,0xbc,0x62,0x17,0xa9,0xcd,0x79,0x3f,0x21, +0x4e,0x96,0xcb,0x0e,0xdc,0x61,0x94,0x30,0x18,0x10,0x6b,0xd0,0x1c,0x10,0x79, +0x02,0x03,0x01,0x00,0x01,0xa3,0x16,0x30,0x14,0x30,0x12,0x06,0x03,0x55,0x1d, +0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01,0x31, +0x77,0x30,0x75,0x02,0x01,0x01,0x30,0x1a,0x30,0x15,0x31,0x13,0x30,0x11,0x06, +0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67, +0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02, +0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05,0x00,0x04,0x40,0x57,0xba,0xe0,0xad, +0xfe,0x36,0x8d,0xb3,0x88,0xa2,0x8d,0x84,0x82,0x52,0x09,0x09,0xd9,0xf0,0xb8, +0x04,0xfa,0xb5,0x51,0x0b,0x2b,0x2e,0xd5,0x72,0x3e,0x3d,0x13,0x8a,0x51,0xc3, +0x71,0x65,0x9a,0x52,0xf2,0x8f,0xb2,0x5b,0x39,0x28,0xb3,0x29,0x36,0xa5,0x8d, +0xe3,0x55,0x71,0x91,0xf9,0x2a,0xd1,0xb8,0xaa,0x52,0xb8,0x22,0x3a,0xeb,0x61, +0x00,0x00,0x00,0x00,0x00,0x00 }; + static void test_decodePKCSContentInfo(DWORD dwEncoding) { BOOL ret; @@ -4849,6 +4879,22 @@ static void test_decodePKCSContentInfo(DWORD dwEncoding) "Unexpected size %d\n", info->Content.cbData); ok(!memcmp(info->Content.pbData, ints[0].encoded, info->Content.cbData), "Unexpected value\n"); + LocalFree(buf); + } + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, + indefiniteSignedPKCSContent, sizeof(indefiniteSignedPKCSContent), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + if (buf) + { + info = (CRYPT_CONTENT_INFO *)buf; + + ok(!strcmp(info->pszObjId, szOID_RSA_signedData), + "Expected %s, got %s\n", szOID_RSA_signedData, info->pszObjId); + todo_wine + ok(info->Content.cbData == 392, "Expected 392, got %d\n", + info->Content.cbData); + LocalFree(buf); } }

1 0

Juan Lang : crypt32: Explicitly count bytes to copy in DecodeCopyBytes.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 9c4c856fde5370c515714f0a81a7dc50ac647838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c4c856fde5370c515714f0a8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:55:13 2007 -0700 crypt32: Explicitly count bytes to copy in DecodeCopyBytes. --- dlls/crypt32/decode.c | 127 ++++++++++++++++++++++++++++++++++--------- dlls/crypt32/tests/encode.c | 1 - 2 files changed, 101 insertions(+), 27 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 8da7138..0125fef 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -361,10 +361,26 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], } else { - ptr += itemDecoded; - decoded += itemDecoded; - TRACE("item %d: decoded %d bytes\n", i, - itemDecoded); + if (itemLen == CMSG_INDEFINITE_LENGTH) + { + if (itemDecoded > itemEncodedLen - 2 || + *(ptr + itemDecoded) != 0 || + *(ptr + itemDecoded + 1) != 0) + { + TRACE("expected 0 TLV\n"); + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + else + itemDecoded += 2; + } + if (ret) + { + ptr += itemDecoded; + decoded += itemDecoded; + TRACE("item %d: decoded %d bytes\n", i, + itemDecoded); + } } } else if (items[i].optional && @@ -1875,41 +1891,100 @@ static BOOL WINAPI CRYPT_AsnDecodeUnicodeName(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_FindEncodedLen(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD *pcbDecoded) +{ + BOOL ret = TRUE, done = FALSE; + DWORD indefiniteNestingLevels = 0, decoded = 0; + + TRACE("(%p, %d)\n", pbEncoded, cbEncoded); + + do { + DWORD dataLen; + + if (!cbEncoded) + done = TRUE; + else if ((ret = CRYPT_GetLengthIndefinite(pbEncoded, cbEncoded, + &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + + if (dataLen == CMSG_INDEFINITE_LENGTH) + { + indefiniteNestingLevels++; + pbEncoded += 1 + lenBytes; + cbEncoded -= 1 + lenBytes; + decoded += 1 + lenBytes; + TRACE("indefiniteNestingLevels = %d\n", + indefiniteNestingLevels); + } + else + { + if (pbEncoded[0] == 0 && pbEncoded[1] == 0 && + indefiniteNestingLevels) + { + indefiniteNestingLevels--; + TRACE("indefiniteNestingLevels = %d\n", + indefiniteNestingLevels); + } + pbEncoded += 1 + lenBytes + dataLen; + cbEncoded -= 1 + lenBytes + dataLen; + decoded += 1 + lenBytes + dataLen; + if (!indefiniteNestingLevels) + done = TRUE; + } + } + } while (ret && !done); + /* If we haven't found all 0 TLVs, we haven't found the end */ + if (ret && indefiniteNestingLevels) + { + SetLastError(CRYPT_E_ASN1_EOD); + ret = FALSE; + } + if (ret) + *pcbDecoded = decoded; + TRACE("returning %d (%d)\n", ret, ret ? *pcbDecoded : 0); + return ret; +} + static BOOL CRYPT_AsnDecodeCopyBytes(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { BOOL ret = TRUE; - DWORD bytesNeeded = sizeof(CRYPT_OBJID_BLOB); + DWORD bytesNeeded = sizeof(CRYPT_OBJID_BLOB), encodedLen = 0; TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) - bytesNeeded += cbEncoded; - if (pcbDecoded) - *pcbDecoded = cbEncoded; - if (!pvStructInfo) - *pcbStructInfo = bytesNeeded; - else if (*pcbStructInfo < bytesNeeded) - { - SetLastError(ERROR_MORE_DATA); - *pcbStructInfo = bytesNeeded; - ret = FALSE; - } - else + if ((ret = CRYPT_FindEncodedLen(pbEncoded, cbEncoded, &encodedLen))) { - PCRYPT_OBJID_BLOB blob = (PCRYPT_OBJID_BLOB)pvStructInfo; - - *pcbStructInfo = bytesNeeded; - blob->cbData = cbEncoded; - if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) - blob->pbData = (LPBYTE)pbEncoded; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += encodedLen; + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + SetLastError(ERROR_MORE_DATA); + *pcbStructInfo = bytesNeeded; + ret = FALSE; + } else { - assert(blob->pbData); - memcpy(blob->pbData, pbEncoded, blob->cbData); + PCRYPT_OBJID_BLOB blob = (PCRYPT_OBJID_BLOB)pvStructInfo; + + *pcbStructInfo = bytesNeeded; + blob->cbData = encodedLen; + if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) + blob->pbData = (LPBYTE)pbEncoded; + else + { + assert(blob->pbData); + memcpy(blob->pbData, pbEncoded, blob->cbData); + } } + if (pcbDecoded) + *pcbDecoded = encodedLen; } return ret; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 3e29db0..eaed27b 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4891,7 +4891,6 @@ static void test_decodePKCSContentInfo(DWORD dwEncoding) ok(!strcmp(info->pszObjId, szOID_RSA_signedData), "Expected %s, got %s\n", szOID_RSA_signedData, info->pszObjId); - todo_wine ok(info->Content.cbData == 392, "Expected 392, got %d\n", info->Content.cbData); LocalFree(buf);

1 0

Juan Lang : crypt32: Simplify AsnDecodeSequenceItems a tiny bit.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: f534a67bfc59d3b8b74d69cfcc4e60411f293104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f534a67bfc59d3b8b74d69cfc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:27:12 2007 -0700 crypt32: Simplify AsnDecodeSequenceItems a tiny bit. --- dlls/crypt32/decode.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 0de2e6a..1e63183 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -308,15 +308,21 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], { if (cbEncoded - (ptr - pbEncoded) != 0) { - DWORD nextItemLen; + DWORD itemLen; if ((ret = CRYPT_GetLengthIndefinite(ptr, - cbEncoded - (ptr - pbEncoded), &nextItemLen))) + cbEncoded - (ptr - pbEncoded), &itemLen))) { - BYTE nextItemLenBytes = GET_LEN_BYTES(ptr[1]); + BYTE itemLenBytes = GET_LEN_BYTES(ptr[1]); if (ptr[0] == items[i].tag || !items[i].tag) { + DWORD itemEncodedLen; + + if (itemLen == CMSG_INDEFINITE_LENGTH) + itemEncodedLen = cbEncoded - (ptr - pbEncoded); + else + itemEncodedLen = 1 + itemLenBytes + itemLen; if (nextData && pvStructInfo && items[i].hasPointer) { TRACE("Setting next pointer to %p\n", @@ -326,21 +332,16 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], } if (items[i].decodeFunc) { - DWORD nextItemEncodedLen, nextItemDecoded; + DWORD itemDecoded; - if (nextItemLen == CMSG_INDEFINITE_LENGTH) - nextItemEncodedLen = cbEncoded - (ptr - pbEncoded); - else - nextItemEncodedLen = 1 + nextItemLenBytes + - nextItemLen; if (pvStructInfo) TRACE("decoding item %d\n", i); else TRACE("sizing item %d\n", i); - ret = items[i].decodeFunc(ptr, nextItemEncodedLen, + ret = items[i].decodeFunc(ptr, itemEncodedLen, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo ? (BYTE *)pvStructInfo + items[i].offset - : NULL, &items[i].size, &nextItemDecoded); + : NULL, &items[i].size, &itemDecoded); if (ret) { /* Account for alignment padding */ @@ -351,19 +352,19 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], if (nextData && items[i].hasPointer && items[i].size > items[i].minSize) nextData += items[i].size - items[i].minSize; - if (nextItemDecoded > nextItemEncodedLen) + if (itemDecoded > itemEncodedLen) { WARN("decoded length %d exceeds encoded %d\n", - nextItemDecoded, nextItemEncodedLen); + itemDecoded, itemEncodedLen); SetLastError(CRYPT_E_ASN1_CORRUPT); ret = FALSE; } else { - ptr += nextItemDecoded; - decoded += nextItemDecoded; + ptr += itemDecoded; + decoded += itemDecoded; TRACE("item %d: decoded %d bytes\n", i, - nextItemDecoded); + itemDecoded); } } else if (items[i].optional && @@ -378,7 +379,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], TRACE("item %d failed: %08x\n", i, GetLastError()); } - else if (nextItemLen == CMSG_INDEFINITE_LENGTH) + else if (itemLen == CMSG_INDEFINITE_LENGTH) { ERR("can't use indefinite length encoding without a decoder\n"); SetLastError(CRYPT_E_ASN1_CORRUPT); @@ -386,10 +387,9 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], } else { - TRACE("item %d: decoded %d bytes\n", i, - 1 + nextItemLenBytes + nextItemLen); - ptr += 1 + nextItemLenBytes + nextItemLen; - decoded += 1 + nextItemLenBytes + nextItemLen; + TRACE("item %d: decoded %d bytes\n", i, itemEncodedLen); + ptr += itemEncodedLen; + decoded += itemEncodedLen; items[i].size = items[i].minSize; } }

1 0

Juan Lang : crypt32: Use correct encoded length when decoding a sequence.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 43e6b48b33026bfb67c3b7a5863a7e525ff7450c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e6b48b33026bfb67c3b7a58… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:28:09 2007 -0700 crypt32: Use correct encoded length when decoding a sequence. --- dlls/crypt32/decode.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 1e63183..f0fab24 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -454,7 +454,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], cbEncoded -= 1 + lenBytes; if (dataLen == CMSG_INDEFINITE_LENGTH) - cbEncoded = dataLen; + dataLen = cbEncoded; else if (cbEncoded < dataLen) { TRACE("dataLen %d exceeds cbEncoded %d, failing\n", dataLen, @@ -462,12 +462,10 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], SetLastError(CRYPT_E_ASN1_CORRUPT); ret = FALSE; } - else - cbEncoded = dataLen; if (ret) { ret = CRYPT_AsnDecodeSequenceItems(items, cItem, - ptr, cbEncoded, dwFlags, NULL, NULL, &cbDecoded); + ptr, dataLen, dwFlags, NULL, NULL, &cbDecoded); if (ret && dataLen == CMSG_INDEFINITE_LENGTH) { if (cbDecoded > cbEncoded - 2) @@ -487,9 +485,9 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], cbDecoded += 2; } } - if (ret && cbDecoded != cbEncoded) + if (ret && cbDecoded != dataLen) { - TRACE("expected %d decoded, got %d, failing\n", cbEncoded, + TRACE("expected %d decoded, got %d, failing\n", dataLen, cbDecoded); SetLastError(CRYPT_E_ASN1_CORRUPT); ret = FALSE; @@ -520,7 +518,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], nextData = (BYTE *)pvStructInfo + structSize; memset(pvStructInfo, 0, structSize); ret = CRYPT_AsnDecodeSequenceItems(items, cItem, - ptr, cbEncoded, dwFlags, pvStructInfo, nextData, + ptr, dataLen, dwFlags, pvStructInfo, nextData, &cbDecoded); } }

1 0