200489 2019-08-06 16:52:39 -0700 Remove IDBDatabaseIdentifier::m_sessionID 2019-08-07 11:07:54 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen alecflett beidson commit-queue darin ews-watchlist jsbell webkit-bug-importer oldest_to_newest 1559002 0 youennf 2019-08-06 16:52:39 -0700 In WebProcess, the IDB connection has the sessionID. In NetworkProcess, the IDBServer has the sessionID. 1559015 1 375669 youennf 2019-08-06 17:20:40 -0700 Created attachment 375669 Patch 1559184 2 375669 commit-queue 2019-08-07 11:05:18 -0700 Comment on attachment 375669 Patch Clearing flags on attachment: 375669 Committed r248377: <https://trac.webkit.org/changeset/248377> 1559185 3 commit-queue 2019-08-07 11:05:19 -0700 All reviewed patches have been landed. Closing bug. 1559186 4 webkit-bug-importer 2019-08-07 11:07:54 -0700 <rdar://problem/54041581> 375669 2019-08-06 17:20:40 -0700 2019-08-07 11:05:18 -0700 Patch bug-200489-20190806172041.patch text/plain 17986 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjEwZTI1NTIwYzNiZDM0 N2ZkNWMxZWNiY2ViNDU1YzlhOGVhMDcwNS4uYjNlNjY4ZWI4YTgxZTA5YzIzN2IyYTY1MDNkZjMw NGI5NzVjZmMzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE5LTA4LTA2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgSURCRGF0YWJh c2VJZGVudGlmaWVyOjptX3Nlc3Npb25JRAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNDg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSURCRGF0YWJhc2VJZGVudGlmaWVyIGNhbiBiZSBjcmVhdGVkIHdp dGhvdXQgYSB2YWxpZCBzZXNzaW9uIElELgorICAgICAgICBJdHMgc2Vzc2lvbiBJRCBpcyBvbmx5 IHVzZWQgaW4gTmV0d29ya1Byb2Nlc3Mgd2hlcmUgaXQgY2FuIGJlIHJldHJpZXZlZCBmcm9tIHRo ZSBJREJTZXJ2ZXIuCisgICAgICAgIEluIFdlYlByb2Nlc3MsIHNlc3Npb24gSUQgaXMgYWxzbyBr bm93biBmcm9tIHRoZSBJREIgY29ubmVjdGlvbi4KKyAgICAgICAgVXBkYXRlIFNRTGl0ZUlEQkJh Y2tpbmdTdG9yZSB0byBzdG9yZSBhIHNlc3Npb24gSUQgd2hpY2ggaXMgZ2l2ZW4gZnJvbSBpdHMg SURCU2VydmVyLgorICAgICAgICBObyBvYnNlcnZhYmxlIGNoYW5nZSBvZiBiZWhhdmlvci4KKwor ICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFiYXNlSWRlbnRpZmllci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJREJEYXRhYmFzZUlkZW50aWZpZXI6OklEQkRhdGFiYXNlSWRlbnRp Zmllcik6CisgICAgICAgIChXZWJDb3JlOjpJREJEYXRhYmFzZUlkZW50aWZpZXI6Omlzb2xhdGVk Q29weSBjb25zdCk6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2VJZGVu dGlmaWVyLmg6CisgICAgICAgIChXZWJDb3JlOjpJREJEYXRhYmFzZUlkZW50aWZpZXI6Omhhc2gg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SURCRGF0YWJhc2VJZGVudGlmaWVyOjpkYXRhYmFz ZU5hbWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SURCRGF0YWJhc2VJZGVudGlmaWVyOjpl bmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SURCRGF0YWJhc2VJZGVudGlmaWVyOjpk ZWNvZGUpOgorICAgICAgICAoV2ViQ29yZTo6SURCRGF0YWJhc2VJZGVudGlmaWVyOjpzZXNzaW9u SUQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQkZhY3Rv cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCRmFjdG9yeTo6b3BlbkludGVybmFsKToKKyAg ICAgICAgKFdlYkNvcmU6OklEQkZhY3Rvcnk6OmRlbGV0ZURhdGFiYXNlKToKKyAgICAgICAgKiBN b2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQlNlcnZlcjo6SURCU2VydmVyOjpjcmVhdGVCYWNraW5nU3RvcmUpOgorICAgICAgICAqIE1v ZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJCYWNraW5nU3RvcmU6OlNRTGl0ZUlEQkJh Y2tpbmdTdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0ZUlEQkJhY2tp bmdTdG9yZTo6Z2V0QmxvYlJlY29yZHNGb3JPYmplY3RTdG9yZVJlY29yZCk6CisgICAgICAgIChX ZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Z2V0UmVjb3JkKToKKyAg ICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFja2luZ1N0b3JlOjpnZXRBbGxP YmplY3RTdG9yZVJlY29yZHMpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJ REJCYWNraW5nU3RvcmU6OnVuY2hlY2tlZEdldEluZGV4UmVjb3JkRm9yT25lS2V5KToKKyAgICAg ICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmg6Cisg ICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6c2Vzc2lv bklEIGNvbnN0KToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURC Q3Vyc29yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQ3Vyc29y OjppbnRlcm5hbEZldGNoTmV4dFJlY29yZCk6CisKIDIwMTktMDgtMDUgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgUlRDUnRwU2VuZGVyLmR0bWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFiYXNl SWRlbnRpZmllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJEYXRh YmFzZUlkZW50aWZpZXIuY3BwCmluZGV4IGFlZDM4Zjc2ZDFmOWFhZDY1MDRjNDhmN2UzYjYzNGQz MDk4ODQ0ODAuLjRmMjZkMzIxZTQ3MmM3OWJkZTE0N2FhMDE5NGYyYzE0ZjA5MGUxZWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFiYXNlSWRlbnRp Zmllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCRGF0YWJh c2VJZGVudGlmaWVyLmNwcApAQCAtMzUsOSArMzUsOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKLUlEQkRhdGFiYXNlSWRlbnRpZmllcjo6SURCRGF0YWJhc2VJZGVudGlmaWVyKGNvbnN0IFN0 cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBQQUw6OlNlc3Npb25JRCYgc2Vzc2lvbklELCBTZWN1 cml0eU9yaWdpbkRhdGEmJiBvcGVuaW5nT3JpZ2luLCBTZWN1cml0eU9yaWdpbkRhdGEmJiBtYWlu RnJhbWVPcmlnaW4pCitJREJEYXRhYmFzZUlkZW50aWZpZXI6OklEQkRhdGFiYXNlSWRlbnRpZmll cihjb25zdCBTdHJpbmcmIGRhdGFiYXNlTmFtZSwgU2VjdXJpdHlPcmlnaW5EYXRhJiYgb3Blbmlu Z09yaWdpbiwgU2VjdXJpdHlPcmlnaW5EYXRhJiYgbWFpbkZyYW1lT3JpZ2luKQogICAgIDogbV9k YXRhYmFzZU5hbWUoZGF0YWJhc2VOYW1lKQotICAgICwgbV9zZXNzaW9uSUQoc2Vzc2lvbklEKQog ICAgICwgbV9vcmlnaW4geyBXVEZNb3ZlKG9wZW5pbmdPcmlnaW4pLCBXVEZNb3ZlKG1haW5GcmFt ZU9yaWdpbikgfQogewogICAgIC8vIFRoZSBlbXB0eSBzdHJpbmcgaXMgYSB2YWxpZCBkYXRhYmFz ZSBuYW1lLCBidXQgYSBudWxsIHN0cmluZyBpcyBub3QuCkBAIC00OSw3ICs0OCw2IEBAIElEQkRh dGFiYXNlSWRlbnRpZmllciBJREJEYXRhYmFzZUlkZW50aWZpZXI6Omlzb2xhdGVkQ29weSgpIGNv bnN0CiAgICAgSURCRGF0YWJhc2VJZGVudGlmaWVyIGlkZW50aWZpZXI7CiAKICAgICBpZGVudGlm aWVyLm1fZGF0YWJhc2VOYW1lID0gbV9kYXRhYmFzZU5hbWUuaXNvbGF0ZWRDb3B5KCk7Ci0gICAg aWRlbnRpZmllci5tX3Nlc3Npb25JRCA9IG1fc2Vzc2lvbklELmlzb2xhdGVkQ29weSgpOwogICAg IGlkZW50aWZpZXIubV9vcmlnaW4gPSBtX29yaWdpbi5pc29sYXRlZENvcHkoKTsKIAogICAgIHJl dHVybiBpZGVudGlmaWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvSURCRGF0YWJhc2VJZGVudGlmaWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9JREJEYXRhYmFzZUlkZW50aWZpZXIuaAppbmRleCAxYmY5NWQyNDFhMDBjMmRjNzMx OThlYzk2NWQyZGE3NTY2YzBkMjI1Li5iOTI4MWU0OWY3OTQwMWVjYTMxMDk0NWZjODExYWNhMWIw ZjYyYTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJE YXRhYmFzZUlkZW50aWZpZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9JREJEYXRhYmFzZUlkZW50aWZpZXIuaApAQCAtNDUsNyArNDUsNyBAQCBwdWJsaWM6CiAgICAg ewogICAgIH0KIAotICAgIFdFQkNPUkVfRVhQT1JUIElEQkRhdGFiYXNlSWRlbnRpZmllcihjb25z dCBTdHJpbmcmIGRhdGFiYXNlTmFtZSwgY29uc3QgUEFMOjpTZXNzaW9uSUQmLCBTZWN1cml0eU9y aWdpbkRhdGEmJiBvcGVuaW5nT3JpZ2luLCBTZWN1cml0eU9yaWdpbkRhdGEmJiBtYWluRnJhbWVP cmlnaW4pOworICAgIFdFQkNPUkVfRVhQT1JUIElEQkRhdGFiYXNlSWRlbnRpZmllcihjb25zdCBT dHJpbmcmIGRhdGFiYXNlTmFtZSwgU2VjdXJpdHlPcmlnaW5EYXRhJiYgb3BlbmluZ09yaWdpbiwg U2VjdXJpdHlPcmlnaW5EYXRhJiYgbWFpbkZyYW1lT3JpZ2luKTsKIAogICAgIElEQkRhdGFiYXNl SWRlbnRpZmllciBpc29sYXRlZENvcHkoKSBjb25zdDsKIApAQCAtNTcsMTAgKzU3LDkgQEAgcHVi bGljOgogICAgIHVuc2lnbmVkIGhhc2goKSBjb25zdAogICAgIHsKICAgICAgICAgdW5zaWduZWQg bmFtZUhhc2ggPSBTdHJpbmdIYXNoOjpoYXNoKG1fZGF0YWJhc2VOYW1lKTsKLSAgICAgICAgdW5z aWduZWQgc2Vzc2lvbklESGFzaCA9IFdURjo6U2Vzc2lvbklESGFzaDo6aGFzaChtX3Nlc3Npb25J RCk7CiAgICAgICAgIHVuc2lnbmVkIG9yaWdpbkhhc2ggPSBtX29yaWdpbi5oYXNoKCk7CiAKLSAg ICAgICAgdW5zaWduZWQgaGFzaENvZGVzWzNdID0geyBuYW1lSGFzaCwgc2Vzc2lvbklESGFzaCwg b3JpZ2luSGFzaCB9OworICAgICAgICB1bnNpZ25lZCBoYXNoQ29kZXNbMl0gPSB7IG5hbWVIYXNo LCBvcmlnaW5IYXNoIH07CiAgICAgICAgIHJldHVybiBTdHJpbmdIYXNoZXI6Omhhc2hNZW1vcnk8 c2l6ZW9mKGhhc2hDb2Rlcyk+KGhhc2hDb2Rlcyk7CiAgICAgfQogCkBAIC04MSw3ICs4MCw2IEBA IHB1YmxpYzoKICAgICB9CiAKICAgICBjb25zdCBTdHJpbmcmIGRhdGFiYXNlTmFtZSgpIGNvbnN0 IHsgcmV0dXJuIG1fZGF0YWJhc2VOYW1lOyB9Ci0gICAgY29uc3QgUEFMOjpTZXNzaW9uSUQmIHNl c3Npb25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Vzc2lvbklEOyB9CiAgICAgY29uc3QgQ2xpZW50 T3JpZ2luJiBvcmlnaW4oKSBjb25zdCB7IHJldHVybiBtX29yaWdpbjsgfQogCiAgICAgU3RyaW5n IGRhdGFiYXNlRGlyZWN0b3J5UmVsYXRpdmVUb1Jvb3QoY29uc3QgU3RyaW5nJiByb290RGlyZWN0 b3J5LCBjb25zdCBTdHJpbmcmIHZlcnNpb25TdHJpbmc9InYxIikgY29uc3Q7CkBAIC05OCw3ICs5 Niw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBTdHJpbmcgbV9kYXRhYmFzZU5hbWU7Ci0g ICAgUEFMOjpTZXNzaW9uSUQgbV9zZXNzaW9uSUQ7CiAgICAgQ2xpZW50T3JpZ2luIG1fb3JpZ2lu OwogICAgIFNlY3VyaXR5T3JpZ2luRGF0YSBtX21haW5GcmFtZU9yaWdpbjsKIH07CkBAIC0xMTgs NyArMTE1LDcgQEAgc3RydWN0IElEQkRhdGFiYXNlSWRlbnRpZmllckhhc2hUcmFpdHMgOiBXVEY6 OlNpbXBsZUNsYXNzSGFzaFRyYWl0czxJREJEYXRhYmFzZUkKIHRlbXBsYXRlPGNsYXNzIEVuY29k ZXI+CiB2b2lkIElEQkRhdGFiYXNlSWRlbnRpZmllcjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIp IGNvbnN0CiB7Ci0gICAgZW5jb2RlciA8PCBtX2RhdGFiYXNlTmFtZSA8PCBtX3Nlc3Npb25JRCA8 PCBtX29yaWdpbjsKKyAgICBlbmNvZGVyIDw8IG1fZGF0YWJhc2VOYW1lIDw8IG1fb3JpZ2luOwog fQogCiB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPgpAQCAtMTI5LDExICsxMjYsNiBAQCBPcHRpb25h bDxJREJEYXRhYmFzZUlkZW50aWZpZXI+IElEQkRhdGFiYXNlSWRlbnRpZmllcjo6ZGVjb2RlKERl Y29kZXImIGRlY29kZXIpCiAgICAgaWYgKCFkYXRhYmFzZU5hbWUpCiAgICAgICAgIHJldHVybiBX VEY6Om51bGxvcHQ7CiAKLSAgICBPcHRpb25hbDxQQUw6OlNlc3Npb25JRD4gc2Vzc2lvbklEOwot ICAgIGRlY29kZXIgPj4gc2Vzc2lvbklEOwotICAgIGlmICghc2Vzc2lvbklEKQotICAgICAgICBy ZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIAogICAgIE9wdGlvbmFsPENsaWVudE9yaWdpbj4gb3Jp Z2luOwogICAgIGRlY29kZXIgPj4gb3JpZ2luOwogICAgIGlmICghb3JpZ2luKQpAQCAtMTQxLDcg KzEzMyw2IEBAIE9wdGlvbmFsPElEQkRhdGFiYXNlSWRlbnRpZmllcj4gSURCRGF0YWJhc2VJZGVu dGlmaWVyOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKIAogICAgIElEQkRhdGFiYXNlSWRlbnRp ZmllciBpZGVudGlmaWVyOwogICAgIGlkZW50aWZpZXIubV9kYXRhYmFzZU5hbWUgPSBXVEZNb3Zl KCpkYXRhYmFzZU5hbWUpOyAvLyBGSVhNRTogV2hlbiBkZWNvZGluZyBmcm9tIElQQywgZGF0YWJh c2VOYW1lIGNhbiBiZSBudWxsLCBhbmQgdGhlIG5vbi1lbXB0eSBjb25zdHJ1Y3RvciBhc3NlcnRz IHRoYXQgdGhpcyBpcyBub3QgdGhlIGNhc2UuCi0gICAgaWRlbnRpZmllci5tX3Nlc3Npb25JRCA9 IFdURk1vdmUoKnNlc3Npb25JRCk7CiAgICAgaWRlbnRpZmllci5tX29yaWdpbiA9IFdURk1vdmUo Km9yaWdpbik7CiAgICAgcmV0dXJuIGlkZW50aWZpZXI7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJGYWN0b3J5LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL0lEQkZhY3RvcnkuY3BwCmluZGV4IDJkYTEwZjIxZmJjNDIxZTI0 MjQ1YzAyNTFkYjNiMWUyMGI1YTNkYzYuLjU3YzU2ZGExZjBiYmY5YTI0NzJkNWRlMzAwOTYxOTBk YTdmOWZjYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lE QkZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkZh Y3RvcnkuY3BwCkBAIC05MSw3ICs5MSw3IEBAIEV4Y2VwdGlvbk9yPFJlZjxJREJPcGVuREJSZXF1 ZXN0Pj4gSURCRmFjdG9yeTo6b3BlbkludGVybmFsKFNjcmlwdEV4ZWN1dGlvbkNvbnRlCiAgICAg ICAgIHJldHVybiBFeGNlcHRpb24geyBTZWN1cml0eUVycm9yLCAiSURCRmFjdG9yeS5vcGVuKCkg Y2FsbGVkIGluIGFuIGludmFsaWQgc2VjdXJpdHkgY29udGV4dCJfcyB9OwogCiAgICAgQVNTRVJU KGNvbnRleHQuc2VjdXJpdHlPcmlnaW4oKSk7Ci0gICAgSURCRGF0YWJhc2VJZGVudGlmaWVyIGRh dGFiYXNlSWRlbnRpZmllcihuYW1lLCBjb250ZXh0LnNlc3Npb25JRCgpLCBTZWN1cml0eU9yaWdp bkRhdGEgeyBjb250ZXh0LnNlY3VyaXR5T3JpZ2luKCktPmRhdGEoKSB9LCBTZWN1cml0eU9yaWdp bkRhdGEgeyBjb250ZXh0LnRvcE9yaWdpbigpLmRhdGEoKSB9KTsKKyAgICBJREJEYXRhYmFzZUlk ZW50aWZpZXIgZGF0YWJhc2VJZGVudGlmaWVyKG5hbWUsIFNlY3VyaXR5T3JpZ2luRGF0YSB7IGNv bnRleHQuc2VjdXJpdHlPcmlnaW4oKS0+ZGF0YSgpIH0sIFNlY3VyaXR5T3JpZ2luRGF0YSB7IGNv bnRleHQudG9wT3JpZ2luKCkuZGF0YSgpIH0pOwogICAgIGlmICghZGF0YWJhc2VJZGVudGlmaWVy LmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFR5cGVFcnJvciwgIklEQkZh Y3Rvcnkub3BlbigpIGNhbGxlZCB3aXRoIGFuIGludmFsaWQgc2VjdXJpdHkgb3JpZ2luIl9zIH07 CiAKQEAgLTExMSw3ICsxMTEsNyBAQCBFeGNlcHRpb25PcjxSZWY8SURCT3BlbkRCUmVxdWVzdD4+ IElEQkZhY3Rvcnk6OmRlbGV0ZURhdGFiYXNlKFNjcmlwdEV4ZWN1dGlvbkNvbgogICAgICAgICBy ZXR1cm4gRXhjZXB0aW9uIHsgU2VjdXJpdHlFcnJvciwgIklEQkZhY3RvcnkuZGVsZXRlRGF0YWJh c2UoKSBjYWxsZWQgaW4gYW4gaW52YWxpZCBzZWN1cml0eSBjb250ZXh0Il9zIH07CiAKICAgICBB U1NFUlQoY29udGV4dC5zZWN1cml0eU9yaWdpbigpKTsKLSAgICBJREJEYXRhYmFzZUlkZW50aWZp ZXIgZGF0YWJhc2VJZGVudGlmaWVyKG5hbWUsIGNvbnRleHQuc2Vzc2lvbklEKCksIFNlY3VyaXR5 T3JpZ2luRGF0YSB7IGNvbnRleHQuc2VjdXJpdHlPcmlnaW4oKS0+ZGF0YSgpIH0sIFNlY3VyaXR5 T3JpZ2luRGF0YSB7IGNvbnRleHQudG9wT3JpZ2luKCkuZGF0YSgpIH0pOworICAgIElEQkRhdGFi YXNlSWRlbnRpZmllciBkYXRhYmFzZUlkZW50aWZpZXIobmFtZSwgU2VjdXJpdHlPcmlnaW5EYXRh IHsgY29udGV4dC5zZWN1cml0eU9yaWdpbigpLT5kYXRhKCkgfSwgU2VjdXJpdHlPcmlnaW5EYXRh IHsgY29udGV4dC50b3BPcmlnaW4oKS5kYXRhKCkgfSk7CiAgICAgaWYgKCFkYXRhYmFzZUlkZW50 aWZpZXIuaXNWYWxpZCgpKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgVHlwZUVycm9yLCAi SURCRmFjdG9yeS5kZWxldGVEYXRhYmFzZSgpIGNhbGxlZCB3aXRoIGFuIGludmFsaWQgc2VjdXJp dHkgb3JpZ2luIl9zIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9JREJTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvc2VydmVyL0lEQlNlcnZlci5jcHAKaW5kZXggN2YwNzA5ZDM5ZmNiZDhhNDdmMjQxZTlj ZGI5MDQ4M2EyZTc2MGFhZS4uODliZmU3OTNkN2RiYjVjZTczMTE0NzllZjY5NTBiOWNmZDE3Y2Uw OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lE QlNlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVy L0lEQlNlcnZlci5jcHAKQEAgLTEzNSw3ICsxMzUsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8SURCQmFj a2luZ1N0b3JlPiBJREJTZXJ2ZXI6OmNyZWF0ZUJhY2tpbmdTdG9yZShjb25zdCBJREJEYXRhYmFz ZQogICAgIGlmIChtX2RhdGFiYXNlRGlyZWN0b3J5UGF0aC5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybiBNZW1vcnlJREJCYWNraW5nU3RvcmU6OmNyZWF0ZShpZGVudGlmaWVyKTsKIAotICAgIHJl dHVybiBzdGQ6Om1ha2VfdW5pcXVlPFNRTGl0ZUlEQkJhY2tpbmdTdG9yZT4oaWRlbnRpZmllciwg bV9kYXRhYmFzZURpcmVjdG9yeVBhdGgsIG1fYmFja2luZ1N0b3JlVGVtcG9yYXJ5RmlsZUhhbmRs ZXIsIG1fcGVyT3JpZ2luUXVvdGEpOworICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPFNRTGl0 ZUlEQkJhY2tpbmdTdG9yZT4obV9zZXNzaW9uSUQsIGlkZW50aWZpZXIsIG1fZGF0YWJhc2VEaXJl Y3RvcnlQYXRoLCBtX2JhY2tpbmdTdG9yZVRlbXBvcmFyeUZpbGVIYW5kbGVyLCBtX3Blck9yaWdp blF1b3RhKTsKIH0KIAogdm9pZCBJREJTZXJ2ZXI6Om9wZW5EYXRhYmFzZShjb25zdCBJREJSZXF1 ZXN0RGF0YSYgcmVxdWVzdERhdGEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCmlu ZGV4IDA4OTlhOWFiN2U5NmM4NTc5NTViMjZhN2IwYWIwYmM4MDJjMjk1OTAuLmRjOWZiYTQyMGQy MjMyYzcyNzllYmI0NjY2NzNjZDgzOWVjY2ExOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5n U3RvcmUuY3BwCkBAIC0yMjgsOCArMjI4LDkgQEAgc3RhdGljIGNvbnN0IFN0cmluZyYgYmxvYkZp bGVzVGFibGVTY2hlbWFBbHRlcm5hdGUoKQogICAgIHJldHVybiBibG9iRmlsZXNUYWJsZVNjaGVt YVN0cmluZzsKIH0KIAotU1FMaXRlSURCQmFja2luZ1N0b3JlOjpTUUxpdGVJREJCYWNraW5nU3Rv cmUoY29uc3QgSURCRGF0YWJhc2VJZGVudGlmaWVyJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcm IGRhdGFiYXNlUm9vdERpcmVjdG9yeSwgSURCQmFja2luZ1N0b3JlVGVtcG9yYXJ5RmlsZUhhbmRs ZXImIGZpbGVIYW5kbGVyLCB1aW50NjRfdCBxdW90YSkKLSAgICA6IG1faWRlbnRpZmllcihpZGVu dGlmaWVyKQorU1FMaXRlSURCQmFja2luZ1N0b3JlOjpTUUxpdGVJREJCYWNraW5nU3RvcmUoUEFM OjpTZXNzaW9uSUQgc2Vzc2lvbklELCBjb25zdCBJREJEYXRhYmFzZUlkZW50aWZpZXImIGlkZW50 aWZpZXIsIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VSb290RGlyZWN0b3J5LCBJREJCYWNraW5nU3Rv cmVUZW1wb3JhcnlGaWxlSGFuZGxlciYgZmlsZUhhbmRsZXIsIHVpbnQ2NF90IHF1b3RhKQorICAg IDogbV9zZXNzaW9uSUQoc2Vzc2lvbklEKQorICAgICwgbV9pZGVudGlmaWVyKGlkZW50aWZpZXIp CiAgICAgLCBtX2RhdGFiYXNlUm9vdERpcmVjdG9yeShkYXRhYmFzZVJvb3REaXJlY3RvcnkpCiAg ICAgLCBtX3RlbXBvcmFyeUZpbGVIYW5kbGVyKGZpbGVIYW5kbGVyKQogICAgICwgbV9xdW90YShx dW90YSkKQEAgLTE5MDUsNyArMTkwNiw3IEBAIElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9y ZTo6YWRkUmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3RpCiAgICAg cmV0dXJuIGVycm9yOwogfQogCi1JREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmdldEJs b2JSZWNvcmRzRm9yT2JqZWN0U3RvcmVSZWNvcmQoaW50NjRfdCBvYmplY3RTdG9yZVJlY29yZCwg VmVjdG9yPFN0cmluZz4mIGJsb2JVUkxzLCBQQUw6OlNlc3Npb25JRCYgc2Vzc2lvbklELCBWZWN0 b3I8U3RyaW5nPiYgYmxvYkZpbGVQYXRocykKK0lEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9y ZTo6Z2V0QmxvYlJlY29yZHNGb3JPYmplY3RTdG9yZVJlY29yZChpbnQ2NF90IG9iamVjdFN0b3Jl UmVjb3JkLCBWZWN0b3I8U3RyaW5nPiYgYmxvYlVSTHMsIFZlY3RvcjxTdHJpbmc+JiBibG9iRmls ZVBhdGhzKQogewogICAgIEFTU0VSVChvYmplY3RTdG9yZVJlY29yZCk7CiAKQEAgLTE5NTQsOCAr MTk1NSw2IEBAIElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Z2V0QmxvYlJlY29yZHNG b3JPYmplY3RTdG9yZVJlY29yZChpbnQ2NF90IG9iamVjCiAgICAgICAgIFN0cmluZyBmaWxlTmFt ZSA9IHNxbC0+Z2V0Q29sdW1uVGV4dCgwKTsKICAgICAgICAgYmxvYkZpbGVQYXRocy5hcHBlbmQo RmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KG1fZGF0YWJhc2VEaXJlY3Rvcnks IGZpbGVOYW1lKSk7CiAgICAgfQotICAgIHNlc3Npb25JRCA9IG1faWRlbnRpZmllci5zZXNzaW9u SUQoKTsKLQogICAgIHJldHVybiBJREJFcnJvciB7IH07CiB9CiAKQEAgLTIwODIsOCArMjA4MSw3 IEBAIElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Z2V0UmVjb3JkKGNvbnN0IElEQlJl c291cmNlSWRlbnRpZmllciYgdHJhbnNhY3RpCiAKICAgICBBU1NFUlQocmVjb3JkSUQpOwogICAg IFZlY3RvcjxTdHJpbmc+IGJsb2JVUkxzLCBibG9iRmlsZVBhdGhzOwotICAgIFBBTDo6U2Vzc2lv bklEIHNlc3Npb25JRDsKLSAgICBhdXRvIGVycm9yID0gZ2V0QmxvYlJlY29yZHNGb3JPYmplY3RT dG9yZVJlY29yZChyZWNvcmRJRCwgYmxvYlVSTHMsIHNlc3Npb25JRCwgYmxvYkZpbGVQYXRocyk7 CisgICAgYXV0byBlcnJvciA9IGdldEJsb2JSZWNvcmRzRm9yT2JqZWN0U3RvcmVSZWNvcmQocmVj b3JkSUQsIGJsb2JVUkxzLCBibG9iRmlsZVBhdGhzKTsKICAgICBBU1NFUlQoYmxvYlVSTHMuc2l6 ZSgpID09IGJsb2JGaWxlUGF0aHMuc2l6ZSgpKTsKIAogICAgIGlmICghZXJyb3IuaXNOdWxsKCkp CkBAIC0yMDkxLDcgKzIwODksNyBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6Omdl dFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aQogCiAgICAgYXV0 byogb2JqZWN0U3RvcmVJbmZvID0gaW5mb0Zvck9iamVjdFN0b3JlKG9iamVjdFN0b3JlSUQpOwog ICAgIEFTU0VSVChvYmplY3RTdG9yZUluZm8pOwotICAgIHJlc3VsdFZhbHVlID0geyBrZXlEYXRh LCB7IHZhbHVlUmVzdWx0QnVmZmVyLCBXVEZNb3ZlKGJsb2JVUkxzKSwgc2Vzc2lvbklELCBXVEZN b3ZlKGJsb2JGaWxlUGF0aHMpIH0sIG9iamVjdFN0b3JlSW5mby0+a2V5UGF0aCgpfTsKKyAgICBy ZXN1bHRWYWx1ZSA9IHsga2V5RGF0YSwgeyB2YWx1ZVJlc3VsdEJ1ZmZlciwgV1RGTW92ZShibG9i VVJMcyksIG1fc2Vzc2lvbklELCBXVEZNb3ZlKGJsb2JGaWxlUGF0aHMpIH0sIG9iamVjdFN0b3Jl SW5mby0+a2V5UGF0aCgpfTsKICAgICByZXR1cm4gSURCRXJyb3IgeyB9OwogfQogCkBAIC0yMjA0 LDE0ICsyMjAyLDEzIEBAIElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Z2V0QWxsT2Jq ZWN0U3RvcmVSZWNvcmRzKGNvbnN0IElEQlJlc291cmNlSWRlbnRpCiAKICAgICAgICAgICAgIEFT U0VSVChyZWNvcmRJRCk7CiAgICAgICAgICAgICBWZWN0b3I8U3RyaW5nPiBibG9iVVJMcywgYmxv YkZpbGVQYXRoczsKLSAgICAgICAgICAgIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRDsKLSAgICAg ICAgICAgIGF1dG8gZXJyb3IgPSBnZXRCbG9iUmVjb3Jkc0Zvck9iamVjdFN0b3JlUmVjb3JkKHJl Y29yZElELCBibG9iVVJMcywgc2Vzc2lvbklELCBibG9iRmlsZVBhdGhzKTsKKyAgICAgICAgICAg IGF1dG8gZXJyb3IgPSBnZXRCbG9iUmVjb3Jkc0Zvck9iamVjdFN0b3JlUmVjb3JkKHJlY29yZElE LCBibG9iVVJMcywgYmxvYkZpbGVQYXRocyk7CiAgICAgICAgICAgICBBU1NFUlQoYmxvYlVSTHMu c2l6ZSgpID09IGJsb2JGaWxlUGF0aHMuc2l6ZSgpKTsKIAogICAgICAgICAgICAgaWYgKCFlcnJv ci5pc051bGwoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZXJyb3I7CiAKLSAgICAgICAgICAg IHJlc3VsdC5hZGRWYWx1ZSh7IHZhbHVlUmVzdWx0QnVmZmVyLCBXVEZNb3ZlKGJsb2JVUkxzKSwg c2Vzc2lvbklELCBXVEZNb3ZlKGJsb2JGaWxlUGF0aHMpIH0pOworICAgICAgICAgICAgcmVzdWx0 LmFkZFZhbHVlKHsgdmFsdWVSZXN1bHRCdWZmZXIsIFdURk1vdmUoYmxvYlVSTHMpLCBtX3Nlc3Np b25JRCwgV1RGTW92ZShibG9iRmlsZVBhdGhzKSB9KTsKICAgICAgICAgfQogCiAgICAgICAgICsr cmV0dXJuZWRSZXN1bHRzOwpAQCAtMjM2Niw4ICsyMzYzLDcgQEAgSURCRXJyb3IgU1FMaXRlSURC QmFja2luZ1N0b3JlOjp1bmNoZWNrZWRHZXRJbmRleFJlY29yZEZvck9uZUtleShpbnQ2NF90IGlu ZGV4SUQKIAogICAgIGludDY0X3QgcmVjb3JkSUQgPSBzcWwtPmdldENvbHVtbkludDY0KDIpOwog ICAgIFZlY3RvcjxTdHJpbmc+IGJsb2JVUkxzLCBibG9iRmlsZVBhdGhzOwotICAgIFBBTDo6U2Vz c2lvbklEIHNlc3Npb25JRDsKLSAgICBhdXRvIGVycm9yID0gZ2V0QmxvYlJlY29yZHNGb3JPYmpl Y3RTdG9yZVJlY29yZChyZWNvcmRJRCwgYmxvYlVSTHMsIHNlc3Npb25JRCwgYmxvYkZpbGVQYXRo cyk7CisgICAgYXV0byBlcnJvciA9IGdldEJsb2JSZWNvcmRzRm9yT2JqZWN0U3RvcmVSZWNvcmQo cmVjb3JkSUQsIGJsb2JVUkxzLCBibG9iRmlsZVBhdGhzKTsKICAgICBBU1NFUlQoYmxvYlVSTHMu c2l6ZSgpID09IGJsb2JGaWxlUGF0aHMuc2l6ZSgpKTsKIAogICAgIGlmICghZXJyb3IuaXNOdWxs KCkpCkBAIC0yMzc1LDcgKzIzNzEsNyBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6 OnVuY2hlY2tlZEdldEluZGV4UmVjb3JkRm9yT25lS2V5KGludDY0X3QgaW5kZXhJRAogCiAgICAg YXV0byogb2JqZWN0U3RvcmVJbmZvID0gaW5mb0Zvck9iamVjdFN0b3JlKG9iamVjdFN0b3JlSUQp OwogICAgIEFTU0VSVChvYmplY3RTdG9yZUluZm8pOwotICAgIGdldFJlc3VsdCA9IHsgb2JqZWN0 U3RvcmVLZXksIG9iamVjdFN0b3JlS2V5LCB7IFRocmVhZFNhZmVEYXRhQnVmZmVyOjpjcmVhdGUo V1RGTW92ZSh2YWx1ZVZlY3RvcikpLCBXVEZNb3ZlKGJsb2JVUkxzKSwgc2Vzc2lvbklELCBXVEZN b3ZlKGJsb2JGaWxlUGF0aHMpIH0sIG9iamVjdFN0b3JlSW5mby0+a2V5UGF0aCgpIH07CisgICAg Z2V0UmVzdWx0ID0geyBvYmplY3RTdG9yZUtleSwgb2JqZWN0U3RvcmVLZXksIHsgVGhyZWFkU2Fm ZURhdGFCdWZmZXI6OmNyZWF0ZShXVEZNb3ZlKHZhbHVlVmVjdG9yKSksIFdURk1vdmUoYmxvYlVS THMpLCBtX3Nlc3Npb25JRCwgV1RGTW92ZShibG9iRmlsZVBhdGhzKSB9LCBvYmplY3RTdG9yZUlu Zm8tPmtleVBhdGgoKSB9OwogICAgIHJldHVybiBJREJFcnJvciB7IH07CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNr aW5nU3RvcmUuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxp dGVJREJCYWNraW5nU3RvcmUuaAppbmRleCBjN2Q1Njg0M2M3YmM3M2U2ZTc0NTA3YjUzMzQ5ODk1 N2FjYmY2MWRiLi4wNmRjMzQ0NTA4YmMwNzMzNWViMTkwMWVhMGZlNzZiMGFmMmQ1MmZmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURC QmFja2luZ1N0b3JlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2Vy dmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5oCkBAIC00OCw3ICs0OCw3IEBAIGNsYXNzIFNRTGl0 ZUlEQkN1cnNvcjsKIGNsYXNzIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZSA6IHB1YmxpYyBJREJCYWNr aW5nU3RvcmUgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIFNR TGl0ZUlEQkJhY2tpbmdTdG9yZShjb25zdCBJREJEYXRhYmFzZUlkZW50aWZpZXImLCBjb25zdCBT dHJpbmcmIGRhdGFiYXNlUm9vdERpcmVjdG9yeSwgSURCQmFja2luZ1N0b3JlVGVtcG9yYXJ5Rmls ZUhhbmRsZXImLCB1aW50NjRfdCBxdW90YSk7CisgICAgU1FMaXRlSURCQmFja2luZ1N0b3JlKFBB TDo6U2Vzc2lvbklELCBjb25zdCBJREJEYXRhYmFzZUlkZW50aWZpZXImLCBjb25zdCBTdHJpbmcm IGRhdGFiYXNlUm9vdERpcmVjdG9yeSwgSURCQmFja2luZ1N0b3JlVGVtcG9yYXJ5RmlsZUhhbmRs ZXImLCB1aW50NjRfdCBxdW90YSk7CiAgICAgCiAgICAgflNRTGl0ZUlEQkJhY2tpbmdTdG9yZSgp IGZpbmFsOwogCkBAIC05MSw3ICs5MSw3IEBAIHB1YmxpYzoKIAogICAgIElEQkJhY2tpbmdTdG9y ZVRlbXBvcmFyeUZpbGVIYW5kbGVyJiB0ZW1wb3JhcnlGaWxlSGFuZGxlcigpIGNvbnN0IHsgcmV0 dXJuIG1fdGVtcG9yYXJ5RmlsZUhhbmRsZXI7IH0KIAotICAgIElEQkVycm9yIGdldEJsb2JSZWNv cmRzRm9yT2JqZWN0U3RvcmVSZWNvcmQoaW50NjRfdCBvYmplY3RTdG9yZVJlY29yZCwgVmVjdG9y PFN0cmluZz4mIGJsb2JVUkxzLCBQQUw6OlNlc3Npb25JRCYsIFZlY3RvcjxTdHJpbmc+JiBibG9i RmlsZVBhdGhzKTsKKyAgICBJREJFcnJvciBnZXRCbG9iUmVjb3Jkc0Zvck9iamVjdFN0b3JlUmVj b3JkKGludDY0X3Qgb2JqZWN0U3RvcmVSZWNvcmQsIFZlY3RvcjxTdHJpbmc+JiBibG9iVVJMcywg VmVjdG9yPFN0cmluZz4mIGJsb2JGaWxlUGF0aHMpOwogCiAgICAgc3RhdGljIFN0cmluZyBkYXRh YmFzZU5hbWVGcm9tRW5jb2RlZEZpbGVuYW1lKGNvbnN0IFN0cmluZyYpOwogICAgIHN0YXRpYyB1 aW50NjRfdCBkYXRhYmFzZXNTaXplRm9yRm9sZGVyKGNvbnN0IFN0cmluZyYgZm9sZGVyKTsKQEAg LTEwMSw2ICsxMDEsOSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFN0cmluZyBkYXRhYmFzZU5hbWVG cm9tRmlsZShjb25zdCBTdHJpbmcmKTsKIAogICAgIGJvb2wgaGFzVHJhbnNhY3Rpb24oY29uc3Qg SURCUmVzb3VyY2VJZGVudGlmaWVyJikgY29uc3QgZmluYWw7CisKKyAgICBQQUw6OlNlc3Npb25J RCBzZXNzaW9uSUQoKSBjb25zdCB7IHJldHVybiBtX3Nlc3Npb25JRDsgfQorCiBwcml2YXRlOgog ICAgIFN0cmluZyBmaWxlbmFtZUZvckRhdGFiYXNlTmFtZSgpIGNvbnN0OwogICAgIFN0cmluZyBm dWxsRGF0YWJhc2VQYXRoKCkgY29uc3Q7CkBAIC0xOTEsNiArMTk0LDcgQEAgcHJpdmF0ZToKICAg ICBKU0M6OkpTR2xvYmFsT2JqZWN0JiBnbG9iYWxPYmplY3QoKTsKICAgICB2b2lkIGluaXRpYWxp emVWTSgpOwogCisgICAgUEFMOjpTZXNzaW9uSUQgbV9zZXNzaW9uSUQ7CiAgICAgSURCRGF0YWJh c2VJZGVudGlmaWVyIG1faWRlbnRpZmllcjsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SURCRGF0YWJh c2VJbmZvPiBtX2RhdGFiYXNlSW5mbzsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SURCRGF0YWJhc2VJ bmZvPiBtX29yaWdpbmFsRGF0YWJhc2VJbmZvQmVmb3JlVmVyc2lvbkNoYW5nZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJDdXJz b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlE QkN1cnNvci5jcHAKaW5kZXggY2FlYWNmMjQxMmI2MGQxOGYzYTU5NDRiYWRiMmQ3MWMxZTk3Yzgx Mi4uMzVmMDgxMDI3NTQ2YTFjOWEwOTI5NGM2MDM3NTk0YTViNWZjZmZlNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkN1cnNvci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlE QkN1cnNvci5jcHAKQEAgLTQ1Niw4ICs0NTYsNyBAQCBTUUxpdGVJREJDdXJzb3I6OkZldGNoUmVz dWx0IFNRTGl0ZUlEQkN1cnNvcjo6aW50ZXJuYWxGZXRjaE5leHRSZWNvcmQoU1FMaXRlQ3Vycwog ICAgICAgICByZWNvcmQucmVjb3JkLnByaW1hcnlLZXkgPSByZWNvcmQucmVjb3JkLmtleTsKIAog ICAgICAgICBWZWN0b3I8U3RyaW5nPiBibG9iVVJMcywgYmxvYkZpbGVQYXRoczsKLSAgICAgICAg UEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEOwotICAgICAgICBhdXRvIGVycm9yID0gbV90cmFuc2Fj dGlvbi0+YmFja2luZ1N0b3JlKCkuZ2V0QmxvYlJlY29yZHNGb3JPYmplY3RTdG9yZVJlY29yZChy ZWNvcmQucm93SUQsIGJsb2JVUkxzLCBzZXNzaW9uSUQsIGJsb2JGaWxlUGF0aHMpOworICAgICAg ICBhdXRvIGVycm9yID0gbV90cmFuc2FjdGlvbi0+YmFja2luZ1N0b3JlKCkuZ2V0QmxvYlJlY29y ZHNGb3JPYmplY3RTdG9yZVJlY29yZChyZWNvcmQucm93SUQsIGJsb2JVUkxzLCBibG9iRmlsZVBh dGhzKTsKICAgICAgICAgaWYgKCFlcnJvci5pc051bGwoKSkgewogICAgICAgICAgICAgTE9HX0VS Uk9SKCJVbmFibGUgdG8gZmV0Y2ggYmxvYiByZWNvcmRzIGZyb20gZGF0YWJhc2Ugd2hpbGUgYWR2 YW5jaW5nIGN1cnNvciIpOwogICAgICAgICAgICAgbWFya0FzRXJyb3JlZChyZWNvcmQpOwpAQCAt NDY1LDcgKzQ2NCw3IEBAIFNRTGl0ZUlEQkN1cnNvcjo6RmV0Y2hSZXN1bHQgU1FMaXRlSURCQ3Vy c29yOjppbnRlcm5hbEZldGNoTmV4dFJlY29yZChTUUxpdGVDdXJzCiAgICAgICAgIH0KIAogICAg ICAgICBpZiAobV9jdXJzb3JUeXBlID09IEluZGV4ZWREQjo6Q3Vyc29yVHlwZTo6S2V5QW5kVmFs dWUpCi0gICAgICAgICAgICByZWNvcmQucmVjb3JkLnZhbHVlID0gc3RkOjptYWtlX3VuaXF1ZTxJ REJWYWx1ZT4oVGhyZWFkU2FmZURhdGFCdWZmZXI6OmNyZWF0ZShXVEZNb3ZlKGtleURhdGEpKSwg YmxvYlVSTHMsIHNlc3Npb25JRCwgYmxvYkZpbGVQYXRocyk7CisgICAgICAgICAgICByZWNvcmQu cmVjb3JkLnZhbHVlID0gc3RkOjptYWtlX3VuaXF1ZTxJREJWYWx1ZT4oVGhyZWFkU2FmZURhdGFC dWZmZXI6OmNyZWF0ZShXVEZNb3ZlKGtleURhdGEpKSwgYmxvYlVSTHMsIG1fdHJhbnNhY3Rpb24t PmJhY2tpbmdTdG9yZSgpLnNlc3Npb25JRCgpLCBibG9iRmlsZVBhdGhzKTsKICAgICB9IGVsc2Ug ewogICAgICAgICBpZiAoIWRlc2VyaWFsaXplSURCS2V5RGF0YShrZXlEYXRhLmRhdGEoKSwga2V5 RGF0YS5zaXplKCksIHJlY29yZC5yZWNvcmQucHJpbWFyeUtleSkpIHsKICAgICAgICAgICAgIExP R19FUlJPUigiVW5hYmxlIHRvIGRlc2VyaWFsaXplIHZhbHVlIGRhdGEgZnJvbSBkYXRhYmFzZSB3 aGlsZSBhZHZhbmNpbmcgaW5kZXggY3Vyc29yIik7Cg==