230409 2021-09-17 09:10:04 -0700 [GPUP] Update AX settings on preference updates 2021-09-17 15:07:20 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham cdumez cfleizach webkit-bug-importer oldest_to_newest 1794462 0 pvollan 2021-09-17 09:10:04 -0700 We should update AX settings in the GPUP process on preference updates, like we do in the WebContent process. 1794464 1 438481 pvollan 2021-09-17 09:15:54 -0700 Created attachment 438481 Patch 1794476 2 438485 pvollan 2021-09-17 09:47:43 -0700 Created attachment 438485 Patch 1794477 3 pvollan 2021-09-17 09:49:26 -0700 Thanks for reviewing, Chris! 1794479 4 438486 pvollan 2021-09-17 09:57:32 -0700 Created attachment 438486 Patch 1794496 5 ews-feeder 2021-09-17 10:36:34 -0700 Committed r282669 (241810@main): <https://commits.webkit.org/241810@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438486. 1794497 6 webkit-bug-importer 2021-09-17 10:37:16 -0700 <rdar://problem/83246786> 1794629 7 cdumez 2021-09-17 14:49:52 -0700 Follow-up build fix: <https://commits.webkit.org/r282698>. 1794635 8 pvollan 2021-09-17 15:07:20 -0700 (In reply to Chris Dumez from comment #7) > Follow-up build fix: <https://commits.webkit.org/r282698>. Thanks Chris! 438481 2021-09-17 09:15:54 -0700 2021-09-17 09:33:07 -0700 Patch bug-230409-20210917091554.patch text/plain 10920 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODI2NjQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDIxLTA5LTE3ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVUF0gVXBkYXRlIEFYIHNl dHRpbmdzIG9uIHByZWZlcmVuY2UgdXBkYXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwNDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2Ugc2hvdWxkIHVwZGF0ZSBBWCBzZXR0aW5ncyBpbiB0aGUg R1BVUCBwcm9jZXNzIG9uIHByZWZlcmVuY2UgdXBkYXRlcywgbGlrZSB3ZSBkbyBpbiB0aGUgV2Vi Q29udGVudCBwcm9jZXNzLiBUbyBhZGRyZXNzIHRoaXMsCisgICAgICAgIG1vdmUgYXNzb2NpYXRl ZCBjb2RlIGZyb20gdGhlIFdlYlByb2Nlc3MgY2xhc3MgdG8gdGhlIEF1eGlsaWFyeVByb2Nlc3Mg Y2xhc3MuCisKKyAgICAgICAgKiBHUFVQcm9jZXNzL0dQVVByb2Nlc3MuaDoKKyAgICAgICAgKiBH UFVQcm9jZXNzL2NvY29hL0dQVVByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6R1BV UHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6R1BV UHJvY2Vzczo6ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5jZUNoYW5n ZSk6CisgICAgICAgICogU2hhcmVkL0F1eGlsaWFyeVByb2Nlc3MuaDoKKyAgICAgICAgKFdlYktp dDo6QXV4aWxpYXJ5UHJvY2Vzczo6ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJl ZmVyZW5jZUNoYW5nZSk6CisgICAgICAgICogU2hhcmVkL0NvY29hL0F1eGlsaWFyeVByb2Nlc3ND b2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6QXV4aWxpYXJ5UHJvY2Vzczo6cHJlZmVyZW5jZURp ZFVwZGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OkF1eGlsaWFyeVByb2Nlc3M6OmhhbmRsZVByZWZl cmVuY2VDaGFuZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorICAgICAg ICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0 OjpXZWJQcm9jZXNzOjpkaXNwYXRjaFNpbXVsYXRlZE5vdGlmaWNhdGlvbnNGb3JQcmVmZXJlbmNl Q2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6aGFuZGxlUHJlZmVyZW5jZUNo YW5nZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6Om5vdGlmeVByZWZlcmVuY2VzQ2hh bmdlZCk6CisgICAgICAgIChXZWJLaXQ6OmRpc3BhdGNoU2ltdWxhdGVkTm90aWZpY2F0aW9uc0Zv clByZWZlcmVuY2VDaGFuZ2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpoYW5kbGVQcmVm ZXJlbmNlQ2hhbmdlKTogRGVsZXRlZC4KKwogMjAyMS0wOS0xNyAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bYTExeV0gQWRkIGEgYnVp bGQgb3B0aW9uIHRvIGVuYWJsZSBBVFNQSQpJbmRleDogU291cmNlL1dlYktpdC9HUFVQcm9jZXNz L0dQVVByb2Nlc3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BV UHJvY2Vzcy5oCShyZXZpc2lvbiAyODI1OTcpCisrKyBTb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mv R1BVUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTcsNiArMTU3LDcgQEAgcHJpdmF0ZToK IAogI2lmIEVOQUJMRShDRlBSRUZTX0RJUkVDVF9NT0RFKQogICAgIHZvaWQgbm90aWZ5UHJlZmVy ZW5jZXNDaGFuZ2VkKGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgY29u c3Qgc3RkOjpvcHRpb25hbDxTdHJpbmc+JiBlbmNvZGVkVmFsdWUpOworICAgIHZvaWQgZGlzcGF0 Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcm IGtleSkgZmluYWw7CiAjZW5kaWYKIAogICAgIC8vIENvbm5lY3Rpb25zIHRvIFdlYlByb2Nlc3Nl cy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9jb2NvYS9HUFVQcm9jZXNzQ29jb2Eu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2NvY29hL0dQVVByb2Nl c3NDb2NvYS5tbQkocmV2aXNpb24gMjgyNTk3KQorKysgU291cmNlL1dlYktpdC9HUFVQcm9jZXNz L2NvY29hL0dQVVByb2Nlc3NDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtNjksMTUgKzY5LDE0 IEBAIFJldGFpblB0cjxOU0RpY3Rpb25hcnk+IEdQVVByb2Nlc3M6OmFkZGkKICNpZiBFTkFCTEUo Q0ZQUkVGU19ESVJFQ1RfTU9ERSkKIHZvaWQgR1BVUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXND aGFuZ2VkKGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3Qgc3Rk OjpvcHRpb25hbDxTdHJpbmc+JiBlbmNvZGVkVmFsdWUpCiB7Ci0gICAgaWQgdmFsdWUgPSBuaWw7 Ci0gICAgaWYgKGVuY29kZWRWYWx1ZSkgewotICAgICAgICB2YWx1ZSA9IGRlY29kZVByZWZlcmVu Y2VWYWx1ZShlbmNvZGVkVmFsdWUpOwotICAgICAgICBpZiAoIXZhbHVlKQotICAgICAgICAgICAg cmV0dXJuOwotICAgIH0KLSAgICBzZXRQcmVmZXJlbmNlVmFsdWUoZG9tYWluLCBrZXksIHZhbHVl KTsKKyAgICBwcmVmZXJlbmNlRGlkVXBkYXRlKGRvbWFpbiwga2V5LCBlbmNvZGVkVmFsdWUpOwog fQotI2VuZGlmCisKK3ZvaWQgR1BVUHJvY2Vzczo6ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRp b25zRm9yUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcmIGtleSkKK3sKK30KKworI2VuZGlm IC8vIEVOQUJMRShDRlBSRUZTX0RJUkVDVF9NT0RFKQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK IApJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vzcy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0F1eGlsaWFyeVByb2Nlc3MuaAkocmV2aXNpb24g MjgyNTk3KQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vzcy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMzgsNiArMTM4LDEwIEBAIHByb3RlY3RlZDoKICNpZiBFTkFCTEUoQ0ZQ UkVGU19ESVJFQ1RfTU9ERSkKICAgICBzdGF0aWMgaWQgZGVjb2RlUHJlZmVyZW5jZVZhbHVlKGNv bnN0IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiYgZW5jb2RlZFZhbHVlKTsKICAgICBzdGF0aWMgdm9p ZCBzZXRQcmVmZXJlbmNlVmFsdWUoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYg a2V5LCBpZCB2YWx1ZSk7CisgICAgCisgICAgdmlydHVhbCB2b2lkIHByZWZlcmVuY2VEaWRVcGRh dGUoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBzdGQ6Om9w dGlvbmFsPFN0cmluZz4mIGVuY29kZWRWYWx1ZSk7CisgICAgdmlydHVhbCB2b2lkIGhhbmRsZVBy ZWZlcmVuY2VDaGFuZ2UoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYga2V5LCBp ZCB2YWx1ZSk7CisgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoU2ltdWxhdGVkTm90aWZpY2F0aW9u c0ZvclByZWZlcmVuY2VDaGFuZ2UoY29uc3QgU3RyaW5nJiBrZXkpIHsgfQogI2VuZGlmCiAKIHBy aXZhdGU6CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9BdXhpbGlhcnlQcm9jZXNz Q29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvQXV4aWxp YXJ5UHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyODI1OTcpCisrKyBTb3VyY2UvV2ViS2l0L1No YXJlZC9Db2NvYS9BdXhpbGlhcnlQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTMy LDkgKzMyLDE1IEBACiAjaW1wb3J0IDxXZWJDb3JlL0Zsb2F0aW5nUG9pbnRFbnZpcm9ubWVudC5o PgogI2ltcG9ydCA8V2ViQ29yZS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaD4KICNpbXBvcnQg PG1hY2gvdGFzay5oPgorI2ltcG9ydCA8cGFsL3NwaS9jb2NvYS9BY2Nlc3NpYmlsaXR5U3VwcG9y dFNQSS5oPgogI2ltcG9ydCA8d3RmL2NvY29hL0VudGl0bGVtZW50cy5oPgogI2ltcG9ydCA8d3Rm L2NvY29hL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrc0NvY29hLmg+CiAKKyNpZiBIQVZFKFVQREFU RV9XRUJfQUNDRVNTSUJJTElUWV9TRVRUSU5HUykgJiYgRU5BQkxFKENGUFJFRlNfRElSRUNUX01P REUpCitTT0ZUX0xJTktfTElCUkFSWShsaWJBY2Nlc3NpYmlsaXR5KQorU09GVF9MSU5LX09QVElP TkFMKGxpYkFjY2Vzc2liaWxpdHksIF9BWFNVcGRhdGVXZWJBY2Nlc3NpYmlsaXR5U2V0dGluZ3Ms IHZvaWQsICgpLCAoKSk7CisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKICNpZiBQTEFU Rk9STShNQUMpIHx8IFBMQVRGT1JNKE1BQ0NBVEFMWVNUKQpAQCAtMTYwLDYgKzE2NiwzOCBAQCB2 b2lkIEF1eGlsaWFyeVByb2Nlc3M6OnNldFByZWZlcmVuY2VWYWx1CiAgICAgfSBlbHNlCiAgICAg ICAgIENGUHJlZmVyZW5jZXNTZXRWYWx1ZShrZXkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgKF9f YnJpZGdlIENGUHJvcGVydHlMaXN0UmVmKXZhbHVlLCBkb21haW4uY3JlYXRlQ0ZTdHJpbmcoKS5n ZXQoKSwga0NGUHJlZmVyZW5jZXNDdXJyZW50VXNlciwga0NGUHJlZmVyZW5jZXNBbnlIb3N0KTsK IH0KKwordm9pZCBBdXhpbGlhcnlQcm9jZXNzOjpwcmVmZXJlbmNlRGlkVXBkYXRlKGNvbnN0IFN0 cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3Qgc3RkOjpvcHRpb25hbDxTdHJp bmc+JiBlbmNvZGVkVmFsdWUpCit7CisgICAgaWQgdmFsdWUgPSBuaWw7CisgICAgaWYgKGVuY29k ZWRWYWx1ZSkgeworICAgICAgICB2YWx1ZSA9IGRlY29kZVByZWZlcmVuY2VWYWx1ZShlbmNvZGVk VmFsdWUpOworICAgICAgICBpZiAoIXZhbHVlKQorICAgICAgICAgICAgcmV0dXJuOworICAgIH0K KyAgICBzZXRQcmVmZXJlbmNlVmFsdWUoZG9tYWluLCBrZXksIHZhbHVlKTsKKyAgICBoYW5kbGVQ cmVmZXJlbmNlQ2hhbmdlKGRvbWFpbiwga2V5LCB2YWx1ZSk7Cit9CisKK3ZvaWQgQXV4aWxpYXJ5 UHJvY2Vzczo6aGFuZGxlUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcmIGRvbWFpbiwgY29u c3QgU3RyaW5nJiBrZXksIGlkIHZhbHVlKQoreworICAgIGlmIChkb21haW4gPT0gU3RyaW5nKGtB WFNBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZURvbWFpbikpIHsKKyNpZiBIQVZFKFVQREFURV9XRUJf QUNDRVNTSUJJTElUWV9TRVRUSU5HUykgJiYgRU5BQkxFKENGUFJFRlNfRElSRUNUX01PREUpCisg ICAgICAgIGlmIChfQVhTVXBkYXRlV2ViQWNjZXNzaWJpbGl0eVNldHRpbmdzUHRyKCkpCisgICAg ICAgICAgICBfQVhTVXBkYXRlV2ViQWNjZXNzaWJpbGl0eVNldHRpbmdzUHRyKCkoKTsKKyNlbGlm IFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgICAgIC8vIElmIHRoZSB1cGRhdGUgbWV0aG9kIGlz IG5vdCBhdmFpbGFibGUsIHRvIHVwZGF0ZSB0aGUgY2FjaGUgaW5zaWRlIEFjY2Vzc2liaWxpdHlT dXBwb3J0LAorICAgICAgICAvLyB0aGVzZSBtZXRob2RzIG5lZWQgdG8gYmUgY2FsbGVkIGRpcmVj dGx5LgorICAgICAgICBpZiAoQ0ZFcXVhbChrZXkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwga0FY U1JlZHVjZU1vdGlvblByZWZlcmVuY2UpICYmIFt2YWx1ZSBpc0tpbmRPZkNsYXNzOltOU051bWJl ciBjbGFzc11dKQorICAgICAgICAgICAgX0FYU1NldFJlZHVjZU1vdGlvbkVuYWJsZWQoWyhOU051 bWJlciAqKXZhbHVlIGJvb2xWYWx1ZV0pOworICAgICAgICBlbHNlIGlmIChDRkVxdWFsKGtleS5j cmVhdGVDRlN0cmluZygpLmdldCgpLCBpbmNyZWFzZUNvbnRyYXN0UHJlZmVyZW5jZUtleSgpKSAm JiBbdmFsdWUgaXNLaW5kT2ZDbGFzczpbTlNOdW1iZXIgY2xhc3NdXSkKKyAgICAgICAgICAgIF9B WFNTZXREYXJrZW5TeXN0ZW1Db2xvcnMoWyhOU051bWJlciAqKXZhbHVlIGJvb2xWYWx1ZV0pOwor I2VuZGlmCisgICAgfQorCisgICAgZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJl ZmVyZW5jZUNoYW5nZShrZXkpOworfQorCiAjZW5kaWYgLy8gRU5BQkxFKENGUFJFRlNfRElSRUNU X01PREUpCiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlByb2Nlc3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUHJvY2Vzcy5oCShyZXZpc2lvbiAyODI1OTcpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC02MDcsNiArNjA3LDExIEBAIHBy aXZhdGU6CiAgICAgdm9pZCBzZXRVc2VTeXN0ZW1BcHBlYXJhbmNlRm9yU2Nyb2xsYmFycyhib29s KTsKICNlbmRpZgogCisjaWYgRU5BQkxFKENGUFJFRlNfRElSRUNUX01PREUpCisgICAgdm9pZCBo YW5kbGVQcmVmZXJlbmNlQ2hhbmdlKGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcm IGtleSwgaWQgdmFsdWUpIGZpbmFsOworICAgIHZvaWQgZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmlj YXRpb25zRm9yUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcmIGtleSkgZmluYWw7CisjZW5k aWYKKwogICAgIFJlZlB0cjxXZWJDb25uZWN0aW9uVG9VSVByb2Nlc3M+IG1fd2ViQ29ubmVjdGlv bjsKIAogICAgIEhhc2hNYXA8V2ViQ29yZTo6UGFnZUlkZW50aWZpZXIsIFJlZlB0cjxXZWJQYWdl Pj4gbV9wYWdlTWFwOwpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlBy b2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29j b2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyODI1OTcpCisrKyBTb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05 MCw3ICs5MCw2IEBACiAjaW1wb3J0IDxwYWwvc3BpL2NmL0NGVXRpbGl0aWVzU1BJLmg+CiAjaW1w b3J0IDxwYWwvc3BpL2NnL0NvcmVHcmFwaGljc1NQSS5oPgogI2ltcG9ydCA8cGFsL3NwaS9jb2Nv YS9BVkZvdW5kYXRpb25TUEkuaD4KLSNpbXBvcnQgPHBhbC9zcGkvY29jb2EvQWNjZXNzaWJpbGl0 eVN1cHBvcnRTUEkuaD4KICNpbXBvcnQgPHBhbC9zcGkvY29jb2EvQ29yZVNlcnZpY2VzU1BJLmg+ CiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL0xhdW5jaFNlcnZpY2VzU1BJLmg+CiAjaW1wb3J0IDxw YWwvc3BpL2NvY29hL05TQWNjZXNzaWJpbGl0eVNQSS5oPgpAQCAtMTg2LDExICsxODUsNiBAQCBT T0ZUX0xJTktfRlJBTUVXT1JLX0lOX1VNQlJFTExBKEFwcGxpY2F0CiBTT0ZUX0xJTktfRlVOQ1RJ T05fTUFZX0ZBSUxfRk9SX1NPVVJDRShXZWJLaXQsIEhJU2VydmljZXMsIF9BWFNldEF1ZGl0VG9r ZW5Jc0F1dGhlbnRpY2F0ZWRDYWxsYmFjaywgdm9pZCwgKEFYQXVkaXRUb2tlbklzQXV0aGVudGlj YXRlZENhbGxiYWNrIGNhbGxiYWNrKSwgKGNhbGxiYWNrKSkKICNlbmRpZgogCi0jaWYgSEFWRShV UERBVEVfV0VCX0FDQ0VTU0lCSUxJVFlfU0VUVElOR1MpICYmIEVOQUJMRShDRlBSRUZTX0RJUkVD VF9NT0RFKQotU09GVF9MSU5LX0xJQlJBUlkobGliQWNjZXNzaWJpbGl0eSkKLVNPRlRfTElOS19P UFRJT05BTChsaWJBY2Nlc3NpYmlsaXR5LCBfQVhTVXBkYXRlV2ViQWNjZXNzaWJpbGl0eVNldHRp bmdzLCB2b2lkLCAoKSwgKCkpOwotI2VuZGlmCi0KIG5hbWVzcGFjZSBXZWJLaXQgewogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTExMDcsNyArMTEwMSw3IEBAIHN0YXRpYyBjb25zdCBX VEY6OlN0cmluZyYgY2FwdGlvblByb2ZpbGUKICAgICByZXR1cm4ga2V5OwogfQogCi1zdGF0aWMg dm9pZCBkaXNwYXRjaFNpbXVsYXRlZE5vdGlmaWNhdGlvbnNGb3JQcmVmZXJlbmNlQ2hhbmdlKGNv bnN0IFN0cmluZyYga2V5KQordm9pZCBXZWJQcm9jZXNzOjpkaXNwYXRjaFNpbXVsYXRlZE5vdGlm aWNhdGlvbnNGb3JQcmVmZXJlbmNlQ2hhbmdlKGNvbnN0IFN0cmluZyYga2V5KQogewogI2lmIFVT RShBUFBLSVQpCiAgICAgLy8gT3JkaW5hcmlseSwgb3RoZXIgcGFydHMgb2YgdGhlIHN5c3RlbSBl bnN1cmUgdGhhdCB0aGlzIG5vdGlmaWNhdGlvbiBpcyBwb3N0ZWQgYWZ0ZXIgdGhpcyBkZWZhdWx0 IGlzIGNoYW5nZWQuCkBAIC0xMTMxLDcgKzExMjUsNyBAQCBzdGF0aWMgdm9pZCBkaXNwYXRjaFNp bXVsYXRlZE5vdGlmaWNhdGlvCiAgICAgfQogfQogCi1zdGF0aWMgdm9pZCBoYW5kbGVQcmVmZXJl bmNlQ2hhbmdlKGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgaWQgdmFs dWUpCit2b2lkIFdlYlByb2Nlc3M6OmhhbmRsZVByZWZlcmVuY2VDaGFuZ2UoY29uc3QgU3RyaW5n JiBkb21haW4sIGNvbnN0IFN0cmluZyYga2V5LCBpZCB2YWx1ZSkKIHsKICAgICBpZiAoa2V5ID09 ICJBcHBsZUxhbmd1YWdlcyIpIHsKICAgICAgICAgLy8gV2UgbmVlZCB0byBzZXQgQXBwbGVMYW5n dWFnZXMgZm9yIHRoZSB2b2xhdGlsZSBkb21haW4sIHNpbWlsYXJseSB0byB3aGF0IHdlIGRvIGlu IFhQQ1NlcnZpY2VNYWluLm1tLgpAQCAtMTE0MywzOSArMTEzNywxOCBAQCBzdGF0aWMgdm9pZCBo YW5kbGVQcmVmZXJlbmNlQ2hhbmdlKGNvbnN0CiAgICAgICAgIFdURjo6bGFuZ3VhZ2VEaWRDaGFu Z2UoKTsKICAgICB9CiAKLSAgICBpZiAoZG9tYWluID09IFN0cmluZyhrQVhTQWNjZXNzaWJpbGl0 eVByZWZlcmVuY2VEb21haW4pKSB7Ci0jaWYgSEFWRShVUERBVEVfV0VCX0FDQ0VTU0lCSUxJVFlf U0VUVElOR1MpICYmIEVOQUJMRShDRlBSRUZTX0RJUkVDVF9NT0RFKQotICAgICAgICBpZiAoX0FY U1VwZGF0ZVdlYkFjY2Vzc2liaWxpdHlTZXR0aW5nc1B0cigpKQotICAgICAgICAgICAgX0FYU1Vw ZGF0ZVdlYkFjY2Vzc2liaWxpdHlTZXR0aW5nc1B0cigpKCk7Ci0jZWxpZiBQTEFURk9STShJT1Nf RkFNSUxZKQotICAgICAgICAvLyBJZiB0aGUgdXBkYXRlIG1ldGhvZCBpcyBub3QgYXZhaWxhYmxl LCB0byB1cGRhdGUgdGhlIGNhY2hlIGluc2lkZSBBY2Nlc3NpYmlsaXR5U3VwcG9ydCwKLSAgICAg ICAgLy8gdGhlc2UgbWV0aG9kcyBuZWVkIHRvIGJlIGNhbGxlZCBkaXJlY3RseS4KLSAgICAgICAg aWYgKENGRXF1YWwoa2V5LmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCksIGtBWFNSZWR1Y2VNb3Rpb25Q cmVmZXJlbmNlKSAmJiBbdmFsdWUgaXNLaW5kT2ZDbGFzczpbTlNOdW1iZXIgY2xhc3NdXSkKLSAg ICAgICAgICAgIF9BWFNTZXRSZWR1Y2VNb3Rpb25FbmFibGVkKFsoTlNOdW1iZXIgKil2YWx1ZSBi b29sVmFsdWVdKTsKLSAgICAgICAgZWxzZSBpZiAoQ0ZFcXVhbChrZXkuY3JlYXRlQ0ZTdHJpbmco KS5nZXQoKSwgaW5jcmVhc2VDb250cmFzdFByZWZlcmVuY2VLZXkoKSkgJiYgW3ZhbHVlIGlzS2lu ZE9mQ2xhc3M6W05TTnVtYmVyIGNsYXNzXV0pCi0gICAgICAgICAgICBfQVhTU2V0RGFya2VuU3lz dGVtQ29sb3JzKFsoTlNOdW1iZXIgKil2YWx1ZSBib29sVmFsdWVdKTsKLSNlbmRpZgotICAgIH0K LSAgICAKICNpZiBVU0UoQVBQS0lUKQogICAgIGF1dG8gY2ZLZXkgPSBrZXkuY3JlYXRlQ0ZTdHJp bmcoKTsKICAgICBpZiAoQ0ZFcXVhbChjZktleS5nZXQoKSwga0FYSW50ZXJmYWNlUmVkdWNlTW90 aW9uS2V5KSB8fCBDRkVxdWFsKGNmS2V5LmdldCgpLCBrQVhJbnRlcmZhY2VJbmNyZWFzZUNvbnRy YXN0S2V5KSB8fCBrZXkgPT0gaW52ZXJ0Q29sb3JzUHJlZmVyZW5jZUtleSgpKQogICAgICAgICBb TlNXb3Jrc3BhY2UgX2ludmFsaWRhdGVBY2Nlc3NpYmlsaXR5RGlzcGxheVZhbHVlc107CiAjZW5k aWYKIAotICAgIGRpc3BhdGNoU2ltdWxhdGVkTm90aWZpY2F0aW9uc0ZvclByZWZlcmVuY2VDaGFu Z2Uoa2V5KTsKKyAgICBBdXhpbGlhcnlQcm9jZXNzOjpoYW5kbGVQcmVmZXJlbmNlQ2hhbmdlKGRv bWFpbiwga2V5LCB2YWx1ZSk7CiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5j ZXNDaGFuZ2VkKGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3Qg c3RkOjpvcHRpb25hbDxTdHJpbmc+JiBlbmNvZGVkVmFsdWUpCiB7Ci0gICAgaWQgdmFsdWUgPSBu aWw7Ci0gICAgaWYgKGVuY29kZWRWYWx1ZSkgewotICAgICAgICB2YWx1ZSA9IGRlY29kZVByZWZl cmVuY2VWYWx1ZShlbmNvZGVkVmFsdWUpOwotICAgICAgICBpZiAoIXZhbHVlKQotICAgICAgICAg ICAgcmV0dXJuOwotICAgIH0KLSAgICBzZXRQcmVmZXJlbmNlVmFsdWUoZG9tYWluLCBrZXksIHZh bHVlKTsKLSAgICBoYW5kbGVQcmVmZXJlbmNlQ2hhbmdlKGRvbWFpbiwga2V5LCB2YWx1ZSk7Cisg ICAgcHJlZmVyZW5jZURpZFVwZGF0ZShkb21haW4sIGtleSwgZW5jb2RlZFZhbHVlKTsKIH0KIAog dm9pZCBXZWJQcm9jZXNzOjp1bmJsb2NrUHJlZmVyZW5jZVNlcnZpY2UoVmVjdG9yPFNhbmRib3hF eHRlbnNpb246OkhhbmRsZT4mJiBoYW5kbGVBcnJheSkK 438485 2021-09-17 09:47:43 -0700 2021-09-17 10:04:43 -0700 Patch bug-230409-20210917094743.patch text/plain 11158 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODI2NjQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDIxLTA5LTE3ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVUF0gVXBkYXRlIEFYIHNl dHRpbmdzIG9uIHByZWZlcmVuY2UgdXBkYXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwNDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMg RmxlaXphY2guCisKKyAgICAgICAgV2Ugc2hvdWxkIHVwZGF0ZSBBWCBzZXR0aW5ncyBpbiB0aGUg R1BVUCBwcm9jZXNzIG9uIHByZWZlcmVuY2UgdXBkYXRlcywgbGlrZSB3ZSBkbyBpbiB0aGUgV2Vi Q29udGVudCBwcm9jZXNzLiBUbyBhZGRyZXNzIHRoaXMsCisgICAgICAgIG1vdmUgYXNzb2NpYXRl ZCBjb2RlIGZyb20gdGhlIFdlYlByb2Nlc3MgY2xhc3MgdG8gdGhlIEF1eGlsaWFyeVByb2Nlc3Mg Y2xhc3MuCisKKyAgICAgICAgKiBHUFVQcm9jZXNzL0dQVVByb2Nlc3MuaDoKKyAgICAgICAgKiBH UFVQcm9jZXNzL2NvY29hL0dQVVByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6R1BV UHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6R1BV UHJvY2Vzczo6ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5jZUNoYW5n ZSk6CisgICAgICAgICogU2hhcmVkL0F1eGlsaWFyeVByb2Nlc3MuaDoKKyAgICAgICAgKFdlYktp dDo6QXV4aWxpYXJ5UHJvY2Vzczo6ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJl ZmVyZW5jZUNoYW5nZSk6CisgICAgICAgICogU2hhcmVkL0NvY29hL0F1eGlsaWFyeVByb2Nlc3ND b2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6QXV4aWxpYXJ5UHJvY2Vzczo6cHJlZmVyZW5jZURp ZFVwZGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OkF1eGlsaWFyeVByb2Nlc3M6OmhhbmRsZVByZWZl cmVuY2VDaGFuZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorICAgICAg ICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0 OjpXZWJQcm9jZXNzOjpkaXNwYXRjaFNpbXVsYXRlZE5vdGlmaWNhdGlvbnNGb3JQcmVmZXJlbmNl Q2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6aGFuZGxlUHJlZmVyZW5jZUNo YW5nZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6Om5vdGlmeVByZWZlcmVuY2VzQ2hh bmdlZCk6CisgICAgICAgIChXZWJLaXQ6OmRpc3BhdGNoU2ltdWxhdGVkTm90aWZpY2F0aW9uc0Zv clByZWZlcmVuY2VDaGFuZ2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpoYW5kbGVQcmVm ZXJlbmNlQ2hhbmdlKTogRGVsZXRlZC4KKwogMjAyMS0wOS0xNyAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bYTExeV0gQWRkIGEgYnVp bGQgb3B0aW9uIHRvIGVuYWJsZSBBVFNQSQpJbmRleDogU291cmNlL1dlYktpdC9HUFVQcm9jZXNz L0dQVVByb2Nlc3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BV UHJvY2Vzcy5oCShyZXZpc2lvbiAyODI1OTcpCisrKyBTb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mv R1BVUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTcsNiArMTU3LDcgQEAgcHJpdmF0ZToK IAogI2lmIEVOQUJMRShDRlBSRUZTX0RJUkVDVF9NT0RFKQogICAgIHZvaWQgbm90aWZ5UHJlZmVy ZW5jZXNDaGFuZ2VkKGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgY29u c3Qgc3RkOjpvcHRpb25hbDxTdHJpbmc+JiBlbmNvZGVkVmFsdWUpOworICAgIHZvaWQgZGlzcGF0 Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcm IGtleSkgZmluYWw7CiAjZW5kaWYKIAogICAgIC8vIENvbm5lY3Rpb25zIHRvIFdlYlByb2Nlc3Nl cy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9jb2NvYS9HUFVQcm9jZXNzQ29jb2Eu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2NvY29hL0dQVVByb2Nl c3NDb2NvYS5tbQkocmV2aXNpb24gMjgyNTk3KQorKysgU291cmNlL1dlYktpdC9HUFVQcm9jZXNz L2NvY29hL0dQVVByb2Nlc3NDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtNjksMTUgKzY5LDE0 IEBAIFJldGFpblB0cjxOU0RpY3Rpb25hcnk+IEdQVVByb2Nlc3M6OmFkZGkKICNpZiBFTkFCTEUo Q0ZQUkVGU19ESVJFQ1RfTU9ERSkKIHZvaWQgR1BVUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXND aGFuZ2VkKGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3Qgc3Rk OjpvcHRpb25hbDxTdHJpbmc+JiBlbmNvZGVkVmFsdWUpCiB7Ci0gICAgaWQgdmFsdWUgPSBuaWw7 Ci0gICAgaWYgKGVuY29kZWRWYWx1ZSkgewotICAgICAgICB2YWx1ZSA9IGRlY29kZVByZWZlcmVu Y2VWYWx1ZShlbmNvZGVkVmFsdWUpOwotICAgICAgICBpZiAoIXZhbHVlKQotICAgICAgICAgICAg cmV0dXJuOwotICAgIH0KLSAgICBzZXRQcmVmZXJlbmNlVmFsdWUoZG9tYWluLCBrZXksIHZhbHVl KTsKKyAgICBwcmVmZXJlbmNlRGlkVXBkYXRlKGRvbWFpbiwga2V5LCBlbmNvZGVkVmFsdWUpOwog fQotI2VuZGlmCisKK3ZvaWQgR1BVUHJvY2Vzczo6ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRp b25zRm9yUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcmIGtleSkKK3sKK30KKworI2VuZGlm IC8vIEVOQUJMRShDRlBSRUZTX0RJUkVDVF9NT0RFKQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK IApJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vzcy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0F1eGlsaWFyeVByb2Nlc3MuaAkocmV2aXNpb24g MjgyNTk3KQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vzcy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMzgsNiArMTM4LDEwIEBAIHByb3RlY3RlZDoKICNpZiBFTkFCTEUoQ0ZQ UkVGU19ESVJFQ1RfTU9ERSkKICAgICBzdGF0aWMgaWQgZGVjb2RlUHJlZmVyZW5jZVZhbHVlKGNv bnN0IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiYgZW5jb2RlZFZhbHVlKTsKICAgICBzdGF0aWMgdm9p ZCBzZXRQcmVmZXJlbmNlVmFsdWUoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYg a2V5LCBpZCB2YWx1ZSk7CisgICAgCisgICAgdmlydHVhbCB2b2lkIHByZWZlcmVuY2VEaWRVcGRh dGUoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBzdGQ6Om9w dGlvbmFsPFN0cmluZz4mIGVuY29kZWRWYWx1ZSk7CisgICAgdmlydHVhbCB2b2lkIGhhbmRsZVBy ZWZlcmVuY2VDaGFuZ2UoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYga2V5LCBp ZCB2YWx1ZSk7CisgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoU2ltdWxhdGVkTm90aWZpY2F0aW9u c0ZvclByZWZlcmVuY2VDaGFuZ2UoY29uc3QgU3RyaW5nJiBrZXkpIHsgfQogI2VuZGlmCiAKIHBy aXZhdGU6CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9BdXhpbGlhcnlQcm9jZXNz Q29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvQXV4aWxp YXJ5UHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyODI1OTcpCisrKyBTb3VyY2UvV2ViS2l0L1No YXJlZC9Db2NvYS9BdXhpbGlhcnlQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTM1 LDYgKzM1LDE2IEBACiAjaW1wb3J0IDx3dGYvY29jb2EvRW50aXRsZW1lbnRzLmg+CiAjaW1wb3J0 IDx3dGYvY29jb2EvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzQ29jb2EuaD4KIAorI2lmIEVOQUJM RShDRlBSRUZTX0RJUkVDVF9NT0RFKQorI2ltcG9ydCAiQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEku aCIKKyNpbXBvcnQgPHBhbC9zcGkvY29jb2EvQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaD4KKyNl bmRpZgorCisjaWYgSEFWRShVUERBVEVfV0VCX0FDQ0VTU0lCSUxJVFlfU0VUVElOR1MpICYmIEVO QUJMRShDRlBSRUZTX0RJUkVDVF9NT0RFKQorU09GVF9MSU5LX0xJQlJBUlkobGliQWNjZXNzaWJp bGl0eSkKK1NPRlRfTElOS19PUFRJT05BTChsaWJBY2Nlc3NpYmlsaXR5LCBfQVhTVXBkYXRlV2Vi QWNjZXNzaWJpbGl0eVNldHRpbmdzLCB2b2lkLCAoKSwgKCkpOworI2VuZGlmCisKIG5hbWVzcGFj ZSBXZWJLaXQgewogCiAjaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShNQUNDQVRBTFlTVCkK QEAgLTE2MCw2ICsxNzAsMzggQEAgdm9pZCBBdXhpbGlhcnlQcm9jZXNzOjpzZXRQcmVmZXJlbmNl VmFsdQogICAgIH0gZWxzZQogICAgICAgICBDRlByZWZlcmVuY2VzU2V0VmFsdWUoa2V5LmNyZWF0 ZUNGU3RyaW5nKCkuZ2V0KCksIChfX2JyaWRnZSBDRlByb3BlcnR5TGlzdFJlZil2YWx1ZSwgZG9t YWluLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCksIGtDRlByZWZlcmVuY2VzQ3VycmVudFVzZXIsIGtD RlByZWZlcmVuY2VzQW55SG9zdCk7CiB9CisKK3ZvaWQgQXV4aWxpYXJ5UHJvY2Vzczo6cHJlZmVy ZW5jZURpZFVwZGF0ZShjb25zdCBTdHJpbmcmIGRvbWFpbiwgY29uc3QgU3RyaW5nJiBrZXksIGNv bnN0IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiYgZW5jb2RlZFZhbHVlKQoreworICAgIGlkIHZhbHVl ID0gbmlsOworICAgIGlmIChlbmNvZGVkVmFsdWUpIHsKKyAgICAgICAgdmFsdWUgPSBkZWNvZGVQ cmVmZXJlbmNlVmFsdWUoZW5jb2RlZFZhbHVlKTsKKyAgICAgICAgaWYgKCF2YWx1ZSkKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICB9CisgICAgc2V0UHJlZmVyZW5jZVZhbHVlKGRvbWFpbiwga2V5 LCB2YWx1ZSk7CisgICAgaGFuZGxlUHJlZmVyZW5jZUNoYW5nZShkb21haW4sIGtleSwgdmFsdWUp OworfQorCit2b2lkIEF1eGlsaWFyeVByb2Nlc3M6OmhhbmRsZVByZWZlcmVuY2VDaGFuZ2UoY29u c3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYga2V5LCBpZCB2YWx1ZSkKK3sKKyAgICBp ZiAoZG9tYWluID09IFN0cmluZyhrQVhTQWNjZXNzaWJpbGl0eVByZWZlcmVuY2VEb21haW4pKSB7 CisjaWYgSEFWRShVUERBVEVfV0VCX0FDQ0VTU0lCSUxJVFlfU0VUVElOR1MpICYmIEVOQUJMRShD RlBSRUZTX0RJUkVDVF9NT0RFKQorICAgICAgICBpZiAoX0FYU1VwZGF0ZVdlYkFjY2Vzc2liaWxp dHlTZXR0aW5nc1B0cigpKQorICAgICAgICAgICAgX0FYU1VwZGF0ZVdlYkFjY2Vzc2liaWxpdHlT ZXR0aW5nc1B0cigpKCk7CisjZWxpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgICAgICAvLyBJ ZiB0aGUgdXBkYXRlIG1ldGhvZCBpcyBub3QgYXZhaWxhYmxlLCB0byB1cGRhdGUgdGhlIGNhY2hl IGluc2lkZSBBY2Nlc3NpYmlsaXR5U3VwcG9ydCwKKyAgICAgICAgLy8gdGhlc2UgbWV0aG9kcyBu ZWVkIHRvIGJlIGNhbGxlZCBkaXJlY3RseS4KKyAgICAgICAgaWYgKENGRXF1YWwoa2V5LmNyZWF0 ZUNGU3RyaW5nKCkuZ2V0KCksIGtBWFNSZWR1Y2VNb3Rpb25QcmVmZXJlbmNlKSAmJiBbdmFsdWUg aXNLaW5kT2ZDbGFzczpbTlNOdW1iZXIgY2xhc3NdXSkKKyAgICAgICAgICAgIF9BWFNTZXRSZWR1 Y2VNb3Rpb25FbmFibGVkKFsoTlNOdW1iZXIgKil2YWx1ZSBib29sVmFsdWVdKTsKKyAgICAgICAg ZWxzZSBpZiAoQ0ZFcXVhbChrZXkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgaW5jcmVhc2VDb250 cmFzdFByZWZlcmVuY2VLZXkoKSkgJiYgW3ZhbHVlIGlzS2luZE9mQ2xhc3M6W05TTnVtYmVyIGNs YXNzXV0pCisgICAgICAgICAgICBfQVhTU2V0RGFya2VuU3lzdGVtQ29sb3JzKFsoTlNOdW1iZXIg Kil2YWx1ZSBib29sVmFsdWVdKTsKKyNlbmRpZgorICAgIH0KKworICAgIGRpc3BhdGNoU2ltdWxh dGVkTm90aWZpY2F0aW9uc0ZvclByZWZlcmVuY2VDaGFuZ2Uoa2V5KTsKK30KKwogI2VuZGlmIC8v IEVOQUJMRShDRlBSRUZTX0RJUkVDVF9NT0RFKQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkocmV2aXNpb24gMjgyNTk3KQor KysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkod29ya2luZyBjb3B5KQpA QCAtNjA3LDYgKzYwNywxMSBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0VXNlU3lzdGVtQXBwZWFy YW5jZUZvclNjcm9sbGJhcnMoYm9vbCk7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShDRlBSRUZTX0RJ UkVDVF9NT0RFKQorICAgIHZvaWQgaGFuZGxlUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcm IGRvbWFpbiwgY29uc3QgU3RyaW5nJiBrZXksIGlkIHZhbHVlKSBmaW5hbDsKKyAgICB2b2lkIGRp c3BhdGNoU2ltdWxhdGVkTm90aWZpY2F0aW9uc0ZvclByZWZlcmVuY2VDaGFuZ2UoY29uc3QgU3Ry aW5nJiBrZXkpIGZpbmFsOworI2VuZGlmCisKICAgICBSZWZQdHI8V2ViQ29ubmVjdGlvblRvVUlQ cm9jZXNzPiBtX3dlYkNvbm5lY3Rpb247CiAKICAgICBIYXNoTWFwPFdlYkNvcmU6OlBhZ2VJZGVu dGlmaWVyLCBSZWZQdHI8V2ViUGFnZT4+IG1fcGFnZU1hcDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQkocmV2aXNpb24gMjgy NTk3KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5t bQkod29ya2luZyBjb3B5KQpAQCAtOTAsNyArOTAsNiBAQAogI2ltcG9ydCA8cGFsL3NwaS9jZi9D RlV0aWxpdGllc1NQSS5oPgogI2ltcG9ydCA8cGFsL3NwaS9jZy9Db3JlR3JhcGhpY3NTUEkuaD4K ICNpbXBvcnQgPHBhbC9zcGkvY29jb2EvQVZGb3VuZGF0aW9uU1BJLmg+Ci0jaW1wb3J0IDxwYWwv c3BpL2NvY29hL0FjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmg+CiAjaW1wb3J0IDxwYWwvc3BpL2Nv Y29hL0NvcmVTZXJ2aWNlc1NQSS5oPgogI2ltcG9ydCA8cGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2 aWNlc1NQSS5oPgogI2ltcG9ydCA8cGFsL3NwaS9jb2NvYS9OU0FjY2Vzc2liaWxpdHlTUEkuaD4K QEAgLTEwOCwxMCArMTA3LDYgQEAKICNpbXBvcnQgPHd0Zi9jb2NvYS9SdW50aW1lQXBwbGljYXRp b25DaGVja3NDb2NvYS5oPgogI2ltcG9ydCA8d3RmL2NvY29hL1ZlY3RvckNvY29hLmg+CiAKLSNp ZiBFTkFCTEUoQ0ZQUkVGU19ESVJFQ1RfTU9ERSkKLSNpbXBvcnQgIkFjY2Vzc2liaWxpdHlTdXBw b3J0U1BJLmgiCi0jZW5kaWYKLQogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQogI2ltcG9y dCA8SmF2YVNjcmlwdENvcmUvUmVtb3RlSW5zcGVjdG9yLmg+CiAjZW5kaWYKQEAgLTE4NiwxMSAr MTgxLDYgQEAgU09GVF9MSU5LX0ZSQU1FV09SS19JTl9VTUJSRUxMQShBcHBsaWNhdAogU09GVF9M SU5LX0ZVTkNUSU9OX01BWV9GQUlMX0ZPUl9TT1VSQ0UoV2ViS2l0LCBISVNlcnZpY2VzLCBfQVhT ZXRBdWRpdFRva2VuSXNBdXRoZW50aWNhdGVkQ2FsbGJhY2ssIHZvaWQsIChBWEF1ZGl0VG9rZW5J c0F1dGhlbnRpY2F0ZWRDYWxsYmFjayBjYWxsYmFjayksIChjYWxsYmFjaykpCiAjZW5kaWYKIAot I2lmIEhBVkUoVVBEQVRFX1dFQl9BQ0NFU1NJQklMSVRZX1NFVFRJTkdTKSAmJiBFTkFCTEUoQ0ZQ UkVGU19ESVJFQ1RfTU9ERSkKLVNPRlRfTElOS19MSUJSQVJZKGxpYkFjY2Vzc2liaWxpdHkpCi1T T0ZUX0xJTktfT1BUSU9OQUwobGliQWNjZXNzaWJpbGl0eSwgX0FYU1VwZGF0ZVdlYkFjY2Vzc2li aWxpdHlTZXR0aW5ncywgdm9pZCwgKCksICgpKTsKLSNlbmRpZgotCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCkBAIC0xMTA3LDcgKzEwOTcsNyBAQCBzdGF0 aWMgY29uc3QgV1RGOjpTdHJpbmcmIGNhcHRpb25Qcm9maWxlCiAgICAgcmV0dXJuIGtleTsKIH0K IAotc3RhdGljIHZvaWQgZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5j ZUNoYW5nZShjb25zdCBTdHJpbmcmIGtleSkKK3ZvaWQgV2ViUHJvY2Vzczo6ZGlzcGF0Y2hTaW11 bGF0ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcmIGtleSkK IHsKICNpZiBVU0UoQVBQS0lUKQogICAgIC8vIE9yZGluYXJpbHksIG90aGVyIHBhcnRzIG9mIHRo ZSBzeXN0ZW0gZW5zdXJlIHRoYXQgdGhpcyBub3RpZmljYXRpb24gaXMgcG9zdGVkIGFmdGVyIHRo aXMgZGVmYXVsdCBpcyBjaGFuZ2VkLgpAQCAtMTEzMSw3ICsxMTIxLDcgQEAgc3RhdGljIHZvaWQg ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpbwogICAgIH0KIH0KIAotc3RhdGljIHZvaWQgaGFu ZGxlUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcmIGRvbWFpbiwgY29uc3QgU3RyaW5nJiBr ZXksIGlkIHZhbHVlKQordm9pZCBXZWJQcm9jZXNzOjpoYW5kbGVQcmVmZXJlbmNlQ2hhbmdlKGNv bnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgaWQgdmFsdWUpCiB7CiAgICAg aWYgKGtleSA9PSAiQXBwbGVMYW5ndWFnZXMiKSB7CiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc2V0 IEFwcGxlTGFuZ3VhZ2VzIGZvciB0aGUgdm9sYXRpbGUgZG9tYWluLCBzaW1pbGFybHkgdG8gd2hh dCB3ZSBkbyBpbiBYUENTZXJ2aWNlTWFpbi5tbS4KQEAgLTExNDMsMzkgKzExMzMsMTggQEAgc3Rh dGljIHZvaWQgaGFuZGxlUHJlZmVyZW5jZUNoYW5nZShjb25zdAogICAgICAgICBXVEY6Omxhbmd1 YWdlRGlkQ2hhbmdlKCk7CiAgICAgfQogCi0gICAgaWYgKGRvbWFpbiA9PSBTdHJpbmcoa0FYU0Fj Y2Vzc2liaWxpdHlQcmVmZXJlbmNlRG9tYWluKSkgewotI2lmIEhBVkUoVVBEQVRFX1dFQl9BQ0NF U1NJQklMSVRZX1NFVFRJTkdTKSAmJiBFTkFCTEUoQ0ZQUkVGU19ESVJFQ1RfTU9ERSkKLSAgICAg ICAgaWYgKF9BWFNVcGRhdGVXZWJBY2Nlc3NpYmlsaXR5U2V0dGluZ3NQdHIoKSkKLSAgICAgICAg ICAgIF9BWFNVcGRhdGVXZWJBY2Nlc3NpYmlsaXR5U2V0dGluZ3NQdHIoKSgpOwotI2VsaWYgUExB VEZPUk0oSU9TX0ZBTUlMWSkKLSAgICAgICAgLy8gSWYgdGhlIHVwZGF0ZSBtZXRob2QgaXMgbm90 IGF2YWlsYWJsZSwgdG8gdXBkYXRlIHRoZSBjYWNoZSBpbnNpZGUgQWNjZXNzaWJpbGl0eVN1cHBv cnQsCi0gICAgICAgIC8vIHRoZXNlIG1ldGhvZHMgbmVlZCB0byBiZSBjYWxsZWQgZGlyZWN0bHku Ci0gICAgICAgIGlmIChDRkVxdWFsKGtleS5jcmVhdGVDRlN0cmluZygpLmdldCgpLCBrQVhTUmVk dWNlTW90aW9uUHJlZmVyZW5jZSkgJiYgW3ZhbHVlIGlzS2luZE9mQ2xhc3M6W05TTnVtYmVyIGNs YXNzXV0pCi0gICAgICAgICAgICBfQVhTU2V0UmVkdWNlTW90aW9uRW5hYmxlZChbKE5TTnVtYmVy ICopdmFsdWUgYm9vbFZhbHVlXSk7Ci0gICAgICAgIGVsc2UgaWYgKENGRXF1YWwoa2V5LmNyZWF0 ZUNGU3RyaW5nKCkuZ2V0KCksIGluY3JlYXNlQ29udHJhc3RQcmVmZXJlbmNlS2V5KCkpICYmIFt2 YWx1ZSBpc0tpbmRPZkNsYXNzOltOU051bWJlciBjbGFzc11dKQotICAgICAgICAgICAgX0FYU1Nl dERhcmtlblN5c3RlbUNvbG9ycyhbKE5TTnVtYmVyICopdmFsdWUgYm9vbFZhbHVlXSk7Ci0jZW5k aWYKLSAgICB9Ci0gICAgCiAjaWYgVVNFKEFQUEtJVCkKICAgICBhdXRvIGNmS2V5ID0ga2V5LmNy ZWF0ZUNGU3RyaW5nKCk7CiAgICAgaWYgKENGRXF1YWwoY2ZLZXkuZ2V0KCksIGtBWEludGVyZmFj ZVJlZHVjZU1vdGlvbktleSkgfHwgQ0ZFcXVhbChjZktleS5nZXQoKSwga0FYSW50ZXJmYWNlSW5j cmVhc2VDb250cmFzdEtleSkgfHwga2V5ID09IGludmVydENvbG9yc1ByZWZlcmVuY2VLZXkoKSkK ICAgICAgICAgW05TV29ya3NwYWNlIF9pbnZhbGlkYXRlQWNjZXNzaWJpbGl0eURpc3BsYXlWYWx1 ZXNdOwogI2VuZGlmCiAKLSAgICBkaXNwYXRjaFNpbXVsYXRlZE5vdGlmaWNhdGlvbnNGb3JQcmVm ZXJlbmNlQ2hhbmdlKGtleSk7CisgICAgQXV4aWxpYXJ5UHJvY2Vzczo6aGFuZGxlUHJlZmVyZW5j ZUNoYW5nZShkb21haW4sIGtleSwgdmFsdWUpOwogfQogCiB2b2lkIFdlYlByb2Nlc3M6Om5vdGlm eVByZWZlcmVuY2VzQ2hhbmdlZChjb25zdCBTdHJpbmcmIGRvbWFpbiwgY29uc3QgU3RyaW5nJiBr ZXksIGNvbnN0IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiYgZW5jb2RlZFZhbHVlKQogewotICAgIGlk IHZhbHVlID0gbmlsOwotICAgIGlmIChlbmNvZGVkVmFsdWUpIHsKLSAgICAgICAgdmFsdWUgPSBk ZWNvZGVQcmVmZXJlbmNlVmFsdWUoZW5jb2RlZFZhbHVlKTsKLSAgICAgICAgaWYgKCF2YWx1ZSkK LSAgICAgICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgc2V0UHJlZmVyZW5jZVZhbHVlKGRvbWFp biwga2V5LCB2YWx1ZSk7Ci0gICAgaGFuZGxlUHJlZmVyZW5jZUNoYW5nZShkb21haW4sIGtleSwg dmFsdWUpOworICAgIHByZWZlcmVuY2VEaWRVcGRhdGUoZG9tYWluLCBrZXksIGVuY29kZWRWYWx1 ZSk7CiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6dW5ibG9ja1ByZWZlcmVuY2VTZXJ2aWNlKFZlY3Rv cjxTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+JiYgaGFuZGxlQXJyYXkpCg== 438486 2021-09-17 09:57:32 -0700 2021-09-17 10:36:35 -0700 Patch bug-230409-20210917095731.patch text/plain 11839 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODI2NjQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDIxLTA5LTE3ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVUF0gVXBkYXRlIEFYIHNl dHRpbmdzIG9uIHByZWZlcmVuY2UgdXBkYXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwNDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMg RmxlaXphY2guCisKKyAgICAgICAgV2Ugc2hvdWxkIHVwZGF0ZSBBWCBzZXR0aW5ncyBpbiB0aGUg R1BVUCBwcm9jZXNzIG9uIHByZWZlcmVuY2UgdXBkYXRlcywgbGlrZSB3ZSBkbyBpbiB0aGUgV2Vi Q29udGVudCBwcm9jZXNzLiBUbyBhZGRyZXNzIHRoaXMsCisgICAgICAgIG1vdmUgYXNzb2NpYXRl ZCBjb2RlIGZyb20gdGhlIFdlYlByb2Nlc3MgY2xhc3MgdG8gdGhlIEF1eGlsaWFyeVByb2Nlc3Mg Y2xhc3MuCisKKyAgICAgICAgKiBHUFVQcm9jZXNzL0dQVVByb2Nlc3MuaDoKKyAgICAgICAgKiBH UFVQcm9jZXNzL2NvY29hL0dQVVByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6R1BV UHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6R1BV UHJvY2Vzczo6ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5jZUNoYW5n ZSk6CisgICAgICAgICogU2hhcmVkL0F1eGlsaWFyeVByb2Nlc3MuaDoKKyAgICAgICAgKFdlYktp dDo6QXV4aWxpYXJ5UHJvY2Vzczo6ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJl ZmVyZW5jZUNoYW5nZSk6CisgICAgICAgICogU2hhcmVkL0NvY29hL0F1eGlsaWFyeVByb2Nlc3ND b2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6QXV4aWxpYXJ5UHJvY2Vzczo6cHJlZmVyZW5jZURp ZFVwZGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OkF1eGlsaWFyeVByb2Nlc3M6OmhhbmRsZVByZWZl cmVuY2VDaGFuZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorICAgICAg ICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0 OjpXZWJQcm9jZXNzOjpkaXNwYXRjaFNpbXVsYXRlZE5vdGlmaWNhdGlvbnNGb3JQcmVmZXJlbmNl Q2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6aGFuZGxlUHJlZmVyZW5jZUNo YW5nZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6Om5vdGlmeVByZWZlcmVuY2VzQ2hh bmdlZCk6CisgICAgICAgIChXZWJLaXQ6OmRpc3BhdGNoU2ltdWxhdGVkTm90aWZpY2F0aW9uc0Zv clByZWZlcmVuY2VDaGFuZ2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpoYW5kbGVQcmVm ZXJlbmNlQ2hhbmdlKTogRGVsZXRlZC4KKwogMjAyMS0wOS0xNyAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bYTExeV0gQWRkIGEgYnVp bGQgb3B0aW9uIHRvIGVuYWJsZSBBVFNQSQpJbmRleDogU291cmNlL1dlYktpdC9HUFVQcm9jZXNz L0dQVVByb2Nlc3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BV UHJvY2Vzcy5oCShyZXZpc2lvbiAyODI1OTcpCisrKyBTb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mv R1BVUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTcsNiArMTU3LDcgQEAgcHJpdmF0ZToK IAogI2lmIEVOQUJMRShDRlBSRUZTX0RJUkVDVF9NT0RFKQogICAgIHZvaWQgbm90aWZ5UHJlZmVy ZW5jZXNDaGFuZ2VkKGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgY29u c3Qgc3RkOjpvcHRpb25hbDxTdHJpbmc+JiBlbmNvZGVkVmFsdWUpOworICAgIHZvaWQgZGlzcGF0 Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcm IGtleSkgZmluYWw7CiAjZW5kaWYKIAogICAgIC8vIENvbm5lY3Rpb25zIHRvIFdlYlByb2Nlc3Nl cy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9jb2NvYS9HUFVQcm9jZXNzQ29jb2Eu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2NvY29hL0dQVVByb2Nl c3NDb2NvYS5tbQkocmV2aXNpb24gMjgyNTk3KQorKysgU291cmNlL1dlYktpdC9HUFVQcm9jZXNz L2NvY29hL0dQVVByb2Nlc3NDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtNjksMTUgKzY5LDE0 IEBAIFJldGFpblB0cjxOU0RpY3Rpb25hcnk+IEdQVVByb2Nlc3M6OmFkZGkKICNpZiBFTkFCTEUo Q0ZQUkVGU19ESVJFQ1RfTU9ERSkKIHZvaWQgR1BVUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXND aGFuZ2VkKGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3Qgc3Rk OjpvcHRpb25hbDxTdHJpbmc+JiBlbmNvZGVkVmFsdWUpCiB7Ci0gICAgaWQgdmFsdWUgPSBuaWw7 Ci0gICAgaWYgKGVuY29kZWRWYWx1ZSkgewotICAgICAgICB2YWx1ZSA9IGRlY29kZVByZWZlcmVu Y2VWYWx1ZShlbmNvZGVkVmFsdWUpOwotICAgICAgICBpZiAoIXZhbHVlKQotICAgICAgICAgICAg cmV0dXJuOwotICAgIH0KLSAgICBzZXRQcmVmZXJlbmNlVmFsdWUoZG9tYWluLCBrZXksIHZhbHVl KTsKKyAgICBwcmVmZXJlbmNlRGlkVXBkYXRlKGRvbWFpbiwga2V5LCBlbmNvZGVkVmFsdWUpOwog fQotI2VuZGlmCisKK3ZvaWQgR1BVUHJvY2Vzczo6ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRp b25zRm9yUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcmIGtleSkKK3sKK30KKworI2VuZGlm IC8vIEVOQUJMRShDRlBSRUZTX0RJUkVDVF9NT0RFKQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK IApJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vzcy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0F1eGlsaWFyeVByb2Nlc3MuaAkocmV2aXNpb24g MjgyNTk3KQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vzcy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMzgsNiArMTM4LDEwIEBAIHByb3RlY3RlZDoKICNpZiBFTkFCTEUoQ0ZQ UkVGU19ESVJFQ1RfTU9ERSkKICAgICBzdGF0aWMgaWQgZGVjb2RlUHJlZmVyZW5jZVZhbHVlKGNv bnN0IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiYgZW5jb2RlZFZhbHVlKTsKICAgICBzdGF0aWMgdm9p ZCBzZXRQcmVmZXJlbmNlVmFsdWUoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYg a2V5LCBpZCB2YWx1ZSk7CisgICAgCisgICAgdmlydHVhbCB2b2lkIHByZWZlcmVuY2VEaWRVcGRh dGUoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBzdGQ6Om9w dGlvbmFsPFN0cmluZz4mIGVuY29kZWRWYWx1ZSk7CisgICAgdmlydHVhbCB2b2lkIGhhbmRsZVBy ZWZlcmVuY2VDaGFuZ2UoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYga2V5LCBp ZCB2YWx1ZSk7CisgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoU2ltdWxhdGVkTm90aWZpY2F0aW9u c0ZvclByZWZlcmVuY2VDaGFuZ2UoY29uc3QgU3RyaW5nJiBrZXkpIHsgfQogI2VuZGlmCiAKIHBy aXZhdGU6CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9BdXhpbGlhcnlQcm9jZXNz Q29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvQXV4aWxp YXJ5UHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyODI1OTcpCisrKyBTb3VyY2UvV2ViS2l0L1No YXJlZC9Db2NvYS9BdXhpbGlhcnlQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTM1 LDYgKzM1LDE2IEBACiAjaW1wb3J0IDx3dGYvY29jb2EvRW50aXRsZW1lbnRzLmg+CiAjaW1wb3J0 IDx3dGYvY29jb2EvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzQ29jb2EuaD4KIAorI2lmIEVOQUJM RShDRlBSRUZTX0RJUkVDVF9NT0RFKQorI2ltcG9ydCAiQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEku aCIKKyNpbXBvcnQgPHBhbC9zcGkvY29jb2EvQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaD4KKyNl bmRpZgorCisjaWYgSEFWRShVUERBVEVfV0VCX0FDQ0VTU0lCSUxJVFlfU0VUVElOR1MpICYmIEVO QUJMRShDRlBSRUZTX0RJUkVDVF9NT0RFKQorU09GVF9MSU5LX0xJQlJBUlkobGliQWNjZXNzaWJp bGl0eSkKK1NPRlRfTElOS19PUFRJT05BTChsaWJBY2Nlc3NpYmlsaXR5LCBfQVhTVXBkYXRlV2Vi QWNjZXNzaWJpbGl0eVNldHRpbmdzLCB2b2lkLCAoKSwgKCkpOworI2VuZGlmCisKIG5hbWVzcGFj ZSBXZWJLaXQgewogCiAjaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShNQUNDQVRBTFlTVCkK QEAgLTE2MCw2ICsxNzAsNDYgQEAgdm9pZCBBdXhpbGlhcnlQcm9jZXNzOjpzZXRQcmVmZXJlbmNl VmFsdQogICAgIH0gZWxzZQogICAgICAgICBDRlByZWZlcmVuY2VzU2V0VmFsdWUoa2V5LmNyZWF0 ZUNGU3RyaW5nKCkuZ2V0KCksIChfX2JyaWRnZSBDRlByb3BlcnR5TGlzdFJlZil2YWx1ZSwgZG9t YWluLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCksIGtDRlByZWZlcmVuY2VzQ3VycmVudFVzZXIsIGtD RlByZWZlcmVuY2VzQW55SG9zdCk7CiB9CisKK3ZvaWQgQXV4aWxpYXJ5UHJvY2Vzczo6cHJlZmVy ZW5jZURpZFVwZGF0ZShjb25zdCBTdHJpbmcmIGRvbWFpbiwgY29uc3QgU3RyaW5nJiBrZXksIGNv bnN0IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiYgZW5jb2RlZFZhbHVlKQoreworICAgIGlkIHZhbHVl ID0gbmlsOworICAgIGlmIChlbmNvZGVkVmFsdWUpIHsKKyAgICAgICAgdmFsdWUgPSBkZWNvZGVQ cmVmZXJlbmNlVmFsdWUoZW5jb2RlZFZhbHVlKTsKKyAgICAgICAgaWYgKCF2YWx1ZSkKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICB9CisgICAgc2V0UHJlZmVyZW5jZVZhbHVlKGRvbWFpbiwga2V5 LCB2YWx1ZSk7CisgICAgaGFuZGxlUHJlZmVyZW5jZUNoYW5nZShkb21haW4sIGtleSwgdmFsdWUp OworfQorCisjaWYgIUhBVkUoVVBEQVRFX1dFQl9BQ0NFU1NJQklMSVRZX1NFVFRJTkdTKSAmJiBQ TEFURk9STShJT1NfRkFNSUxZKQorc3RhdGljIGNvbnN0IFdURjo6U3RyaW5nJiBpbmNyZWFzZUNv bnRyYXN0UHJlZmVyZW5jZUtleSgpCit7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFdURjo6 U3RyaW5nPiBrZXkoTUFLRV9TVEFUSUNfU1RSSU5HX0lNUEwoIkRhcmtlblN5c3RlbUNvbG9ycyIp KTsKKyAgICByZXR1cm4ga2V5OworfQorI2VuZGlmCisKK3ZvaWQgQXV4aWxpYXJ5UHJvY2Vzczo6 aGFuZGxlUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcmIGRvbWFpbiwgY29uc3QgU3RyaW5n JiBrZXksIGlkIHZhbHVlKQoreworICAgIGlmIChkb21haW4gPT0gU3RyaW5nKGtBWFNBY2Nlc3Np YmlsaXR5UHJlZmVyZW5jZURvbWFpbikpIHsKKyNpZiBIQVZFKFVQREFURV9XRUJfQUNDRVNTSUJJ TElUWV9TRVRUSU5HUykKKyAgICAgICAgaWYgKF9BWFNVcGRhdGVXZWJBY2Nlc3NpYmlsaXR5U2V0 dGluZ3NQdHIoKSkKKyAgICAgICAgICAgIF9BWFNVcGRhdGVXZWJBY2Nlc3NpYmlsaXR5U2V0dGlu Z3NQdHIoKSgpOworI2VsaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICAgICAgLy8gSWYgdGhl IHVwZGF0ZSBtZXRob2QgaXMgbm90IGF2YWlsYWJsZSwgdG8gdXBkYXRlIHRoZSBjYWNoZSBpbnNp ZGUgQWNjZXNzaWJpbGl0eVN1cHBvcnQsCisgICAgICAgIC8vIHRoZXNlIG1ldGhvZHMgbmVlZCB0 byBiZSBjYWxsZWQgZGlyZWN0bHkuCisgICAgICAgIGlmIChDRkVxdWFsKGtleS5jcmVhdGVDRlN0 cmluZygpLmdldCgpLCBrQVhTUmVkdWNlTW90aW9uUHJlZmVyZW5jZSkgJiYgW3ZhbHVlIGlzS2lu ZE9mQ2xhc3M6W05TTnVtYmVyIGNsYXNzXV0pCisgICAgICAgICAgICBfQVhTU2V0UmVkdWNlTW90 aW9uRW5hYmxlZChbKE5TTnVtYmVyICopdmFsdWUgYm9vbFZhbHVlXSk7CisgICAgICAgIGVsc2Ug aWYgKENGRXF1YWwoa2V5LmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCksIGluY3JlYXNlQ29udHJhc3RQ cmVmZXJlbmNlS2V5KCkpICYmIFt2YWx1ZSBpc0tpbmRPZkNsYXNzOltOU051bWJlciBjbGFzc11d KQorICAgICAgICAgICAgX0FYU1NldERhcmtlblN5c3RlbUNvbG9ycyhbKE5TTnVtYmVyICopdmFs dWUgYm9vbFZhbHVlXSk7CisjZW5kaWYKKyAgICB9CisKKyAgICBkaXNwYXRjaFNpbXVsYXRlZE5v dGlmaWNhdGlvbnNGb3JQcmVmZXJlbmNlQ2hhbmdlKGtleSk7Cit9CisKICNlbmRpZiAvLyBFTkFC TEUoQ0ZQUkVGU19ESVJFQ1RfTU9ERSkKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBT b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgJKHJldmlzaW9uIDI4MjU5NykKKysrIFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgJKHdvcmtpbmcgY29weSkKQEAgLTYw Nyw2ICs2MDcsMTEgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldFVzZVN5c3RlbUFwcGVhcmFuY2VG b3JTY3JvbGxiYXJzKGJvb2wpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoQ0ZQUkVGU19ESVJFQ1Rf TU9ERSkKKyAgICB2b2lkIGhhbmRsZVByZWZlcmVuY2VDaGFuZ2UoY29uc3QgU3RyaW5nJiBkb21h aW4sIGNvbnN0IFN0cmluZyYga2V5LCBpZCB2YWx1ZSkgZmluYWw7CisgICAgdm9pZCBkaXNwYXRj aFNpbXVsYXRlZE5vdGlmaWNhdGlvbnNGb3JQcmVmZXJlbmNlQ2hhbmdlKGNvbnN0IFN0cmluZyYg a2V5KSBmaW5hbDsKKyNlbmRpZgorCiAgICAgUmVmUHRyPFdlYkNvbm5lY3Rpb25Ub1VJUHJvY2Vz cz4gbV93ZWJDb25uZWN0aW9uOwogCiAgICAgSGFzaE1hcDxXZWJDb3JlOjpQYWdlSWRlbnRpZmll ciwgUmVmUHRyPFdlYlBhZ2U+PiBtX3BhZ2VNYXA7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI4MjU5NykK KysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdv cmtpbmcgY29weSkKQEAgLTkwLDcgKzkwLDYgQEAKICNpbXBvcnQgPHBhbC9zcGkvY2YvQ0ZVdGls aXRpZXNTUEkuaD4KICNpbXBvcnQgPHBhbC9zcGkvY2cvQ29yZUdyYXBoaWNzU1BJLmg+CiAjaW1w b3J0IDxwYWwvc3BpL2NvY29hL0FWRm91bmRhdGlvblNQSS5oPgotI2ltcG9ydCA8cGFsL3NwaS9j b2NvYS9BY2Nlc3NpYmlsaXR5U3VwcG9ydFNQSS5oPgogI2ltcG9ydCA8cGFsL3NwaS9jb2NvYS9D b3JlU2VydmljZXNTUEkuaD4KICNpbXBvcnQgPHBhbC9zcGkvY29jb2EvTGF1bmNoU2VydmljZXNT UEkuaD4KICNpbXBvcnQgPHBhbC9zcGkvY29jb2EvTlNBY2Nlc3NpYmlsaXR5U1BJLmg+CkBAIC0x MDgsMTAgKzEwNyw2IEBACiAjaW1wb3J0IDx3dGYvY29jb2EvUnVudGltZUFwcGxpY2F0aW9uQ2hl Y2tzQ29jb2EuaD4KICNpbXBvcnQgPHd0Zi9jb2NvYS9WZWN0b3JDb2NvYS5oPgogCi0jaWYgRU5B QkxFKENGUFJFRlNfRElSRUNUX01PREUpCi0jaW1wb3J0ICJBY2Nlc3NpYmlsaXR5U3VwcG9ydFNQ SS5oIgotI2VuZGlmCi0KICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKICNpbXBvcnQgPEph dmFTY3JpcHRDb3JlL1JlbW90ZUluc3BlY3Rvci5oPgogI2VuZGlmCkBAIC0xODYsMTEgKzE4MSw2 IEBAIFNPRlRfTElOS19GUkFNRVdPUktfSU5fVU1CUkVMTEEoQXBwbGljYXQKIFNPRlRfTElOS19G VU5DVElPTl9NQVlfRkFJTF9GT1JfU09VUkNFKFdlYktpdCwgSElTZXJ2aWNlcywgX0FYU2V0QXVk aXRUb2tlbklzQXV0aGVudGljYXRlZENhbGxiYWNrLCB2b2lkLCAoQVhBdWRpdFRva2VuSXNBdXRo ZW50aWNhdGVkQ2FsbGJhY2sgY2FsbGJhY2spLCAoY2FsbGJhY2spKQogI2VuZGlmCiAKLSNpZiBI QVZFKFVQREFURV9XRUJfQUNDRVNTSUJJTElUWV9TRVRUSU5HUykgJiYgRU5BQkxFKENGUFJFRlNf RElSRUNUX01PREUpCi1TT0ZUX0xJTktfTElCUkFSWShsaWJBY2Nlc3NpYmlsaXR5KQotU09GVF9M SU5LX09QVElPTkFMKGxpYkFjY2Vzc2liaWxpdHksIF9BWFNVcGRhdGVXZWJBY2Nlc3NpYmlsaXR5 U2V0dGluZ3MsIHZvaWQsICgpLCAoKSk7Ci0jZW5kaWYKLQogbmFtZXNwYWNlIFdlYktpdCB7CiB1 c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtMTA5MywyMSArMTA4MywxMyBAQCBzdGF0aWMg Y29uc3QgV1RGOjpTdHJpbmcmIGludmVydENvbG9yc1ByCiB9CiAjZW5kaWYKIAotI2lmICEoSEFW RShVUERBVEVfV0VCX0FDQ0VTU0lCSUxJVFlfU0VUVElOR1MpICYmIEVOQUJMRShDRlBSRUZTX0RJ UkVDVF9NT0RFKSkgJiYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLXN0YXRpYyBjb25zdCBXVEY6OlN0 cmluZyYgaW5jcmVhc2VDb250cmFzdFByZWZlcmVuY2VLZXkoKQotewotICAgIHN0YXRpYyBOZXZl ckRlc3Ryb3llZDxXVEY6OlN0cmluZz4ga2V5KE1BS0VfU1RBVElDX1NUUklOR19JTVBMKCJEYXJr ZW5TeXN0ZW1Db2xvcnMiKSk7Ci0gICAgcmV0dXJuIGtleTsKLX0KLSNlbmRpZgotCiBzdGF0aWMg Y29uc3QgV1RGOjpTdHJpbmcmIGNhcHRpb25Qcm9maWxlUHJlZmVyZW5jZUtleSgpCiB7CiAgICAg c3RhdGljIE5ldmVyRGVzdHJveWVkPFdURjo6U3RyaW5nPiBrZXkoTUFLRV9TVEFUSUNfU1RSSU5H X0lNUEwoIk1BQ2FwdGlvbkFjdGl2ZVByb2ZpbGUiKSk7CiAgICAgcmV0dXJuIGtleTsKIH0KIAot c3RhdGljIHZvaWQgZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5jZUNo YW5nZShjb25zdCBTdHJpbmcmIGtleSkKK3ZvaWQgV2ViUHJvY2Vzczo6ZGlzcGF0Y2hTaW11bGF0 ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcmIGtleSkKIHsK ICNpZiBVU0UoQVBQS0lUKQogICAgIC8vIE9yZGluYXJpbHksIG90aGVyIHBhcnRzIG9mIHRoZSBz eXN0ZW0gZW5zdXJlIHRoYXQgdGhpcyBub3RpZmljYXRpb24gaXMgcG9zdGVkIGFmdGVyIHRoaXMg ZGVmYXVsdCBpcyBjaGFuZ2VkLgpAQCAtMTEzMSw3ICsxMTEzLDcgQEAgc3RhdGljIHZvaWQgZGlz cGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpbwogICAgIH0KIH0KIAotc3RhdGljIHZvaWQgaGFuZGxl UHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcmIGRvbWFpbiwgY29uc3QgU3RyaW5nJiBrZXks IGlkIHZhbHVlKQordm9pZCBXZWJQcm9jZXNzOjpoYW5kbGVQcmVmZXJlbmNlQ2hhbmdlKGNvbnN0 IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgaWQgdmFsdWUpCiB7CiAgICAgaWYg KGtleSA9PSAiQXBwbGVMYW5ndWFnZXMiKSB7CiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc2V0IEFw cGxlTGFuZ3VhZ2VzIGZvciB0aGUgdm9sYXRpbGUgZG9tYWluLCBzaW1pbGFybHkgdG8gd2hhdCB3 ZSBkbyBpbiBYUENTZXJ2aWNlTWFpbi5tbS4KQEAgLTExNDMsMzkgKzExMjUsMTggQEAgc3RhdGlj IHZvaWQgaGFuZGxlUHJlZmVyZW5jZUNoYW5nZShjb25zdAogICAgICAgICBXVEY6Omxhbmd1YWdl RGlkQ2hhbmdlKCk7CiAgICAgfQogCi0gICAgaWYgKGRvbWFpbiA9PSBTdHJpbmcoa0FYU0FjY2Vz c2liaWxpdHlQcmVmZXJlbmNlRG9tYWluKSkgewotI2lmIEhBVkUoVVBEQVRFX1dFQl9BQ0NFU1NJ QklMSVRZX1NFVFRJTkdTKSAmJiBFTkFCTEUoQ0ZQUkVGU19ESVJFQ1RfTU9ERSkKLSAgICAgICAg aWYgKF9BWFNVcGRhdGVXZWJBY2Nlc3NpYmlsaXR5U2V0dGluZ3NQdHIoKSkKLSAgICAgICAgICAg IF9BWFNVcGRhdGVXZWJBY2Nlc3NpYmlsaXR5U2V0dGluZ3NQdHIoKSgpOwotI2VsaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKLSAgICAgICAgLy8gSWYgdGhlIHVwZGF0ZSBtZXRob2QgaXMgbm90IGF2 YWlsYWJsZSwgdG8gdXBkYXRlIHRoZSBjYWNoZSBpbnNpZGUgQWNjZXNzaWJpbGl0eVN1cHBvcnQs Ci0gICAgICAgIC8vIHRoZXNlIG1ldGhvZHMgbmVlZCB0byBiZSBjYWxsZWQgZGlyZWN0bHkuCi0g ICAgICAgIGlmIChDRkVxdWFsKGtleS5jcmVhdGVDRlN0cmluZygpLmdldCgpLCBrQVhTUmVkdWNl TW90aW9uUHJlZmVyZW5jZSkgJiYgW3ZhbHVlIGlzS2luZE9mQ2xhc3M6W05TTnVtYmVyIGNsYXNz XV0pCi0gICAgICAgICAgICBfQVhTU2V0UmVkdWNlTW90aW9uRW5hYmxlZChbKE5TTnVtYmVyICop dmFsdWUgYm9vbFZhbHVlXSk7Ci0gICAgICAgIGVsc2UgaWYgKENGRXF1YWwoa2V5LmNyZWF0ZUNG U3RyaW5nKCkuZ2V0KCksIGluY3JlYXNlQ29udHJhc3RQcmVmZXJlbmNlS2V5KCkpICYmIFt2YWx1 ZSBpc0tpbmRPZkNsYXNzOltOU051bWJlciBjbGFzc11dKQotICAgICAgICAgICAgX0FYU1NldERh cmtlblN5c3RlbUNvbG9ycyhbKE5TTnVtYmVyICopdmFsdWUgYm9vbFZhbHVlXSk7Ci0jZW5kaWYK LSAgICB9Ci0gICAgCiAjaWYgVVNFKEFQUEtJVCkKICAgICBhdXRvIGNmS2V5ID0ga2V5LmNyZWF0 ZUNGU3RyaW5nKCk7CiAgICAgaWYgKENGRXF1YWwoY2ZLZXkuZ2V0KCksIGtBWEludGVyZmFjZVJl ZHVjZU1vdGlvbktleSkgfHwgQ0ZFcXVhbChjZktleS5nZXQoKSwga0FYSW50ZXJmYWNlSW5jcmVh c2VDb250cmFzdEtleSkgfHwga2V5ID09IGludmVydENvbG9yc1ByZWZlcmVuY2VLZXkoKSkKICAg ICAgICAgW05TV29ya3NwYWNlIF9pbnZhbGlkYXRlQWNjZXNzaWJpbGl0eURpc3BsYXlWYWx1ZXNd OwogI2VuZGlmCiAKLSAgICBkaXNwYXRjaFNpbXVsYXRlZE5vdGlmaWNhdGlvbnNGb3JQcmVmZXJl bmNlQ2hhbmdlKGtleSk7CisgICAgQXV4aWxpYXJ5UHJvY2Vzczo6aGFuZGxlUHJlZmVyZW5jZUNo YW5nZShkb21haW4sIGtleSwgdmFsdWUpOwogfQogCiB2b2lkIFdlYlByb2Nlc3M6Om5vdGlmeVBy ZWZlcmVuY2VzQ2hhbmdlZChjb25zdCBTdHJpbmcmIGRvbWFpbiwgY29uc3QgU3RyaW5nJiBrZXks IGNvbnN0IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiYgZW5jb2RlZFZhbHVlKQogewotICAgIGlkIHZh bHVlID0gbmlsOwotICAgIGlmIChlbmNvZGVkVmFsdWUpIHsKLSAgICAgICAgdmFsdWUgPSBkZWNv ZGVQcmVmZXJlbmNlVmFsdWUoZW5jb2RlZFZhbHVlKTsKLSAgICAgICAgaWYgKCF2YWx1ZSkKLSAg ICAgICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgc2V0UHJlZmVyZW5jZVZhbHVlKGRvbWFpbiwg a2V5LCB2YWx1ZSk7Ci0gICAgaGFuZGxlUHJlZmVyZW5jZUNoYW5nZShkb21haW4sIGtleSwgdmFs dWUpOworICAgIHByZWZlcmVuY2VEaWRVcGRhdGUoZG9tYWluLCBrZXksIGVuY29kZWRWYWx1ZSk7 CiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6dW5ibG9ja1ByZWZlcmVuY2VTZXJ2aWNlKFZlY3RvcjxT YW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+JiYgaGFuZGxlQXJyYXkpCg==