198612 2019-06-06 09:32:43 -0700 REGRESSION(244439): platform/mac/media/encrypted-media/fps-* tests are crashing 2019-06-14 13:10:41 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson ryanhaddad webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1542436 0 jer.noble 2019-06-06 09:32:43 -0700 REGRESSION(244439): platform/mac/media/encrypted-media/fps-* tests are crashing 1542439 1 jer.noble 2019-06-06 09:33:24 -0700 <rdar://problem/51078978> 1542443 2 371503 jer.noble 2019-06-06 09:37:17 -0700 Created attachment 371503 Patch 1542541 3 371503 eric.carlson 2019-06-06 13:29:54 -0700 Comment on attachment 371503 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371503&action=review > Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp:135 > + if (psshBox.systemID() != CDMPrivateFairPlayStreaming::fairPlaySystemID()) { I think you want an “==“ here 1542542 4 371522 jer.noble 2019-06-06 13:31:52 -0700 Created attachment 371522 Patch 1544800 5 372132 jer.noble 2019-06-14 12:27:27 -0700 Created attachment 372132 Patch for landing 1544815 6 372132 commit-queue 2019-06-14 13:10:39 -0700 Comment on attachment 372132 Patch for landing Clearing flags on attachment: 372132 Committed r246441: <https://trac.webkit.org/changeset/246441> 1544816 7 commit-queue 2019-06-14 13:10:41 -0700 All reviewed patches have been landed. Closing bug. 371503 2019-06-06 09:37:17 -0700 2019-06-06 13:31:51 -0700 Patch bug-198612-20190606093717.patch text/plain 9648 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDc5MWY0NzBkNDAyYzQ0 NTA1NTIyODlkNWUzMzUzMGQ1ODY0NWM3My4uYWFjODFlZWViZjQ1YTFhYTcyNTczMDYzOTI5MWY4 ZTY3NjhhYjVkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA2LTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04oMjQ0NDM5 KTogcGxhdGZvcm0vbWFjL21lZGlhL2VuY3J5cHRlZC1tZWRpYS9mcHMtKiB0ZXN0cyBhcmUgY3Jh c2hpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 ODYxMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTEwNzg5Nzg+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHR3byBpbXBsZW1lbnRh dGlvbnMgb2YgYSAnY2VuYycgaW5pdGlhbGlhdGlvbiBkYXRhIGZhY3Rvcnk7IGFuIEFTU0VSVCBm aXJlcyB3aGVuCisgICAgICAgIHRoZSBzZWNvbmQgb25lIGlzIGFkZGVkIHRvIHRoZSByZWdpc3Ry eS4gVW5pZnkgdGhlbS4KKworICAgICAgICAqIE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEvSW5pdERh dGFSZWdpc3RyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpleHRyYWN0S2V5SURzQ2VuYyk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0NETUZhaXJQbGF5U3RyZWFt aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6 dmFsaWRGYWlyUGxheVN0cmVhbWluZ1NjaGVtZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNUHJp dmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpmYWlyUGxheVN5c3RlbUlEKToKKyAgICAgICAgKFdlYkNv cmU6OnZhbGlkSW5pdERhdGFUeXBlcyk6CisgICAgICAgIChXZWJDb3JlOjpDRE1GYWN0b3J5Ojpw bGF0Zm9ybVJlZ2lzdGVyRmFjdG9yaWVzKToKKyAgICAgICAgKFdlYkNvcmU6OnZhbGlkRmFpclBs YXlTdHJlYW1pbmdTY2hlbWVzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNETVByaXZh dGVGYWlyUGxheVN0cmVhbWluZzo6Y2VuY05hbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6ZmFpclBsYXlTeXN0ZW1JRCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpleHRyYWN0 U2NoZW1lQW5kS2V5SWRGcm9tQ2VuYyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDRE1Q cml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OmV4dHJhY3RLZXlJRHNDZW5jKTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkNETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6c2FuaXRpemVDZW5j KTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RN RmFpclBsYXlTdHJlYW1pbmcuaDoKKwogMjAxOS0wNi0wNSAgQW50b2luZSBRdWludCAgPGdyYW91 dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFtQb2ludGVyIEV2ZW50c10gRmlyZSBwb2ludGVyb3V0 IGFuZCBwb2ludGVybGVhdmUgZXZlbnRzIGFmdGVyIGZpcmluZyBwb2ludGVyY2FuY2VsCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0luaXREYXRhUmVn aXN0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9Jbml0RGF0 YVJlZ2lzdHJ5LmNwcAppbmRleCA5ZjhiNWUwNTUxYjY1ODcwZGE1OTA3OTNiMjVmOTkxODQyYTM0 NmNiLi43MjI0YTBkNDY4ZTcyN2YyOTE4ODJkZWMxODYwOTM5MTliMTkyZjZkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0luaXREYXRhUmVnaXN0cnku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvSW5pdERhdGFS ZWdpc3RyeS5jcHAKQEAgLTI4LDYgKzI4LDggQEAKIAogI2lmIEVOQUJMRShFTkNSWVBURURfTUVE SUEpCiAKKyNpbmNsdWRlICJDRE1GYWlyUGxheVN0cmVhbWluZy5oIgorI2luY2x1ZGUgIklTT0Zh aXJQbGF5U3RyZWFtaW5nUHNzaEJveC5oIgogI2luY2x1ZGUgIklTT1Byb3RlY3Rpb25TeXN0ZW1T cGVjaWZpY0hlYWRlckJveC5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0RhdGFWaWV3Lmg+ CiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKQEAgLTEyOSw2ICsxMzEsMjMgQEAgc3RhdGlj IE9wdGlvbmFsPFZlY3RvcjxSZWY8U2hhcmVkQnVmZmVyPj4+IGV4dHJhY3RLZXlJRHNDZW5jKGNv bnN0IFNoYXJlZEJ1ZmZlciYKICAgICAgICAgaWYgKCFwc3NoQm94LnJlYWQodmlldywgb2Zmc2V0 KSkKICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKKyNpZiBIQVZFKEZBSVJQTEFZ U1RSRUFNSU5HX0NFTkNfSU5JVERBVEEpCisgICAgICAgIGlmIChwc3NoQm94LnN5c3RlbUlEKCkg IT0gQ0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpmYWlyUGxheVN5c3RlbUlEKCkpIHsKKyAg ICAgICAgICAgIElTT0ZhaXJQbGF5U3RyZWFtaW5nUHNzaEJveCBmcHNQc3NoOworICAgICAgICAg ICAgb2Zmc2V0IC09IHBzc2hCb3guc2l6ZSgpOworICAgICAgICAgICAgaWYgKCFmcHNQc3NoLnJl YWQodmlldywgb2Zmc2V0KSkKKyAgICAgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0Owor CisgICAgICAgICAgICBGb3VyQ0Mgc2NoZW1lID0gZnBzUHNzaC5pbml0RGF0YUJveCgpLmluZm8o KS5zY2hlbWUoKTsKKyAgICAgICAgICAgIGlmIChDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6 OnZhbGlkRmFpclBsYXlTdHJlYW1pbmdTY2hlbWVzKCkuY29udGFpbnMoc2NoZW1lKSkgeworICAg ICAgICAgICAgICAgIGZvciAoYXV0byByZXF1ZXN0IDogZnBzUHNzaC5pbml0RGF0YUJveCgpLnJl cXVlc3RzKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgYXV0byYga2V5SUQgPSByZXF1ZXN0LnJl cXVlc3RJbmZvKCkua2V5SUQoKTsKKyAgICAgICAgICAgICAgICAgICAga2V5SURzLmFwcGVuZChT aGFyZWRCdWZmZXI6OmNyZWF0ZShrZXlJRC5kYXRhKCksIGtleUlELnNpemUoKSkpOworICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorI2VuZGlmCisKICAgICAgICAg Zm9yIChhdXRvJiB2YWx1ZSA6IHBzc2hCb3gua2V5SURzKCkpCiAgICAgICAgICAgICBrZXlJRHMu YXBwZW5kKFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKFdURk1vdmUodmFsdWUpKSk7CiAgICAgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0NE TUZhaXJQbGF5U3RyZWFtaW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9DRE1GYWlyUGxheVN0cmVhbWluZy5jcHAKaW5kZXggMGI0ZGY1ODg2Y2Y5 ZDZlMTAzZDk4YzI0OWRkYzdhNzdlY2UzZGMzNC4uMWI4NTM1NDgwZTQyMjhiNjE1NWExNTVlZmY4 MjYxNDVlMWMyMzIwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL0NETUZhaXJQbGF5U3RyZWFtaW5nLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcu Y3BwCkBAIC0zMiw3ICszMiw2IEBACiAjaW5jbHVkZSAiQ0RNS2V5U3lzdGVtQ29uZmlndXJhdGlv bi5oIgogI2luY2x1ZGUgIkNETVJlc3RyaWN0aW9ucy5oIgogI2luY2x1ZGUgIkNETVNlc3Npb25U eXBlLmgiCi0jaW5jbHVkZSAiSVNPRmFpclBsYXlTdHJlYW1pbmdQc3NoQm94LmgiCiAjaW5jbHVk ZSAiSVNPU2NoZW1lSW5mb3JtYXRpb25Cb3guaCIKICNpbmNsdWRlICJJU09TY2hlbWVUeXBlQm94 LmgiCiAjaW5jbHVkZSAiSVNPVHJhY2tFbmNyeXB0aW9uQm94LmgiCkBAIC01MSw5ICs1MCw5IEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIGNvbnN0IFZlY3RvcjxGb3VyQ0M+JiB2 YWxpZEZhaXJQbGF5U3RyZWFtaW5nU2NoZW1lcygpCitjb25zdCBWZWN0b3I8Rm91ckNDPiYgQ0RN UHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjp2YWxpZEZhaXJQbGF5U3RyZWFtaW5nU2NoZW1lcygp CiB7Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFZlY3RvcjxGb3VyQ0M+PiB2YWxpZFNjaGVt ZXMgPSBWZWN0b3I8Rm91ckNDPih7IAorICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxWZWN0b3I8 Rm91ckNDPj4gdmFsaWRTY2hlbWVzID0gVmVjdG9yPEZvdXJDQz4oewogICAgICAgICAiY2JjcyIs CiAgICAgICAgICJjYmMyIiwKICAgICAgICAgImNiYzEiLApAQCAtNzUsMTMgKzc0LDcgQEAgY29u c3QgQXRvbWljU3RyaW5nJiBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OnNrZE5hbWUoKQog ICAgIHJldHVybiBza2Q7CiB9CiAKLWNvbnN0IEF0b21pY1N0cmluZyYgQ0RNUHJpdmF0ZUZhaXJQ bGF5U3RyZWFtaW5nOjpjZW5jTmFtZSgpCi17Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEF0 b21pY1N0cmluZz4gY2VuYyB7IE1BS0VfU1RBVElDX1NUUklOR19JTVBMKCJjZW5jIikgfTsKLSAg ICByZXR1cm4gY2VuYzsKLX0KLQotc3RhdGljIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgZmFpclBs YXlTeXN0ZW1JRCgpCitjb25zdCBWZWN0b3I8dWludDhfdD4mIENETVByaXZhdGVGYWlyUGxheVN0 cmVhbWluZzo6ZmFpclBsYXlTeXN0ZW1JRCgpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PFZlY3Rvcjx1aW50OF90Pj4gc3lzdGVtSUQgPSBWZWN0b3I8dWludDhfdD4oeyAweDk0LCAweENF LCAweDg2LCAweEZCLCAweDA3LCAweEZGLCAweDRGLCAweDQzLCAweEFELCAweEI4LCAweDkzLCAw eEQyLCAweEZBLCAweDk2LCAweDhDLCAweEEyIH0pOwogICAgIHJldHVybiBzeXN0ZW1JRDsKQEAg LTE4NCw1NCArMTc3LDYgQEAgT3B0aW9uYWw8VmVjdG9yPFJlZjxTaGFyZWRCdWZmZXI+Pj4gQ0RN UHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpleHRyYWN0S2V5SURzU2kKICAgICByZXR1cm4ga2V5 SURzOwogfQogCi1zdGF0aWMgU2NoZW1lQW5kS2V5UmVzdWx0IGV4dHJhY3RTY2hlbWVBbmRLZXlJ ZEZyb21DZW5jKGNvbnN0IFNoYXJlZEJ1ZmZlciYgYnVmZmVyKQotewotICAgIGF1dG8gYXJyYXlC dWZmZXIgPSBidWZmZXIudHJ5Q3JlYXRlQXJyYXlCdWZmZXIoKTsKLSAgICBpZiAoIWFycmF5QnVm ZmVyKQotICAgICAgICByZXR1cm4geyB9OwotCi0gICAgYXV0byB2aWV3ID0gSlNDOjpEYXRhVmll dzo6Y3JlYXRlKFdURk1vdmUoYXJyYXlCdWZmZXIpLCAwLCBidWZmZXIuc2l6ZSgpKTsKLSAgICB1 bnNpZ25lZCBvZmZzZXQgeyAwIH07Ci0KLSAgICBTY2hlbWVBbmRLZXlSZXN1bHQgcmVzdWx0Owot ICAgIHdoaWxlIChvZmZzZXQgPCBidWZmZXIuc2l6ZSgpKSB7Ci0gICAgICAgIGF1dG8gcGVla1Jl c3VsdCA9IElTT0JveDo6cGVla0JveCh2aWV3LCBvZmZzZXQpOwotICAgICAgICBpZiAoIXBlZWtS ZXN1bHQgfHwgcGVla1Jlc3VsdC52YWx1ZSgpLmZpcnN0ICE9IElTT1Byb3RlY3Rpb25TeXN0ZW1T cGVjaWZpY0hlYWRlckJveDo6Ym94VHlwZU5hbWUoKSkKLSAgICAgICAgICAgIHJldHVybiB7IH07 Ci0KLSAgICAgICAgSVNPUHJvdGVjdGlvblN5c3RlbVNwZWNpZmljSGVhZGVyQm94IHBzc2hCb3g7 Ci0gICAgICAgIGlmICghcHNzaEJveC5yZWFkKHZpZXcsIG9mZnNldCkpCi0gICAgICAgICAgICBy ZXR1cm4geyB9OwotCi0gICAgICAgIGlmIChwc3NoQm94LnN5c3RlbUlEKCkgIT0gZmFpclBsYXlT eXN0ZW1JRCgpKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgSVNPRmFpclBsYXlT dHJlYW1pbmdQc3NoQm94IGZwc1Bzc2g7Ci0gICAgICAgIG9mZnNldCAtPSBwc3NoQm94LnNpemUo KTsKLSAgICAgICAgaWYgKCFmcHNQc3NoLnJlYWQodmlldywgb2Zmc2V0KSkKLSAgICAgICAgICAg IHJldHVybiB7IH07Ci0KLSAgICAgICAgRm91ckNDIHNjaGVtZSA9IGZwc1Bzc2guaW5pdERhdGFC b3goKS5pbmZvKCkuc2NoZW1lKCk7Ci0gICAgICAgIGZvciAoYXV0byByZXF1ZXN0IDogZnBzUHNz aC5pbml0RGF0YUJveCgpLnJlcXVlc3RzKCkpCi0gICAgICAgICAgICByZXN1bHQuYXBwZW5kKHN0 ZDo6bWFrZV9wYWlyKHNjaGVtZSwgcmVxdWVzdC5yZXF1ZXN0SW5mbygpLmtleUlEKCkpKTsKLSAg ICB9Ci0KLSAgICByZXR1cm4gcmVzdWx0OwotfQotCi1PcHRpb25hbDxWZWN0b3I8UmVmPFNoYXJl ZEJ1ZmZlcj4+PiBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OmV4dHJhY3RLZXlJRHNDZW5j KGNvbnN0IFNoYXJlZEJ1ZmZlciYgYnVmZmVyKQotewotICAgIFZlY3RvcjxSZWY8U2hhcmVkQnVm ZmVyPj4ga2V5SURzOwotICAgIGF1dG8gcmVzdWx0cyA9IGV4dHJhY3RTY2hlbWVBbmRLZXlJZEZy b21DZW5jKGJ1ZmZlcik7Ci0KLSAgICBmb3IgKGF1dG8mIHJlc3VsdCA6IHJlc3VsdHMpIHsKLSAg ICAgICAgaWYgKHZhbGlkRmFpclBsYXlTdHJlYW1pbmdTY2hlbWVzKCkuY29udGFpbnMocmVzdWx0 LmZpcnN0KSkKLSAgICAgICAgICAgIGtleUlEcy5hcHBlbmQoU2hhcmVkQnVmZmVyOjpjcmVhdGUo cmVzdWx0LnNlY29uZC5kYXRhKCksIHJlc3VsdC5zZWNvbmQuc2l6ZSgpKSk7Ci0gICAgfQotCi0g ICAgcmV0dXJuIGtleUlEczsKLX0KLQogUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gQ0RNUHJpdmF0ZUZh aXJQbGF5U3RyZWFtaW5nOjpzYW5pdGl6ZVNpbmYoY29uc3QgU2hhcmVkQnVmZmVyJiBidWZmZXIp CiB7CiAgICAgLy8gQ29tbW9uIFNJTkYgQm94IEZvcm1hdApAQCAtMjQ3LDEzICsxOTIsNiBAQCBS ZWZQdHI8U2hhcmVkQnVmZmVyPiBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OnNhbml0aXpl U2tkKGNvbnN0IFNoYXJlZEJ1ZmZlcgogICAgIHJldHVybiBidWZmZXIuY29weSgpOwogfQogCi1S ZWZQdHI8U2hhcmVkQnVmZmVyPiBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OnNhbml0aXpl Q2VuYyhjb25zdCBTaGFyZWRCdWZmZXImIGJ1ZmZlcikKLXsKLSAgICBVTlVTRURfUEFSQU0oYnVm ZmVyKTsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBidWZmZXIuY29weSgpOwot fQotCiBPcHRpb25hbDxWZWN0b3I8UmVmPFNoYXJlZEJ1ZmZlcj4+PiBDRE1Qcml2YXRlRmFpclBs YXlTdHJlYW1pbmc6OmV4dHJhY3RLZXlJRHNTa2QoY29uc3QgU2hhcmVkQnVmZmVyJiBidWZmZXIp CiB7CiAgICAgLy8gSW4gdGhlICdza2QnIHNjaGVtZSwgdGhlIGluaXQgZGF0YSBpcyB0aGUga2V5 IElELgpAQCAtMjY3LDkgKzIwNSw2IEBAIHN0YXRpYyBjb25zdCBIYXNoU2V0PEF0b21pY1N0cmlu Zz4mIHZhbGlkSW5pdERhdGFUeXBlcygpCiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hT ZXQ8QXRvbWljU3RyaW5nPj4gdmFsaWRUeXBlcyA9IEhhc2hTZXQ8QXRvbWljU3RyaW5nPih7CiAg ICAgICAgIENETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6c2luZk5hbWUoKSwKICAgICAgICAg Q0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpza2ROYW1lKCksCi0jaWYgSEFWRShGQUlSUExB WVNUUkVBTUlOR19DRU5DX0lOSVREQVRBKQotICAgICAgICBDRE1Qcml2YXRlRmFpclBsYXlTdHJl YW1pbmc6OmNlbmNOYW1lKCksCi0jZW5kaWYKICAgICB9KTsKICAgICByZXR1cm4gdmFsaWRUeXBl czsKIH0KQEAgLTI4MSw5ICsyMTYsNiBAQCB2b2lkIENETUZhY3Rvcnk6OnBsYXRmb3JtUmVnaXN0 ZXJGYWN0b3JpZXMoVmVjdG9yPENETUZhY3RvcnkqPiYgZmFjdG9yaWVzKQogCiAgICAgSW5pdERh dGFSZWdpc3RyeTo6c2hhcmVkKCkucmVnaXN0ZXJJbml0RGF0YVR5cGUoQ0RNUHJpdmF0ZUZhaXJQ bGF5U3RyZWFtaW5nOjpzaW5mTmFtZSgpLCB7IENETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6 c2FuaXRpemVTaW5mLCBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OmV4dHJhY3RLZXlJRHNT aW5mIH0pOwogICAgIEluaXREYXRhUmVnaXN0cnk6OnNoYXJlZCgpLnJlZ2lzdGVySW5pdERhdGFU eXBlKENETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6c2tkTmFtZSgpLCB7IENETVByaXZhdGVG YWlyUGxheVN0cmVhbWluZzo6c2FuaXRpemVTa2QsIENETVByaXZhdGVGYWlyUGxheVN0cmVhbWlu Zzo6ZXh0cmFjdEtleUlEc1NrZCB9KTsKLSNpZiBIQVZFKEZBSVJQTEFZU1RSRUFNSU5HX0NFTkNf SU5JVERBVEEpCi0gICAgSW5pdERhdGFSZWdpc3RyeTo6c2hhcmVkKCkucmVnaXN0ZXJJbml0RGF0 YVR5cGUoQ0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpjZW5jTmFtZSgpLCB7IENETVByaXZh dGVGYWlyUGxheVN0cmVhbWluZzo6c2FuaXRpemVDZW5jLCBDRE1Qcml2YXRlRmFpclBsYXlTdHJl YW1pbmc6OmV4dHJhY3RLZXlJRHNDZW5jIH0pOwotI2VuZGlmCiB9CiAKIENETUZhY3RvcnlGYWly UGxheVN0cmVhbWluZyYgQ0RNRmFjdG9yeUZhaXJQbGF5U3RyZWFtaW5nOjpzaW5nbGV0b24oKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L0NETUZhaXJQbGF5U3RyZWFtaW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcuaAppbmRleCBjYjVhYTAyM2I4ZWMw NWVjYmI0OGUxZWQxOWM3M2NkYzVkMjRkNzVmLi45MTY3YjZlMThiNDYyMmZiOGE1MmEwNGYyNWU4 NGNiYTVlNmFhNzE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcuaApA QCAtMzIsNiArMzIsOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0cnVjdCBGb3VyQ0M7 CisKIGNsYXNzIENETUZhY3RvcnlGYWlyUGxheVN0cmVhbWluZyBmaW5hbCA6IHB1YmxpYyBDRE1G YWN0b3J5IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgQ0RNRmFjdG9yeUZhaXJQbGF5U3RyZWFtaW5n JiBzaW5nbGV0b24oKTsKQEAgLTc1LDkgKzc3LDggQEAgcHVibGljOgogICAgIHN0YXRpYyBPcHRp b25hbDxWZWN0b3I8UmVmPFNoYXJlZEJ1ZmZlcj4+PiBleHRyYWN0S2V5SURzU2tkKGNvbnN0IFNo YXJlZEJ1ZmZlciYpOwogICAgIHN0YXRpYyBSZWZQdHI8U2hhcmVkQnVmZmVyPiBzYW5pdGl6ZVNr ZChjb25zdCBTaGFyZWRCdWZmZXImKTsKIAotICAgIHN0YXRpYyBjb25zdCBBdG9taWNTdHJpbmcm IGNlbmNOYW1lKCk7Ci0gICAgc3RhdGljIE9wdGlvbmFsPFZlY3RvcjxSZWY8U2hhcmVkQnVmZmVy Pj4+IGV4dHJhY3RLZXlJRHNDZW5jKGNvbnN0IFNoYXJlZEJ1ZmZlciYpOwotICAgIHN0YXRpYyBS ZWZQdHI8U2hhcmVkQnVmZmVyPiBzYW5pdGl6ZUNlbmMoY29uc3QgU2hhcmVkQnVmZmVyJik7Cisg ICAgc3RhdGljIGNvbnN0IFZlY3RvcjxGb3VyQ0M+JiB2YWxpZEZhaXJQbGF5U3RyZWFtaW5nU2No ZW1lcygpOworICAgIHN0YXRpYyBjb25zdCBWZWN0b3I8dWludDhfdD4mIGZhaXJQbGF5U3lzdGVt SUQoKTsKIH07CiAKIH0K 371522 2019-06-06 13:31:52 -0700 2019-06-14 12:27:26 -0700 Patch bug-198612-20190606133151.patch text/plain 9648 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDc5MWY0NzBkNDAyYzQ0 NTA1NTIyODlkNWUzMzUzMGQ1ODY0NWM3My4uYWFjODFlZWViZjQ1YTFhYTcyNTczMDYzOTI5MWY4 ZTY3NjhhYjVkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA2LTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04oMjQ0NDM5 KTogcGxhdGZvcm0vbWFjL21lZGlhL2VuY3J5cHRlZC1tZWRpYS9mcHMtKiB0ZXN0cyBhcmUgY3Jh c2hpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 ODYxMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTEwNzg5Nzg+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHR3byBpbXBsZW1lbnRh dGlvbnMgb2YgYSAnY2VuYycgaW5pdGlhbGlhdGlvbiBkYXRhIGZhY3Rvcnk7IGFuIEFTU0VSVCBm aXJlcyB3aGVuCisgICAgICAgIHRoZSBzZWNvbmQgb25lIGlzIGFkZGVkIHRvIHRoZSByZWdpc3Ry eS4gVW5pZnkgdGhlbS4KKworICAgICAgICAqIE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEvSW5pdERh dGFSZWdpc3RyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpleHRyYWN0S2V5SURzQ2VuYyk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0NETUZhaXJQbGF5U3RyZWFt aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6 dmFsaWRGYWlyUGxheVN0cmVhbWluZ1NjaGVtZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNUHJp dmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpmYWlyUGxheVN5c3RlbUlEKToKKyAgICAgICAgKFdlYkNv cmU6OnZhbGlkSW5pdERhdGFUeXBlcyk6CisgICAgICAgIChXZWJDb3JlOjpDRE1GYWN0b3J5Ojpw bGF0Zm9ybVJlZ2lzdGVyRmFjdG9yaWVzKToKKyAgICAgICAgKFdlYkNvcmU6OnZhbGlkRmFpclBs YXlTdHJlYW1pbmdTY2hlbWVzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNETVByaXZh dGVGYWlyUGxheVN0cmVhbWluZzo6Y2VuY05hbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6ZmFpclBsYXlTeXN0ZW1JRCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpleHRyYWN0 U2NoZW1lQW5kS2V5SWRGcm9tQ2VuYyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDRE1Q cml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OmV4dHJhY3RLZXlJRHNDZW5jKTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkNETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6c2FuaXRpemVDZW5j KTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RN RmFpclBsYXlTdHJlYW1pbmcuaDoKKwogMjAxOS0wNi0wNSAgQW50b2luZSBRdWludCAgPGdyYW91 dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFtQb2ludGVyIEV2ZW50c10gRmlyZSBwb2ludGVyb3V0 IGFuZCBwb2ludGVybGVhdmUgZXZlbnRzIGFmdGVyIGZpcmluZyBwb2ludGVyY2FuY2VsCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0luaXREYXRhUmVn aXN0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9Jbml0RGF0 YVJlZ2lzdHJ5LmNwcAppbmRleCA5ZjhiNWUwNTUxYjY1ODcwZGE1OTA3OTNiMjVmOTkxODQyYTM0 NmNiLi4wNjI4ZjlmYThmODhlNDNhN2JiNmYzOTBjYTg3OTgxMDMxNGM0YzJkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0luaXREYXRhUmVnaXN0cnku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvSW5pdERhdGFS ZWdpc3RyeS5jcHAKQEAgLTI4LDYgKzI4LDggQEAKIAogI2lmIEVOQUJMRShFTkNSWVBURURfTUVE SUEpCiAKKyNpbmNsdWRlICJDRE1GYWlyUGxheVN0cmVhbWluZy5oIgorI2luY2x1ZGUgIklTT0Zh aXJQbGF5U3RyZWFtaW5nUHNzaEJveC5oIgogI2luY2x1ZGUgIklTT1Byb3RlY3Rpb25TeXN0ZW1T cGVjaWZpY0hlYWRlckJveC5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0RhdGFWaWV3Lmg+ CiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKQEAgLTEyOSw2ICsxMzEsMjMgQEAgc3RhdGlj IE9wdGlvbmFsPFZlY3RvcjxSZWY8U2hhcmVkQnVmZmVyPj4+IGV4dHJhY3RLZXlJRHNDZW5jKGNv bnN0IFNoYXJlZEJ1ZmZlciYKICAgICAgICAgaWYgKCFwc3NoQm94LnJlYWQodmlldywgb2Zmc2V0 KSkKICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKKyNpZiBIQVZFKEZBSVJQTEFZ U1RSRUFNSU5HX0NFTkNfSU5JVERBVEEpCisgICAgICAgIGlmIChwc3NoQm94LnN5c3RlbUlEKCkg PT0gQ0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpmYWlyUGxheVN5c3RlbUlEKCkpIHsKKyAg ICAgICAgICAgIElTT0ZhaXJQbGF5U3RyZWFtaW5nUHNzaEJveCBmcHNQc3NoOworICAgICAgICAg ICAgb2Zmc2V0IC09IHBzc2hCb3guc2l6ZSgpOworICAgICAgICAgICAgaWYgKCFmcHNQc3NoLnJl YWQodmlldywgb2Zmc2V0KSkKKyAgICAgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0Owor CisgICAgICAgICAgICBGb3VyQ0Mgc2NoZW1lID0gZnBzUHNzaC5pbml0RGF0YUJveCgpLmluZm8o KS5zY2hlbWUoKTsKKyAgICAgICAgICAgIGlmIChDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6 OnZhbGlkRmFpclBsYXlTdHJlYW1pbmdTY2hlbWVzKCkuY29udGFpbnMoc2NoZW1lKSkgeworICAg ICAgICAgICAgICAgIGZvciAoYXV0byByZXF1ZXN0IDogZnBzUHNzaC5pbml0RGF0YUJveCgpLnJl cXVlc3RzKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgYXV0byYga2V5SUQgPSByZXF1ZXN0LnJl cXVlc3RJbmZvKCkua2V5SUQoKTsKKyAgICAgICAgICAgICAgICAgICAga2V5SURzLmFwcGVuZChT aGFyZWRCdWZmZXI6OmNyZWF0ZShrZXlJRC5kYXRhKCksIGtleUlELnNpemUoKSkpOworICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorI2VuZGlmCisKICAgICAgICAg Zm9yIChhdXRvJiB2YWx1ZSA6IHBzc2hCb3gua2V5SURzKCkpCiAgICAgICAgICAgICBrZXlJRHMu YXBwZW5kKFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKFdURk1vdmUodmFsdWUpKSk7CiAgICAgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0NE TUZhaXJQbGF5U3RyZWFtaW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9DRE1GYWlyUGxheVN0cmVhbWluZy5jcHAKaW5kZXggMGI0ZGY1ODg2Y2Y5 ZDZlMTAzZDk4YzI0OWRkYzdhNzdlY2UzZGMzNC4uMWI4NTM1NDgwZTQyMjhiNjE1NWExNTVlZmY4 MjYxNDVlMWMyMzIwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL0NETUZhaXJQbGF5U3RyZWFtaW5nLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcu Y3BwCkBAIC0zMiw3ICszMiw2IEBACiAjaW5jbHVkZSAiQ0RNS2V5U3lzdGVtQ29uZmlndXJhdGlv bi5oIgogI2luY2x1ZGUgIkNETVJlc3RyaWN0aW9ucy5oIgogI2luY2x1ZGUgIkNETVNlc3Npb25U eXBlLmgiCi0jaW5jbHVkZSAiSVNPRmFpclBsYXlTdHJlYW1pbmdQc3NoQm94LmgiCiAjaW5jbHVk ZSAiSVNPU2NoZW1lSW5mb3JtYXRpb25Cb3guaCIKICNpbmNsdWRlICJJU09TY2hlbWVUeXBlQm94 LmgiCiAjaW5jbHVkZSAiSVNPVHJhY2tFbmNyeXB0aW9uQm94LmgiCkBAIC01MSw5ICs1MCw5IEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIGNvbnN0IFZlY3RvcjxGb3VyQ0M+JiB2 YWxpZEZhaXJQbGF5U3RyZWFtaW5nU2NoZW1lcygpCitjb25zdCBWZWN0b3I8Rm91ckNDPiYgQ0RN UHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjp2YWxpZEZhaXJQbGF5U3RyZWFtaW5nU2NoZW1lcygp CiB7Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFZlY3RvcjxGb3VyQ0M+PiB2YWxpZFNjaGVt ZXMgPSBWZWN0b3I8Rm91ckNDPih7IAorICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxWZWN0b3I8 Rm91ckNDPj4gdmFsaWRTY2hlbWVzID0gVmVjdG9yPEZvdXJDQz4oewogICAgICAgICAiY2JjcyIs CiAgICAgICAgICJjYmMyIiwKICAgICAgICAgImNiYzEiLApAQCAtNzUsMTMgKzc0LDcgQEAgY29u c3QgQXRvbWljU3RyaW5nJiBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OnNrZE5hbWUoKQog ICAgIHJldHVybiBza2Q7CiB9CiAKLWNvbnN0IEF0b21pY1N0cmluZyYgQ0RNUHJpdmF0ZUZhaXJQ bGF5U3RyZWFtaW5nOjpjZW5jTmFtZSgpCi17Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEF0 b21pY1N0cmluZz4gY2VuYyB7IE1BS0VfU1RBVElDX1NUUklOR19JTVBMKCJjZW5jIikgfTsKLSAg ICByZXR1cm4gY2VuYzsKLX0KLQotc3RhdGljIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgZmFpclBs YXlTeXN0ZW1JRCgpCitjb25zdCBWZWN0b3I8dWludDhfdD4mIENETVByaXZhdGVGYWlyUGxheVN0 cmVhbWluZzo6ZmFpclBsYXlTeXN0ZW1JRCgpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PFZlY3Rvcjx1aW50OF90Pj4gc3lzdGVtSUQgPSBWZWN0b3I8dWludDhfdD4oeyAweDk0LCAweENF LCAweDg2LCAweEZCLCAweDA3LCAweEZGLCAweDRGLCAweDQzLCAweEFELCAweEI4LCAweDkzLCAw eEQyLCAweEZBLCAweDk2LCAweDhDLCAweEEyIH0pOwogICAgIHJldHVybiBzeXN0ZW1JRDsKQEAg LTE4NCw1NCArMTc3LDYgQEAgT3B0aW9uYWw8VmVjdG9yPFJlZjxTaGFyZWRCdWZmZXI+Pj4gQ0RN UHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpleHRyYWN0S2V5SURzU2kKICAgICByZXR1cm4ga2V5 SURzOwogfQogCi1zdGF0aWMgU2NoZW1lQW5kS2V5UmVzdWx0IGV4dHJhY3RTY2hlbWVBbmRLZXlJ ZEZyb21DZW5jKGNvbnN0IFNoYXJlZEJ1ZmZlciYgYnVmZmVyKQotewotICAgIGF1dG8gYXJyYXlC dWZmZXIgPSBidWZmZXIudHJ5Q3JlYXRlQXJyYXlCdWZmZXIoKTsKLSAgICBpZiAoIWFycmF5QnVm ZmVyKQotICAgICAgICByZXR1cm4geyB9OwotCi0gICAgYXV0byB2aWV3ID0gSlNDOjpEYXRhVmll dzo6Y3JlYXRlKFdURk1vdmUoYXJyYXlCdWZmZXIpLCAwLCBidWZmZXIuc2l6ZSgpKTsKLSAgICB1 bnNpZ25lZCBvZmZzZXQgeyAwIH07Ci0KLSAgICBTY2hlbWVBbmRLZXlSZXN1bHQgcmVzdWx0Owot ICAgIHdoaWxlIChvZmZzZXQgPCBidWZmZXIuc2l6ZSgpKSB7Ci0gICAgICAgIGF1dG8gcGVla1Jl c3VsdCA9IElTT0JveDo6cGVla0JveCh2aWV3LCBvZmZzZXQpOwotICAgICAgICBpZiAoIXBlZWtS ZXN1bHQgfHwgcGVla1Jlc3VsdC52YWx1ZSgpLmZpcnN0ICE9IElTT1Byb3RlY3Rpb25TeXN0ZW1T cGVjaWZpY0hlYWRlckJveDo6Ym94VHlwZU5hbWUoKSkKLSAgICAgICAgICAgIHJldHVybiB7IH07 Ci0KLSAgICAgICAgSVNPUHJvdGVjdGlvblN5c3RlbVNwZWNpZmljSGVhZGVyQm94IHBzc2hCb3g7 Ci0gICAgICAgIGlmICghcHNzaEJveC5yZWFkKHZpZXcsIG9mZnNldCkpCi0gICAgICAgICAgICBy ZXR1cm4geyB9OwotCi0gICAgICAgIGlmIChwc3NoQm94LnN5c3RlbUlEKCkgIT0gZmFpclBsYXlT eXN0ZW1JRCgpKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgSVNPRmFpclBsYXlT dHJlYW1pbmdQc3NoQm94IGZwc1Bzc2g7Ci0gICAgICAgIG9mZnNldCAtPSBwc3NoQm94LnNpemUo KTsKLSAgICAgICAgaWYgKCFmcHNQc3NoLnJlYWQodmlldywgb2Zmc2V0KSkKLSAgICAgICAgICAg IHJldHVybiB7IH07Ci0KLSAgICAgICAgRm91ckNDIHNjaGVtZSA9IGZwc1Bzc2guaW5pdERhdGFC b3goKS5pbmZvKCkuc2NoZW1lKCk7Ci0gICAgICAgIGZvciAoYXV0byByZXF1ZXN0IDogZnBzUHNz aC5pbml0RGF0YUJveCgpLnJlcXVlc3RzKCkpCi0gICAgICAgICAgICByZXN1bHQuYXBwZW5kKHN0 ZDo6bWFrZV9wYWlyKHNjaGVtZSwgcmVxdWVzdC5yZXF1ZXN0SW5mbygpLmtleUlEKCkpKTsKLSAg ICB9Ci0KLSAgICByZXR1cm4gcmVzdWx0OwotfQotCi1PcHRpb25hbDxWZWN0b3I8UmVmPFNoYXJl ZEJ1ZmZlcj4+PiBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OmV4dHJhY3RLZXlJRHNDZW5j KGNvbnN0IFNoYXJlZEJ1ZmZlciYgYnVmZmVyKQotewotICAgIFZlY3RvcjxSZWY8U2hhcmVkQnVm ZmVyPj4ga2V5SURzOwotICAgIGF1dG8gcmVzdWx0cyA9IGV4dHJhY3RTY2hlbWVBbmRLZXlJZEZy b21DZW5jKGJ1ZmZlcik7Ci0KLSAgICBmb3IgKGF1dG8mIHJlc3VsdCA6IHJlc3VsdHMpIHsKLSAg ICAgICAgaWYgKHZhbGlkRmFpclBsYXlTdHJlYW1pbmdTY2hlbWVzKCkuY29udGFpbnMocmVzdWx0 LmZpcnN0KSkKLSAgICAgICAgICAgIGtleUlEcy5hcHBlbmQoU2hhcmVkQnVmZmVyOjpjcmVhdGUo cmVzdWx0LnNlY29uZC5kYXRhKCksIHJlc3VsdC5zZWNvbmQuc2l6ZSgpKSk7Ci0gICAgfQotCi0g ICAgcmV0dXJuIGtleUlEczsKLX0KLQogUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gQ0RNUHJpdmF0ZUZh aXJQbGF5U3RyZWFtaW5nOjpzYW5pdGl6ZVNpbmYoY29uc3QgU2hhcmVkQnVmZmVyJiBidWZmZXIp CiB7CiAgICAgLy8gQ29tbW9uIFNJTkYgQm94IEZvcm1hdApAQCAtMjQ3LDEzICsxOTIsNiBAQCBS ZWZQdHI8U2hhcmVkQnVmZmVyPiBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OnNhbml0aXpl U2tkKGNvbnN0IFNoYXJlZEJ1ZmZlcgogICAgIHJldHVybiBidWZmZXIuY29weSgpOwogfQogCi1S ZWZQdHI8U2hhcmVkQnVmZmVyPiBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OnNhbml0aXpl Q2VuYyhjb25zdCBTaGFyZWRCdWZmZXImIGJ1ZmZlcikKLXsKLSAgICBVTlVTRURfUEFSQU0oYnVm ZmVyKTsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBidWZmZXIuY29weSgpOwot fQotCiBPcHRpb25hbDxWZWN0b3I8UmVmPFNoYXJlZEJ1ZmZlcj4+PiBDRE1Qcml2YXRlRmFpclBs YXlTdHJlYW1pbmc6OmV4dHJhY3RLZXlJRHNTa2QoY29uc3QgU2hhcmVkQnVmZmVyJiBidWZmZXIp CiB7CiAgICAgLy8gSW4gdGhlICdza2QnIHNjaGVtZSwgdGhlIGluaXQgZGF0YSBpcyB0aGUga2V5 IElELgpAQCAtMjY3LDkgKzIwNSw2IEBAIHN0YXRpYyBjb25zdCBIYXNoU2V0PEF0b21pY1N0cmlu Zz4mIHZhbGlkSW5pdERhdGFUeXBlcygpCiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hT ZXQ8QXRvbWljU3RyaW5nPj4gdmFsaWRUeXBlcyA9IEhhc2hTZXQ8QXRvbWljU3RyaW5nPih7CiAg ICAgICAgIENETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6c2luZk5hbWUoKSwKICAgICAgICAg Q0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpza2ROYW1lKCksCi0jaWYgSEFWRShGQUlSUExB WVNUUkVBTUlOR19DRU5DX0lOSVREQVRBKQotICAgICAgICBDRE1Qcml2YXRlRmFpclBsYXlTdHJl YW1pbmc6OmNlbmNOYW1lKCksCi0jZW5kaWYKICAgICB9KTsKICAgICByZXR1cm4gdmFsaWRUeXBl czsKIH0KQEAgLTI4MSw5ICsyMTYsNiBAQCB2b2lkIENETUZhY3Rvcnk6OnBsYXRmb3JtUmVnaXN0 ZXJGYWN0b3JpZXMoVmVjdG9yPENETUZhY3RvcnkqPiYgZmFjdG9yaWVzKQogCiAgICAgSW5pdERh dGFSZWdpc3RyeTo6c2hhcmVkKCkucmVnaXN0ZXJJbml0RGF0YVR5cGUoQ0RNUHJpdmF0ZUZhaXJQ bGF5U3RyZWFtaW5nOjpzaW5mTmFtZSgpLCB7IENETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6 c2FuaXRpemVTaW5mLCBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OmV4dHJhY3RLZXlJRHNT aW5mIH0pOwogICAgIEluaXREYXRhUmVnaXN0cnk6OnNoYXJlZCgpLnJlZ2lzdGVySW5pdERhdGFU eXBlKENETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6c2tkTmFtZSgpLCB7IENETVByaXZhdGVG YWlyUGxheVN0cmVhbWluZzo6c2FuaXRpemVTa2QsIENETVByaXZhdGVGYWlyUGxheVN0cmVhbWlu Zzo6ZXh0cmFjdEtleUlEc1NrZCB9KTsKLSNpZiBIQVZFKEZBSVJQTEFZU1RSRUFNSU5HX0NFTkNf SU5JVERBVEEpCi0gICAgSW5pdERhdGFSZWdpc3RyeTo6c2hhcmVkKCkucmVnaXN0ZXJJbml0RGF0 YVR5cGUoQ0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpjZW5jTmFtZSgpLCB7IENETVByaXZh dGVGYWlyUGxheVN0cmVhbWluZzo6c2FuaXRpemVDZW5jLCBDRE1Qcml2YXRlRmFpclBsYXlTdHJl YW1pbmc6OmV4dHJhY3RLZXlJRHNDZW5jIH0pOwotI2VuZGlmCiB9CiAKIENETUZhY3RvcnlGYWly UGxheVN0cmVhbWluZyYgQ0RNRmFjdG9yeUZhaXJQbGF5U3RyZWFtaW5nOjpzaW5nbGV0b24oKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L0NETUZhaXJQbGF5U3RyZWFtaW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcuaAppbmRleCBjYjVhYTAyM2I4ZWMw NWVjYmI0OGUxZWQxOWM3M2NkYzVkMjRkNzVmLi45MTY3YjZlMThiNDYyMmZiOGE1MmEwNGYyNWU4 NGNiYTVlNmFhNzE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcuaApA QCAtMzIsNiArMzIsOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0cnVjdCBGb3VyQ0M7 CisKIGNsYXNzIENETUZhY3RvcnlGYWlyUGxheVN0cmVhbWluZyBmaW5hbCA6IHB1YmxpYyBDRE1G YWN0b3J5IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgQ0RNRmFjdG9yeUZhaXJQbGF5U3RyZWFtaW5n JiBzaW5nbGV0b24oKTsKQEAgLTc1LDkgKzc3LDggQEAgcHVibGljOgogICAgIHN0YXRpYyBPcHRp b25hbDxWZWN0b3I8UmVmPFNoYXJlZEJ1ZmZlcj4+PiBleHRyYWN0S2V5SURzU2tkKGNvbnN0IFNo YXJlZEJ1ZmZlciYpOwogICAgIHN0YXRpYyBSZWZQdHI8U2hhcmVkQnVmZmVyPiBzYW5pdGl6ZVNr ZChjb25zdCBTaGFyZWRCdWZmZXImKTsKIAotICAgIHN0YXRpYyBjb25zdCBBdG9taWNTdHJpbmcm IGNlbmNOYW1lKCk7Ci0gICAgc3RhdGljIE9wdGlvbmFsPFZlY3RvcjxSZWY8U2hhcmVkQnVmZmVy Pj4+IGV4dHJhY3RLZXlJRHNDZW5jKGNvbnN0IFNoYXJlZEJ1ZmZlciYpOwotICAgIHN0YXRpYyBS ZWZQdHI8U2hhcmVkQnVmZmVyPiBzYW5pdGl6ZUNlbmMoY29uc3QgU2hhcmVkQnVmZmVyJik7Cisg ICAgc3RhdGljIGNvbnN0IFZlY3RvcjxGb3VyQ0M+JiB2YWxpZEZhaXJQbGF5U3RyZWFtaW5nU2No ZW1lcygpOworICAgIHN0YXRpYyBjb25zdCBWZWN0b3I8dWludDhfdD4mIGZhaXJQbGF5U3lzdGVt SUQoKTsKIH07CiAKIH0K 372132 2019-06-14 12:27:27 -0700 2019-06-14 13:10:39 -0700 Patch for landing bug-198612-20190614122726.patch text/plain 9606 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDFiZjhjYjdhZjM0NDZh MWIyMzQxZmQ5ZjllNzFkMmEzOTQ1Y2ZjMS4uY2JhNTM5NjU2ZjlhMDZkOTU3YWZiYjFmMjIyYzZh MDhkMWI0ZmYwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA2LTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04oMjQ0NDM5 KTogcGxhdGZvcm0vbWFjL21lZGlhL2VuY3J5cHRlZC1tZWRpYS9mcHMtKiB0ZXN0cyBhcmUgY3Jh c2hpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 ODYxMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTEwNzg5Nzg+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIFRoZXJlIGFyZSB0d28gaW1wbGVtZW50YXRp b25zIG9mIGEgJ2NlbmMnIGluaXRpYWxpYXRpb24gZGF0YSBmYWN0b3J5OyBhbiBBU1NFUlQgZmly ZXMgd2hlbgorICAgICAgICB0aGUgc2Vjb25kIG9uZSBpcyBhZGRlZCB0byB0aGUgcmVnaXN0cnku IFVuaWZ5IHRoZW0uCisKKyAgICAgICAgKiBNb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0luaXREYXRh UmVnaXN0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZXh0cmFjdEtleUlEc0NlbmMpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9DRE1GYWlyUGxheVN0cmVhbWlu Zy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OnZh bGlkRmFpclBsYXlTdHJlYW1pbmdTY2hlbWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNETVByaXZh dGVGYWlyUGxheVN0cmVhbWluZzo6ZmFpclBsYXlTeXN0ZW1JRCk6CisgICAgICAgIChXZWJDb3Jl Ojp2YWxpZEluaXREYXRhVHlwZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNRmFjdG9yeTo6cGxh dGZvcm1SZWdpc3RlckZhY3Rvcmllcyk6CisgICAgICAgIChXZWJDb3JlOjp2YWxpZEZhaXJQbGF5 U3RyZWFtaW5nU2NoZW1lcyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDRE1Qcml2YXRl RmFpclBsYXlTdHJlYW1pbmc6OmNlbmNOYW1lKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OmZhaXJQbGF5U3lzdGVtSUQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6ZXh0cmFjdFNj aGVtZUFuZEtleUlkRnJvbUNlbmMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q0RNUHJp dmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpleHRyYWN0S2V5SURzQ2VuYyk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OnNhbml0aXplQ2VuYyk6 IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0NETUZh aXJQbGF5U3RyZWFtaW5nLmg6CisKIDIwMTktMDYtMTQgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBh cHBsZS5jb20+CiAKICAgICAgICAgW1dITFNMXSBJbXBsZW1lbnQgb3V0LW9mLWJvdW5kcyBhbmQg bnVsbHB0ciBiZWhhdmlvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNy eXB0ZWRtZWRpYS9Jbml0RGF0YVJlZ2lzdHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv ZW5jcnlwdGVkbWVkaWEvSW5pdERhdGFSZWdpc3RyeS5jcHAKaW5kZXggOWY4YjVlMDU1MWI2NTg3 MGRhNTkwNzkzYjI1Zjk5MTg0MmEzNDZjYi4uM2IyZjgxZDZkMzc5NmRlYTYzZmUxZmNhYjdjMzAy Njk3YjlhMTg3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRt ZWRpYS9Jbml0RGF0YVJlZ2lzdHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2Vu Y3J5cHRlZG1lZGlhL0luaXREYXRhUmVnaXN0cnkuY3BwCkBAIC0zNiw2ICszNiwxMSBAQAogI2lu Y2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0Jhc2U2NC5o PgogCisjaWYgSEFWRShGQUlSUExBWVNUUkVBTUlOR19DRU5DX0lOSVREQVRBKQorI2luY2x1ZGUg IkNETUZhaXJQbGF5U3RyZWFtaW5nLmgiCisjaW5jbHVkZSAiSVNPRmFpclBsYXlTdHJlYW1pbmdQ c3NoQm94LmgiCisjZW5kaWYKKwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTEyOSw2ICsx MzQsMjMgQEAgc3RhdGljIE9wdGlvbmFsPFZlY3RvcjxSZWY8U2hhcmVkQnVmZmVyPj4+IGV4dHJh Y3RLZXlJRHNDZW5jKGNvbnN0IFNoYXJlZEJ1ZmZlciYKICAgICAgICAgaWYgKCFwc3NoQm94LnJl YWQodmlldywgb2Zmc2V0KSkKICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKKyNp ZiBIQVZFKEZBSVJQTEFZU1RSRUFNSU5HX0NFTkNfSU5JVERBVEEpCisgICAgICAgIGlmIChwc3No Qm94LnN5c3RlbUlEKCkgPT0gQ0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpmYWlyUGxheVN5 c3RlbUlEKCkpIHsKKyAgICAgICAgICAgIElTT0ZhaXJQbGF5U3RyZWFtaW5nUHNzaEJveCBmcHNQ c3NoOworICAgICAgICAgICAgb2Zmc2V0IC09IHBzc2hCb3guc2l6ZSgpOworICAgICAgICAgICAg aWYgKCFmcHNQc3NoLnJlYWQodmlldywgb2Zmc2V0KSkKKyAgICAgICAgICAgICAgICByZXR1cm4g V1RGOjpudWxsb3B0OworCisgICAgICAgICAgICBGb3VyQ0Mgc2NoZW1lID0gZnBzUHNzaC5pbml0 RGF0YUJveCgpLmluZm8oKS5zY2hlbWUoKTsKKyAgICAgICAgICAgIGlmIChDRE1Qcml2YXRlRmFp clBsYXlTdHJlYW1pbmc6OnZhbGlkRmFpclBsYXlTdHJlYW1pbmdTY2hlbWVzKCkuY29udGFpbnMo c2NoZW1lKSkgeworICAgICAgICAgICAgICAgIGZvciAoYXV0byByZXF1ZXN0IDogZnBzUHNzaC5p bml0RGF0YUJveCgpLnJlcXVlc3RzKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgYXV0byYga2V5 SUQgPSByZXF1ZXN0LnJlcXVlc3RJbmZvKCkua2V5SUQoKTsKKyAgICAgICAgICAgICAgICAgICAg a2V5SURzLmFwcGVuZChTaGFyZWRCdWZmZXI6OmNyZWF0ZShrZXlJRC5kYXRhKCksIGtleUlELnNp emUoKSkpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorI2Vu ZGlmCisKICAgICAgICAgZm9yIChhdXRvJiB2YWx1ZSA6IHBzc2hCb3gua2V5SURzKCkpCiAgICAg ICAgICAgICBrZXlJRHMuYXBwZW5kKFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKFdURk1vdmUodmFsdWUp KSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YXZmb3VuZGF0aW9uL0NETUZhaXJQbGF5U3RyZWFtaW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9DRE1GYWlyUGxheVN0cmVhbWluZy5jcHAKaW5k ZXggMGI0ZGY1ODg2Y2Y5ZDZlMTAzZDk4YzI0OWRkYzdhNzdlY2UzZGMzNC4uMWI4NTM1NDgwZTQy MjhiNjE1NWExNTVlZmY4MjYxNDVlMWMyMzIwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0NETUZhaXJQbGF5U3RyZWFtaW5nLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RNRmFp clBsYXlTdHJlYW1pbmcuY3BwCkBAIC0zMiw3ICszMiw2IEBACiAjaW5jbHVkZSAiQ0RNS2V5U3lz dGVtQ29uZmlndXJhdGlvbi5oIgogI2luY2x1ZGUgIkNETVJlc3RyaWN0aW9ucy5oIgogI2luY2x1 ZGUgIkNETVNlc3Npb25UeXBlLmgiCi0jaW5jbHVkZSAiSVNPRmFpclBsYXlTdHJlYW1pbmdQc3No Qm94LmgiCiAjaW5jbHVkZSAiSVNPU2NoZW1lSW5mb3JtYXRpb25Cb3guaCIKICNpbmNsdWRlICJJ U09TY2hlbWVUeXBlQm94LmgiCiAjaW5jbHVkZSAiSVNPVHJhY2tFbmNyeXB0aW9uQm94LmgiCkBA IC01MSw5ICs1MCw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIGNvbnN0IFZl Y3RvcjxGb3VyQ0M+JiB2YWxpZEZhaXJQbGF5U3RyZWFtaW5nU2NoZW1lcygpCitjb25zdCBWZWN0 b3I8Rm91ckNDPiYgQ0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjp2YWxpZEZhaXJQbGF5U3Ry ZWFtaW5nU2NoZW1lcygpCiB7Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFZlY3RvcjxGb3Vy Q0M+PiB2YWxpZFNjaGVtZXMgPSBWZWN0b3I8Rm91ckNDPih7IAorICAgIHN0YXRpYyBOZXZlckRl c3Ryb3llZDxWZWN0b3I8Rm91ckNDPj4gdmFsaWRTY2hlbWVzID0gVmVjdG9yPEZvdXJDQz4oewog ICAgICAgICAiY2JjcyIsCiAgICAgICAgICJjYmMyIiwKICAgICAgICAgImNiYzEiLApAQCAtNzUs MTMgKzc0LDcgQEAgY29uc3QgQXRvbWljU3RyaW5nJiBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1p bmc6OnNrZE5hbWUoKQogICAgIHJldHVybiBza2Q7CiB9CiAKLWNvbnN0IEF0b21pY1N0cmluZyYg Q0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpjZW5jTmFtZSgpCi17Ci0gICAgc3RhdGljIE5l dmVyRGVzdHJveWVkPEF0b21pY1N0cmluZz4gY2VuYyB7IE1BS0VfU1RBVElDX1NUUklOR19JTVBM KCJjZW5jIikgfTsKLSAgICByZXR1cm4gY2VuYzsKLX0KLQotc3RhdGljIGNvbnN0IFZlY3Rvcjx1 aW50OF90PiYgZmFpclBsYXlTeXN0ZW1JRCgpCitjb25zdCBWZWN0b3I8dWludDhfdD4mIENETVBy aXZhdGVGYWlyUGxheVN0cmVhbWluZzo6ZmFpclBsYXlTeXN0ZW1JRCgpCiB7CiAgICAgc3RhdGlj IE5ldmVyRGVzdHJveWVkPFZlY3Rvcjx1aW50OF90Pj4gc3lzdGVtSUQgPSBWZWN0b3I8dWludDhf dD4oeyAweDk0LCAweENFLCAweDg2LCAweEZCLCAweDA3LCAweEZGLCAweDRGLCAweDQzLCAweEFE LCAweEI4LCAweDkzLCAweEQyLCAweEZBLCAweDk2LCAweDhDLCAweEEyIH0pOwogICAgIHJldHVy biBzeXN0ZW1JRDsKQEAgLTE4NCw1NCArMTc3LDYgQEAgT3B0aW9uYWw8VmVjdG9yPFJlZjxTaGFy ZWRCdWZmZXI+Pj4gQ0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpleHRyYWN0S2V5SURzU2kK ICAgICByZXR1cm4ga2V5SURzOwogfQogCi1zdGF0aWMgU2NoZW1lQW5kS2V5UmVzdWx0IGV4dHJh Y3RTY2hlbWVBbmRLZXlJZEZyb21DZW5jKGNvbnN0IFNoYXJlZEJ1ZmZlciYgYnVmZmVyKQotewot ICAgIGF1dG8gYXJyYXlCdWZmZXIgPSBidWZmZXIudHJ5Q3JlYXRlQXJyYXlCdWZmZXIoKTsKLSAg ICBpZiAoIWFycmF5QnVmZmVyKQotICAgICAgICByZXR1cm4geyB9OwotCi0gICAgYXV0byB2aWV3 ID0gSlNDOjpEYXRhVmlldzo6Y3JlYXRlKFdURk1vdmUoYXJyYXlCdWZmZXIpLCAwLCBidWZmZXIu c2l6ZSgpKTsKLSAgICB1bnNpZ25lZCBvZmZzZXQgeyAwIH07Ci0KLSAgICBTY2hlbWVBbmRLZXlS ZXN1bHQgcmVzdWx0OwotICAgIHdoaWxlIChvZmZzZXQgPCBidWZmZXIuc2l6ZSgpKSB7Ci0gICAg ICAgIGF1dG8gcGVla1Jlc3VsdCA9IElTT0JveDo6cGVla0JveCh2aWV3LCBvZmZzZXQpOwotICAg ICAgICBpZiAoIXBlZWtSZXN1bHQgfHwgcGVla1Jlc3VsdC52YWx1ZSgpLmZpcnN0ICE9IElTT1By b3RlY3Rpb25TeXN0ZW1TcGVjaWZpY0hlYWRlckJveDo6Ym94VHlwZU5hbWUoKSkKLSAgICAgICAg ICAgIHJldHVybiB7IH07Ci0KLSAgICAgICAgSVNPUHJvdGVjdGlvblN5c3RlbVNwZWNpZmljSGVh ZGVyQm94IHBzc2hCb3g7Ci0gICAgICAgIGlmICghcHNzaEJveC5yZWFkKHZpZXcsIG9mZnNldCkp Ci0gICAgICAgICAgICByZXR1cm4geyB9OwotCi0gICAgICAgIGlmIChwc3NoQm94LnN5c3RlbUlE KCkgIT0gZmFpclBsYXlTeXN0ZW1JRCgpKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAg ICAgSVNPRmFpclBsYXlTdHJlYW1pbmdQc3NoQm94IGZwc1Bzc2g7Ci0gICAgICAgIG9mZnNldCAt PSBwc3NoQm94LnNpemUoKTsKLSAgICAgICAgaWYgKCFmcHNQc3NoLnJlYWQodmlldywgb2Zmc2V0 KSkKLSAgICAgICAgICAgIHJldHVybiB7IH07Ci0KLSAgICAgICAgRm91ckNDIHNjaGVtZSA9IGZw c1Bzc2guaW5pdERhdGFCb3goKS5pbmZvKCkuc2NoZW1lKCk7Ci0gICAgICAgIGZvciAoYXV0byBy ZXF1ZXN0IDogZnBzUHNzaC5pbml0RGF0YUJveCgpLnJlcXVlc3RzKCkpCi0gICAgICAgICAgICBy ZXN1bHQuYXBwZW5kKHN0ZDo6bWFrZV9wYWlyKHNjaGVtZSwgcmVxdWVzdC5yZXF1ZXN0SW5mbygp LmtleUlEKCkpKTsKLSAgICB9Ci0KLSAgICByZXR1cm4gcmVzdWx0OwotfQotCi1PcHRpb25hbDxW ZWN0b3I8UmVmPFNoYXJlZEJ1ZmZlcj4+PiBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OmV4 dHJhY3RLZXlJRHNDZW5jKGNvbnN0IFNoYXJlZEJ1ZmZlciYgYnVmZmVyKQotewotICAgIFZlY3Rv cjxSZWY8U2hhcmVkQnVmZmVyPj4ga2V5SURzOwotICAgIGF1dG8gcmVzdWx0cyA9IGV4dHJhY3RT Y2hlbWVBbmRLZXlJZEZyb21DZW5jKGJ1ZmZlcik7Ci0KLSAgICBmb3IgKGF1dG8mIHJlc3VsdCA6 IHJlc3VsdHMpIHsKLSAgICAgICAgaWYgKHZhbGlkRmFpclBsYXlTdHJlYW1pbmdTY2hlbWVzKCku Y29udGFpbnMocmVzdWx0LmZpcnN0KSkKLSAgICAgICAgICAgIGtleUlEcy5hcHBlbmQoU2hhcmVk QnVmZmVyOjpjcmVhdGUocmVzdWx0LnNlY29uZC5kYXRhKCksIHJlc3VsdC5zZWNvbmQuc2l6ZSgp KSk7Ci0gICAgfQotCi0gICAgcmV0dXJuIGtleUlEczsKLX0KLQogUmVmUHRyPFNoYXJlZEJ1ZmZl cj4gQ0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpzYW5pdGl6ZVNpbmYoY29uc3QgU2hhcmVk QnVmZmVyJiBidWZmZXIpCiB7CiAgICAgLy8gQ29tbW9uIFNJTkYgQm94IEZvcm1hdApAQCAtMjQ3 LDEzICsxOTIsNiBAQCBSZWZQdHI8U2hhcmVkQnVmZmVyPiBDRE1Qcml2YXRlRmFpclBsYXlTdHJl YW1pbmc6OnNhbml0aXplU2tkKGNvbnN0IFNoYXJlZEJ1ZmZlcgogICAgIHJldHVybiBidWZmZXIu Y29weSgpOwogfQogCi1SZWZQdHI8U2hhcmVkQnVmZmVyPiBDRE1Qcml2YXRlRmFpclBsYXlTdHJl YW1pbmc6OnNhbml0aXplQ2VuYyhjb25zdCBTaGFyZWRCdWZmZXImIGJ1ZmZlcikKLXsKLSAgICBV TlVTRURfUEFSQU0oYnVmZmVyKTsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBi dWZmZXIuY29weSgpOwotfQotCiBPcHRpb25hbDxWZWN0b3I8UmVmPFNoYXJlZEJ1ZmZlcj4+PiBD RE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6OmV4dHJhY3RLZXlJRHNTa2QoY29uc3QgU2hhcmVk QnVmZmVyJiBidWZmZXIpCiB7CiAgICAgLy8gSW4gdGhlICdza2QnIHNjaGVtZSwgdGhlIGluaXQg ZGF0YSBpcyB0aGUga2V5IElELgpAQCAtMjY3LDkgKzIwNSw2IEBAIHN0YXRpYyBjb25zdCBIYXNo U2V0PEF0b21pY1N0cmluZz4mIHZhbGlkSW5pdERhdGFUeXBlcygpCiAgICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPEhhc2hTZXQ8QXRvbWljU3RyaW5nPj4gdmFsaWRUeXBlcyA9IEhhc2hTZXQ8QXRv bWljU3RyaW5nPih7CiAgICAgICAgIENETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6c2luZk5h bWUoKSwKICAgICAgICAgQ0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpza2ROYW1lKCksCi0j aWYgSEFWRShGQUlSUExBWVNUUkVBTUlOR19DRU5DX0lOSVREQVRBKQotICAgICAgICBDRE1Qcml2 YXRlRmFpclBsYXlTdHJlYW1pbmc6OmNlbmNOYW1lKCksCi0jZW5kaWYKICAgICB9KTsKICAgICBy ZXR1cm4gdmFsaWRUeXBlczsKIH0KQEAgLTI4MSw5ICsyMTYsNiBAQCB2b2lkIENETUZhY3Rvcnk6 OnBsYXRmb3JtUmVnaXN0ZXJGYWN0b3JpZXMoVmVjdG9yPENETUZhY3RvcnkqPiYgZmFjdG9yaWVz KQogCiAgICAgSW5pdERhdGFSZWdpc3RyeTo6c2hhcmVkKCkucmVnaXN0ZXJJbml0RGF0YVR5cGUo Q0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpzaW5mTmFtZSgpLCB7IENETVByaXZhdGVGYWly UGxheVN0cmVhbWluZzo6c2FuaXRpemVTaW5mLCBDRE1Qcml2YXRlRmFpclBsYXlTdHJlYW1pbmc6 OmV4dHJhY3RLZXlJRHNTaW5mIH0pOwogICAgIEluaXREYXRhUmVnaXN0cnk6OnNoYXJlZCgpLnJl Z2lzdGVySW5pdERhdGFUeXBlKENETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6c2tkTmFtZSgp LCB7IENETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6c2FuaXRpemVTa2QsIENETVByaXZhdGVG YWlyUGxheVN0cmVhbWluZzo6ZXh0cmFjdEtleUlEc1NrZCB9KTsKLSNpZiBIQVZFKEZBSVJQTEFZ U1RSRUFNSU5HX0NFTkNfSU5JVERBVEEpCi0gICAgSW5pdERhdGFSZWdpc3RyeTo6c2hhcmVkKCku cmVnaXN0ZXJJbml0RGF0YVR5cGUoQ0RNUHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpjZW5jTmFt ZSgpLCB7IENETVByaXZhdGVGYWlyUGxheVN0cmVhbWluZzo6c2FuaXRpemVDZW5jLCBDRE1Qcml2 YXRlRmFpclBsYXlTdHJlYW1pbmc6OmV4dHJhY3RLZXlJRHNDZW5jIH0pOwotI2VuZGlmCiB9CiAK IENETUZhY3RvcnlGYWlyUGxheVN0cmVhbWluZyYgQ0RNRmFjdG9yeUZhaXJQbGF5U3RyZWFtaW5n OjpzaW5nbGV0b24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL0NETUZhaXJQbGF5U3RyZWFtaW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcuaAppbmRl eCBjYjVhYTAyM2I4ZWMwNWVjYmI0OGUxZWQxOWM3M2NkYzVkMjRkNzVmLi45MTY3YjZlMThiNDYy MmZiOGE1MmEwNGYyNWU4NGNiYTVlNmFhNzE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RNRmFpclBs YXlTdHJlYW1pbmcuaApAQCAtMzIsNiArMzIsOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK K3N0cnVjdCBGb3VyQ0M7CisKIGNsYXNzIENETUZhY3RvcnlGYWlyUGxheVN0cmVhbWluZyBmaW5h bCA6IHB1YmxpYyBDRE1GYWN0b3J5IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgQ0RNRmFjdG9yeUZh aXJQbGF5U3RyZWFtaW5nJiBzaW5nbGV0b24oKTsKQEAgLTc1LDkgKzc3LDggQEAgcHVibGljOgog ICAgIHN0YXRpYyBPcHRpb25hbDxWZWN0b3I8UmVmPFNoYXJlZEJ1ZmZlcj4+PiBleHRyYWN0S2V5 SURzU2tkKGNvbnN0IFNoYXJlZEJ1ZmZlciYpOwogICAgIHN0YXRpYyBSZWZQdHI8U2hhcmVkQnVm ZmVyPiBzYW5pdGl6ZVNrZChjb25zdCBTaGFyZWRCdWZmZXImKTsKIAotICAgIHN0YXRpYyBjb25z dCBBdG9taWNTdHJpbmcmIGNlbmNOYW1lKCk7Ci0gICAgc3RhdGljIE9wdGlvbmFsPFZlY3RvcjxS ZWY8U2hhcmVkQnVmZmVyPj4+IGV4dHJhY3RLZXlJRHNDZW5jKGNvbnN0IFNoYXJlZEJ1ZmZlciYp OwotICAgIHN0YXRpYyBSZWZQdHI8U2hhcmVkQnVmZmVyPiBzYW5pdGl6ZUNlbmMoY29uc3QgU2hh cmVkQnVmZmVyJik7CisgICAgc3RhdGljIGNvbnN0IFZlY3RvcjxGb3VyQ0M+JiB2YWxpZEZhaXJQ bGF5U3RyZWFtaW5nU2NoZW1lcygpOworICAgIHN0YXRpYyBjb25zdCBWZWN0b3I8dWludDhfdD4m IGZhaXJQbGF5U3lzdGVtSUQoKTsKIH07CiAKIH0K