50160 2010-11-29 08:44:32 -0800 [Chromium] Clean up IndexedDB 2 sided roll bits 2010-12-03 08:14:41 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jorlow jorlow andreip hans steveblock oldest_to_newest 314439 0 jorlow 2010-11-29 08:44:32 -0800 [Chromium] Clean up IndexedDB 2 sided roll bits 314441 1 75035 jorlow 2010-11-29 08:45:36 -0800 Created attachment 75035 Patch 314451 2 75035 hans 2010-11-29 08:59:57 -0800 Comment on attachment 75035 Patch looks good, thanks for fixing 316824 3 jorlow 2010-12-03 08:14:41 -0800 Committed r73264: <http://trac.webkit.org/changeset/73264> 75035 2010-11-29 08:45:36 -0800 2010-11-30 15:37:11 -0800 Patch bug-50160-20101129164534.patch text/plain 9520 jorlow ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDY0NDNjYjE2ZWJiYTcwMTVhZmMxZGZmMDJhOTYyZmQyYTViNjdhZjku Ljk0MGJmZGE5N2Q0ODQ0OGNkNGQ4YzkwYmVmNzE4NWVkZjY3NTJkNjAgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIzIEBACisyMDEwLTExLTI5ICBKZXJlbXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtDaHJvbWl1bV0gQ2xlYW4gdXAgSW5kZXhlZERCIDIgc2lkZWQgcm9sbCBiaXRzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDE2MAorCisgICAgICAg ICogcHVibGljL1dlYklEQkRhdGFiYXNlLmg6CisgICAgICAgIChXZWJLaXQ6OldlYklEQkRhdGFi YXNlOjp2ZXJzaW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCRGF0YWJhc2U6Om9iamVjdFN0 b3JlTmFtZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJEYXRhYmFzZTo6ZGVsZXRlT2JqZWN0 U3RvcmUpOgorICAgICAgICAqIHB1YmxpYy9XZWJJREJGYWN0b3J5Lmg6CisgICAgICAgIChXZWJL aXQ6OldlYklEQkZhY3Rvcnk6Om9wZW4pOgorICAgICAgICAqIHB1YmxpYy9XZWJJREJLZXlSYW5n ZS5oOgorICAgICAgICAqIHB1YmxpYy9XZWJJREJPYmplY3RTdG9yZS5oOgorICAgICAgICAoV2Vi S2l0OjpXZWJJREJPYmplY3RTdG9yZTo6ZGVsZXRlRnVuY3Rpb24pOgorICAgICAgICAqIHNyYy9J REJEYXRhYmFzZVByb3h5LmNwcDoKKyAgICAgICAgKiBzcmMvSURCRGF0YWJhc2VQcm94eS5oOgor ICAgICAgICAqIHNyYy9XZWJJREJLZXlSYW5nZS5jcHA6CisKIDIwMTAtMTEtMjkgIEJlcm5oYXJk IEJhdWVyICA8YmF1ZXJiQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKZXJl bXkgT3Jsb3cuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQkRhdGFi YXNlLmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQkRhdGFiYXNlLmgKaW5kZXggMTU4 OGUyM2MxZTgyNzZlNDUwZGVmZWQ5MTg4YWNmNjIxYzczMzhiNi4uNWVkODA1MjcyZWZkODE5NDli NTQ5NjZiZDMwZDdkMDdmNzU4ZmQ0NCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJJREJEYXRhYmFzZS5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCRGF0 YWJhc2UuaApAQCAtNDcsMjYgKzQ3LDIyIEBAIHB1YmxpYzoKICAgICAgICAgV0VCS0lUX0FTU0VS VF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4gV2ViU3RyaW5nKCk7CiAgICAgfQotICAg IC8vIEZJWE1FOiByZW1vdmUgYWZ0ZXIgcm9sbC4KLSAgICB2aXJ0dWFsIFdlYlN0cmluZyBkZXNj cmlwdGlvbigpIGNvbnN0CisgICAgdmlydHVhbCBXZWJTdHJpbmcgdmVyc2lvbigpIGNvbnN0CiAg ICAgeworICAgICAgICBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVy biBXZWJTdHJpbmcoKTsKICAgICB9Ci0gICAgdmlydHVhbCBXZWJTdHJpbmcgdmVyc2lvbigpIGNv bnN0CisgICAgdmlydHVhbCBXZWJET01TdHJpbmdMaXN0IG9iamVjdFN0b3JlTmFtZXMoKSBjb25z dAogICAgIHsKICAgICAgICAgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICBy ZXR1cm4gV2ViU3RyaW5nKCk7CisgICAgICAgIHJldHVybiBXZWJET01TdHJpbmdMaXN0KCk7CiAg ICAgfQotICAgIHZpcnR1YWwgV2ViRE9NU3RyaW5nTGlzdCBvYmplY3RTdG9yZXMoKSBjb25zdCB7 IHJldHVybiBvYmplY3RTdG9yZU5hbWVzKCk7IH0gLy8gRklYTUU6IFJlbW92ZSBhZnRlciByb2xs LgotICAgIHZpcnR1YWwgV2ViRE9NU3RyaW5nTGlzdCBvYmplY3RTdG9yZU5hbWVzKCkgY29uc3Qg eyByZXR1cm4gb2JqZWN0U3RvcmVzKCk7IH0gLy8gRklYTUU6IEFzc2VydCBub3QgcmVhY2hlZCBh ZnRlciByb2xsLgogICAgIHZpcnR1YWwgV2ViSURCT2JqZWN0U3RvcmUqIGNyZWF0ZU9iamVjdFN0 b3JlKGNvbnN0IFdlYlN0cmluZyYgbmFtZSwgY29uc3QgV2ViU3RyaW5nJiBrZXlQYXRoLCBib29s IGF1dG9JbmNyZW1lbnQsIGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJiwgV2ViRXhjZXB0aW9uQ29k ZSYpCiAgICAgeyAKICAgICAgICAgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAg ICByZXR1cm4gMDsKICAgICB9Ci0gICAgdmlydHVhbCB2b2lkIGRlbGV0ZU9iamVjdFN0b3JlKGNv bnN0IFdlYlN0cmluZyYgbmFtZSwgY29uc3QgV2ViSURCVHJhbnNhY3Rpb24mIHRyYW5zYWN0aW9u LCBXZWJFeGNlcHRpb25Db2RlJiBlYykgeyByZW1vdmVPYmplY3RTdG9yZShuYW1lLCB0cmFuc2Fj dGlvbiwgZWMpOyB9Ci0gICAgLy8gRklYTUU6IHJlbW92ZSBhZnRlciByb2xsLgotICAgIHZpcnR1 YWwgdm9pZCByZW1vdmVPYmplY3RTdG9yZShjb25zdCBXZWJTdHJpbmcmIG5hbWUsIGNvbnN0IFdl YklEQlRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgV2ViRXhjZXB0aW9uQ29kZSYgZWMpIHsgZGVs ZXRlT2JqZWN0U3RvcmUobmFtZSwgdHJhbnNhY3Rpb24sIGVjKTsgfQorICAgIHZpcnR1YWwgdm9p ZCBkZWxldGVPYmplY3RTdG9yZShjb25zdCBXZWJTdHJpbmcmIG5hbWUsIGNvbnN0IFdlYklEQlRy YW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgV2ViRXhjZXB0aW9uQ29kZSYgZWMpIHsgV0VCS0lUX0FT U0VSVF9OT1RfUkVBQ0hFRCgpOyB9CiAgICAgdmlydHVhbCB2b2lkIHNldFZlcnNpb24oY29uc3Qg V2ViU3RyaW5nJiB2ZXJzaW9uLCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcywgV2ViRXhjZXB0 aW9uQ29kZSYpIHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9CiAgICAgLy8gVHJhbnNm ZXJzIG93bmVyc2hpcCBvZiB0aGUgV2ViSURCVHJhbnNhY3Rpb24gdG8gdGhlIGNhbGxlci4KICAg ICB2aXJ0dWFsIFdlYklEQlRyYW5zYWN0aW9uKiB0cmFuc2FjdGlvbihjb25zdCBXZWJET01TdHJp bmdMaXN0JiBuYW1lcywgdW5zaWduZWQgc2hvcnQgbW9kZSwgdW5zaWduZWQgbG9uZyB0aW1lb3V0 LCBXZWJFeGNlcHRpb25Db2RlJikKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViSURCRmFjdG9yeS5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJGYWN0b3J5LmgK aW5kZXggNWUzMzM3ZTdhNTdmOWVlNzRlMDVmMTRlMjdhODkxMDczNzE0ZTUxNS4uMTBhMTM0YWI2 MjFlYmUzZWQ1ZmI0ODU5ZDZmZTZkZDQ5NWEzZjkwMiAxMDA3NTUKLS0tIGEvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJREJGYWN0b3J5LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJJREJGYWN0b3J5LmgKQEAgLTUxLDE3ICs1MSwxMCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFs IH5XZWJJREJGYWN0b3J5KCkgeyB9CiAKLSAgICAvLyBGSVhNRTogUmVtb3ZlIGFmdGVyIHJvbGwu Ci0gICAgdmlydHVhbCB2b2lkIG9wZW4oY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBjb25zdCBXZWJT dHJpbmcmIGRlc2NyaXB0aW9uLCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcywgY29uc3QgV2Vi U2VjdXJpdHlPcmlnaW4mIG9yaWdpbiwgV2ViRnJhbWUqIHdlYkZyYW1lLCBjb25zdCBXZWJTdHJp bmcmIGRhdGFEaXIsIHVuc2lnbmVkIGxvbmcgbG9uZyBtYXhpbXVtU2l6ZSkKLSAgICB7Ci0gICAg ICAgIG9wZW4obmFtZSwgY2FsbGJhY2tzLCBvcmlnaW4sIHdlYkZyYW1lLCBkYXRhRGlyLCBtYXhp bXVtU2l6ZSk7Ci0gICAgfQotCiAgICAgLy8gVGhlIFdlYktpdCBpbXBsZW1lbnRhdGlvbiBvZiBv cGVuIGlnbm9yZXMgdGhlIFdlYkZyYW1lKiBwYXJhbWV0ZXIuCiAgICAgdmlydHVhbCB2b2lkIG9w ZW4oY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBXZWJJREJDYWxsYmFja3MqIGNhbGxiYWNrcywgY29u c3QgV2ViU2VjdXJpdHlPcmlnaW4mIG9yaWdpbiwgV2ViRnJhbWUqIHdlYkZyYW1lLCBjb25zdCBX ZWJTdHJpbmcmIGRhdGFEaXIsIHVuc2lnbmVkIGxvbmcgbG9uZyBtYXhpbXVtU2l6ZSkKICAgICB7 Ci0gICAgICAgIC8vIFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgb3Blbihu YW1lLCAiIiwgY2FsbGJhY2tzLCBvcmlnaW4sIHdlYkZyYW1lLCBkYXRhRGlyLCBtYXhpbXVtU2l6 ZSk7CisgICAgICAgIFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CiB9OwogCmRp ZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQktleVJhbmdlLmggYi9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYklEQktleVJhbmdlLmgKaW5kZXggNmE5YzZkYTMyOWQzN2M3 MzIwY2Y0NTYxOGMyNWY0NmYxNGFlMDgwOC4uOTIyZDRlZDVkYThhNDI2YzEyMzgyMmZhYjQxZTU3 ODc5MDZhMTdiNiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJLZXlS YW5nZS5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCS2V5UmFuZ2UuaApAQCAt NDMsMTMgKzQzLDYgQEAgcHVibGljOgogICAgIFdlYklEQktleVJhbmdlKGNvbnN0IFdlYklEQktl eVJhbmdlJiBrZXlSYW5nZSkgeyBhc3NpZ24oa2V5UmFuZ2UpOyB9CiAgICAgV2ViSURCS2V5UmFu Z2UoY29uc3QgV2ViSURCS2V5JiBsb3dlciwgY29uc3QgV2ViSURCS2V5JiB1cHBlciwgYm9vbCBs b3dlck9wZW4sIGJvb2wgdXBwZXJPcGVuKSB7IGFzc2lnbihsb3dlciwgdXBwZXIsIGxvd2VyT3Bl biwgdXBwZXJPcGVuKTsgfQogCi0gICAgLy8gRklYTUU6IFJlbW92ZSBuZXh0IDMgbWV0aG9kcyBh ZnRlciBuZXh0IHJvbGwuCi0gICAgV2ViSURCS2V5UmFuZ2UoY29uc3QgV2ViSURCS2V5JiBsb3dl ciwgY29uc3QgV2ViSURCS2V5JiB1cHBlciwgdW5zaWduZWQgc2hvcnQgZmxhZ3MpIHsgYXNzaWdu KGxvd2VyLCB1cHBlciwgZmxhZ3MpOyB9Ci0gICAgV0VCS0lUX0FQSSB2b2lkIGFzc2lnbihjb25z dCBXZWJJREJLZXkmIGxvd2VyLCBjb25zdCBXZWJJREJLZXkmIHVwcGVyLCB1bnNpZ25lZCBzaG9y dCBmbGFncyk7Ci0gICAgV0VCS0lUX0FQSSB1bnNpZ25lZCBzaG9ydCBmbGFncygpIGNvbnN0Owot ICAgIFdFQktJVF9BUEkgV2ViSURCS2V5IGxlZnQoKSBjb25zdDsKLSAgICBXRUJLSVRfQVBJIFdl YklEQktleSByaWdodCgpIGNvbnN0OwotCiAgICAgV0VCS0lUX0FQSSBXZWJJREJLZXkgbG93ZXIo KSBjb25zdDsKICAgICBXRUJLSVRfQVBJIFdlYklEQktleSB1cHBlcigpIGNvbnN0OwogICAgIFdF QktJVF9BUEkgYm9vbCBsb3dlck9wZW4oKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViSURCT2JqZWN0U3RvcmUuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViSURCT2JqZWN0U3RvcmUuaAppbmRleCAxNzU2MmNhMzM5ZWIwNzUyYTRlNGY5NTY5OTIwOTZk MDI4NGQxZGM2Li44ZjIyNDdmMTcyOWIzNGVmNzIyMzFiZDYwMjJjM2E1MDBiMTkxOTAxIDEwMDc1 NQotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQk9iamVjdFN0b3JlLmgKKysrIGIv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJPYmplY3RTdG9yZS5oCkBAIC02MSw5ICs2MSw3 IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBnZXQoY29uc3QgV2ViSURCS2V5JiwgV2Vi SURCQ2FsbGJhY2tzKiwgY29uc3QgV2ViSURCVHJhbnNhY3Rpb24mLCBXZWJFeGNlcHRpb25Db2Rl JikgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgcHV0 KGNvbnN0IFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSYsIGNvbnN0IFdlYklEQktleSYsIGJvb2wg YWRkT25seSwgV2ViSURCQ2FsbGJhY2tzKiwgY29uc3QgV2ViSURCVHJhbnNhY3Rpb24mLCBXZWJF eGNlcHRpb25Db2RlJikgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KLSAgICAvLyBG SVhNRTogUmVtb3ZlIGFmdGVyIHJvbGwuCi0gICAgdmlydHVhbCB2b2lkIHJlbW92ZShjb25zdCBX ZWJJREJLZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MsIGNvbnN0IFdlYklEQlRy YW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgV2ViRXhjZXB0aW9uQ29kZSYgZWMpIHsgZGVsZXRlRnVu Y3Rpb24oa2V5LCBjYWxsYmFja3MsIHRyYW5zYWN0aW9uLCBlYyk7IH0KLSAgICB2aXJ0dWFsIHZv aWQgZGVsZXRlRnVuY3Rpb24oY29uc3QgV2ViSURCS2V5JiBrZXksIFdlYklEQkNhbGxiYWNrcyog Y2FsbGJhY2tzLCBjb25zdCBXZWJJREJUcmFuc2FjdGlvbiYgdHJhbnNhY3Rpb24sIFdlYkV4Y2Vw dGlvbkNvZGUmIGVjKSB7IHJlbW92ZShrZXksIGNhbGxiYWNrcywgdHJhbnNhY3Rpb24sIGVjKTsg fQorICAgIHZpcnR1YWwgdm9pZCBkZWxldGVGdW5jdGlvbihjb25zdCBXZWJJREJLZXkmIGtleSwg V2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MsIGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJiB0cmFu c2FjdGlvbiwgV2ViRXhjZXB0aW9uQ29kZSYgZWMpIHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hF RCgpOyB9CiAgICAgdmlydHVhbCBXZWJJREJJbmRleCogY3JlYXRlSW5kZXgoY29uc3QgV2ViU3Ry aW5nJiBuYW1lLCBjb25zdCBXZWJTdHJpbmcmIGtleVBhdGgsIGJvb2wgdW5pcXVlLCBjb25zdCBX ZWJJREJUcmFuc2FjdGlvbiYsIFdlYkV4Y2VwdGlvbkNvZGUmKQogICAgIHsKICAgICAgICAgV0VC S0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3Ny Yy9JREJEYXRhYmFzZVByb3h5LmNwcCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvSURCRGF0YWJhc2VQ cm94eS5jcHAKaW5kZXggNjg1ZjUzYzA0ODVkZmE3ZTc4ZmQ2NGJhZmI2MzcwOTc3M2ViNzQ2My4u ZjA3MGQ2NDhhMjg2YzI2NjNkNGQyMjYyYjU4YWVlMDkxNDAwZWNhNiAxMDA2NDQKLS0tIGEvV2Vi S2l0L2Nocm9taXVtL3NyYy9JREJEYXRhYmFzZVByb3h5LmNwcAorKysgYi9XZWJLaXQvY2hyb21p dW0vc3JjL0lEQkRhdGFiYXNlUHJveHkuY3BwCkBAIC02MSwxMSArNjEsNiBAQCBTdHJpbmcgSURC RGF0YWJhc2VQcm94eTo6bmFtZSgpIGNvbnN0CiAgICAgcmV0dXJuIG1fd2ViSURCRGF0YWJhc2Ut Pm5hbWUoKTsKIH0KIAotU3RyaW5nIElEQkRhdGFiYXNlUHJveHk6OmRlc2NyaXB0aW9uKCkgY29u c3QKLXsKLSAgICByZXR1cm4gbV93ZWJJREJEYXRhYmFzZS0+ZGVzY3JpcHRpb24oKTsKLX0KLQog U3RyaW5nIElEQkRhdGFiYXNlUHJveHk6OnZlcnNpb24oKSBjb25zdAogewogICAgIHJldHVybiBt X3dlYklEQkRhdGFiYXNlLT52ZXJzaW9uKCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0v c3JjL0lEQkRhdGFiYXNlUHJveHkuaCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvSURCRGF0YWJhc2VQ cm94eS5oCmluZGV4IDg0NjkzZjI3YzViNTE3ZDEwNTQ4NjkyMDg3YTQ2ZGI1MTBiMTgwNmQuLmM1 MWE2MDQ5MDdiNTMxNDk5MjQ2ZjUzMjNlOGY4ZjUyMGE5YWVhZGEgMTAwNjQ0Ci0tLSBhL1dlYktp dC9jaHJvbWl1bS9zcmMvSURCRGF0YWJhc2VQcm94eS5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9z cmMvSURCRGF0YWJhc2VQcm94eS5oCkBAIC00Myw3ICs0Myw2IEBAIHB1YmxpYzoKICAgICB2aXJ0 dWFsIH5JREJEYXRhYmFzZVByb3h5KCk7CiAKICAgICB2aXJ0dWFsIFN0cmluZyBuYW1lKCkgY29u c3Q7Ci0gICAgdmlydHVhbCBTdHJpbmcgZGVzY3JpcHRpb24oKSBjb25zdDsKICAgICB2aXJ0dWFs IFN0cmluZyB2ZXJzaW9uKCkgY29uc3Q7CiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPERPTVN0cmlu Z0xpc3Q+IG9iamVjdFN0b3JlTmFtZXMoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJJREJLZXlSYW5nZS5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklE QktleVJhbmdlLmNwcAppbmRleCBlYzViN2MyYjVkMzc2MzIzNjAzYmE0ZDQ5MjVjZTdiMWJjOTU5 MTc3Li41MTdmZjAwNjkwOGY2OGE1ZDUxOGI0NDU2YjNjNDMzMmJjZmNkMDBiIDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQktleVJhbmdlLmNwcAorKysgYi9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYklEQktleVJhbmdlLmNwcApAQCAtNDcsMzMgKzQ3LDExIEBAIHZvaWQgV2Vi SURCS2V5UmFuZ2U6OmFzc2lnbihjb25zdCBXZWJJREJLZXkmIGxvd2VyLCBjb25zdCBXZWJJREJL ZXkmIHVwcGVyLCBib29sCiAgICAgICAgIG1fcHJpdmF0ZSA9IElEQktleVJhbmdlOjpjcmVhdGUo bG93ZXIsIHVwcGVyLCBsb3dlck9wZW4sIHVwcGVyT3Blbik7CiB9CiAKLS8vIEZJWE1FOiBSZW1v dmUgdGhpcyBhZnRlciBuZXh0IHJvbGwuCi12b2lkIFdlYklEQktleVJhbmdlOjphc3NpZ24oY29u c3QgV2ViSURCS2V5JiBsb3dlciwgY29uc3QgV2ViSURCS2V5JiB1cHBlciwgdW5zaWduZWQgc2hv cnQgZmxhZ3MpCi17Ci0gICAgYm9vbCBsb3dlck9wZW4gPSAhIShmbGFncyAmIDEpOwotICAgIGJv b2wgdXBwZXJPcGVuID0gISEoZmxhZ3MgJiAyKTsKLQotICAgIGlmIChsb3dlci50eXBlKCkgPT0g V2ViSURCS2V5OjpJbnZhbGlkVHlwZSAmJiB1cHBlci50eXBlKCkgPT0gV2ViSURCS2V5OjpJbnZh bGlkVHlwZSkKLSAgICAgICAgbV9wcml2YXRlID0gMDsKLSAgICBlbHNlCi0gICAgICAgIG1fcHJp dmF0ZSA9IElEQktleVJhbmdlOjpjcmVhdGUobG93ZXIsIHVwcGVyLCBsb3dlck9wZW4sIHVwcGVy T3Blbik7Ci19Ci0KIHZvaWQgV2ViSURCS2V5UmFuZ2U6OnJlc2V0KCkKIHsKICAgICBtX3ByaXZh dGUucmVzZXQoKTsKIH0KIAotV2ViSURCS2V5IFdlYklEQktleVJhbmdlOjpsZWZ0KCkgY29uc3QK LXsKLSAgICByZXR1cm4gbG93ZXIoKTsKLX0KLQotV2ViSURCS2V5IFdlYklEQktleVJhbmdlOjpy aWdodCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIHVwcGVyKCk7Ci19Ci0KIFdlYklEQktleSBXZWJJ REJLZXlSYW5nZTo6bG93ZXIoKSBjb25zdAogewogICAgIGlmICghbV9wcml2YXRlLmdldCgpKQpA QCAtOTgsMjAgKzc2LDYgQEAgYm9vbCBXZWJJREJLZXlSYW5nZTo6dXBwZXJPcGVuKCkgY29uc3QK ICAgICByZXR1cm4gbV9wcml2YXRlLmdldCgpICYmIG1fcHJpdmF0ZS0+dXBwZXJPcGVuKCk7CiB9 CiAKLS8vIEZJWE1FOiBSZW1vdmUgdGhpcyBhZnRlciBuZXh0IHJvbGwuCi11bnNpZ25lZCBzaG9y dCBXZWJJREJLZXlSYW5nZTo6ZmxhZ3MoKSBjb25zdAotewotICAgIGlmICghbV9wcml2YXRlLmdl dCgpKQotICAgICAgICByZXR1cm4gMDsKLQotICAgIHVuc2lnbmVkIHNob3J0IGZsYWdzID0gMDsK LSAgICBpZiAobV9wcml2YXRlLT5sb3dlck9wZW4oKSkKLSAgICAgICAgZmxhZ3MgfD0gMTsKLSAg ICBpZiAobV9wcml2YXRlLT51cHBlck9wZW4oKSkKLSAgICAgICAgZmxhZ3MgfD0gMjsKLSAgICBy ZXR1cm4gZmxhZ3M7Ci19Ci0KIFdlYklEQktleVJhbmdlOjpXZWJJREJLZXlSYW5nZShjb25zdCBQ YXNzUmVmUHRyPElEQktleVJhbmdlPiYgdmFsdWUpCiAgICAgOiBtX3ByaXZhdGUodmFsdWUpCiB7 Cg==