139741 2014-12-17 12:20:03 -0800 Clean up SQL statement building in SQLiteIDBCursor 2014-12-17 12:31:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1056499 0 andersca 2014-12-17 12:20:03 -0800 Clean up SQL statement building in SQLiteIDBCursor 1056500 1 243450 andersca 2014-12-17 12:21:10 -0800 Created attachment 243450 Patch 1056501 2 243450 kling 2014-12-17 12:27:13 -0800 Comment on attachment 243450 Patch k, r=me 1056503 3 andersca 2014-12-17 12:31:15 -0800 Committed r177453: <http://trac.webkit.org/changeset/177453> 243450 2014-12-17 12:21:10 -0800 2014-12-17 12:27:13 -0800 Patch bug-139741-20141217122204.patch text/plain 9818 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjhkN2E4MDVmNDllODFj ZjQ5Yzg4NDhlN2FkNjQ1ZmYxNTI3YWE4Zi4uNWMzZWE5OWJkMjk2ZTlkMDRkM2FiM2E1MmQ3OWI5 NzMwZjI2N2UwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTEyLTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgU1FM IHN0YXRlbWVudCBidWlsZGluZyBpbiBTUUxpdGVJREJDdXJzb3IKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTc0MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgdmFzdGx5IHNpbXBsaWZpZXMgdGhl IGNvZGUgYW5kIGdldHMgcmlkIG9mIHRoZSBsYXN0CisgICAgICAgIHVzZXMgb2YgREVQUkVDQVRF RF9ERUZJTkVfU1RBVElDX0xPQ0FMIGluIFdlYktpdDIuCisKKyAgICAgICAgKiBEYXRhYmFzZVBy b2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9TUUxpdGVJREJDdXJzb3IuY3BwOgorICAgICAgICAoV2Vi S2l0OjpidWlsZEluZGV4U3RhdGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6YnVpbGRPYmplY3RT dG9yZVN0YXRlbWVudCk6CisgICAgICAgIChXZWJLaXQ6OlNRTGl0ZUlEQkN1cnNvcjo6ZXN0YWJs aXNoU3RhdGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6Z2V0SW5kZXhTdGF0ZW1lbnQpOiBEZWxl dGVkLgorICAgICAgICAoV2ViS2l0OjpnZXRPYmplY3RTdG9yZVN0YXRlbWVudCk6IERlbGV0ZWQu CisKIDIwMTQtMTItMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBHVEsrIGJ1aWxkIGFmdGVyIHIxNzc0MjcuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0 ZS9TUUxpdGVJREJDdXJzb3IuY3BwIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0lu ZGV4ZWREQi9zcWxpdGUvU1FMaXRlSURCQ3Vyc29yLmNwcAppbmRleCA5MzJiZjczOGFlMDJlMDg3 OGEzMDYwZDkwYzMzZjA0OTQ5YTVmY2ZkLi5iMzE2YTIzYTVhZjdhODI3YmQxOGFmNmU0ODQ0Mzhj YWU2Njg1OTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5k ZXhlZERCL3NxbGl0ZS9TUUxpdGVJREJDdXJzb3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL0Rh dGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1NRTGl0ZUlEQkN1cnNvci5jcHAKQEAgLTY3 LDg4ICs2Nyw2MSBAQCBTUUxpdGVJREJDdXJzb3I6OlNRTGl0ZUlEQkN1cnNvcihTUUxpdGVJREJU cmFuc2FjdGlvbiogdHJhbnNhY3Rpb24sIGNvbnN0IElEQklkZQogICAgIEFTU0VSVChtX29iamVj dFN0b3JlSUQpOwogfQogCi1zdGF0aWMgY29uc3QgU3RyaW5nJiBnZXRJbmRleFN0YXRlbWVudChi b29sIGhhc0xvd2VyS2V5LCBib29sIGlzTG93ZXJPcGVuLCBib29sIGhhc1VwcGVyS2V5LCBib29s IGlzVXBwZXJPcGVuLCBib29sIGRlc2NlbmRpbmcsIGJvb2wgdW5pcXVlKQorc3RhdGljIFN0cmlu ZyBidWlsZEluZGV4U3RhdGVtZW50KGNvbnN0IElEQktleVJhbmdlRGF0YSYga2V5UmFuZ2UsIElu ZGV4ZWREQjo6Q3Vyc29yRGlyZWN0aW9uIGN1cnNvckRpcmVjdGlvbikKIHsKLSAgICBERVBSRUNB VEVEX0RFRklORV9TVEFUSUNfTE9DQUwoVmVjdG9yPFN0cmluZz4sIGluZGV4U3RhdGVtZW50cywg KCkpOwotCi0gICAgaWYgKGluZGV4U3RhdGVtZW50cy5pc0VtcHR5KCkpIHsKLSAgICAgICAgaW5k ZXhTdGF0ZW1lbnRzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoMTIpOwotCi0gICAgICAgIC8vIExv d2VyIG1pc3Npbmcvb3BlbiwgdXBwZXIgbWlzc2luZy9vcGVuLgotICAgICAgICBpbmRleFN0YXRl bWVudHMudW5jaGVja2VkQXBwZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZh bHVlIEZST00gSW5kZXhSZWNvcmRzIFdIRVJFIGluZGV4SUQgPSA/IEFORCBrZXkgPiBDQVNUKD8g QVMgVEVYVCkgQU5EIGtleSA8IENBU1QoPyBBUyBURVhUKSBPUkRFUiBCWSBrZXksIHZhbHVlOyIp KTsKLSAgICAgICAgaW5kZXhTdGF0ZW1lbnRzLnVuY2hlY2tlZEFwcGVuZChBU0NJSUxpdGVyYWwo IlNFTEVDVCByb3dpZCwga2V5LCB2YWx1ZSBGUk9NIEluZGV4UmVjb3JkcyBXSEVSRSBpbmRleElE ID0gPyBBTkQga2V5ID4gQ0FTVCg/IEFTIFRFWFQpIEFORCBrZXkgPCBDQVNUKD8gQVMgVEVYVCkg T1JERVIgQlkga2V5IERFU0MsIHZhbHVlIERFU0M7IikpOwotICAgICAgICBpbmRleFN0YXRlbWVu dHMudW5jaGVja2VkQXBwZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZhbHVl IEZST00gSW5kZXhSZWNvcmRzIFdIRVJFIGluZGV4SUQgPSA/IEFORCBrZXkgPiBDQVNUKD8gQVMg VEVYVCkgQU5EIGtleSA8IENBU1QoPyBBUyBURVhUKSBPUkRFUiBCWSBrZXkgREVTQywgdmFsdWU7 IikpOwotCi0gICAgICAgIC8vIExvd2VyIG1pc3Npbmcvb3BlbiwgdXBwZXIgY2xvc2VkLgotICAg ICAgICBpbmRleFN0YXRlbWVudHMudW5jaGVja2VkQXBwZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNU IHJvd2lkLCBrZXksIHZhbHVlIEZST00gSW5kZXhSZWNvcmRzIFdIRVJFIGluZGV4SUQgPSA/IEFO RCBrZXkgPiBDQVNUKD8gQVMgVEVYVCkgQU5EIGtleSA8PSBDQVNUKD8gQVMgVEVYVCkgT1JERVIg Qlkga2V5LCB2YWx1ZTsiKSk7Ci0gICAgICAgIGluZGV4U3RhdGVtZW50cy51bmNoZWNrZWRBcHBl bmQoQVNDSUlMaXRlcmFsKCJTRUxFQ1Qgcm93aWQsIGtleSwgdmFsdWUgRlJPTSBJbmRleFJlY29y ZHMgV0hFUkUgaW5kZXhJRCA9ID8gQU5EIGtleSA+IENBU1QoPyBBUyBURVhUKSBBTkQga2V5IDw9 IENBU1QoPyBBUyBURVhUKSBPUkRFUiBCWSBrZXkgREVTQywgdmFsdWUgREVTQzsiKSk7Ci0gICAg ICAgIGluZGV4U3RhdGVtZW50cy51bmNoZWNrZWRBcHBlbmQoQVNDSUlMaXRlcmFsKCJTRUxFQ1Qg cm93aWQsIGtleSwgdmFsdWUgRlJPTSBJbmRleFJlY29yZHMgV0hFUkUgaW5kZXhJRCA9ID8gQU5E IGtleSA+IENBU1QoPyBBUyBURVhUKSBBTkQga2V5IDw9IENBU1QoPyBBUyBURVhUKSBPUkRFUiBC WSBrZXkgREVTQywgdmFsdWU7IikpOwotCi0gICAgICAgIC8vIExvd2VyIGNsb3NlZCwgdXBwZXIg bWlzc2luZy9vcGVuLgotICAgICAgICBpbmRleFN0YXRlbWVudHMudW5jaGVja2VkQXBwZW5kKEFT Q0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZhbHVlIEZST00gSW5kZXhSZWNvcmRzIFdI RVJFIGluZGV4SUQgPSA/IEFORCBrZXkgPj0gQ0FTVCg/IEFTIFRFWFQpIEFORCBrZXkgPCBDQVNU KD8gQVMgVEVYVCkgT1JERVIgQlkga2V5LCB2YWx1ZTsiKSk7Ci0gICAgICAgIGluZGV4U3RhdGVt ZW50cy51bmNoZWNrZWRBcHBlbmQoQVNDSUlMaXRlcmFsKCJTRUxFQ1Qgcm93aWQsIGtleSwgdmFs dWUgRlJPTSBJbmRleFJlY29yZHMgV0hFUkUgaW5kZXhJRCA9ID8gQU5EIGtleSA+PSBDQVNUKD8g QVMgVEVYVCkgQU5EIGtleSA8IENBU1QoPyBBUyBURVhUKSBPUkRFUiBCWSBrZXkgREVTQywgdmFs dWUgREVTQzsiKSk7Ci0gICAgICAgIGluZGV4U3RhdGVtZW50cy51bmNoZWNrZWRBcHBlbmQoQVND SUlMaXRlcmFsKCJTRUxFQ1Qgcm93aWQsIGtleSwgdmFsdWUgRlJPTSBJbmRleFJlY29yZHMgV0hF UkUgaW5kZXhJRCA9ID8gQU5EIGtleSA+PSBDQVNUKD8gQVMgVEVYVCkgQU5EIGtleSA8IENBU1Qo PyBBUyBURVhUKSBPUkRFUiBCWSBrZXkgREVTQywgdmFsdWU7IikpOwotCi0gICAgICAgIC8vIExv d2VyIGNsb3NlZCwgdXBwZXIgY2xvc2VkLgotICAgICAgICBpbmRleFN0YXRlbWVudHMudW5jaGVj a2VkQXBwZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZhbHVlIEZST00gSW5k ZXhSZWNvcmRzIFdIRVJFIGluZGV4SUQgPSA/IEFORCBrZXkgPj0gQ0FTVCg/IEFTIFRFWFQpIEFO RCBrZXkgPD0gQ0FTVCg/IEFTIFRFWFQpIE9SREVSIEJZIGtleSwgdmFsdWU7IikpOwotICAgICAg ICBpbmRleFN0YXRlbWVudHMudW5jaGVja2VkQXBwZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNUIHJv d2lkLCBrZXksIHZhbHVlIEZST00gSW5kZXhSZWNvcmRzIFdIRVJFIGluZGV4SUQgPSA/IEFORCBr ZXkgPj0gQ0FTVCg/IEFTIFRFWFQpIEFORCBrZXkgPD0gQ0FTVCg/IEFTIFRFWFQpIE9SREVSIEJZ IGtleSBERVNDLCB2YWx1ZSBERVNDOyIpKTsKLSAgICAgICAgaW5kZXhTdGF0ZW1lbnRzLnVuY2hl Y2tlZEFwcGVuZChBU0NJSUxpdGVyYWwoIlNFTEVDVCByb3dpZCwga2V5LCB2YWx1ZSBGUk9NIElu ZGV4UmVjb3JkcyBXSEVSRSBpbmRleElEID0gPyBBTkQga2V5ID49IENBU1QoPyBBUyBURVhUKSBB TkQga2V5IDw9IENBU1QoPyBBUyBURVhUKSBPUkRFUiBCWSBrZXkgREVTQywgdmFsdWU7IikpOwot ICAgIH0KKyAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CiAKLSAgICBzaXplX3QgaSA9IDA7Cisg ICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCJTRUxFQ1Qgcm93aWQsIGtleSwgdmFsdWUgRlJPTSBJ bmRleFJlY29yZHMgV0hFUkUgaW5kZXhJRCA9ID8gQU5EIGtleSAiKTsKKyAgICBpZiAoIWtleVJh bmdlLmxvd2VyS2V5LmlzTnVsbCAmJiAha2V5UmFuZ2UubG93ZXJPcGVuKQorICAgICAgICBidWls ZGVyLmFwcGVuZExpdGVyYWwoIj49Iik7CisgICAgZWxzZQorICAgICAgICBidWlsZGVyLmFwcGVu ZExpdGVyYWwoIj4iKTsKIAotICAgIGlmIChoYXNMb3dlcktleSAmJiAhaXNMb3dlck9wZW4pCi0g ICAgICAgIGkgKz0gNjsKKyAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIiBDQVNUKD8gQVMgVEVY VCkgQU5EIGtleSAiKTsKKyAgICBpZiAoIWtleVJhbmdlLnVwcGVyS2V5LmlzTnVsbCAmJiAha2V5 UmFuZ2UudXBwZXJPcGVuKQorICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIjw9Iik7Cisg ICAgZWxzZQorICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIjwiKTsKIAotICAgIGlmICho YXNVcHBlcktleSAmJiAhaXNVcHBlck9wZW4pCi0gICAgICAgIGkgKz0gMzsKKyAgICBidWlsZGVy LmFwcGVuZExpdGVyYWwoIiBDQVNUKD8gQVMgVEVYVCkgT1JERVIgQlkga2V5Iik7CisgICAgaWYg KGN1cnNvckRpcmVjdGlvbiA9PSBJbmRleGVkREI6OkN1cnNvckRpcmVjdGlvbjo6UHJldiB8fCBj dXJzb3JEaXJlY3Rpb24gPT0gSW5kZXhlZERCOjpDdXJzb3JEaXJlY3Rpb246OlByZXZOb0R1cGxp Y2F0ZSkKKyAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCIgREVTQyIpOwogCi0gICAgaWYg KGRlc2NlbmRpbmcpIHsKLSAgICAgICAgaWYgKCF1bmlxdWUpCi0gICAgICAgICAgICBpICs9IDE7 Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGkgKz0gMjsKLSAgICB9CisgICAgYnVpbGRlci5h cHBlbmRMaXRlcmFsKCIsIHZhbHVlIik7CisgICAgaWYgKGN1cnNvckRpcmVjdGlvbiA9PSBJbmRl eGVkREI6OkN1cnNvckRpcmVjdGlvbjo6UHJldikKKyAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRl cmFsKCIgREVTQyIpOworCisgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCI7Iik7CiAKLSAgICBy ZXR1cm4gaW5kZXhTdGF0ZW1lbnRzW2ldOworICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7 CiB9CiAKLXN0YXRpYyBjb25zdCBTdHJpbmcmIGdldE9iamVjdFN0b3JlU3RhdGVtZW50KGJvb2wg aGFzTG93ZXJLZXksIGJvb2wgaXNMb3dlck9wZW4sIGJvb2wgaGFzVXBwZXJLZXksIGJvb2wgaXNV cHBlck9wZW4sIGJvb2wgZGVzY2VuZGluZykKK3N0YXRpYyBTdHJpbmcgYnVpbGRPYmplY3RTdG9y ZVN0YXRlbWVudChjb25zdCBJREJLZXlSYW5nZURhdGEmIGtleVJhbmdlLCBJbmRleGVkREI6OkN1 cnNvckRpcmVjdGlvbiBjdXJzb3JEaXJlY3Rpb24pCiB7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVf U1RBVElDX0xPQ0FMKFZlY3RvcjxTdHJpbmc+LCBzdGF0ZW1lbnRzLCAoKSk7CisgICAgU3RyaW5n QnVpbGRlciBidWlsZGVyOwogCi0gICAgaWYgKHN0YXRlbWVudHMuaXNFbXB0eSgpKSB7Ci0gICAg ICAgIHN0YXRlbWVudHMucmVzZXJ2ZUNhcGFjaXR5KDgpOworICAgIGJ1aWxkZXIuYXBwZW5kTGl0 ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZhbHVlIEZST00gUmVjb3JkcyBXSEVSRSBvYmplY3RT dG9yZUlEID0gPyBBTkQga2V5ICIpOwogCi0gICAgICAgIC8vIExvd2VyIG1pc3Npbmcvb3Blbiwg dXBwZXIgbWlzc2luZy9vcGVuLgotICAgICAgICBzdGF0ZW1lbnRzLmFwcGVuZChBU0NJSUxpdGVy YWwoIlNFTEVDVCByb3dpZCwga2V5LCB2YWx1ZSBGUk9NIFJlY29yZHMgV0hFUkUgb2JqZWN0U3Rv cmVJRCA9ID8gQU5EIGtleSA+IENBU1QoPyBBUyBURVhUKSBBTkQga2V5IDwgQ0FTVCg/IEFTIFRF WFQpIE9SREVSIEJZIGtleTsiKSk7Ci0gICAgICAgIHN0YXRlbWVudHMuYXBwZW5kKEFTQ0lJTGl0 ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZhbHVlIEZST00gUmVjb3JkcyBXSEVSRSBvYmplY3RT dG9yZUlEID0gPyBBTkQga2V5ID4gQ0FTVCg/IEFTIFRFWFQpIEFORCBrZXkgPCBDQVNUKD8gQVMg VEVYVCkgT1JERVIgQlkga2V5IERFU0M7IikpOwotCi0gICAgICAgIC8vIExvd2VyIG1pc3Npbmcv b3BlbiwgdXBwZXIgY2xvc2VkLgotICAgICAgICBzdGF0ZW1lbnRzLmFwcGVuZChBU0NJSUxpdGVy YWwoIlNFTEVDVCByb3dpZCwga2V5LCB2YWx1ZSBGUk9NIFJlY29yZHMgV0hFUkUgb2JqZWN0U3Rv cmVJRCA9ID8gQU5EIGtleSA+IENBU1QoPyBBUyBURVhUKSBBTkQga2V5IDw9IENBU1QoPyBBUyBU RVhUKSBPUkRFUiBCWSBrZXk7IikpOwotICAgICAgICBzdGF0ZW1lbnRzLmFwcGVuZChBU0NJSUxp dGVyYWwoIlNFTEVDVCByb3dpZCwga2V5LCB2YWx1ZSBGUk9NIFJlY29yZHMgV0hFUkUgb2JqZWN0 U3RvcmVJRCA9ID8gQU5EIGtleSA+IENBU1QoPyBBUyBURVhUKSBBTkQga2V5IDw9IENBU1QoPyBB UyBURVhUKSBPUkRFUiBCWSBrZXkgREVTQzsiKSk7CisgICAgaWYgKCFrZXlSYW5nZS5sb3dlcktl eS5pc051bGwgJiYgIWtleVJhbmdlLmxvd2VyT3BlbikKKyAgICAgICAgYnVpbGRlci5hcHBlbmRM aXRlcmFsKCI+PSIpOworICAgIGVsc2UKKyAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCI+ Iik7CiAKLSAgICAgICAgLy8gTG93ZXIgY2xvc2VkLCB1cHBlciBtaXNzaW5nL29wZW4uCi0gICAg ICAgIHN0YXRlbWVudHMuYXBwZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZh bHVlIEZST00gUmVjb3JkcyBXSEVSRSBvYmplY3RTdG9yZUlEID0gPyBBTkQga2V5ID49IENBU1Qo PyBBUyBURVhUKSBBTkQga2V5IDwgQ0FTVCg/IEFTIFRFWFQpIE9SREVSIEJZIGtleTsiKSk7Ci0g ICAgICAgIHN0YXRlbWVudHMuYXBwZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXks IHZhbHVlIEZST00gUmVjb3JkcyBXSEVSRSBvYmplY3RTdG9yZUlEID0gPyBBTkQga2V5ID49IENB U1QoPyBBUyBURVhUKSBBTkQga2V5IDwgQ0FTVCg/IEFTIFRFWFQpIE9SREVSIEJZIGtleSBERVND OyIpKTsKKyAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIiBDQVNUKD8gQVMgVEVYVCkgQU5EIGtl eSAiKTsKIAotICAgICAgICAvLyBMb3dlciBjbG9zZWQsIHVwcGVyIGNsb3NlZC4KLSAgICAgICAg c3RhdGVtZW50cy5hcHBlbmQoQVNDSUlMaXRlcmFsKCJTRUxFQ1Qgcm93aWQsIGtleSwgdmFsdWUg RlJPTSBSZWNvcmRzIFdIRVJFIG9iamVjdFN0b3JlSUQgPSA/IEFORCBrZXkgPj0gQ0FTVCg/IEFT IFRFWFQpIEFORCBrZXkgPD0gQ0FTVCg/IEFTIFRFWFQpIE9SREVSIEJZIGtleTsiKSk7Ci0gICAg ICAgIHN0YXRlbWVudHMuYXBwZW5kKEFTQ0lJTGl0ZXJhbCgiU0VMRUNUIHJvd2lkLCBrZXksIHZh bHVlIEZST00gUmVjb3JkcyBXSEVSRSBvYmplY3RTdG9yZUlEID0gPyBBTkQga2V5ID49IENBU1Qo PyBBUyBURVhUKSBBTkQga2V5IDw9IENBU1QoPyBBUyBURVhUKSBPUkRFUiBCWSBrZXkgREVTQzsi KSk7Ci0gICAgfQotCi0gICAgc2l6ZV90IGkgPSAwOworICAgIGlmICgha2V5UmFuZ2UudXBwZXJL ZXkuaXNOdWxsICYmICFrZXlSYW5nZS51cHBlck9wZW4pCisgICAgICAgIGJ1aWxkZXIuYXBwZW5k TGl0ZXJhbCgiPD0iKTsKKyAgICBlbHNlCisgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgi PCIpOwogCi0gICAgaWYgKGhhc0xvd2VyS2V5ICYmICFpc0xvd2VyT3BlbikKLSAgICAgICAgaSAr PSA0OworICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiIENBU1QoPyBBUyBURVhUKSBPUkRFUiBC WSBrZXkiKTsKIAotICAgIGlmIChoYXNVcHBlcktleSAmJiAhaXNVcHBlck9wZW4pCi0gICAgICAg IGkgKz0gMjsKKyAgICBpZiAoY3Vyc29yRGlyZWN0aW9uID09IEluZGV4ZWREQjo6Q3Vyc29yRGly ZWN0aW9uOjpQcmV2IHx8IGN1cnNvckRpcmVjdGlvbiA9PSBJbmRleGVkREI6OkN1cnNvckRpcmVj dGlvbjo6UHJldk5vRHVwbGljYXRlKQorICAgICAgICBidWlsZGVyLmFwcGVuZCgiIERFU0MiKTsK IAotICAgIGlmIChkZXNjZW5kaW5nKQotICAgICAgICBpICs9IDE7CisgICAgYnVpbGRlci5hcHBl bmRMaXRlcmFsKCI7Iik7CiAKLSAgICByZXR1cm4gc3RhdGVtZW50c1tpXTsKKyAgICByZXR1cm4g YnVpbGRlci50b1N0cmluZygpOwogfQogCiBib29sIFNRTGl0ZUlEQkN1cnNvcjo6ZXN0YWJsaXNo U3RhdGVtZW50KCkKQEAgLTE1NywxMCArMTMwLDEwIEBAIGJvb2wgU1FMaXRlSURCQ3Vyc29yOjpl c3RhYmxpc2hTdGF0ZW1lbnQoKQogICAgIFN0cmluZyBzcWw7CiAKICAgICBpZiAobV9pbmRleElE ICE9IElEQkluZGV4TWV0YWRhdGE6OkludmFsaWRJZCkgewotICAgICAgICBzcWwgPSBnZXRJbmRl eFN0YXRlbWVudCghbV9rZXlSYW5nZS5sb3dlcktleS5pc051bGwsIG1fa2V5UmFuZ2UubG93ZXJP cGVuLCAhbV9rZXlSYW5nZS51cHBlcktleS5pc051bGwsIG1fa2V5UmFuZ2UudXBwZXJPcGVuLCBt X2N1cnNvckRpcmVjdGlvbiA9PSBJbmRleGVkREI6OkN1cnNvckRpcmVjdGlvbjo6UHJldiB8fCBt X2N1cnNvckRpcmVjdGlvbiA9PSBJbmRleGVkREI6OkN1cnNvckRpcmVjdGlvbjo6UHJldk5vRHVw bGljYXRlLCBtX2N1cnNvckRpcmVjdGlvbiA9PSBJbmRleGVkREI6OkN1cnNvckRpcmVjdGlvbjo6 TmV4dE5vRHVwbGljYXRlIHx8IG1fY3Vyc29yRGlyZWN0aW9uID09IEluZGV4ZWREQjo6Q3Vyc29y RGlyZWN0aW9uOjpQcmV2Tm9EdXBsaWNhdGUpOworICAgICAgICBzcWwgPSBidWlsZEluZGV4U3Rh dGVtZW50KG1fa2V5UmFuZ2UsIG1fY3Vyc29yRGlyZWN0aW9uKTsKICAgICAgICAgbV9ib3VuZElE ID0gbV9pbmRleElEOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHNxbCA9IGdldE9iamVjdFN0b3Jl U3RhdGVtZW50KCFtX2tleVJhbmdlLmxvd2VyS2V5LmlzTnVsbCwgbV9rZXlSYW5nZS5sb3dlck9w ZW4sICFtX2tleVJhbmdlLnVwcGVyS2V5LmlzTnVsbCwgbV9rZXlSYW5nZS51cHBlck9wZW4sIG1f Y3Vyc29yRGlyZWN0aW9uID09IEluZGV4ZWREQjo6Q3Vyc29yRGlyZWN0aW9uOjpQcmV2IHx8IG1f Y3Vyc29yRGlyZWN0aW9uID09IEluZGV4ZWREQjo6Q3Vyc29yRGlyZWN0aW9uOjpQcmV2Tm9EdXBs aWNhdGUpOworICAgICAgICBzcWwgPSBidWlsZE9iamVjdFN0b3JlU3RhdGVtZW50KG1fa2V5UmFu Z2UsIG1fY3Vyc29yRGlyZWN0aW9uKTsKICAgICAgICAgbV9ib3VuZElEID0gbV9vYmplY3RTdG9y ZUlEOwogICAgIH0KIAo=