128563 2014-02-10 16:23:30 -0800 IDB: storage/indexeddb/mozilla/indexes.html fails 2014-02-10 18:24:23 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson alecflett commit-queue jsbell webkit-bug-importer oldest_to_newest 979129 0 beidson 2014-02-10 16:23:30 -0800 IDB: storage/indexeddb/mozilla/indexes.html fails The reasons are: 1 - For key-only cursors, the wrong version of onSuccess is called. 2 - In debug builds it ASSERTs because in IDBRequest::onSuccess a key injection is attempted with a null keypath... which is silly. No keypath, no key injection. 3 - For NextUnique index cursors, the secondary ordering was wrong (it was Descending, it should be Ascending) 979132 1 webkit-bug-importer 2014-02-10 16:24:20 -0800 <rdar://problem/16031590> 979135 2 223767 beidson 2014-02-10 16:28:22 -0800 Created attachment 223767 Patch v1 979146 3 223767 thorton 2014-02-10 16:53:11 -0800 Comment on attachment 223767 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=223767&action=review > Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp:100 > if (hasLowerKey && !isLowerOpen) This is pretty ugly. 979180 4 223767 commit-queue 2014-02-10 18:24:21 -0800 Comment on attachment 223767 Patch v1 Clearing flags on attachment: 223767 Committed r163849: <http://trac.webkit.org/changeset/163849> 979181 5 commit-queue 2014-02-10 18:24:23 -0800 All reviewed patches have been landed. Closing bug. 223767 2014-02-10 16:28:22 -0800 2014-02-10 18:24:21 -0800 Patch v1 patch text/plain 16656 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5N2I3OGY0Li4xYWYzMGZmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTQtMDIt MTAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIElEQjogc3Rv cmFnZS9pbmRleGVkZGIvbW96aWxsYS9pbmRleGVzLmh0bWwgZmFpbHMKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzE2MDMxNTkwPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyODU2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zOiBBZGQgdGhlIHRlc3Qg KHN0aWxsIHNraXBwZWQgZm9yIG5vdyBkdWUgdG8gdW5yZWxhdGVkIHJlYXNvbnMpLgorCisyMDE0 LTAyLTEwICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBJREI6 IHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvb2JqZWN0LXN0b3JlLXJlbW92ZS12YWx1ZXMuaHRt bCBmYWlscwogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTYwMjkzMTk+IGFuZCBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4NDg3CiAKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA1MWM1ZTE0Li5lYjQ3YWRiIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMK KysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCkBAIC00 ODAsNiArNDgwLDcgQEAgZnVsbHNjcmVlbi9hbm9ueW1vdXMtYmxvY2stbWVyZ2UtY3Jhc2guaHRt bCBbIFBhc3MgXQogIyBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL2N1cnNvci1tdXRhdGlvbi5o dG1sIFsgUGFzcyBdCiAjIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvY3Vyc29ycy5odG1sIFsg UGFzcyBdCiAjIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvaW5kZXgtcHJldi1uby1kdXBsaWNh dGUuaHRtbCBbIFBhc3MgXQorIyBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL2luZGV4ZXMuaHRt bCBbIFBhc3MgXQogIyBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL29iamVjdC1jdXJzb3JzLmh0 bWwgWyBQYXNzIF0KICMgc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9vYmplY3Qtc3RvcmUtcmVt b3ZlLXZhbHVlcy5odG1sIFsgUGFzcyBdCiAjIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvdmVy c2lvbmNoYW5nZS1hYm9ydC5odG1sIFsgUGFzcyBdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFhOGZhMS4uYjA0 MWZkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAyLTEwICBCcmFkeSBFaWRz b24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBJREI6IHN0b3JhZ2UvaW5kZXhlZGRi L21vemlsbGEvaW5kZXhlcy5odG1sIGZhaWxzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjAz MTU5MD4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg1NjMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0ZWQg Ynkgc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9pbmRleGVzLmh0bWwgKGFuZCBwcm9iYWJseSBv dGhlcnMpCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJHZXRSZXN1bHQuaDoKKyAg ICAgICAgKFdlYkNvcmU6OklEQkdldFJlc3VsdDo6SURCR2V0UmVzdWx0KTogQWRkIGEgY29uc3Ry dWN0b3IgdGhhdCB0YWtlcyBhbiBJREJLZXlEYXRhIGFyZ3VtZW50LgorCisgICAgICAgICogTW9k dWxlcy9pbmRleGVkZGIvSURCUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJSZXF1 ZXN0OjpvblN1Y2Nlc3MpOiBJZiB0aGVyZeKAmXMgbm8ga2V5UGF0aCB0aGVuIHNraXAgdGhlIGlu amVjdGlvbiBzdGVwLgorCiAyMDE0LTAyLTEwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUu Y29tPgogCiAgICAgICAgIFtNU0VdIEZpeCBsYXllcmluZyB2aW9sYXRpb25zIGluIE1lZGlhU291 cmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJHZXRS ZXN1bHQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkdldFJlc3VsdC5o CmluZGV4IDA0YWUwZjQuLmVjMGM3MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL0lEQkdldFJlc3VsdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL0lEQkdldFJlc3VsdC5oCkBAIC01MCw2ICs1MCwxMSBAQCBzdHJ1Y3QgSURCR2V0 UmVzdWx0IHsKICAgICB7CiAgICAgfQogCisgICAgSURCR2V0UmVzdWx0KGNvbnN0IElEQktleURh dGEmIGtleURhdGEpCisgICAgICAgIDoga2V5RGF0YShrZXlEYXRhKQorICAgIHsKKyAgICB9CisK ICAgICBJREJHZXRSZXN1bHQoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IGJ1ZmZlciwgUGFzc1Jl ZlB0cjxJREJLZXk+IGtleSwgY29uc3QgSURCS2V5UGF0aCYgcGF0aCkKICAgICAgICAgOiB2YWx1 ZUJ1ZmZlcihidWZmZXIpCiAgICAgICAgICwga2V5RGF0YShrZXkuZ2V0KCkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJSZXF1ZXN0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlJlcXVlc3QuY3BwCmluZGV4IGRiMjViYjgu LjA2MGVjYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lE QlJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlJl cXVlc3QuY3BwCkBAIC0zNjMsMTIgKzM2MywxNiBAQCB2b2lkIElEQlJlcXVlc3Q6Om9uU3VjY2Vz cyhQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gdmFsdWVCdWZmZXIsIFBhc3NSZWZQdHI8SURCSwog ICAgIERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlIHZhbHVlID0gZGVzZXJpYWxpemVJREJWYWx1ZUJ1 ZmZlcihyZXF1ZXN0U3RhdGUoKSwgdmFsdWVCdWZmZXIsIHRydWUpOwogCiAgICAgUmVmUHRyPElE QktleT4gcHJpbWFyeUtleSA9IHBycFByaW1hcnlLZXk7CisKKyAgICBpZiAoIWtleVBhdGguaXNO dWxsKCkpIHsKICNpZm5kZWYgTkRFQlVHCi0gICAgUmVmUHRyPElEQktleT4gZXhwZWN0ZWRLZXkg PSBjcmVhdGVJREJLZXlGcm9tU2NyaXB0VmFsdWVBbmRLZXlQYXRoKHJlcXVlc3RTdGF0ZSgpLT5l eGVjKCksIHZhbHVlLCBrZXlQYXRoKTsKLSAgICBBU1NFUlQoIWV4cGVjdGVkS2V5IHx8IGV4cGVj dGVkS2V5LT5pc0VxdWFsKHByaW1hcnlLZXkuZ2V0KCkpKTsKKyAgICAgICAgUmVmUHRyPElEQktl eT4gZXhwZWN0ZWRLZXkgPSBjcmVhdGVJREJLZXlGcm9tU2NyaXB0VmFsdWVBbmRLZXlQYXRoKHJl cXVlc3RTdGF0ZSgpLT5leGVjKCksIHZhbHVlLCBrZXlQYXRoKTsKKyAgICAgICAgQVNTRVJUKCFl eHBlY3RlZEtleSB8fCBleHBlY3RlZEtleS0+aXNFcXVhbChwcmltYXJ5S2V5LmdldCgpKSk7CiAj ZW5kaWYKLSAgICBib29sIGluamVjdGVkID0gaW5qZWN0SURCS2V5SW50b1NjcmlwdFZhbHVlKHJl cXVlc3RTdGF0ZSgpLCBwcmltYXJ5S2V5LCB2YWx1ZSwga2V5UGF0aCk7Ci0gICAgQVNTRVJUX1VO VVNFRChpbmplY3RlZCwgaW5qZWN0ZWQpOworICAgICAgICBib29sIGluamVjdGVkID0gaW5qZWN0 SURCS2V5SW50b1NjcmlwdFZhbHVlKHJlcXVlc3RTdGF0ZSgpLCBwcmltYXJ5S2V5LCB2YWx1ZSwg a2V5UGF0aCk7CisgICAgICAgIEFTU0VSVF9VTlVTRUQoaW5qZWN0ZWQsIGluamVjdGVkKTsKKyAg ICB9CisKICAgICBvblN1Y2Nlc3NJbnRlcm5hbCh2YWx1ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBk MWZmOWQ3Li42MDliNDJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTQtMDItMTAg IEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIElEQjogc3RvcmFn ZS9pbmRleGVkZGIvbW96aWxsYS9pbmRleGVzLmh0bWwgZmFpbHMKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzE2MDMxNTkwPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyODU2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFzZS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OlVuaXF1ZUlEQkRhdGFiYXNlOjpnZXRSZWNvcmRGcm9tQmFja2luZ1N0 b3JlKTogUGFzcyB0aGUgY3Vyc29yIHR5cGUgdG8gdGhlIGJhY2tpbmcgc3RvcmUuCisKKyAgICAg ICAgKiBEYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0 b3JlLmg6CisgICAgICAgICogRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVl SURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpVbmlx dWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZTo6Z2V0SW5kZXhSZWNvcmQpOiBJZiBpdOKA mXMgYSBrZXktb25seSBjdXJzb3IsCisgICAgICAgICAgcmV0dXJuIG9ubHkgdGhlIGtleSByZXN1 bHQuCisgICAgICAgICogRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURC RGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuaDoKKworICAgICAgICAqIERhdGFiYXNlUHJvY2Vz cy9JbmRleGVkREIvc3FsaXRlL1NRTGl0ZUlEQkN1cnNvci5jcHA6CisgICAgICAgIChXZWJLaXQ6 OmdldEluZGV4U3RhdGVtZW50KTogRml4IGluZGV4IHN0YXRlbWVudCBzZWxlY3Rpb24gc28gYXNj ZW5kaW5nLCB1bmlxdWUgY3Vyc29ycyBzb3J0IGNvcnJlY3RseS4KKworMjAxNC0wMi0xMCAgQnJh ZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgSURCOiBzdG9yYWdlL2lu ZGV4ZWRkYi9tb3ppbGxhL29iamVjdC1zdG9yZS1yZW1vdmUtdmFsdWVzLmh0bWwgZmFpbHMKICAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2MDI5MzE5PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyODQ4NwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9E YXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCmlu ZGV4IDcyOTQ5NDAuLjQ0NzI1ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNl UHJvY2Vzcy9JbmRleGVkREIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCkBAIC05 MjQsNyArOTI0LDcgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6Z2V0UmVjb3JkRnJvbUJhY2tp bmdTdG9yZSh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IElEQkkKICAgICAvLyBJREJJbmRleCBn ZXQgcmVjb3JkCiAKICAgICBJREJHZXRSZXN1bHQgcmVzdWx0OwotICAgIGlmICghbV9iYWNraW5n U3RvcmUtPmdldEluZGV4UmVjb3JkKHRyYW5zYWN0aW9uLCBvYmplY3RTdG9yZU1ldGFkYXRhLmlk LCBpbmRleElELCBrZXlSYW5nZURhdGEsIHJlc3VsdCkpIHsKKyAgICBpZiAoIW1fYmFja2luZ1N0 b3JlLT5nZXRJbmRleFJlY29yZCh0cmFuc2FjdGlvbiwgb2JqZWN0U3RvcmVNZXRhZGF0YS5pZCwg aW5kZXhJRCwga2V5UmFuZ2VEYXRhLCBjdXJzb3JUeXBlLCByZXN1bHQpKSB7CiAgICAgICAgIHBv c3RNYWluVGhyZWFkVGFzayhjcmVhdGVBc3luY1Rhc2soKnRoaXMsICZVbmlxdWVJREJEYXRhYmFz ZTo6ZGlkR2V0UmVjb3JkRnJvbUJhY2tpbmdTdG9yZSwgcmVxdWVzdElELCBJREJHZXRSZXN1bHQo KSwgSURCRGF0YWJhc2VFeGNlcHRpb246OlVua25vd25FcnJvciwgQVNDSUlMaXRlcmFsKCJGYWls ZWQgdG8gZ2V0IGluZGV4IHJlY29yZCBmcm9tIGJhY2tpbmcgc3RvcmUiKSkpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNz L0luZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZS5oIGIvU291cmNlL1dlYktp dDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9y ZS5oCmluZGV4IDQwYjhhOGQuLjFmYjlhYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0Rh dGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmUuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRh dGFiYXNlQmFja2luZ1N0b3JlLmgKQEAgLTcxLDcgKzcxLDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgYm9vbCBrZXlFeGlzdHNJbk9iamVjdFN0b3JlKGNvbnN0IElEQklkZW50aWZpZXImIHRyYW5z YWN0aW9uSWRlbnRpZmllciwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBjb25zdCBXZWJDb3JlOjpJ REJLZXlEYXRhJiwgYm9vbCYga2V5RXhpc3RzKSA9IDA7CiAgICAgdmlydHVhbCBib29sIHB1dFJl Y29yZChjb25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIGludDY0X3Qg b2JqZWN0U3RvcmVJRCwgY29uc3QgV2ViQ29yZTo6SURCS2V5RGF0YSYsIGNvbnN0IHVpbnQ4X3Qq IHZhbHVlQnVmZmVyLCBzaXplX3QgdmFsdWVTaXplKSA9IDA7CiAgICAgdmlydHVhbCBib29sIHB1 dEluZGV4UmVjb3JkKGNvbnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwg aW50NjRfdCBvYmplY3RTdG9yZUlELCBpbnQ2NF90IGluZGV4SUQsIGNvbnN0IFdlYkNvcmU6OklE QktleURhdGEmLCBjb25zdCBXZWJDb3JlOjpJREJLZXlEYXRhJiBpbmRleEtleSkgPSAwOwotICAg IHZpcnR1YWwgYm9vbCBnZXRJbmRleFJlY29yZChjb25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2Fj dGlvbklkZW50aWZpZXIsIGludDY0X3Qgb2JqZWN0U3RvcmVJRCwgaW50NjRfdCBpbmRleElELCBj b25zdCBXZWJDb3JlOjpJREJLZXlSYW5nZURhdGEmLCBXZWJDb3JlOjpJREJHZXRSZXN1bHQmKSA9 IDA7CisgICAgdmlydHVhbCBib29sIGdldEluZGV4UmVjb3JkKGNvbnN0IElEQklkZW50aWZpZXIm IHRyYW5zYWN0aW9uSWRlbnRpZmllciwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBpbnQ2NF90IGlu ZGV4SUQsIGNvbnN0IFdlYkNvcmU6OklEQktleVJhbmdlRGF0YSYsIFdlYkNvcmU6OkluZGV4ZWRE Qjo6Q3Vyc29yVHlwZSwgV2ViQ29yZTo6SURCR2V0UmVzdWx0JikgPSAwOwogICAgIHZpcnR1YWwg Ym9vbCBkZWxldGVSYW5nZShjb25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZp ZXIsIGludDY0X3Qgb2JqZWN0U3RvcmVJRCwgY29uc3QgV2ViQ29yZTo6SURCS2V5UmFuZ2VEYXRh JikgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBkZWxldGVSZWNvcmQoY29uc3QgSURCSWRlbnRpZmll ciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGNvbnN0IFdl YkNvcmU6OklEQktleURhdGEmKSA9IDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0Rh dGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1NRTGl0ZUlEQkN1cnNvci5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9TUUxpdGVJREJDdXJz b3IuY3BwCmluZGV4IGI4YTViN2IuLjVkZTM1OTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1NRTGl0ZUlEQkN1cnNvci5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvU1FMaXRl SURCQ3Vyc29yLmNwcApAQCAtNzIsMjkgKzcyLDI1IEBAIHN0YXRpYyBjb25zdCBTdHJpbmcmIGdl dEluZGV4U3RhdGVtZW50KGJvb2wgaGFzTG93ZXJLZXksIGJvb2wgaXNMb3dlck9wZW4sIGJvb2wK ICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFZlY3RvcjxTdHJpbmc+LCBpbmRleFN0YXRlbWVudHMs ICgpKTsKIAogICAgIGlmIChpbmRleFN0YXRlbWVudHMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGlu ZGV4U3RhdGVtZW50cy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KDE2KTsKKyAgICAgICAgaW5kZXhT dGF0ZW1lbnRzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoMTIpOwogCiAgICAgICAgIC8vIExvd2Vy IG1pc3Npbmcvb3BlbiwgdXBwZXIgbWlzc2luZy9vcGVuLgogICAgICAgICBpbmRleFN0YXRlbWVu dHMudW5jaGVja2VkQXBwZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZhbHVl IEZST00gSW5kZXhSZWNvcmRzIFdIRVJFIGluZGV4SUQgPSA/IEFORCBrZXkgPiBDQVNUKD8gQVMg VEVYVCkgQU5EIGtleSA8IENBU1QoPyBBUyBURVhUKSBPUkRFUiBCWSBrZXksIHZhbHVlOyIpKTsK LSAgICAgICAgaW5kZXhTdGF0ZW1lbnRzLnVuY2hlY2tlZEFwcGVuZChBU0NJSUxpdGVyYWwoIlNF TEVDVCByb3dpZCwga2V5LCB2YWx1ZSBGUk9NIEluZGV4UmVjb3JkcyBXSEVSRSBpbmRleElEID0g PyBBTkQga2V5ID4gQ0FTVCg/IEFTIFRFWFQpIEFORCBrZXkgPCBDQVNUKD8gQVMgVEVYVCkgT1JE RVIgQlkga2V5LCB2YWx1ZSBERVNDOyIpKTsKICAgICAgICAgaW5kZXhTdGF0ZW1lbnRzLnVuY2hl Y2tlZEFwcGVuZChBU0NJSUxpdGVyYWwoIlNFTEVDVCByb3dpZCwga2V5LCB2YWx1ZSBGUk9NIElu ZGV4UmVjb3JkcyBXSEVSRSBpbmRleElEID0gPyBBTkQga2V5ID4gQ0FTVCg/IEFTIFRFWFQpIEFO RCBrZXkgPCBDQVNUKD8gQVMgVEVYVCkgT1JERVIgQlkga2V5IERFU0MsIHZhbHVlIERFU0M7Iikp OwogICAgICAgICBpbmRleFN0YXRlbWVudHMudW5jaGVja2VkQXBwZW5kKEFTQ0lJTGl0ZXJhbCgi U0VMRUNUIHJvd2lkLCBrZXksIHZhbHVlIEZST00gSW5kZXhSZWNvcmRzIFdIRVJFIGluZGV4SUQg PSA/IEFORCBrZXkgPiBDQVNUKD8gQVMgVEVYVCkgQU5EIGtleSA8IENBU1QoPyBBUyBURVhUKSBP UkRFUiBCWSBrZXkgREVTQywgdmFsdWU7IikpOwogCiAgICAgICAgIC8vIExvd2VyIG1pc3Npbmcv b3BlbiwgdXBwZXIgY2xvc2VkLgogICAgICAgICBpbmRleFN0YXRlbWVudHMudW5jaGVja2VkQXBw ZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZhbHVlIEZST00gSW5kZXhSZWNv cmRzIFdIRVJFIGluZGV4SUQgPSA/IEFORCBrZXkgPiBDQVNUKD8gQVMgVEVYVCkgQU5EIGtleSA8 PSBDQVNUKD8gQVMgVEVYVCkgT1JERVIgQlkga2V5LCB2YWx1ZTsiKSk7Ci0gICAgICAgIGluZGV4 U3RhdGVtZW50cy51bmNoZWNrZWRBcHBlbmQoQVNDSUlMaXRlcmFsKCJTRUxFQ1Qgcm93aWQsIGtl eSwgdmFsdWUgRlJPTSBJbmRleFJlY29yZHMgV0hFUkUgaW5kZXhJRCA9ID8gQU5EIGtleSA+IENB U1QoPyBBUyBURVhUKSBBTkQga2V5IDw9IENBU1QoPyBBUyBURVhUKSBPUkRFUiBCWSBrZXksIHZh bHVlIERFU0M7IikpOwogICAgICAgICBpbmRleFN0YXRlbWVudHMudW5jaGVja2VkQXBwZW5kKEFT Q0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZhbHVlIEZST00gSW5kZXhSZWNvcmRzIFdI RVJFIGluZGV4SUQgPSA/IEFORCBrZXkgPiBDQVNUKD8gQVMgVEVYVCkgQU5EIGtleSA8PSBDQVNU KD8gQVMgVEVYVCkgT1JERVIgQlkga2V5IERFU0MsIHZhbHVlIERFU0M7IikpOwogICAgICAgICBp bmRleFN0YXRlbWVudHMudW5jaGVja2VkQXBwZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lk LCBrZXksIHZhbHVlIEZST00gSW5kZXhSZWNvcmRzIFdIRVJFIGluZGV4SUQgPSA/IEFORCBrZXkg PiBDQVNUKD8gQVMgVEVYVCkgQU5EIGtleSA8PSBDQVNUKD8gQVMgVEVYVCkgT1JERVIgQlkga2V5 IERFU0MsIHZhbHVlOyIpKTsKIAogICAgICAgICAvLyBMb3dlciBjbG9zZWQsIHVwcGVyIG1pc3Np bmcvb3Blbi4KICAgICAgICAgaW5kZXhTdGF0ZW1lbnRzLnVuY2hlY2tlZEFwcGVuZChBU0NJSUxp dGVyYWwoIlNFTEVDVCByb3dpZCwga2V5LCB2YWx1ZSBGUk9NIEluZGV4UmVjb3JkcyBXSEVSRSBp bmRleElEID0gPyBBTkQga2V5ID49IENBU1QoPyBBUyBURVhUKSBBTkQga2V5IDwgQ0FTVCg/IEFT IFRFWFQpIE9SREVSIEJZIGtleSwgdmFsdWU7IikpOwotICAgICAgICBpbmRleFN0YXRlbWVudHMu dW5jaGVja2VkQXBwZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZhbHVlIEZS T00gSW5kZXhSZWNvcmRzIFdIRVJFIGluZGV4SUQgPSA/IEFORCBrZXkgPj0gQ0FTVCg/IEFTIFRF WFQpIEFORCBrZXkgPCBDQVNUKD8gQVMgVEVYVCkgT1JERVIgQlkga2V5LCB2YWx1ZSBERVNDOyIp KTsKICAgICAgICAgaW5kZXhTdGF0ZW1lbnRzLnVuY2hlY2tlZEFwcGVuZChBU0NJSUxpdGVyYWwo IlNFTEVDVCByb3dpZCwga2V5LCB2YWx1ZSBGUk9NIEluZGV4UmVjb3JkcyBXSEVSRSBpbmRleElE ID0gPyBBTkQga2V5ID49IENBU1QoPyBBUyBURVhUKSBBTkQga2V5IDwgQ0FTVCg/IEFTIFRFWFQp IE9SREVSIEJZIGtleSBERVNDLCB2YWx1ZSBERVNDOyIpKTsKICAgICAgICAgaW5kZXhTdGF0ZW1l bnRzLnVuY2hlY2tlZEFwcGVuZChBU0NJSUxpdGVyYWwoIlNFTEVDVCByb3dpZCwga2V5LCB2YWx1 ZSBGUk9NIEluZGV4UmVjb3JkcyBXSEVSRSBpbmRleElEID0gPyBBTkQga2V5ID49IENBU1QoPyBB UyBURVhUKSBBTkQga2V5IDwgQ0FTVCg/IEFTIFRFWFQpIE9SREVSIEJZIGtleSBERVNDLCB2YWx1 ZTsiKSk7CiAKICAgICAgICAgLy8gTG93ZXIgY2xvc2VkLCB1cHBlciBjbG9zZWQuCiAgICAgICAg IGluZGV4U3RhdGVtZW50cy51bmNoZWNrZWRBcHBlbmQoQVNDSUlMaXRlcmFsKCJTRUxFQ1Qgcm93 aWQsIGtleSwgdmFsdWUgRlJPTSBJbmRleFJlY29yZHMgV0hFUkUgaW5kZXhJRCA9ID8gQU5EIGtl eSA+PSBDQVNUKD8gQVMgVEVYVCkgQU5EIGtleSA8PSBDQVNUKD8gQVMgVEVYVCkgT1JERVIgQlkg a2V5LCB2YWx1ZTsiKSk7Ci0gICAgICAgIGluZGV4U3RhdGVtZW50cy51bmNoZWNrZWRBcHBlbmQo QVNDSUlMaXRlcmFsKCJTRUxFQ1Qgcm93aWQsIGtleSwgdmFsdWUgRlJPTSBJbmRleFJlY29yZHMg V0hFUkUgaW5kZXhJRCA9ID8gQU5EIGtleSA+PSBDQVNUKD8gQVMgVEVYVCkgQU5EIGtleSA8PSBD QVNUKD8gQVMgVEVYVCkgT1JERVIgQlkga2V5LCB2YWx1ZSBERVNDOyIpKTsKICAgICAgICAgaW5k ZXhTdGF0ZW1lbnRzLnVuY2hlY2tlZEFwcGVuZChBU0NJSUxpdGVyYWwoIlNFTEVDVCByb3dpZCwg a2V5LCB2YWx1ZSBGUk9NIEluZGV4UmVjb3JkcyBXSEVSRSBpbmRleElEID0gPyBBTkQga2V5ID49 IENBU1QoPyBBUyBURVhUKSBBTkQga2V5IDw9IENBU1QoPyBBUyBURVhUKSBPUkRFUiBCWSBrZXkg REVTQywgdmFsdWUgREVTQzsiKSk7CiAgICAgICAgIGluZGV4U3RhdGVtZW50cy51bmNoZWNrZWRB cHBlbmQoQVNDSUlMaXRlcmFsKCJTRUxFQ1Qgcm93aWQsIGtleSwgdmFsdWUgRlJPTSBJbmRleFJl Y29yZHMgV0hFUkUgaW5kZXhJRCA9ID8gQU5EIGtleSA+PSBDQVNUKD8gQVMgVEVYVCkgQU5EIGtl eSA8PSBDQVNUKD8gQVMgVEVYVCkgT1JERVIgQlkga2V5IERFU0MsIHZhbHVlOyIpKTsKICAgICB9 CkBAIC0xMDIsMTYgKzk4LDE3IEBAIHN0YXRpYyBjb25zdCBTdHJpbmcmIGdldEluZGV4U3RhdGVt ZW50KGJvb2wgaGFzTG93ZXJLZXksIGJvb2wgaXNMb3dlck9wZW4sIGJvb2wKICAgICBzaXplX3Qg aSA9IDA7CiAKICAgICBpZiAoaGFzTG93ZXJLZXkgJiYgIWlzTG93ZXJPcGVuKQotICAgICAgICBp ICs9IDg7CisgICAgICAgIGkgKz0gNjsKIAogICAgIGlmIChoYXNVcHBlcktleSAmJiAhaXNVcHBl ck9wZW4pCi0gICAgICAgIGkgKz0gNDsKLQotICAgIGlmIChkZXNjZW5kaW5nKQotICAgICAgICBp ICs9IDI7CisgICAgICAgIGkgKz0gMzsKIAotICAgIGlmICh1bmlxdWUpCi0gICAgICAgIGkgKz0g MTsKKyAgICBpZiAoZGVzY2VuZGluZykgeworICAgICAgICBpZiAoIXVuaXF1ZSkKKyAgICAgICAg ICAgIGkgKz0gMTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgaSArPSAyOworICAgIH0KIAog ICAgIHJldHVybiBpbmRleFN0YXRlbWVudHNbaV07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJh Y2tpbmdTdG9yZVNRTGl0ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5k ZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5jcHAKaW5k ZXggZGMxYTAzNS4uYWZmMGFjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQ cm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxp dGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3Fs aXRlL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmNwcApAQCAtOTA5LDcgKzkw OSw3IEBAIGJvb2wgVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6OnVuY2hlY2tl ZFB1dEluZGV4UmVjb3JkKGludDY0X3Qgb2JqZWN0CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJv b2wgVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6OmdldEluZGV4UmVjb3JkKGNv bnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgaW50NjRfdCBvYmplY3RT dG9yZUlELCBpbnQ2NF90IGluZGV4SUQsIGNvbnN0IElEQktleVJhbmdlRGF0YSYga2V5UmFuZ2VE YXRhLCBJREJHZXRSZXN1bHQmIHJlc3VsdCkKK2Jvb2wgVW5pcXVlSURCRGF0YWJhc2VCYWNraW5n U3RvcmVTUUxpdGU6OmdldEluZGV4UmVjb3JkKGNvbnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0 aW9uSWRlbnRpZmllciwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBpbnQ2NF90IGluZGV4SUQsIGNv bnN0IElEQktleVJhbmdlRGF0YSYga2V5UmFuZ2VEYXRhLCBJbmRleGVkREI6OkN1cnNvclR5cGUg Y3Vyc29yVHlwZSwgSURCR2V0UmVzdWx0JiByZXN1bHQpCiB7CiAgICAgQVNTRVJUKCFpc01haW5U aHJlYWQoKSk7CiAgICAgQVNTRVJUKG1fc3FsaXRlREIpOwpAQCAtOTIxLDcgKzkyMSw3IEBAIGJv b2wgVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6OmdldEluZGV4UmVjb3JkKGNv bnN0IElEQklkZW50aWZpZXImIHRyCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAg ICBTUUxpdGVJREJDdXJzb3IqIGN1cnNvciA9IHRyYW5zYWN0aW9uLT5vcGVuQ3Vyc29yKG9iamVj dFN0b3JlSUQsIGluZGV4SUQsIEluZGV4ZWREQjo6Q3Vyc29yRGlyZWN0aW9uOjpOZXh0LCBJbmRl eGVkREI6OkN1cnNvclR5cGU6OktleUFuZFZhbHVlLCBJREJEYXRhYmFzZUJhY2tlbmQ6Ok5vcm1h bFRhc2ssIGtleVJhbmdlRGF0YSk7CisgICAgU1FMaXRlSURCQ3Vyc29yKiBjdXJzb3IgPSB0cmFu c2FjdGlvbi0+b3BlbkN1cnNvcihvYmplY3RTdG9yZUlELCBpbmRleElELCBJbmRleGVkREI6OkN1 cnNvckRpcmVjdGlvbjo6TmV4dCwgY3Vyc29yVHlwZSwgSURCRGF0YWJhc2VCYWNrZW5kOjpOb3Jt YWxUYXNrLCBrZXlSYW5nZURhdGEpOwogCiAgICAgaWYgKCFjdXJzb3IpIHsKICAgICAgICAgTE9H X0VSUk9SKCJDYW5ub3Qgb3BlbiBjdXJzb3IgdG8gcGVyZm9ybSBpbmRleCBnZXQgaW4gZGF0YWJh c2UiKTsKQEAgLTkzMSw4ICs5MzEsMTIgQEAgYm9vbCBVbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdT dG9yZVNRTGl0ZTo6Z2V0SW5kZXhSZWNvcmQoY29uc3QgSURCSWRlbnRpZmllciYgdHIKICAgICAv LyBFdmVuIHRob3VnaCB3ZSdyZSBvbmx5IHVzaW5nIHRoaXMgY3Vyc29yIGxvY2FsbHksIGFkZCBp dCB0byBvdXIgY3Vyc29yIHNldC4KICAgICBtX2N1cnNvcnMuc2V0KGN1cnNvci0+aWRlbnRpZmll cigpLCBjdXJzb3IpOwogCi0gICAgcmVzdWx0ID0gSURCR2V0UmVzdWx0KFNoYXJlZEJ1ZmZlcjo6 Y3JlYXRlKGN1cnNvci0+Y3VycmVudFZhbHVlQnVmZmVyKCkuZGF0YSgpLCBjdXJzb3ItPmN1cnJl bnRWYWx1ZUJ1ZmZlcigpLnNpemUoKSkpOwotICAgIHJlc3VsdC5rZXlEYXRhID0gY3Vyc29yLT5j dXJyZW50UHJpbWFyeUtleSgpOworICAgIGlmIChjdXJzb3JUeXBlID09IEluZGV4ZWREQjo6Q3Vy c29yVHlwZTo6S2V5T25seSkKKyAgICAgICAgcmVzdWx0ID0gSURCR2V0UmVzdWx0KGN1cnNvci0+ Y3VycmVudFByaW1hcnlLZXkoKSk7CisgICAgZWxzZSB7CisgICAgICAgIHJlc3VsdCA9IElEQkdl dFJlc3VsdChTaGFyZWRCdWZmZXI6OmNyZWF0ZShjdXJzb3ItPmN1cnJlbnRWYWx1ZUJ1ZmZlcigp LmRhdGEoKSwgY3Vyc29yLT5jdXJyZW50VmFsdWVCdWZmZXIoKS5zaXplKCkpKTsKKyAgICAgICAg cmVzdWx0LmtleURhdGEgPSBjdXJzb3ItPmN1cnJlbnRQcmltYXJ5S2V5KCk7CisgICAgfQogCiAg ICAgLy8gQ2xvc2luZyB0aGUgY3Vyc29yIHdpbGwgZGVzdHJveSB0aGUgY3Vyc29yIG9iamVjdCBh bmQgcmVtb3ZlIGl0IGZyb20gb3VyIGN1cnNvciBzZXQuCiAgICAgdHJhbnNhY3Rpb24tPmNsb3Nl Q3Vyc29yKCpjdXJzb3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9j ZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUu aCBiL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1VuaXF1 ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmgKaW5kZXggOTQ0MTZkYS4uNDdiNWI4MiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxp dGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJh Y2tpbmdTdG9yZVNRTGl0ZS5oCkBAIC04MCw3ICs4MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IGJvb2wga2V5RXhpc3RzSW5PYmplY3RTdG9yZShjb25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2Fj dGlvbklkZW50aWZpZXIsIGludDY0X3Qgb2JqZWN0U3RvcmVJRCwgY29uc3QgV2ViQ29yZTo6SURC S2V5RGF0YSYsIGJvb2wmIGtleUV4aXN0cykgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBib29sIHB1 dFJlY29yZChjb25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIGludDY0 X3Qgb2JqZWN0U3RvcmVJRCwgY29uc3QgV2ViQ29yZTo6SURCS2V5RGF0YSYsIGNvbnN0IHVpbnQ4 X3QqIHZhbHVlQnVmZmVyLCBzaXplX3QgdmFsdWVTaXplKSBvdmVycmlkZTsKICAgICB2aXJ0dWFs IGJvb2wgcHV0SW5kZXhSZWNvcmQoY29uc3QgSURCSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVu dGlmaWVyLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGludDY0X3QgaW5kZXhJRCwgY29uc3QgV2Vi Q29yZTo6SURCS2V5RGF0YSYga2V5VmFsdWUsIGNvbnN0IFdlYkNvcmU6OklEQktleURhdGEmIGlu ZGV4S2V5KSBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIGJvb2wgZ2V0SW5kZXhSZWNvcmQoY29uc3Qg SURCSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBpbnQ2NF90IG9iamVjdFN0b3Jl SUQsIGludDY0X3QgaW5kZXhJRCwgY29uc3QgV2ViQ29yZTo6SURCS2V5UmFuZ2VEYXRhJiwgV2Vi Q29yZTo6SURCR2V0UmVzdWx0Jikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIGdldEluZGV4 UmVjb3JkKGNvbnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgaW50NjRf dCBvYmplY3RTdG9yZUlELCBpbnQ2NF90IGluZGV4SUQsIGNvbnN0IFdlYkNvcmU6OklEQktleVJh bmdlRGF0YSYsIFdlYkNvcmU6OkluZGV4ZWREQjo6Q3Vyc29yVHlwZSwgV2ViQ29yZTo6SURCR2V0 UmVzdWx0Jikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBib29sIGRlbGV0ZVJhbmdlKGNvbnN0IElE QklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgaW50NjRfdCBvYmplY3RTdG9yZUlE LCBjb25zdCBXZWJDb3JlOjpJREJLZXlSYW5nZURhdGEmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFs IGJvb2wgZGVsZXRlUmVjb3JkKGNvbnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRp ZmllciwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBjb25zdCBXZWJDb3JlOjpJREJLZXlEYXRhJikg b3ZlcnJpZGU7CiAK