46263 2010-09-22 08:14:41 -0700 [Chromium] Change WebKit API for IDBTransaciton to new style 2010-09-22 09:57:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jorlow jorlow andreip steveblock oldest_to_newest 282938 0 jorlow 2010-09-22 08:14:41 -0700 [Chromium] Change WebKit API for IDBTransaciton to new style 282939 1 68374 jorlow 2010-09-22 08:15:57 -0700 Created attachment 68374 Patch 282954 2 andreip 2010-09-22 08:39:32 -0700 LGTM, sorry for not pointing this out in the previous patch. 282999 3 jorlow 2010-09-22 09:57:43 -0700 Committed r68051: <http://trac.webkit.org/changeset/68051> 68374 2010-09-22 08:15:57 -0700 2010-09-22 09:44:49 -0700 Patch bug-46263-20100922161555.patch text/plain 14228 jorlow ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGZjZGZkM2NkNDk1NmFhNTU1YzVjY2YwNDdiNzliNDMyNjQ5N2M5NzEu LjRjMzliNjRhOTBiM2Q0YjAzNTQzNTFkOTZhYWUwNTA5ZThhOTY1YTQgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDMzIEBACisyMDEwLTA5LTIyICBKZXJlbXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtDaHJvbWl1bV0gQ2hhbmdlIFdlYktpdCBBUEkgZm9yIElEQlRyYW5zYWNpdG9uIHRvIG5ldyBz dHlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYy NjMKKworICAgICAgICAqIHB1YmxpYy9XZWJJREJJbmRleC5oOgorICAgICAgICAoV2ViS2l0OjpX ZWJJREJJbmRleDo6b3Blbk9iamVjdEN1cnNvcik6CisgICAgICAgIChXZWJLaXQ6OldlYklEQklu ZGV4OjpvcGVuQ3Vyc29yKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCSW5kZXg6OmdldE9iamVj dCk6CisgICAgICAgIChXZWJLaXQ6OldlYklEQkluZGV4OjpnZXQpOgorICAgICAgICAqIHB1Ymxp Yy9XZWJJREJPYmplY3RTdG9yZS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJPYmplY3RTdG9y ZTo6Z2V0KToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCT2JqZWN0U3RvcmU6OnB1dCk6CisgICAg ICAgIChXZWJLaXQ6OldlYklEQk9iamVjdFN0b3JlOjpyZW1vdmUpOgorICAgICAgICAoV2ViS2l0 OjpXZWJJREJPYmplY3RTdG9yZTo6b3BlbkN1cnNvcik6CisgICAgICAgICogc3JjL1dlYklEQklu ZGV4SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYklEQkluZGV4SW1wbDo6b3BlbkN1cnNv cik6CisgICAgICAgIChXZWJLaXQ6OldlYklEQkluZGV4SW1wbDo6b3Blbk9iamVjdEN1cnNvcik6 CisgICAgICAgIChXZWJLaXQ6OldlYklEQkluZGV4SW1wbDo6Z2V0T2JqZWN0KToKKyAgICAgICAg KFdlYktpdDo6V2ViSURCSW5kZXhJbXBsOjpnZXQpOgorICAgICAgICAqIHNyYy9XZWJJREJJbmRl eEltcGwuaDoKKyAgICAgICAgKiBzcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViSURCT2JqZWN0U3RvcmVJbXBsOjpnZXQpOgorICAgICAgICAoV2ViS2l0 OjpXZWJJREJPYmplY3RTdG9yZUltcGw6OnB1dCk6CisgICAgICAgIChXZWJLaXQ6OldlYklEQk9i amVjdFN0b3JlSW1wbDo6cmVtb3ZlKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCT2JqZWN0U3Rv cmVJbXBsOjpvcGVuQ3Vyc29yKToKKyAgICAgICAgKiBzcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBs Lmg6CisKIDIwMTAtMDktMjEgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJ1c3NlbGwuCmRpZmYgLS1naXQgYS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYklEQkluZGV4LmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYklEQkluZGV4LmgKaW5kZXggOTQzYzI2ZDIwZGU4NjI1Y2VlNDlkMzZiMjk2OTFkZmIxYzEy MzczMS4uYjRiYTFmNDBhZmYzOTBlZGFhOGMzMzBmZTljYTIxZjIzZWVjMjEzNiAxMDA2NDQKLS0t IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJJbmRleC5oCisrKyBiL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViSURCSW5kZXguaApAQCAtMjYsNiArMjYsNyBAQAogI2lmbmRlZiBXZWJJ REJJbmRleF9oCiAjZGVmaW5lIFdlYklEQkluZGV4X2gKIAorI2luY2x1ZGUgIldlYklEQlRyYW5z YWN0aW9uLmgiCiAjaW5jbHVkZSAiV2ViU3RyaW5nLmgiCiAKIG5hbWVzcGFjZSBXZWJLaXQgewpA QCAtNjAsMTEgKzYxLDQzIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0K IAotICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhlIGRlZmF1bHQgcGFyYW1ldGVycyBmb3IgdHJhbnNh Y3Rpb25JZHMuCi0gICAgdmlydHVhbCB2b2lkIG9wZW5PYmplY3RDdXJzb3IoY29uc3QgV2ViSURC S2V5UmFuZ2UmLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIFdlYklEQkNhbGxiYWNrcyosIGlu dCB0cmFuc2FjdGlvbklkID0gMCkgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KLSAg ICB2aXJ0dWFsIHZvaWQgb3BlbkN1cnNvcihjb25zdCBXZWJJREJLZXlSYW5nZSYsIHVuc2lnbmVk IHNob3J0IGRpcmVjdGlvbiwgV2ViSURCQ2FsbGJhY2tzKiwgaW50IHRyYW5zYWN0aW9uSWQgPSAw KSB7IFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQotICAgIHZpcnR1YWwgdm9pZCBnZXRP YmplY3QoY29uc3QgV2ViSURCS2V5JiwgV2ViSURCQ2FsbGJhY2tzKiwgaW50IHRyYW5zYWN0aW9u SWQgPSAwKSB7IFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQotICAgIHZpcnR1YWwgdm9p ZCBnZXQoY29uc3QgV2ViSURCS2V5JiwgV2ViSURCQ2FsbGJhY2tzKiwgaW50IHRyYW5zYWN0aW9u SWQgPSAwKSB7IFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQorICAgIC8vIEZJWE1FOiBS ZW1vdmUgdGhlIHZlcnNpb25zIHdpdGhvdXQgdHJhbnNhY3Rpb24gcGFyYW1ldGVycy4KKyAgICB2 aXJ0dWFsIHZvaWQgb3Blbk9iamVjdEN1cnNvcihjb25zdCBXZWJJREJLZXlSYW5nZSYgcmFuZ2Us IHVuc2lnbmVkIHNob3J0IGRpcmVjdGlvbiwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MsIGNv bnN0IFdlYklEQlRyYW5zYWN0aW9uJikKKyAgICB7CisgICAgICAgIG9wZW5PYmplY3RDdXJzb3Io cmFuZ2UsIGRpcmVjdGlvbiwgY2FsbGJhY2tzKTsKKyAgICB9CisgICAgdmlydHVhbCB2b2lkIG9w ZW5PYmplY3RDdXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2UmIHJhbmdlLCB1bnNpZ25lZCBzaG9y dCBkaXJlY3Rpb24sIFdlYklEQkNhbGxiYWNrcyogY2FsbGJhY2tzKQorICAgIHsKKyAgICAgICAg V2ViSURCVHJhbnNhY3Rpb24gdHJhbnNhY3Rpb247CisgICAgICAgIG9wZW5PYmplY3RDdXJzb3Io cmFuZ2UsIGRpcmVjdGlvbiwgY2FsbGJhY2tzLCB0cmFuc2FjdGlvbik7CisgICAgfQorICAgIHZp cnR1YWwgdm9pZCBvcGVuQ3Vyc29yKGNvbnN0IFdlYklEQktleVJhbmdlJiByYW5nZSwgdW5zaWdu ZWQgc2hvcnQgZGlyZWN0aW9uLCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcywgY29uc3QgV2Vi SURCVHJhbnNhY3Rpb24mKQorICAgIHsKKyAgICAgICAgb3BlbkN1cnNvcihyYW5nZSwgZGlyZWN0 aW9uLCBjYWxsYmFja3MpOworICAgIH0KKyAgICB2aXJ0dWFsIHZvaWQgb3BlbkN1cnNvcihjb25z dCBXZWJJREJLZXlSYW5nZSYgcmFuZ2UsIHVuc2lnbmVkIHNob3J0IGRpcmVjdGlvbiwgV2ViSURC Q2FsbGJhY2tzKiBjYWxsYmFja3MpCisgICAgeworICAgICAgICBXZWJJREJUcmFuc2FjdGlvbiB0 cmFuc2FjdGlvbjsKKyAgICAgICAgb3BlbkN1cnNvcihyYW5nZSwgZGlyZWN0aW9uLCBjYWxsYmFj a3MsIHRyYW5zYWN0aW9uKTsKKyAgICB9CisgICAgdmlydHVhbCB2b2lkIGdldE9iamVjdChjb25z dCBXZWJJREJLZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MsIGNvbnN0IFdlYklE QlRyYW5zYWN0aW9uJikKKyAgICB7CisgICAgICAgIGdldE9iamVjdChrZXksIGNhbGxiYWNrcyk7 CisgICAgfQorICAgIHZpcnR1YWwgdm9pZCBnZXRPYmplY3QoY29uc3QgV2ViSURCS2V5JiBrZXks IFdlYklEQkNhbGxiYWNrcyogY2FsbGJhY2tzKQorICAgIHsKKyAgICAgICAgV2ViSURCVHJhbnNh Y3Rpb24gdHJhbnNhY3Rpb247CisgICAgICAgIGdldE9iamVjdChrZXksIGNhbGxiYWNrcywgdHJh bnNhY3Rpb24pOworICAgIH0KKyAgICB2aXJ0dWFsIHZvaWQgZ2V0KGNvbnN0IFdlYklEQktleSYg a2V5LCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcywgY29uc3QgV2ViSURCVHJhbnNhY3Rpb24m KQorICAgIHsKKyAgICAgICAgZ2V0KGtleSwgY2FsbGJhY2tzKTsKKyAgICB9CisgICAgdmlydHVh bCB2b2lkIGdldChjb25zdCBXZWJJREJLZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFj a3MpCisgICAgeworICAgICAgICBXZWJJREJUcmFuc2FjdGlvbiB0cmFuc2FjdGlvbjsKKyAgICAg ICAgZ2V0KGtleSwgY2FsbGJhY2tzLCB0cmFuc2FjdGlvbik7CisgICAgfQogfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklE Qk9iamVjdFN0b3JlLmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQk9iamVjdFN0b3Jl LmgKaW5kZXggZmUxYzI3OWM0NTc2MDJmNjU5OTdkYzNkNGU0YjUxYWEzZmFjM2NlMy4uNTY5ZWRl MTVlZjc5NDgzODZiZDY2N2E0MmQ4NTZiMWEyMjA4OTk1MiAxMDA3NTUKLS0tIGEvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJJREJPYmplY3RTdG9yZS5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViSURCT2JqZWN0U3RvcmUuaApAQCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgIldl YkNvbW1vbi5oIgogI2luY2x1ZGUgIldlYkRPTVN0cmluZ0xpc3QuaCIKICNpbmNsdWRlICJXZWJJ REJDYWxsYmFja3MuaCIKKyNpbmNsdWRlICJXZWJJREJUcmFuc2FjdGlvbi5oIgogI2luY2x1ZGUg IldlYlN0cmluZy5oIgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTU3LDkgKzU4LDMzIEBAIHB1 YmxpYzoKICAgICB9CiAKICAgICAvLyBGSVhNRTogUmVtb3ZlIHRoZSBkZWZhdWx0IHBhcmFtZXRl cnMgZm9yIHRyYW5zYWN0aW9uSWRzLgotICAgIHZpcnR1YWwgdm9pZCBnZXQoY29uc3QgV2ViSURC S2V5JiBrZXksIFdlYklEQkNhbGxiYWNrcyosIGludCB0cmFuc2FjdGlvbklkID0gMCkgeyBXRUJL SVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KLSAgICB2aXJ0dWFsIHZvaWQgcHV0KGNvbnN0IFdl YlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSYgdmFsdWUsIGNvbnN0IFdlYklEQktleSYga2V5LCBib29s IGFkZE9ubHksIFdlYklEQkNhbGxiYWNrcyosIGludCB0cmFuc2FjdGlvbklkID0gMCkgeyBXRUJL SVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KLSAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlKGNvbnN0 IFdlYklEQktleSYga2V5LCBXZWJJREJDYWxsYmFja3MqLCBpbnQgdHJhbnNhY3Rpb25JZCA9IDAp IHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9CisgICAgdmlydHVhbCB2b2lkIGdldChj b25zdCBXZWJJREJLZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MsIGNvbnN0IFdl YklEQlRyYW5zYWN0aW9uJikKKyAgICB7CisgICAgICAgIGdldChrZXksIGNhbGxiYWNrcyk7Cisg ICAgfQorICAgIHZpcnR1YWwgdm9pZCBnZXQoY29uc3QgV2ViSURCS2V5JiBrZXksIFdlYklEQkNh bGxiYWNrcyogY2FsbGJhY2tzKQorICAgIHsKKyAgICAgICAgV2ViSURCVHJhbnNhY3Rpb24gdHJh bnNhY3Rpb247CisgICAgICAgIGdldChrZXksIGNhbGxiYWNrcywgdHJhbnNhY3Rpb24pOworICAg IH0KKyAgICB2aXJ0dWFsIHZvaWQgcHV0KGNvbnN0IFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSYg dmFsdWUsIGNvbnN0IFdlYklEQktleSYga2V5LCBib29sIGFkZE9ubHksIFdlYklEQkNhbGxiYWNr cyogY2FsbGJhY2tzLCBjb25zdCBXZWJJREJUcmFuc2FjdGlvbiYpCisgICAgeworICAgICAgICBw dXQodmFsdWUsIGtleSwgYWRkT25seSwgY2FsbGJhY2tzKTsKKyAgICB9CisgICAgdmlydHVhbCB2 b2lkIHB1dChjb25zdCBXZWJTZXJpYWxpemVkU2NyaXB0VmFsdWUmIHZhbHVlLCBjb25zdCBXZWJJ REJLZXkmIGtleSwgYm9vbCBhZGRPbmx5LCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcykKKyAg ICB7CisgICAgICAgIFdlYklEQlRyYW5zYWN0aW9uIHRyYW5zYWN0aW9uOworICAgICAgICBwdXQo dmFsdWUsIGtleSwgYWRkT25seSwgY2FsbGJhY2tzLCB0cmFuc2FjdGlvbik7CisgICAgfQorICAg IHZpcnR1YWwgdm9pZCByZW1vdmUoY29uc3QgV2ViSURCS2V5JiBrZXksIFdlYklEQkNhbGxiYWNr cyogY2FsbGJhY2tzLCBjb25zdCBXZWJJREJUcmFuc2FjdGlvbiYpCisgICAgeworICAgICAgICBy ZW1vdmUoa2V5LCBjYWxsYmFja3MpOworICAgIH0KKyAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlKGNv bnN0IFdlYklEQktleSYga2V5LCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcykKKyAgICB7Cisg ICAgICAgIFdlYklEQlRyYW5zYWN0aW9uIHRyYW5zYWN0aW9uOworICAgICAgICByZW1vdmUoa2V5 LCBjYWxsYmFja3MsIHRyYW5zYWN0aW9uKTsKKyAgICB9CiAgICAgdmlydHVhbCB2b2lkIGNyZWF0 ZUluZGV4KGNvbnN0IFdlYlN0cmluZyYgbmFtZSwgY29uc3QgV2ViU3RyaW5nJiBrZXlQYXRoLCBi b29sIHVuaXF1ZSwgV2ViSURCQ2FsbGJhY2tzKikgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVE KCk7IH0KICAgICAvLyBUcmFuc2ZlcnMgb3duZXJzaGlwIG9mIHRoZSBXZWJJREJJbmRleCB0byB0 aGUgY2FsbGVyLgogICAgIHZpcnR1YWwgV2ViSURCSW5kZXgqIGluZGV4KGNvbnN0IFdlYlN0cmlu ZyYgbmFtZSkKQEAgLTY4LDcgKzkzLDE1IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIDA7CiAg ICAgfQogICAgIHZpcnR1YWwgdm9pZCByZW1vdmVJbmRleChjb25zdCBXZWJTdHJpbmcmIG5hbWUs IFdlYklEQkNhbGxiYWNrcyopIHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9Ci0gICAg dmlydHVhbCB2b2lkIG9wZW5DdXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2UmLCB1bnNpZ25lZCBz aG9ydCBkaXJlY3Rpb24sIFdlYklEQkNhbGxiYWNrcyosIGludCB0cmFuc2FjdGlvbklkID0gMCkg eyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KKyAgICB2aXJ0dWFsIHZvaWQgb3BlbkN1 cnNvcihjb25zdCBXZWJJREJLZXlSYW5nZSYgcmFuZ2UsIHVuc2lnbmVkIHNob3J0IGRpcmVjdGlv biwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MsIGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJikK KyAgICB7CisgICAgICAgIG9wZW5DdXJzb3IocmFuZ2UsIGRpcmVjdGlvbiwgY2FsbGJhY2tzKTsK KyAgICB9CisgICAgdmlydHVhbCB2b2lkIG9wZW5DdXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2Um IHJhbmdlLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIFdlYklEQkNhbGxiYWNrcyogY2FsbGJh Y2tzKQorICAgIHsKKyAgICAgICAgV2ViSURCVHJhbnNhY3Rpb24gdHJhbnNhY3Rpb247CisgICAg ICAgIG9wZW5DdXJzb3IocmFuZ2UsIGRpcmVjdGlvbiwgY2FsbGJhY2tzLCB0cmFuc2FjdGlvbik7 CisgICAgfQogICAgIC8vIEZJWE1FOiBmaW5pc2guCiB9OwogCmRpZmYgLS1naXQgYS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYklEQkluZGV4SW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YklEQkluZGV4SW1wbC5jcHAKaW5kZXggMTEwNGZiYWYwOTRhNzcxZjNmZTVlMzZmZDYwODc0ZjQx OTNiZWQ4Yy4uYzA0OWFhYzRiOGJkMDY0OTRlNjBiNjQzNjBlNDczYjJmN2YwOTIwZiAxMDA2NDQK LS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleEltcGwuY3BwCisrKyBiL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViSURCSW5kZXhJbXBsLmNwcApAQCAtNjgsMjcgKzY4LDIzIEBAIGJv b2wgV2ViSURCSW5kZXhJbXBsOjp1bmlxdWUoKSBjb25zdAogICAgIHJldHVybiBtX2JhY2tlbmQt PnVuaXF1ZSgpOwogfQogCi12b2lkIFdlYklEQkluZGV4SW1wbDo6b3BlbkN1cnNvcihjb25zdCBX ZWJJREJLZXlSYW5nZSYga2V5UmFuZ2UsIHVuc2lnbmVkIHNob3J0IGRpcmVjdGlvbiwgV2ViSURC Q2FsbGJhY2tzKiBjYWxsYmFja3MsIGludCB0cmFuc2FjdGlvbklkKQordm9pZCBXZWJJREJJbmRl eEltcGw6Om9wZW5DdXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2UmIGtleVJhbmdlLCB1bnNpZ25l ZCBzaG9ydCBkaXJlY3Rpb24sIFdlYklEQkNhbGxiYWNrcyogY2FsbGJhY2tzKQogewotICAgIEFT U0VSVF9VTlVTRUQodHJhbnNhY3Rpb25JZCwgIXRyYW5zYWN0aW9uSWQpOyAvLyBGSVhNRTogUGFz cyB0aGUgdHJhbnNhY3Rpb24gaW4uCiAgICAgbV9iYWNrZW5kLT5vcGVuQ3Vyc29yKGtleVJhbmdl LCBkaXJlY3Rpb24sIElEQkNhbGxiYWNrc1Byb3h5OjpjcmVhdGUoY2FsbGJhY2tzKSk7CiB9CiAK LXZvaWQgV2ViSURCSW5kZXhJbXBsOjpvcGVuT2JqZWN0Q3Vyc29yKGNvbnN0IFdlYklEQktleVJh bmdlJiBrZXlSYW5nZSwgdW5zaWduZWQgc2hvcnQgZGlyZWN0aW9uLCBXZWJJREJDYWxsYmFja3Mq IGNhbGxiYWNrcywgaW50IHRyYW5zYWN0aW9uSWQpCit2b2lkIFdlYklEQkluZGV4SW1wbDo6b3Bl bk9iamVjdEN1cnNvcihjb25zdCBXZWJJREJLZXlSYW5nZSYga2V5UmFuZ2UsIHVuc2lnbmVkIHNo b3J0IGRpcmVjdGlvbiwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MpCiB7Ci0gICAgQVNTRVJU X1VOVVNFRCh0cmFuc2FjdGlvbklkLCAhdHJhbnNhY3Rpb25JZCk7IC8vIEZJWE1FOiBQYXNzIHRo ZSB0cmFuc2FjdGlvbiBpbi4KICAgICBtX2JhY2tlbmQtPm9wZW5PYmplY3RDdXJzb3Ioa2V5UmFu Z2UsIGRpcmVjdGlvbiwgSURCQ2FsbGJhY2tzUHJveHk6OmNyZWF0ZShjYWxsYmFja3MpKTsKIH0K IAotdm9pZCBXZWJJREJJbmRleEltcGw6OmdldE9iamVjdChjb25zdCBXZWJJREJLZXkmIGtleVJh bmdlLCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcywgaW50IHRyYW5zYWN0aW9uSWQpCit2b2lk IFdlYklEQkluZGV4SW1wbDo6Z2V0T2JqZWN0KGNvbnN0IFdlYklEQktleSYga2V5UmFuZ2UsIFdl YklEQkNhbGxiYWNrcyogY2FsbGJhY2tzKQogewotICAgIEFTU0VSVF9VTlVTRUQodHJhbnNhY3Rp b25JZCwgIXRyYW5zYWN0aW9uSWQpOyAvLyBGSVhNRTogUGFzcyB0aGUgdHJhbnNhY3Rpb24gaW4u CiAgICAgbV9iYWNrZW5kLT5nZXRPYmplY3Qoa2V5UmFuZ2UsIElEQkNhbGxiYWNrc1Byb3h5Ojpj cmVhdGUoY2FsbGJhY2tzKSk7CiB9CiAKLXZvaWQgV2ViSURCSW5kZXhJbXBsOjpnZXQoY29uc3Qg V2ViSURCS2V5JiBrZXlSYW5nZSwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MsIGludCB0cmFu c2FjdGlvbklkKQordm9pZCBXZWJJREJJbmRleEltcGw6OmdldChjb25zdCBXZWJJREJLZXkmIGtl eVJhbmdlLCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcykKIHsKLSAgICBBU1NFUlRfVU5VU0VE KHRyYW5zYWN0aW9uSWQsICF0cmFuc2FjdGlvbklkKTsgLy8gRklYTUU6IFBhc3MgdGhlIHRyYW5z YWN0aW9uIGluLgogICAgIG1fYmFja2VuZC0+Z2V0KGtleVJhbmdlLCBJREJDYWxsYmFja3NQcm94 eTo6Y3JlYXRlKGNhbGxiYWNrcykpOwogfQogCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYklEQkluZGV4SW1wbC5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleElt cGwuaAppbmRleCAwMjY1NmZmYjc2YTUzM2Q1MmJiNGZkMGZkODk1NmVhMmVlYTVjYjcxLi4yMTA4 MDAxY2NkYzJmNzk4ZWYwOGRlYmQ3ODk4NzllMmJiMzJhOTA5IDEwMDY0NAotLS0gYS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYklEQkluZGV4SW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViSURCSW5kZXhJbXBsLmgKQEAgLTQ2LDEwICs0NiwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCBXZWJTdHJpbmcga2V5UGF0aCgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCB1bmlxdWUoKSBj b25zdDsKIAotICAgIHZpcnR1YWwgdm9pZCBvcGVuT2JqZWN0Q3Vyc29yKGNvbnN0IFdlYklEQktl eVJhbmdlJiwgdW5zaWduZWQgc2hvcnQgZGlyZWN0aW9uLCBXZWJJREJDYWxsYmFja3MqLCBpbnQg dHJhbnNhY3Rpb25JZCk7IAotICAgIHZpcnR1YWwgdm9pZCBvcGVuQ3Vyc29yKGNvbnN0IFdlYklE QktleVJhbmdlJiwgdW5zaWduZWQgc2hvcnQgZGlyZWN0aW9uLCBXZWJJREJDYWxsYmFja3MqLCBp bnQgdHJhbnNhY3Rpb25JZCk7Ci0gICAgdmlydHVhbCB2b2lkIGdldE9iamVjdChjb25zdCBXZWJJ REJLZXkmLCBXZWJJREJDYWxsYmFja3MqLCBpbnQgdHJhbnNhY3Rpb25JZCk7Ci0gICAgdmlydHVh bCB2b2lkIGdldChjb25zdCBXZWJJREJLZXkmLCBXZWJJREJDYWxsYmFja3MqLCBpbnQgdHJhbnNh Y3Rpb25JZCk7CisgICAgdmlydHVhbCB2b2lkIG9wZW5PYmplY3RDdXJzb3IoY29uc3QgV2ViSURC S2V5UmFuZ2UmLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIFdlYklEQkNhbGxiYWNrcyopOyAK KyAgICB2aXJ0dWFsIHZvaWQgb3BlbkN1cnNvcihjb25zdCBXZWJJREJLZXlSYW5nZSYsIHVuc2ln bmVkIHNob3J0IGRpcmVjdGlvbiwgV2ViSURCQ2FsbGJhY2tzKik7CisgICAgdmlydHVhbCB2b2lk IGdldE9iamVjdChjb25zdCBXZWJJREJLZXkmLCBXZWJJREJDYWxsYmFja3MqKTsKKyAgICB2aXJ0 dWFsIHZvaWQgZ2V0KGNvbnN0IFdlYklEQktleSYsIFdlYklEQkNhbGxiYWNrcyopOwogCiBwcml2 YXRlOgogICAgIFdURjo6UmVmUHRyPFdlYkNvcmU6OklEQkluZGV4QmFja2VuZEludGVyZmFjZT4g bV9iYWNrZW5kOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RT dG9yZUltcGwuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RTdG9yZUltcGwu Y3BwCmluZGV4IDUwNzU3MGY2NGIzYmY0OGQ3ODRhODY1MjkxNmJkYzUyMzdlZjVmZmQuLjFhZDFk OWYzZTQ3MzhhNzc0ZjNiNjYxNGIyMDZmNjFhM2FiMmVjMDIgMTAwNzU1Ci0tLSBhL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYklEQk9iamVjdFN0b3JlSW1wbC5jcHAKQEAgLTY1LDIxICs2NSwxOCBAQCBXZWJE T01TdHJpbmdMaXN0IFdlYklEQk9iamVjdFN0b3JlSW1wbDo6aW5kZXhOYW1lcygpIGNvbnN0CiAg ICAgcmV0dXJuIG1fb2JqZWN0U3RvcmUtPmluZGV4TmFtZXMoKTsKIH0KIAotdm9pZCBXZWJJREJP YmplY3RTdG9yZUltcGw6OmdldChjb25zdCBXZWJJREJLZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tz KiBjYWxsYmFja3MsIGludCB0cmFuc2FjdGlvbklkKQordm9pZCBXZWJJREJPYmplY3RTdG9yZUlt cGw6OmdldChjb25zdCBXZWJJREJLZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3Mp CiB7Ci0gICAgQVNTRVJUX1VOVVNFRCh0cmFuc2FjdGlvbklkLCAhdHJhbnNhY3Rpb25JZCk7IC8v IEZJWE1FOiBQYXNzIHRoZSB0cmFuc2FjdGlvbiBpbi4KICAgICBtX29iamVjdFN0b3JlLT5nZXQo a2V5LCBJREJDYWxsYmFja3NQcm94eTo6Y3JlYXRlKGNhbGxiYWNrcykpOwogfQogCi12b2lkIFdl YklEQk9iamVjdFN0b3JlSW1wbDo6cHV0KGNvbnN0IFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSYg dmFsdWUsIGNvbnN0IFdlYklEQktleSYga2V5LCBib29sIGFkZE9ubHksIFdlYklEQkNhbGxiYWNr cyogY2FsbGJhY2tzLCBpbnQgdHJhbnNhY3Rpb25JZCkKK3ZvaWQgV2ViSURCT2JqZWN0U3RvcmVJ bXBsOjpwdXQoY29uc3QgV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlJiB2YWx1ZSwgY29uc3QgV2Vi SURCS2V5JiBrZXksIGJvb2wgYWRkT25seSwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MpCiB7 Ci0gICAgQVNTRVJUX1VOVVNFRCh0cmFuc2FjdGlvbklkLCAhdHJhbnNhY3Rpb25JZCk7IC8vIEZJ WE1FOiBQYXNzIHRoZSB0cmFuc2FjdGlvbiBpbi4KICAgICBtX29iamVjdFN0b3JlLT5wdXQodmFs dWUsIGtleSwgYWRkT25seSwgSURCQ2FsbGJhY2tzUHJveHk6OmNyZWF0ZShjYWxsYmFja3MpKTsK IH0KIAotdm9pZCBXZWJJREJPYmplY3RTdG9yZUltcGw6OnJlbW92ZShjb25zdCBXZWJJREJLZXkm IGtleSwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MsIGludCB0cmFuc2FjdGlvbklkKQordm9p ZCBXZWJJREJPYmplY3RTdG9yZUltcGw6OnJlbW92ZShjb25zdCBXZWJJREJLZXkmIGtleSwgV2Vi SURCQ2FsbGJhY2tzKiBjYWxsYmFja3MpCiB7Ci0gICAgQVNTRVJUX1VOVVNFRCh0cmFuc2FjdGlv bklkLCAhdHJhbnNhY3Rpb25JZCk7IC8vIEZJWE1FOiBQYXNzIHRoZSB0cmFuc2FjdGlvbiBpbi4K ICAgICBtX29iamVjdFN0b3JlLT5yZW1vdmUoa2V5LCBJREJDYWxsYmFja3NQcm94eTo6Y3JlYXRl KGNhbGxiYWNrcykpOwogfQogCkBAIC0xMDEsOSArOTgsOCBAQCB2b2lkIFdlYklEQk9iamVjdFN0 b3JlSW1wbDo6cmVtb3ZlSW5kZXgoY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBXZWJJREJDYWxsYmFj a3MqCiAgICAgbV9vYmplY3RTdG9yZS0+cmVtb3ZlSW5kZXgobmFtZSwgSURCQ2FsbGJhY2tzUHJv eHk6OmNyZWF0ZShjYWxsYmFja3MpKTsKIH0KIAotdm9pZCBXZWJJREJPYmplY3RTdG9yZUltcGw6 Om9wZW5DdXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2UmIGtleVJhbmdlLCB1bnNpZ25lZCBzaG9y dCBkaXJlY3Rpb24sIFdlYklEQkNhbGxiYWNrcyogY2FsbGJhY2tzLCBpbnQgdHJhbnNhY3Rpb25J ZCkKK3ZvaWQgV2ViSURCT2JqZWN0U3RvcmVJbXBsOjpvcGVuQ3Vyc29yKGNvbnN0IFdlYklEQktl eVJhbmdlJiBrZXlSYW5nZSwgdW5zaWduZWQgc2hvcnQgZGlyZWN0aW9uLCBXZWJJREJDYWxsYmFj a3MqIGNhbGxiYWNrcykKIHsKLSAgICBBU1NFUlRfVU5VU0VEKHRyYW5zYWN0aW9uSWQsICF0cmFu c2FjdGlvbklkKTsgLy8gRklYTUU6IFBhc3MgdGhlIHRyYW5zYWN0aW9uIGluLgogICAgIG1fb2Jq ZWN0U3RvcmUtPm9wZW5DdXJzb3IoSURCS2V5UmFuZ2U6OmNyZWF0ZShrZXlSYW5nZS5sZWZ0KCks IGtleVJhbmdlLnJpZ2h0KCksIGtleVJhbmdlLmZsYWdzKCkpLCBkaXJlY3Rpb24sIElEQkNhbGxi YWNrc1Byb3h5OjpjcmVhdGUoY2FsbGJhY2tzKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmggYi9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYklEQk9iamVjdFN0b3JlSW1wbC5oCmluZGV4IDY4ODg4ZjQ5ZTNhZmJhODkxNjZlMjdjNjIx ODE1MGRiZTIyZWM2MDEuLjlmMzEzNjljMzBiMTQxNWYxYjkyYzcwODVjYWRlZGEwMjc4OTkyMmIg MTAwNzU1Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmgK KysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RTdG9yZUltcGwuaApAQCAtNDcs MTUgKzQ3LDE1IEBAIHB1YmxpYzoKICAgICBXZWJTdHJpbmcga2V5UGF0aCgpIGNvbnN0OwogICAg IFdlYkRPTVN0cmluZ0xpc3QgaW5kZXhOYW1lcygpIGNvbnN0OwogCi0gICAgdm9pZCBnZXQoY29u c3QgV2ViSURCS2V5JiBrZXksIFdlYklEQkNhbGxiYWNrcyosIGludCB0cmFuc2FjdGlvbklkKTsK LSAgICB2b2lkIHB1dChjb25zdCBXZWJTZXJpYWxpemVkU2NyaXB0VmFsdWUmIHZhbHVlLCBjb25z dCBXZWJJREJLZXkmIGtleSwgYm9vbCBhZGRPbmx5LCBXZWJJREJDYWxsYmFja3MqLCBpbnQgdHJh bnNhY3Rpb25JZCk7Ci0gICAgdm9pZCByZW1vdmUoY29uc3QgV2ViSURCS2V5JiBrZXksIFdlYklE QkNhbGxiYWNrcyosIGludCB0cmFuc2FjdGlvbklkKTsKKyAgICB2b2lkIGdldChjb25zdCBXZWJJ REJLZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tzKik7CisgICAgdm9pZCBwdXQoY29uc3QgV2ViU2Vy aWFsaXplZFNjcmlwdFZhbHVlJiB2YWx1ZSwgY29uc3QgV2ViSURCS2V5JiBrZXksIGJvb2wgYWRk T25seSwgV2ViSURCQ2FsbGJhY2tzKik7CisgICAgdm9pZCByZW1vdmUoY29uc3QgV2ViSURCS2V5 JiBrZXksIFdlYklEQkNhbGxiYWNrcyopOwogCiAgICAgdm9pZCBjcmVhdGVJbmRleChjb25zdCBX ZWJTdHJpbmcmIG5hbWUsIGNvbnN0IFdlYlN0cmluZyYga2V5UGF0aCwgYm9vbCB1bmlxdWUsIFdl YklEQkNhbGxiYWNrcyogY2FsbGJhY2tzKTsKICAgICBXZWJJREJJbmRleCogaW5kZXgoY29uc3Qg V2ViU3RyaW5nJiBuYW1lKTsKICAgICB2b2lkIHJlbW92ZUluZGV4KGNvbnN0IFdlYlN0cmluZyYg bmFtZSwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MpOwogCi0gICAgdm9pZCBvcGVuQ3Vyc29y KGNvbnN0IFdlYklEQktleVJhbmdlJiwgdW5zaWduZWQgc2hvcnQgZGlyZWN0aW9uLCBXZWJJREJD YWxsYmFja3MqLCBpbnQgdHJhbnNhY3Rpb25JZCk7CisgICAgdm9pZCBvcGVuQ3Vyc29yKGNvbnN0 IFdlYklEQktleVJhbmdlJiwgdW5zaWduZWQgc2hvcnQgZGlyZWN0aW9uLCBXZWJJREJDYWxsYmFj a3MqKTsKIAogIHByaXZhdGU6CiAgICAgV1RGOjpSZWZQdHI8V2ViQ29yZTo6SURCT2JqZWN0U3Rv cmVCYWNrZW5kSW50ZXJmYWNlPiBtX29iamVjdFN0b3JlOwo=