85114 2012-04-27 17:49:41 -0700 IndexedDB: Handle generated keys up to 2^53 2025-01-22 08:31:38 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 85441 1 jsbell jsbell alecflett dgrogan tony vincent.emonet webkit.review.bot zmo oldest_to_newest 612049 0 jsbell 2012-04-27 17:49:41 -0700 IndexedDB: Handle generated keys up to 2^53 612050 1 139311 jsbell 2012-04-27 17:52:09 -0700 Created attachment 139311 Patch 612051 2 jsbell 2012-04-27 17:54:19 -0700 I noticed this edge case when perusing the spec, and we had many casts to int that prevented us from getting anywhere close to 2^53. dgrogan@, alecflett@ - sanity check? 612927 3 139311 dgrogan 2012-04-30 14:02:14 -0700 Comment on attachment 139311 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139311&action=review LGTM > Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp:-605 > -double IDBLevelDBBackingStore::nextAutoIncrementNumber(int64_t databaseId, int64_t objectStoreId) Seems weird that this was ever a double. Do you know why it was? 612939 4 jsbell 2012-04-30 14:13:10 -0700 (In reply to comment #3) > > Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp:-605 > > -double IDBLevelDBBackingStore::nextAutoIncrementNumber(int64_t databaseId, int64_t objectStoreId) > > Seems weird that this was ever a double. Do you know why it was? Since it's a number-type key it would be stored as a double (equivalent to JS number). The double->int64 conversion could reasonably be done anywhere along the call stack, but this seemed like the best place. 612940 5 jsbell 2012-04-30 14:13:38 -0700 tony@ - r? 614754 6 139311 webkit.review.bot 2012-05-02 16:02:58 -0700 Comment on attachment 139311 Patch Clearing flags on attachment: 139311 Committed r115902: <http://trac.webkit.org/changeset/115902> 614755 7 webkit.review.bot 2012-05-02 16:03:06 -0700 All reviewed patches have been landed. Closing bug. 614883 8 zmo 2012-05-02 18:05:53 -0700 cc1plus: warnings being treated as errors third_party/WebKit/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.cpp:686: error: integer constant is too large for 'long' type make: *** [out/Release/obj.target/webcore_remaining/third_party/WebKit/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.o] Error 1 Compie failure on Linux 32 bot. I couldn't get hold of you in time, so I am reverting. Apparently the constant is too large for 32 bit. 614891 9 jsbell 2012-05-02 18:16:20 -0700 Sorry. Probably would compile with L or .0 suffix. 615392 10 jsbell 2012-05-03 10:36:50 -0700 (In reply to comment #9) > Sorry. Probably would compile with L or .0 suffix. ... or more correctly, LL. Verified this with a test app and compiling with gcc -m32. Will re-land shortly. 615395 11 140045 jsbell 2012-05-03 10:41:18 -0700 Created attachment 140045 Patch for landing 615494 12 140045 webkit.review.bot 2012-05-03 12:32:21 -0700 Comment on attachment 140045 Patch for landing Clearing flags on attachment: 140045 Committed r115997: <http://trac.webkit.org/changeset/115997> 615495 13 webkit.review.bot 2012-05-03 12:32:27 -0700 All reviewed patches have been landed. Closing bug. 2088997 14 m_dubet 2025-01-22 08:31:38 -0800 *** Bug 284746 has been marked as a duplicate of this bug. *** 139311 2012-04-27 17:52:09 -0700 2012-05-03 10:41:12 -0700 Patch bug-85114-20120427175208.patch text/plain 11241 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU4ZTcyY2ZkMzc0NmI3 NDAzNWM2ZjBhNDVmNzM4OTVlNDQ0ZDc2OC4uODAyYjk2YjJiMDUyMTRjMTAyYmEzZDQxZGFlZDg4 OTFiMWQwZDI2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA0LTI3ICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBIYW5k bGUgZ2VuZXJhdGVkIGtleXMgdXAgdG8gMl41MworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUxMTQKKworICAgICAgICBUaGUgc3BlYyBkZWZpbmVzIHRo ZSBiZWhhdmlvciBmb3IgZ2VuZXJhdGVkIGtleXMgdXAgdG8gMl41MworICAgICAgICAodGhlIG1h eGltdW0gaW50ZWdlciBzdG9yYWJsZSBhcyBhbiBFQ01BU2NyaXB0IG51bWJlcikgYW5kCisgICAg ICAgIHRoZSBlcnJvciBjYXNlIHdoZW4gZ29pbmcgYmV5b25kIHRoYXQuIEVuc3VyZSB0aGF0IHdl IGNhbgorICAgICAgICBoYW5kbGUgdmFsdWVzIHVwIHRvIHRoYXQgcG9pbnQgYW5kIGdlbmVyYXRl IGVycm9ycyBiZXlvbmQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGVzdDogc3RvcmFnZS9pbmRleGVkZGIva2V5LWdlbmVyYXRvci5odG1sCisKKyAg ICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJCYWNraW5nU3RvcmUuaDoKKyAgICAgICAgKElE QkJhY2tpbmdTdG9yZSk6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJh Y2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJMZXZlbERCQmFja2luZ1N0b3Jl OjpuZXh0QXV0b0luY3JlbWVudE51bWJlcik6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIv SURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5oOgorICAgICAgICAoSURCTGV2ZWxEQkJhY2tpbmdTdG9y ZSk6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1w bC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsOjpwdXRJ bnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpJREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsOjpn ZW5BdXRvSW5jcmVtZW50S2V5KToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJPYmpl Y3RTdG9yZUJhY2tlbmRJbXBsLmg6CisgICAgICAgIChJREJPYmplY3RTdG9yZUJhY2tlbmRJbXBs KToKKwogMjAxMi0wNC0yNyAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEltcGxlbWVudCB0aGUgIkRpc2FibGUgSmF2YVNj cmlwdCIgb3B0aW9uIGluIHRoZSBzZXR0aW5ncyBkaWFsb2cKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkJhY2tpbmdTdG9yZS5oIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQmFja2luZ1N0b3JlLmgKaW5kZXggZjZiYjEwYWFhYzVj ODU5Mzg2OWI4NWRhYzE2N2E5Yjg0ZTA2NzU3ZC4uOWJlMjZkYjczOGUwZmRkM2JiMjQxZWU4YzQ0 YzQzOWNiMTk2NzYzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvSURCQmFja2luZ1N0b3JlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvSURCQmFja2luZ1N0b3JlLmgKQEAgLTY3LDcgKzY3LDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgYm9vbCBwdXRPYmplY3RTdG9yZVJlY29yZChpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qg b2JqZWN0U3RvcmVJZCwgY29uc3QgSURCS2V5JiwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgT2JqZWN0 U3RvcmVSZWNvcmRJZGVudGlmaWVyKikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBjbGVhck9iamVj dFN0b3JlKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkKSA9IDA7CiAg ICAgdmlydHVhbCB2b2lkIGRlbGV0ZU9iamVjdFN0b3JlUmVjb3JkKGludDY0X3QgZGF0YWJhc2VJ ZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkLCBjb25zdCBPYmplY3RTdG9yZVJlY29yZElkZW50aWZp ZXIqKSA9IDA7Ci0gICAgdmlydHVhbCBkb3VibGUgbmV4dEF1dG9JbmNyZW1lbnROdW1iZXIoaW50 NjRfdCBkYXRhYmFzZUlkLCBpbnQ2NF90IG9iamVjdFN0b3JlSWQpID0gMDsKKyAgICB2aXJ0dWFs IGludDY0X3QgbmV4dEF1dG9JbmNyZW1lbnROdW1iZXIoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2 NF90IG9iamVjdFN0b3JlSWQpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wga2V5RXhpc3RzSW5PYmpl Y3RTdG9yZShpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3RvcmVJZCwgY29uc3Qg SURCS2V5JiwgT2JqZWN0U3RvcmVSZWNvcmRJZGVudGlmaWVyKiBmb3VuZFJlY29yZElkZW50aWZp ZXIpID0gMDsKIAogICAgIGNsYXNzIE9iamVjdFN0b3JlUmVjb3JkQ2FsbGJhY2sgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdT dG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFj a2luZ1N0b3JlLmNwcAppbmRleCBkY2YzYThhYTcwMDMxNDM3MTc4MWM5MzQ3YjcyOGUwYjA2M2Ni NWM2Li5iZWIyYTcxYWUzYjYyZTIxMWFlMzc0YzBiZWU1ODI0ZTRmNDQ5MzVlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3Jl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFj a2luZ1N0b3JlLmNwcApAQCAtNjAyLDcgKzYwMiw3IEBAIHZvaWQgSURCTGV2ZWxEQkJhY2tpbmdT dG9yZTo6ZGVsZXRlT2JqZWN0U3RvcmVSZWNvcmQoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2NF90 CiAgICAgbV9jdXJyZW50VHJhbnNhY3Rpb24tPnJlbW92ZShleGlzdHNFbnRyeUtleSk7CiB9CiAK LWRvdWJsZSBJREJMZXZlbERCQmFja2luZ1N0b3JlOjpuZXh0QXV0b0luY3JlbWVudE51bWJlcihp bnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3RvcmVJZCkKK2ludDY0X3QgSURCTGV2 ZWxEQkJhY2tpbmdTdG9yZTo6bmV4dEF1dG9JbmNyZW1lbnROdW1iZXIoaW50NjRfdCBkYXRhYmFz ZUlkLCBpbnQ2NF90IG9iamVjdFN0b3JlSWQpCiB7CiAgICAgQVNTRVJUKG1fY3VycmVudFRyYW5z YWN0aW9uKTsKICAgICBjb25zdCBWZWN0b3I8Y2hhcj4gc3RhcnRLZXkgPSBPYmplY3RTdG9yZURh dGFLZXk6OmVuY29kZShkYXRhYmFzZUlkLCBvYmplY3RTdG9yZUlkLCBtaW5JREJLZXkoKSk7CkBA IC02MTAsOSArNjEwLDEwIEBAIGRvdWJsZSBJREJMZXZlbERCQmFja2luZ1N0b3JlOjpuZXh0QXV0 b0luY3JlbWVudE51bWJlcihpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0CiAKICAgICBPd25QdHI8 TGV2ZWxEQkl0ZXJhdG9yPiBpdCA9IG1fY3VycmVudFRyYW5zYWN0aW9uLT5jcmVhdGVJdGVyYXRv cigpOwogCi0gICAgaW50IG1heE51bWVyaWNLZXkgPSAwOworICAgIGludDY0X3QgbWF4TnVtZXJp Y0tleSA9IDA7CiAKLSAgICAvLyBGSVhNRTogQmUgbW9yZSBlZmZpY2llbnQ6IHNlZWsgdG8gc29t ZXRoaW5nIGFmdGVyIHRoZSBvYmplY3Qgc3RvcmUgZGF0YSwgdGhlbiByZXZlcnNlLgorICAgIC8v IEZJWE1FOiBUaGlzIGRvZXMgYSBmb3J3YXJkIHNjYW4gb3ZlciBhbGwga2V5cy4gSW1wcm92ZSBp dC4KKyAgICAvLyBTaW5jZSBhbGwgZGF0ZXMgPiBhbGwgbnVtYmVycywgY3JlYXRlIERhdGUoLUlu ZmluaXR5KSBhbmQgc2VlayBiYWNrd2FyZHMuCiAKICAgICBmb3IgKGl0LT5zZWVrKHN0YXJ0S2V5 KTsgaXQtPmlzVmFsaWQoKSAmJiBjb21wYXJlS2V5cyhpdC0+a2V5KCksIHN0b3BLZXkpIDwgMDsg aXQtPm5leHQoKSkgewogICAgICAgICBjb25zdCBjaGFyICpwID0gaXQtPmtleSgpLmJlZ2luKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERC QmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZl bERCQmFja2luZ1N0b3JlLmgKaW5kZXggMjRkNDM5ZDc2NjEzMTEzZWUxODRmNGU1NTAxNjcxN2U3 ZDI5NjYyNi4uZWMzMDYzYjZlODc3MWNkY2NmMDIzYWJkOWQ1NzgyMTcxZTAwMjJjMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdT dG9yZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVsREJC YWNraW5nU3RvcmUuaApAQCAtNTgsNyArNTgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29s IHB1dE9iamVjdFN0b3JlUmVjb3JkKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RT dG9yZUlkLCBjb25zdCBJREJLZXkmLCBjb25zdCBTdHJpbmcmIHZhbHVlLCBPYmplY3RTdG9yZVJl Y29yZElkZW50aWZpZXIqKTsKICAgICB2aXJ0dWFsIHZvaWQgY2xlYXJPYmplY3RTdG9yZShpbnQ2 NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3RvcmVJZCk7CiAgICAgdmlydHVhbCB2b2lk IGRlbGV0ZU9iamVjdFN0b3JlUmVjb3JkKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmpl Y3RTdG9yZUlkLCBjb25zdCBPYmplY3RTdG9yZVJlY29yZElkZW50aWZpZXIqKTsKLSAgICB2aXJ0 dWFsIGRvdWJsZSBuZXh0QXV0b0luY3JlbWVudE51bWJlcihpbnQ2NF90IGRhdGFiYXNlSWQsIGlu dDY0X3Qgb2JqZWN0U3RvcmVJZCk7CisgICAgdmlydHVhbCBpbnQ2NF90IG5leHRBdXRvSW5jcmVt ZW50TnVtYmVyKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkKTsKICAg ICB2aXJ0dWFsIGJvb2wga2V5RXhpc3RzSW5PYmplY3RTdG9yZShpbnQ2NF90IGRhdGFiYXNlSWQs IGludDY0X3Qgb2JqZWN0U3RvcmVJZCwgY29uc3QgSURCS2V5JiwgT2JqZWN0U3RvcmVSZWNvcmRJ ZGVudGlmaWVyKiBmb3VuZFJlY29yZElkZW50aWZpZXIpOwogCiAgICAgdmlydHVhbCBib29sIGZv ckVhY2hPYmplY3RTdG9yZVJlY29yZChpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0 U3RvcmVJZCwgT2JqZWN0U3RvcmVSZWNvcmRDYWxsYmFjayYpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZUJhY2tlbmRJ bXBsLmNwcAppbmRleCA1ZDJkNTBjMmFlYmU3ZjQwMGQ2MGQ4ZTEwODZiMDA1ZmY5YjNkNTUzLi44 NTk5YjM4YzkwOGYwOWM5NjM5OGExMzVhYjU5MzA5ZDMwZmFjZWJjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZUJh Y2tlbmRJbXBsLmNwcApAQCAtMjU1LDYgKzI1NSwxMCBAQCB2b2lkIElEQk9iamVjdFN0b3JlQmFj a2VuZEltcGw6OnB1dEludGVybmFsKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRy PAogICAgICAgICBpZiAoYXV0b0luY3JlbWVudCkgewogICAgICAgICAgICAgaWYgKCFrZXkpIHsK ICAgICAgICAgICAgICAgICBSZWZQdHI8SURCS2V5PiBhdXRvSW5jS2V5ID0gb2JqZWN0U3RvcmUt PmdlbkF1dG9JbmNyZW1lbnRLZXkoKTsKKyAgICAgICAgICAgICAgICBpZiAoIWF1dG9JbmNLZXkt PnZhbGlkKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgY2FsbGJhY2tzLT5vbkVycm9yKElEQkRh dGFiYXNlRXJyb3I6OmNyZWF0ZShJREJEYXRhYmFzZUV4Y2VwdGlvbjo6REFUQV9FUlIsICJNYXhp bXVtIGtleSBnZW5lcmF0b3IgdmFsdWUgcmVhY2hlZC4iKSk7CisgICAgICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYgKGhhc0tleVBh dGgpIHsKICAgICAgICAgICAgICAgICAgICAgUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4g dmFsdWVBZnRlckluamVjdGlvbiA9IGluamVjdEtleUludG9LZXlQYXRoKGF1dG9JbmNLZXksIHZh bHVlLCBvYmplY3RTdG9yZS0+bV9rZXlQYXRoKTsKICAgICAgICAgICAgICAgICAgICAgQVNTRVJU KHZhbHVlQWZ0ZXJJbmplY3Rpb24pOwpAQCAtNjc5LDEwICs2ODMsMTUgQEAgdm9pZCBJREJPYmpl Y3RTdG9yZUJhY2tlbmRJbXBsOjphZGRJbmRleFRvTWFwKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQq LCBQYXNzUmVmUHQKIAogUGFzc1JlZlB0cjxJREJLZXk+IElEQk9iamVjdFN0b3JlQmFja2VuZElt cGw6OmdlbkF1dG9JbmNyZW1lbnRLZXkoKQogeworICAgIGNvbnN0IGludDY0X3Qga01heEdlbmVy YXRvclZhbHVlID0gOTAwNzE5OTI1NDc0MDk5MjsgLy8gTWF4aW11bSBpbnRlZ2VyIHN0b3JhYmxl IGFzIEVDTUFTY3JpcHQgbnVtYmVyLgorICAgIGlmIChtX2F1dG9JbmNyZW1lbnROdW1iZXIgPiBr TWF4R2VuZXJhdG9yVmFsdWUpCisgICAgICAgIHJldHVybiBJREJLZXk6OmNyZWF0ZUludmFsaWQo KTsKICAgICBpZiAobV9hdXRvSW5jcmVtZW50TnVtYmVyID4gMCkKICAgICAgICAgcmV0dXJuIElE QktleTo6Y3JlYXRlTnVtYmVyKG1fYXV0b0luY3JlbWVudE51bWJlcisrKTsKIAotICAgIG1fYXV0 b0luY3JlbWVudE51bWJlciA9IHN0YXRpY19jYXN0PGludD4obV9iYWNraW5nU3RvcmUtPm5leHRB dXRvSW5jcmVtZW50TnVtYmVyKG1fZGF0YWJhc2VJZCwgaWQoKSkpOworICAgIG1fYXV0b0luY3Jl bWVudE51bWJlciA9IG1fYmFja2luZ1N0b3JlLT5uZXh0QXV0b0luY3JlbWVudE51bWJlcihtX2Rh dGFiYXNlSWQsIGlkKCkpOworICAgIGlmIChtX2F1dG9JbmNyZW1lbnROdW1iZXIgPiBrTWF4R2Vu ZXJhdG9yVmFsdWUpCisgICAgICAgIHJldHVybiBJREJLZXk6OmNyZWF0ZUludmFsaWQoKTsKICAg ICByZXR1cm4gSURCS2V5OjpjcmVhdGVOdW1iZXIobV9hdXRvSW5jcmVtZW50TnVtYmVyKyspOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmpl Y3RTdG9yZUJhY2tlbmRJbXBsLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9J REJPYmplY3RTdG9yZUJhY2tlbmRJbXBsLmgKaW5kZXggOGQyZTFkYTk5ZTg0YWM4OWRiNDdhZjYx ZTVmMWVhYzMzN2RlYzJkZC4uNmUwYzVlOGZkNmFhMWEzNWJhM2ExNzgyM2M1MzE4OTE3Y2YxMjdm OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0 U3RvcmVCYWNrZW5kSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L0lEQk9iamVjdFN0b3JlQmFja2VuZEltcGwuaApAQCAtMTE1LDcgKzExNSw3IEBAIHByaXZhdGU6 CiAKICAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBSZWZQdHI8SURCSW5kZXhCYWNrZW5kSW1w bD4gPiBJbmRleE1hcDsKICAgICBJbmRleE1hcCBtX2luZGV4ZXM7Ci0gICAgaW50IG1fYXV0b0lu Y3JlbWVudE51bWJlcjsKKyAgICBpbnQ2NF90IG1fYXV0b0luY3JlbWVudE51bWJlcjsKIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwZjRkYzFkYzAyYWY4NDU0MGRhNmQ0NjNm ODhkYWJmOTBiYjUzOThiLi5iODk5ZTg3NDA3N2U3Y2RlMTMzMmRhYzRlNTI2MGNiYTM5MmIzOGYw IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDQtMjcgIEpvc2h1YSBCZWxsICA8anNiZWxs QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbmRleGVkREI6IEhhbmRsZSBnZW5lcmF0ZWQga2V5 cyB1cCB0byAyXjUzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04NTExNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogc3RvcmFnZS9pbmRleGVkZGIva2V5LWdlbmVyYXRvci1leHBlY3RlZC50eHQ6CisgICAg ICAgICogc3RvcmFnZS9pbmRleGVkZGIvcmVzb3VyY2VzL2tleS1nZW5lcmF0b3IuanM6CisgICAg ICAgIChnZXQgZGVmaW5lVGVzdCk6CisKIDIwMTItMDQtMjcgIENocmlzdG9waGUgRHVtZXogIDxj aHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXSBSZXNvdXJjZUVycm9y IGRvbWFpbiBuZWVkcyB0byBiZSBwcm9wZXJseSBzZXQgaW4gRnJhbWVMb2FkZXJDbGllbnQKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2tleS1nZW5lcmF0b3ItZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIva2V5LWdlbmVyYXRvci1l eHBlY3RlZC50eHQKaW5kZXggYWY4YTE4YjgxMjAyYjhiMDExNDk3MGZjNzg3YWE5YWM4MzMzMDE0 Mi4uYjMxYzI3YjlmZDE1ZGQ1NTYxMGExNjFiYTU3ZjU2MmEwMTc2ZjkyYSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIva2V5LWdlbmVyYXRvci1leHBlY3RlZC50eHQK KysrIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIva2V5LWdlbmVyYXRvci1leHBlY3Rl ZC50eHQKQEAgLTE0Miw2ICsxNDIsMjkgQEAgcmVxdWVzdCA9IHN0b3JlLmdldCgyKQogUEFTUyBH b3QgImMiIGZvciBrZXk6IDEKIFBBU1MgR290ICJkIiBmb3Iga2V5OiAyCiBkYi5jbG9zZSgpCisK K1ZlcmlmeSB0aGF0IGtleXMgYWJvdmUgMl41MyByZXN1bHQgaW4gZXJyb3JzLgorcmVxdWVzdCA9 IGluZGV4ZWREQi5kZWxldGVEYXRhYmFzZSgna2V5LWdlbmVyYXRvcicpCityZXF1ZXN0ID0gaW5k ZXhlZERCLm9wZW4oJ2tleS1nZW5lcmF0b3InKQorZGIgPSByZXF1ZXN0LnJlc3VsdAorcmVxdWVz dCA9IGRiLnNldFZlcnNpb24oJzEnKQordHJhbnMgPSByZXF1ZXN0LnJlc3VsdAordHJhbnMxID0g ZGIudHJhbnNhY3Rpb24oWydzdG9yZSddLCBJREJUcmFuc2FjdGlvbi5SRUFEX1dSSVRFKQorc3Rv cmVfdDEgPSB0cmFuczEub2JqZWN0U3RvcmUoJ3N0b3JlJykKK3N0b3JlX3QxLnB1dCgnYScpCity ZXF1ZXN0ID0gc3RvcmUuZ2V0KDEpCitzdG9yZV90MS5wdXQoJ2InLCA5MDA3MTk5MjU0NzQwOTky KQorcmVxdWVzdCA9IHN0b3JlLmdldCg5MDA3MTk5MjU0NzQwOTkyKQorc3RvcmVfdDEucHV0KCdj JykKK3N0b3JlX3QxLnB1dCgnZCcsIDIpCityZXF1ZXN0ID0gc3RvcmUuZ2V0KDIpCitQQVNTIEdv dCAiYSIgZm9yIGtleTogMQorUEFTUyBHb3QgImIiIGZvciBrZXk6IDkwMDcxOTkyNTQ3NDA5OTIK K0Vycm9yIGV2ZW50IGZpcmVkIGF1dG8taW5jcmVtZW50aW5nIHBhc3QgMl41MyAoYXMgZXhwZWN0 ZWQpCitQQVNTIGV2ZW50LnRhcmdldC5lcnJvckNvZGUgaXMgSURCRGF0YWJhc2VFeGNlcHRpb24u REFUQV9FUlIKK2V2ZW50LnByZXZlbnREZWZhdWx0KCkKK1BBU1MgR290ICJkIiBmb3Iga2V5OiAy CitkYi5jbG9zZSgpCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09N UExFVEUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL3Jlc291cmNl cy9rZXktZ2VuZXJhdG9yLmpzIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvcmVzb3Vy Y2VzL2tleS1nZW5lcmF0b3IuanMKaW5kZXggMjFiMTc1MThjZTExYjA2MWUxYzVmZjhmOTBjMGJj Y2JmMTE2YmI5ZC4uMDJiMmUwZWNiZTQ5YzBmMGRhNGE3NjIyYWVlNjhhNzIzYTA0MWFiOCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvcmVzb3VyY2VzL2tleS1nZW5l cmF0b3IuanMKKysrIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvcmVzb3VyY2VzL2tl eS1nZW5lcmF0b3IuanMKQEAgLTIwMyw0ICsyMDMsMzEgQEAgZGVmaW5lVGVzdCgKICAgICB9CiAp OwogCi10ZXN0KCk7ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorZGVmaW5lVGVzdCgKKyAg ICAnVmVyaWZ5IHRoYXQga2V5cyBhYm92ZSAyXjUzIHJlc3VsdCBpbiBlcnJvcnMuJywKKyAgICBm dW5jdGlvbiAoZGIsIHRyYW5zKSB7CisgICAgICAgIGRiLmNyZWF0ZU9iamVjdFN0b3JlKCdzdG9y ZScsIHsgYXV0b0luY3JlbWVudDogdHJ1ZSB9KTsKKyAgICB9LAorCisgICAgZnVuY3Rpb24gKGRi LCBjYWxsYmFjaykgeworICAgICAgICBldmFsQW5kTG9nKCJ0cmFuczEgPSBkYi50cmFuc2FjdGlv bihbJ3N0b3JlJ10sIElEQlRyYW5zYWN0aW9uLlJFQURfV1JJVEUpIik7CisgICAgICAgIGV2YWxB bmRMb2coInN0b3JlX3QxID0gdHJhbnMxLm9iamVjdFN0b3JlKCdzdG9yZScpIik7CisgICAgICAg IGV2YWxBbmRMb2coInN0b3JlX3QxLnB1dCgnYScpIik7CisgICAgICAgIGNoZWNrKHN0b3JlX3Qx LCAxLCAnYScpOworICAgICAgICBldmFsQW5kTG9nKCJzdG9yZV90MS5wdXQoJ2InLCA5MDA3MTk5 MjU0NzQwOTkyKSIpOworICAgICAgICBjaGVjayhzdG9yZV90MSwgOTAwNzE5OTI1NDc0MDk5Miwg J2InKTsKKyAgICAgICAgcmVxdWVzdCA9IGV2YWxBbmRMb2coInN0b3JlX3QxLnB1dCgnYycpIik7 CisgICAgICAgIHJlcXVlc3Qub25zdWNjZXNzID0gdW5leHBlY3RlZFN1Y2Nlc3NDYWxsYmFjazsK KyAgICAgICAgcmVxdWVzdC5vbmVycm9yID0gZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgZGVi dWcoIkVycm9yIGV2ZW50IGZpcmVkIGF1dG8taW5jcmVtZW50aW5nIHBhc3QgMl41MyAoYXMgZXhw ZWN0ZWQpIik7CisgICAgICAgICAgICBzaG91bGRCZSgiZXZlbnQudGFyZ2V0LmVycm9yQ29kZSIs ICJJREJEYXRhYmFzZUV4Y2VwdGlvbi5EQVRBX0VSUiIpOworICAgICAgICAgICAgZXZhbEFuZExv ZygiZXZlbnQucHJldmVudERlZmF1bHQoKSIpOworICAgICAgICB9OworICAgICAgICBldmFsQW5k TG9nKCJzdG9yZV90MS5wdXQoJ2QnLCAyKSIpOworICAgICAgICBjaGVjayhzdG9yZV90MSwgMiwg J2QnKTsKKworICAgICAgICB0cmFuczEub25jb21wbGV0ZSA9IGNhbGxiYWNrOworICAgIH0KKyk7 CisKK3Rlc3QoKTsK 140045 2012-05-03 10:41:18 -0700 2012-05-03 12:32:21 -0700 Patch for landing bug-85114-20120503104115.patch text/plain 11246 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODhlN2Q2YzBjNDkwZDJh NjU5YzU2ZDMyNTc2MDMyNzhkMTE1Mjg5OS4uZGZmYjEwMTA1NTJhMjQwNmI3MTI5YmEwYTRjZDg3 NzQ1NjJiOWM0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA1LTAzICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBIYW5k bGUgZ2VuZXJhdGVkIGtleXMgdXAgdG8gMl41MworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUxMTQKKworICAgICAgICBUaGUgc3BlYyBkZWZpbmVzIHRo ZSBiZWhhdmlvciBmb3IgZ2VuZXJhdGVkIGtleXMgdXAgdG8gMl41MworICAgICAgICAodGhlIG1h eGltdW0gaW50ZWdlciBzdG9yYWJsZSBhcyBhbiBFQ01BU2NyaXB0IG51bWJlcikgYW5kCisgICAg ICAgIHRoZSBlcnJvciBjYXNlIHdoZW4gZ29pbmcgYmV5b25kIHRoYXQuIEVuc3VyZSB0aGF0IHdl IGNhbgorICAgICAgICBoYW5kbGUgdmFsdWVzIHVwIHRvIHRoYXQgcG9pbnQgYW5kIGdlbmVyYXRl IGVycm9ycyBiZXlvbmQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KKworICAg ICAgICBUZXN0OiBzdG9yYWdlL2luZGV4ZWRkYi9rZXktZ2VuZXJhdG9yLmh0bWwKKworICAgICAg ICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQkJhY2tpbmdTdG9yZS5oOgorICAgICAgICAoSURCQmFj a2luZ1N0b3JlKToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2lu Z1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkxldmVsREJCYWNraW5nU3RvcmU6Om5l eHRBdXRvSW5jcmVtZW50TnVtYmVyKToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJM ZXZlbERCQmFja2luZ1N0b3JlLmg6CisgICAgICAgIChJREJMZXZlbERCQmFja2luZ1N0b3JlKToK KyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OklEQk9iamVjdFN0b3JlQmFja2VuZEltcGw6OnB1dEludGVy bmFsKToKKyAgICAgICAgKFdlYkNvcmU6OklEQk9iamVjdFN0b3JlQmFja2VuZEltcGw6OmdlbkF1 dG9JbmNyZW1lbnRLZXkpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0 b3JlQmFja2VuZEltcGwuaDoKKyAgICAgICAgKElEQk9iamVjdFN0b3JlQmFja2VuZEltcGwpOgor CiAyMDEyLTA1LTAzICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBjb21waWxlIHRpbWUgYW1iaWd1aXR5IGhhcHBlbnMgd2hl biBJIHRyeSB0byBhc3NpZ24gYSBUeXBlQnVpbGRlciBvYmplY3QgdG8gYW4gb3V0IGFyZ3VtZW50 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQmFja2lu Z1N0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJCYWNraW5nU3Rv cmUuaAppbmRleCBmNmJiMTBhYWFjNWM4NTkzODY5Yjg1ZGFjMTY3YTliODRlMDY3NTdkLi45YmUy NmRiNzM4ZTBmZGQzYmIyNDFlZThjNDRjNDM5Y2IxOTY3NjNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJCYWNraW5nU3RvcmUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJCYWNraW5nU3RvcmUuaApAQCAtNjcsNyArNjcs NyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIHB1dE9iamVjdFN0b3JlUmVjb3JkKGludDY0 X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkLCBjb25zdCBJREJLZXkmLCBjb25z dCBTdHJpbmcmIHZhbHVlLCBPYmplY3RTdG9yZVJlY29yZElkZW50aWZpZXIqKSA9IDA7CiAgICAg dmlydHVhbCB2b2lkIGNsZWFyT2JqZWN0U3RvcmUoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2NF90 IG9iamVjdFN0b3JlSWQpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGVsZXRlT2JqZWN0U3RvcmVS ZWNvcmQoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2NF90IG9iamVjdFN0b3JlSWQsIGNvbnN0IE9i amVjdFN0b3JlUmVjb3JkSWRlbnRpZmllciopID0gMDsKLSAgICB2aXJ0dWFsIGRvdWJsZSBuZXh0 QXV0b0luY3JlbWVudE51bWJlcihpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3Rv cmVJZCkgPSAwOworICAgIHZpcnR1YWwgaW50NjRfdCBuZXh0QXV0b0luY3JlbWVudE51bWJlcihp bnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3RvcmVJZCkgPSAwOwogICAgIHZpcnR1 YWwgYm9vbCBrZXlFeGlzdHNJbk9iamVjdFN0b3JlKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRf dCBvYmplY3RTdG9yZUlkLCBjb25zdCBJREJLZXkmLCBPYmplY3RTdG9yZVJlY29yZElkZW50aWZp ZXIqIGZvdW5kUmVjb3JkSWRlbnRpZmllcikgPSAwOwogCiAgICAgY2xhc3MgT2JqZWN0U3RvcmVS ZWNvcmRDYWxsYmFjayB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwCmluZGV4IGQzNzY5ZWFjMTA3OTA4 OTJhZGVlZjcxOTE4N2M2NGRjMzk0MGMxZjAuLjMzNzVkNjI4MzQ4NmVjNmYzY2Q1ZWZhNWE1MDBi NDQ2OWQyOTA3MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwCkBAIC02MDIsNyArNjAyLDcgQEAg dm9pZCBJREJMZXZlbERCQmFja2luZ1N0b3JlOjpkZWxldGVPYmplY3RTdG9yZVJlY29yZChpbnQ2 NF90IGRhdGFiYXNlSWQsIGludDY0X3QKICAgICBtX2N1cnJlbnRUcmFuc2FjdGlvbi0+cmVtb3Zl KGV4aXN0c0VudHJ5S2V5KTsKIH0KIAotZG91YmxlIElEQkxldmVsREJCYWNraW5nU3RvcmU6Om5l eHRBdXRvSW5jcmVtZW50TnVtYmVyKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RT dG9yZUlkKQoraW50NjRfdCBJREJMZXZlbERCQmFja2luZ1N0b3JlOjpuZXh0QXV0b0luY3JlbWVu dE51bWJlcihpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3RvcmVJZCkKIHsKICAg ICBBU1NFUlQobV9jdXJyZW50VHJhbnNhY3Rpb24pOwogICAgIGNvbnN0IFZlY3RvcjxjaGFyPiBz dGFydEtleSA9IE9iamVjdFN0b3JlRGF0YUtleTo6ZW5jb2RlKGRhdGFiYXNlSWQsIG9iamVjdFN0 b3JlSWQsIG1pbklEQktleSgpKTsKQEAgLTYxMCw5ICs2MTAsMTAgQEAgZG91YmxlIElEQkxldmVs REJCYWNraW5nU3RvcmU6Om5leHRBdXRvSW5jcmVtZW50TnVtYmVyKGludDY0X3QgZGF0YWJhc2VJ ZCwgaW50NjQKIAogICAgIE93blB0cjxMZXZlbERCSXRlcmF0b3I+IGl0ID0gbV9jdXJyZW50VHJh bnNhY3Rpb24tPmNyZWF0ZUl0ZXJhdG9yKCk7CiAKLSAgICBpbnQgbWF4TnVtZXJpY0tleSA9IDA7 CisgICAgaW50NjRfdCBtYXhOdW1lcmljS2V5ID0gMDsKIAotICAgIC8vIEZJWE1FOiBCZSBtb3Jl IGVmZmljaWVudDogc2VlayB0byBzb21ldGhpbmcgYWZ0ZXIgdGhlIG9iamVjdCBzdG9yZSBkYXRh LCB0aGVuIHJldmVyc2UuCisgICAgLy8gRklYTUU6IFRoaXMgZG9lcyBhIGZvcndhcmQgc2NhbiBv dmVyIGFsbCBrZXlzLiBJbXByb3ZlIGl0LgorICAgIC8vIFNpbmNlIGFsbCBkYXRlcyA+IGFsbCBu dW1iZXJzLCBjcmVhdGUgRGF0ZSgtSW5maW5pdHkpIGFuZCBzZWVrIGJhY2t3YXJkcy4KIAogICAg IGZvciAoaXQtPnNlZWsoc3RhcnRLZXkpOyBpdC0+aXNWYWxpZCgpICYmIGNvbXBhcmVLZXlzKGl0 LT5rZXkoKSwgc3RvcEtleSkgPCAwOyBpdC0+bmV4dCgpKSB7CiAgICAgICAgIGNvbnN0IGNoYXIg KnAgPSBpdC0+a2V5KCkuYmVnaW4oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuaCBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuaAppbmRleCAyNGQ0MzlkNzY2 MTMxMTNlZTE4NGY0ZTU1MDE2NzE3ZTdkMjk2NjI2Li5lYzMwNjNiNmU4NzcxY2RjY2YwMjNhYmQ5 ZDU3ODIxNzFlMDAyMmMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3JlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5oCkBAIC01OCw3ICs1OCw3IEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgcHV0T2JqZWN0U3RvcmVSZWNvcmQoaW50NjRfdCBkYXRh YmFzZUlkLCBpbnQ2NF90IG9iamVjdFN0b3JlSWQsIGNvbnN0IElEQktleSYsIGNvbnN0IFN0cmlu ZyYgdmFsdWUsIE9iamVjdFN0b3JlUmVjb3JkSWRlbnRpZmllciopOwogICAgIHZpcnR1YWwgdm9p ZCBjbGVhck9iamVjdFN0b3JlKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9y ZUlkKTsKICAgICB2aXJ0dWFsIHZvaWQgZGVsZXRlT2JqZWN0U3RvcmVSZWNvcmQoaW50NjRfdCBk YXRhYmFzZUlkLCBpbnQ2NF90IG9iamVjdFN0b3JlSWQsIGNvbnN0IE9iamVjdFN0b3JlUmVjb3Jk SWRlbnRpZmllciopOwotICAgIHZpcnR1YWwgZG91YmxlIG5leHRBdXRvSW5jcmVtZW50TnVtYmVy KGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkKTsKKyAgICB2aXJ0dWFs IGludDY0X3QgbmV4dEF1dG9JbmNyZW1lbnROdW1iZXIoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2 NF90IG9iamVjdFN0b3JlSWQpOwogICAgIHZpcnR1YWwgYm9vbCBrZXlFeGlzdHNJbk9iamVjdFN0 b3JlKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkLCBjb25zdCBJREJL ZXkmLCBPYmplY3RTdG9yZVJlY29yZElkZW50aWZpZXIqIGZvdW5kUmVjb3JkSWRlbnRpZmllcik7 CiAKICAgICB2aXJ0dWFsIGJvb2wgZm9yRWFjaE9iamVjdFN0b3JlUmVjb3JkKGludDY0X3QgZGF0 YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkLCBPYmplY3RTdG9yZVJlY29yZENhbGxiYWNr Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmpl Y3RTdG9yZUJhY2tlbmRJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L0lEQk9iamVjdFN0b3JlQmFja2VuZEltcGwuY3BwCmluZGV4IDVkMmQ1MGMyYWViZTdmNDAwZDYw ZDhlMTA4NmIwMDVmZjliM2Q1NTMuLjdlMmI1NTI3MWY3ODY3OTcyM2ViYWZhZTgxNTFiNGNiMmJi NTVhZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9i amVjdFN0b3JlQmFja2VuZEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQk9iamVjdFN0b3JlQmFja2VuZEltcGwuY3BwCkBAIC0yNTUsNiArMjU1LDEwIEBA IHZvaWQgSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbDo6cHV0SW50ZXJuYWwoU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8CiAgICAgICAgIGlmIChhdXRvSW5jcmVtZW50KSB7CiAg ICAgICAgICAgICBpZiAoIWtleSkgewogICAgICAgICAgICAgICAgIFJlZlB0cjxJREJLZXk+IGF1 dG9JbmNLZXkgPSBvYmplY3RTdG9yZS0+Z2VuQXV0b0luY3JlbWVudEtleSgpOworICAgICAgICAg ICAgICAgIGlmICghYXV0b0luY0tleS0+dmFsaWQoKSkgeworICAgICAgICAgICAgICAgICAgICBj YWxsYmFja3MtPm9uRXJyb3IoSURCRGF0YWJhc2VFcnJvcjo6Y3JlYXRlKElEQkRhdGFiYXNlRXhj ZXB0aW9uOjpEQVRBX0VSUiwgIk1heGltdW0ga2V5IGdlbmVyYXRvciB2YWx1ZSByZWFjaGVkLiIp KTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICBpZiAoaGFzS2V5UGF0aCkgewogICAgICAgICAgICAgICAgICAgICBSZWZQdHI8 U2VyaWFsaXplZFNjcmlwdFZhbHVlPiB2YWx1ZUFmdGVySW5qZWN0aW9uID0gaW5qZWN0S2V5SW50 b0tleVBhdGgoYXV0b0luY0tleSwgdmFsdWUsIG9iamVjdFN0b3JlLT5tX2tleVBhdGgpOwogICAg ICAgICAgICAgICAgICAgICBBU1NFUlQodmFsdWVBZnRlckluamVjdGlvbik7CkBAIC02NzksMTAg KzY4MywxNSBAQCB2b2lkIElEQk9iamVjdFN0b3JlQmFja2VuZEltcGw6OmFkZEluZGV4VG9NYXAo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdAogCiBQYXNzUmVmUHRyPElEQktleT4g SURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbDo6Z2VuQXV0b0luY3JlbWVudEtleSgpCiB7CisgICAg Y29uc3QgaW50NjRfdCBrTWF4R2VuZXJhdG9yVmFsdWUgPSA5MDA3MTk5MjU0NzQwOTkyTEw7IC8v IE1heGltdW0gaW50ZWdlciBzdG9yYWJsZSBhcyBFQ01BU2NyaXB0IG51bWJlci4KKyAgICBpZiAo bV9hdXRvSW5jcmVtZW50TnVtYmVyID4ga01heEdlbmVyYXRvclZhbHVlKQorICAgICAgICByZXR1 cm4gSURCS2V5OjpjcmVhdGVJbnZhbGlkKCk7CiAgICAgaWYgKG1fYXV0b0luY3JlbWVudE51bWJl ciA+IDApCiAgICAgICAgIHJldHVybiBJREJLZXk6OmNyZWF0ZU51bWJlcihtX2F1dG9JbmNyZW1l bnROdW1iZXIrKyk7CiAKLSAgICBtX2F1dG9JbmNyZW1lbnROdW1iZXIgPSBzdGF0aWNfY2FzdDxp bnQ+KG1fYmFja2luZ1N0b3JlLT5uZXh0QXV0b0luY3JlbWVudE51bWJlcihtX2RhdGFiYXNlSWQs IGlkKCkpKTsKKyAgICBtX2F1dG9JbmNyZW1lbnROdW1iZXIgPSBtX2JhY2tpbmdTdG9yZS0+bmV4 dEF1dG9JbmNyZW1lbnROdW1iZXIobV9kYXRhYmFzZUlkLCBpZCgpKTsKKyAgICBpZiAobV9hdXRv SW5jcmVtZW50TnVtYmVyID4ga01heEdlbmVyYXRvclZhbHVlKQorICAgICAgICByZXR1cm4gSURC S2V5OjpjcmVhdGVJbnZhbGlkKCk7CiAgICAgcmV0dXJuIElEQktleTo6Y3JlYXRlTnVtYmVyKG1f YXV0b0luY3JlbWVudE51bWJlcisrKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbC5oIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbC5oCmluZGV4 IDhkMmUxZGE5OWU4NGFjODlkYjQ3YWY2MWU1ZjFlYWMzMzdkZWMyZGQuLjZlMGM1ZThmZDZhYTFh MzViYTNhMTc4MjNjNTMxODkxN2NmMTI3ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlQmFja2VuZEltcGwuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsLmgKQEAg LTExNSw3ICsxMTUsNyBAQCBwcml2YXRlOgogCiAgICAgdHlwZWRlZiBIYXNoTWFwPFN0cmluZywg UmVmUHRyPElEQkluZGV4QmFja2VuZEltcGw+ID4gSW5kZXhNYXA7CiAgICAgSW5kZXhNYXAgbV9p bmRleGVzOwotICAgIGludCBtX2F1dG9JbmNyZW1lbnROdW1iZXI7CisgICAgaW50NjRfdCBtX2F1 dG9JbmNyZW1lbnROdW1iZXI7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg NzNiY2M2YjI0YTZiODFkNzBiNDFiMDAxOGNjZDUwNzgwN2ViYWYzYS4uZjlhMDUyZDIyNmE2OWU3 NDNiNGZjYTU4ZmYyZWJhYmRkZjcyNzYyOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA1 LTAzICBKb3NodWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhl ZERCOiBIYW5kbGUgZ2VuZXJhdGVkIGtleXMgdXAgdG8gMl41MworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUxMTQKKworICAgICAgICBSZXZpZXdlZCBi eSBUb255IENoYW5nLgorCisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIva2V5LWdlbmVyYXRv ci1leHBlY3RlZC50eHQ6CisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIvcmVzb3VyY2VzL2tl eS1nZW5lcmF0b3IuanM6CisgICAgICAgIChnZXQgZGVmaW5lVGVzdCk6CisKIDIwMTItMDUtMDMg IFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVuaUBsaW51eC5pbnRlbC5jb20+ CiAKICAgICAgICAgW0VGTF0gW0RSVF0gVXBkYXRlIEVGTCBiYXNlbGluZXMgYWZ0ZXIgcjExNTg0 NgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIva2V5LWdlbmVyYXRv ci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9rZXktZ2VuZXJh dG9yLWV4cGVjdGVkLnR4dAppbmRleCBhZjhhMThiODEyMDJiOGIwMTE0OTcwZmM3ODdhYTlhYzgz MzMwMTQyLi5iMzFjMjdiOWZkMTVkZDU1NjEwYTE2MWJhNTdmNTYyYTAxNzZmOTJhIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9rZXktZ2VuZXJhdG9yLWV4cGVjdGVk LnR4dAorKysgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9rZXktZ2VuZXJhdG9yLWV4 cGVjdGVkLnR4dApAQCAtMTQyLDYgKzE0MiwyOSBAQCByZXF1ZXN0ID0gc3RvcmUuZ2V0KDIpCiBQ QVNTIEdvdCAiYyIgZm9yIGtleTogMQogUEFTUyBHb3QgImQiIGZvciBrZXk6IDIKIGRiLmNsb3Nl KCkKKworVmVyaWZ5IHRoYXQga2V5cyBhYm92ZSAyXjUzIHJlc3VsdCBpbiBlcnJvcnMuCityZXF1 ZXN0ID0gaW5kZXhlZERCLmRlbGV0ZURhdGFiYXNlKCdrZXktZ2VuZXJhdG9yJykKK3JlcXVlc3Qg PSBpbmRleGVkREIub3Blbigna2V5LWdlbmVyYXRvcicpCitkYiA9IHJlcXVlc3QucmVzdWx0City ZXF1ZXN0ID0gZGIuc2V0VmVyc2lvbignMScpCit0cmFucyA9IHJlcXVlc3QucmVzdWx0Cit0cmFu czEgPSBkYi50cmFuc2FjdGlvbihbJ3N0b3JlJ10sIElEQlRyYW5zYWN0aW9uLlJFQURfV1JJVEUp CitzdG9yZV90MSA9IHRyYW5zMS5vYmplY3RTdG9yZSgnc3RvcmUnKQorc3RvcmVfdDEucHV0KCdh JykKK3JlcXVlc3QgPSBzdG9yZS5nZXQoMSkKK3N0b3JlX3QxLnB1dCgnYicsIDkwMDcxOTkyNTQ3 NDA5OTIpCityZXF1ZXN0ID0gc3RvcmUuZ2V0KDkwMDcxOTkyNTQ3NDA5OTIpCitzdG9yZV90MS5w dXQoJ2MnKQorc3RvcmVfdDEucHV0KCdkJywgMikKK3JlcXVlc3QgPSBzdG9yZS5nZXQoMikKK1BB U1MgR290ICJhIiBmb3Iga2V5OiAxCitQQVNTIEdvdCAiYiIgZm9yIGtleTogOTAwNzE5OTI1NDc0 MDk5MgorRXJyb3IgZXZlbnQgZmlyZWQgYXV0by1pbmNyZW1lbnRpbmcgcGFzdCAyXjUzIChhcyBl eHBlY3RlZCkKK1BBU1MgZXZlbnQudGFyZ2V0LmVycm9yQ29kZSBpcyBJREJEYXRhYmFzZUV4Y2Vw dGlvbi5EQVRBX0VSUgorZXZlbnQucHJldmVudERlZmF1bHQoKQorUEFTUyBHb3QgImQiIGZvciBr ZXk6IDIKK2RiLmNsb3NlKCkKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIAogVEVT VCBDT01QTEVURQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvcmVz b3VyY2VzL2tleS1nZW5lcmF0b3IuanMgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9y ZXNvdXJjZXMva2V5LWdlbmVyYXRvci5qcwppbmRleCAyMWIxNzUxOGNlMTFiMDYxZTFjNWZmOGY5 MGMwYmNjYmYxMTZiYjlkLi4wMmIyZTBlY2JlNDljMGYwZGE0YTc2MjJhZWU2OGE3MjNhMDQxYWI4 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9yZXNvdXJjZXMva2V5 LWdlbmVyYXRvci5qcworKysgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9yZXNvdXJj ZXMva2V5LWdlbmVyYXRvci5qcwpAQCAtMjAzLDQgKzIwMywzMSBAQCBkZWZpbmVUZXN0KAogICAg IH0KICk7CiAKLXRlc3QoKTsKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCitkZWZpbmVUZXN0 KAorICAgICdWZXJpZnkgdGhhdCBrZXlzIGFib3ZlIDJeNTMgcmVzdWx0IGluIGVycm9ycy4nLAor ICAgIGZ1bmN0aW9uIChkYiwgdHJhbnMpIHsKKyAgICAgICAgZGIuY3JlYXRlT2JqZWN0U3RvcmUo J3N0b3JlJywgeyBhdXRvSW5jcmVtZW50OiB0cnVlIH0pOworICAgIH0sCisKKyAgICBmdW5jdGlv biAoZGIsIGNhbGxiYWNrKSB7CisgICAgICAgIGV2YWxBbmRMb2coInRyYW5zMSA9IGRiLnRyYW5z YWN0aW9uKFsnc3RvcmUnXSwgSURCVHJhbnNhY3Rpb24uUkVBRF9XUklURSkiKTsKKyAgICAgICAg ZXZhbEFuZExvZygic3RvcmVfdDEgPSB0cmFuczEub2JqZWN0U3RvcmUoJ3N0b3JlJykiKTsKKyAg ICAgICAgZXZhbEFuZExvZygic3RvcmVfdDEucHV0KCdhJykiKTsKKyAgICAgICAgY2hlY2soc3Rv cmVfdDEsIDEsICdhJyk7CisgICAgICAgIGV2YWxBbmRMb2coInN0b3JlX3QxLnB1dCgnYicsIDkw MDcxOTkyNTQ3NDA5OTIpIik7CisgICAgICAgIGNoZWNrKHN0b3JlX3QxLCA5MDA3MTk5MjU0NzQw OTkyLCAnYicpOworICAgICAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygic3RvcmVfdDEucHV0KCdj JykiKTsKKyAgICAgICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSB1bmV4cGVjdGVkU3VjY2Vzc0NhbGxi YWNrOworICAgICAgICByZXF1ZXN0Lm9uZXJyb3IgPSBmdW5jdGlvbiAoKSB7CisgICAgICAgICAg ICBkZWJ1ZygiRXJyb3IgZXZlbnQgZmlyZWQgYXV0by1pbmNyZW1lbnRpbmcgcGFzdCAyXjUzIChh cyBleHBlY3RlZCkiKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCJldmVudC50YXJnZXQuZXJyb3JD b2RlIiwgIklEQkRhdGFiYXNlRXhjZXB0aW9uLkRBVEFfRVJSIik7CisgICAgICAgICAgICBldmFs QW5kTG9nKCJldmVudC5wcmV2ZW50RGVmYXVsdCgpIik7CisgICAgICAgIH07CisgICAgICAgIGV2 YWxBbmRMb2coInN0b3JlX3QxLnB1dCgnZCcsIDIpIik7CisgICAgICAgIGNoZWNrKHN0b3JlX3Qx LCAyLCAnZCcpOworCisgICAgICAgIHRyYW5zMS5vbmNvbXBsZXRlID0gY2FsbGJhY2s7CisgICAg fQorKTsKKwordGVzdCgpOwo=