222868 2021-03-06 12:24:59 -0800 Transition Cocoa DumpRenderTree to allow any preference keys, not just hard coded supported ones 2021-03-07 09:42:17 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sam sam simon.fraser webkit-bug-importer oldest_to_newest 1736832 0 sam 2021-03-06 12:24:59 -0800 Transition Cocoa DumpRenderTree to allow any preference key, not just hard codded supported one 1736833 1 422505 sam 2021-03-06 12:30:48 -0800 Created attachment 422505 Patch 1736874 2 422515 sam 2021-03-06 18:21:55 -0800 Created attachment 422515 Patch 1736934 3 422515 simon.fraser 2021-03-07 09:28:45 -0800 Comment on attachment 422515 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422515&action=review > Tools/DumpRenderTree/TestOptions.cpp:123 > + { "AspectRatioOfImgFromWidthAndHeightEnabled", false }, > + { "AsyncClipboardAPIEnabled", false }, > + { "CSSOMViewSmoothScrollingEnabled", false }, > + { "ContactPickerAPIEnabled", false }, > + { "CoreMathMLEnabled", false }, > + { "GenericCueAPIEnabled", false }, > + { "IntersectionObserverEnabled", false }, > + { "IsLoggedInAPIEnabled", false }, > + { "LazyIframeLoadingEnabled", false }, > + { "LazyImageLoadingEnabled", false }, > + { "RequestIdleCallbackEnabled", false }, > + { "ResizeObserverEnabled", false }, > + { "WebAuthenticationEnabled", false }, > + { "WebGPUEnabled", false }, Seems like at least some of these should just be enabled in WK1. Like, AspectRatioOfImgFromWidthAndHeightEnabled is purely about layout. 1736937 4 ews-feeder 2021-03-07 09:41:55 -0800 Committed r274052: <https://commits.webkit.org/r274052> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422515. 1736938 5 webkit-bug-importer 2021-03-07 09:42:17 -0800 <rdar://problem/75148917> 422505 2021-03-06 12:30:48 -0800 2021-03-06 18:21:53 -0800 Patch bug-222868-20210306123047.patch text/plain 18644 sam SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NDA0MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDIxLTAzLTA2ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKwor ICAgICAgICBUcmFuc2l0aW9uIENvY29hIER1bXBSZW5kZXJUcmVlIHRvIGFsbG93IGFueSBwcmVm ZXJlbmNlIGtleXMsIG5vdCBqdXN0IGhhcmQgY29kZWQgc3VwcG9ydGVkIG9uZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjg2OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYWxsb3dzIGFueSBw cmVmZXJlbmNlIGtleSBpbiBhIFdlYlByZWZlcmVuY2UqLnlhbWwgdG8gYmUgdXNlZCBmb3IgQ29j b2EgV2ViS2l0TGVnYWN5CisgICAgICAgIHRlc3RzIGluIHRoZSBjb21tZW50IGhlYWRlciBjb21t YW5kLCBqdXN0IGxpa2UgV2ViS2l0VGVzdFJ1bm5lci4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL1Rlc3RPcHRpb25zLmNwcDoKKyAgICAgICAgKFdUUjo6VGVzdE9wdGlvbnM6OmRlZmF1bHRz KToKKyAgICAgICAgVXBkYXRlIGRlZmF1bHRzIHRvIG9ubHkgdGhlIGRlZmF1bHQgdmFsdWVzIHRo YXQgZG9uJ3QgbWF0Y2gKKyAgICAgICAgZGVmYXVsdHMgaW4gV2ViUHJlZmVyZW5jZSoueWFtbCBm aWxlcyBhbmQgZXhwZXJpbWVudGFsIGZlYXR1cmVzCisgICAgICAgIHRoYXQgYXJlIG5vdCBzdXBw b3J0ZWQgaW4gYnV0IHN0aWxsIGRlY2xhcmUgc3VwcG9ydCBpbiB0aGUgZmlsZS4KKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuaDoKKyAgICAgICAgUmVtb3ZlIHVuaW1wbGVt ZW50ZWQgZnVuY3Rpb24gZGVjbGFyYXRpb24uCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9t YWMvRHVtcFJlbmRlclRyZWUubW06CisgICAgICAgIChzZXRXZWJQcmVmZXJlbmNlc0ZvclRlc3RP cHRpb25zKToKKyAgICAgICAgKHNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzRm9yVGVzdGlu Zyk6CisgICAgICAgIChwcmVwYXJlQ29uc2lzdGVudFRlc3RpbmdFbnZpcm9ubWVudCk6CisgICAg ICAgIChyZXNldFdlYlByZWZlcmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKTogRGVsZXRlZC4KKyAg ICAgICAgKHdlYlByZWZlcmVuY2VGZWF0dXJlVmFsdWUpOiBEZWxldGVkLgorICAgICAgICBSZXBs YWNlIG1vc3QgZXhwbGljaXQgcmVzZXRpbmcgd2l0aCB0aGUgY29tYmluYXRpb24gb2YgX3Jlc2V0 Rm9yVGVzdGluZywgYXV0b21hdGljCisgICAgICAgIGVuYWJsaW5nIGV4cGVyaW1lbnRhbCBmZWF0 dXJlcywgYW5kIHVzZSBvZiBfc2V0PHR5cGU+UHJlZmVyZW5jZUZvclRlc3RpbmdXaXRoVmFsdWUK KyAgICAgICAgZnJvbSBUZXN0T3B0aW9ucy4KKwogMjAyMS0wMy0wNiAgRGF2aWQgS2lsemVyICA8 ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIHdlYmtpdC1wYXRjaCB3b24ndCBwYXJzZSBy ZGFyOi8vbm5ubm5ubm4gVVJMcyBpbiBDaGFuZ2VMb2dzCkluZGV4OiBUb29scy9EdW1wUmVuZGVy VHJlZS9UZXN0T3B0aW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUv VGVzdE9wdGlvbnMuY3BwCShyZXZpc2lvbiAyNzQwNDApCisrKyBUb29scy9EdW1wUmVuZGVyVHJl ZS9UZXN0T3B0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICog Q29weXJpZ2h0IChDKSAyMDE2LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICogQ29weXJpZ2h0IChDKSAyMDE2LTIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC02Myw1NCArNjMsNzEgQEAgY29u c3QgVGVzdEZlYXR1cmVzJiBUZXN0T3B0aW9uczo6ZGVmYXVsdAogICAgIHN0YXRpYyBUZXN0RmVh dHVyZXMgZmVhdHVyZXM7CiAgICAgaWYgKGZlYXR1cmVzLmJvb2xXZWJQcmVmZXJlbmNlRmVhdHVy ZXMuZW1wdHkoKSkgewogICAgICAgICBmZWF0dXJlcy5ib29sV2ViUHJlZmVyZW5jZUZlYXR1cmVz ID0gewotICAgICAgICAgICAgLy8gVGhlc2UgYXJlIFdlYlByZWZlcmVuY2UgdmFsdWVzIHRoYXQg bXVzdCBhbHdheXMgYmUgc2V0IGFzIHRoZXkgbWF5CisgICAgICAgICAgICAvLyBUaGVzZSBhcmUg bm9uLWV4cGVyaW1lbnRhbCBXZWJQcmVmZXJlbmNlIHZhbHVlcyB0aGF0IG11c3QgYWx3YXlzIGJl IHNldCBhcyB0aGV5CiAgICAgICAgICAgICAvLyBkaWZmZXIgZnJvbSB0aGUgZGVmYXVsdCBzZXQg aW4gdGhlIFdlYlByZWZlcmVuY2VzKi55YW1sIGNvbmZpZ3VyYXRpb24uCi0gICAgICAgICAgICB7 ICJBY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkIiwgZmFsc2UgfSwKLSAgICAgICAgICAgIHsgIkFs bG93Q3Jvc3NPcmlnaW5TdWJyZXNvdXJjZXNUb0Fza0ZvckNyZWRlbnRpYWxzIiwgZmFsc2UgfSwK LSAgICAgICAgICAgIHsgIkFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyIsIHRydWUgfSwKLSAg ICAgICAgICAgIHsgIkFsbG93VG9wTmF2aWdhdGlvblRvRGF0YVVSTHMiLCB0cnVlIH0sCi0gICAg ICAgICAgICB7ICJBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyIsIHRydWUgfSwKKyAg ICAgICAgICAgIHsgIkFsbG93c0lubGluZU1lZGlhUGxheWJhY2siLCB0cnVlIH0sCisgICAgICAg ICAgICB7ICJDYW52YXNVc2VzQWNjZWxlcmF0ZWREcmF3aW5nIiwgdHJ1ZSB9LAorICAgICAgICAg ICAgeyAiQ29sb3JGaWx0ZXJFbmFibGVkIiwgdHJ1ZSB9LAorICAgICAgICAgICAgeyAiQ3VzdG9t UGFzdGVib2FyZERhdGFFbmFibGVkIiwgdHJ1ZSB9LAorICAgICAgICAgICAgeyAiRE9NUGFzdGVB bGxvd2VkIiwgdHJ1ZSB9LAorICAgICAgICAgICAgeyAiRGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCIs IHRydWUgfSwKKyAgICAgICAgICAgIHsgIkRpcmVjdG9yeVVwbG9hZEVuYWJsZWQiLCB0cnVlIH0s CisgICAgICAgICAgICB7ICJEb3dubG9hZEF0dHJpYnV0ZUVuYWJsZWQiLCB0cnVlIH0sCisgICAg ICAgICAgICB7ICJFbmNyeXB0ZWRNZWRpYUFQSUVuYWJsZWQiLCB0cnVlIH0sCisgICAgICAgICAg ICB7ICJGdWxsU2NyZWVuRW5hYmxlZCIsIHRydWUgfSwKKyAgICAgICAgICAgIHsgIkdhbWVwYWRz RW5hYmxlZCIsIHRydWUgfSwKKyAgICAgICAgICAgIHsgIkhpZGRlblBhZ2VDU1NBbmltYXRpb25T dXNwZW5zaW9uRW5hYmxlZCIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJJbmxpbmVNZWRpYVBs YXliYWNrUmVxdWlyZXNQbGF5c0lubGluZUF0dHJpYnV0ZSIsIGZhbHNlIH0sCisgICAgICAgICAg ICB7ICJKYXZhRW5hYmxlZCIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJKYXZhU2NyaXB0Q2Fu QWNjZXNzQ2xpcGJvYXJkIiwgdHJ1ZSB9LAorICAgICAgICAgICAgeyAiSmF2YVNjcmlwdENhbk9w ZW5XaW5kb3dzQXV0b21hdGljYWxseSIsIHRydWUgfSwKKyAgICAgICAgICAgIHsgIkxhcmdlSW1h Z2VBc3luY0RlY29kaW5nRW5hYmxlZCIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJMaW5rUHJl bG9hZEVuYWJsZWQiLCB0cnVlIH0sCisgICAgICAgICAgICB7ICJNZWRpYURhdGFMb2Fkc0F1dG9t YXRpY2FsbHkiLCB0cnVlIH0sCisgICAgICAgICAgICB7ICJNZWRpYURldmljZXNFbmFibGVkIiwg dHJ1ZSB9LAorICAgICAgICAgICAgeyAiTWVkaWFQcmVsb2FkaW5nRW5hYmxlZCIsIHRydWUgfSwK KyAgICAgICAgICAgIHsgIk1vY2tTY3JvbGxiYXJzRW5hYmxlZCIsIHRydWUgfSwKKyAgICAgICAg ICAgIHsgIk5lZWRzU3RvcmFnZUFjY2Vzc0Zyb21GaWxlVVJMc1F1aXJrIiwgZmFsc2UgfSwKKyAg ICAgICAgICAgIHsgIk9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCIsIHRydWUgfSwK KyAgICAgICAgICAgIHsgIlJlcXVpcmVzVXNlckdlc3R1cmVGb3JBdWRpb1BsYXliYWNrIiwgZmFs c2UgfSwKKyAgICAgICAgICAgIHsgIlJlcXVpcmVzVXNlckdlc3R1cmVGb3JNZWRpYVBsYXliYWNr IiwgZmFsc2UgfSwKKyAgICAgICAgICAgIHsgIlJlcXVpcmVzVXNlckdlc3R1cmVGb3JWaWRlb1Bs YXliYWNrIiwgZmFsc2UgfSwKKyAgICAgICAgICAgIHsgIlNob3VsZFByaW50QmFja2dyb3VuZHMi LCB0cnVlIH0sCisgICAgICAgICAgICB7ICJTaHJpbmtzU3RhbmRhbG9uZUltYWdlc1RvRml0Iiwg dHJ1ZSB9LAorICAgICAgICAgICAgeyAiU3VicGl4ZWxBbnRpYWxpYXNlZExheWVyVGV4dEVuYWJs ZWQiLCBmYWxzZSB9LAorICAgICAgICAgICAgeyAiVGV4dEFyZWFzQXJlUmVzaXphYmxlIiwgdHJ1 ZSB9LAorICAgICAgICAgICAgeyAiVGV4dEF1dG9zaXppbmdFbmFibGVkIiwgZmFsc2UgfSwKKyAg ICAgICAgICAgIHsgIlVzZXNCYWNrRm9yd2FyZENhY2hlIiwgZmFsc2UgfSwKKyAgICAgICAgICAg IHsgIldlYkF1ZGlvRW5hYmxlZCIsIHRydWUgfSwKKyAgICAgICAgICAgIHsgIldlYlNRTEVuYWJs ZWQiLCB0cnVlIH0sCisgICAgICAgICAgICB7ICJYU1NBdWRpdG9yRW5hYmxlZCIsIGZhbHNlIH0s CisKKyAgICAgICAgICAgIC8vIEZJWE1FOiBUaGVzZSBleHBlcmltZW50YWwgZmVhdHVyZXMgYXJl IGN1cnJlbnRseSB0aGUgb25seSBvbmVzIG5vdCBlbmFibGVkIGZvciBXZWJLaXRMZWdhY3ksIHdl CisgICAgICAgICAgICAvLyBzaG91bGQgZWl0aGVyIGVuYWJsZSB0aGVtIG9yIHN0b3AgZXhwb3Np bmcgdGhlbSAoYXMgd2UgZG8gd2l0aCB3aXRoIHByZWZlcmVuY2VzIGxpa2UgSFRUUDNFbmFibGVk KS4KKyAgICAgICAgICAgIC8vIEFsbCBvdGhlciBleHBlcmltZW50YWwgZmVhdHVyZXMgYXJlIGF1 dG9tYXRpY2FsbHkgZW5hYmxlZCByZWdhcmRsZXNzIG9mIHRoZWlyIHNwZWNpZmllZCBkZWZhdWx0 cy4KICAgICAgICAgICAgIHsgIkFzcGVjdFJhdGlvT2ZJbWdGcm9tV2lkdGhBbmRIZWlnaHRFbmFi bGVkIiwgZmFsc2UgfSwKLSAgICAgICAgICAgIHsgIkFzcGVjdFJhdGlvRW5hYmxlZCIsIHRydWUg fSwKICAgICAgICAgICAgIHsgIkFzeW5jQ2xpcGJvYXJkQVBJRW5hYmxlZCIsIGZhbHNlIH0sCi0g ICAgICAgICAgICB7ICJBdHRhY2htZW50RWxlbWVudEVuYWJsZWQiLCBmYWxzZSB9LAotICAgICAg ICAgICAgeyAiQ1NTTG9naWNhbEVuYWJsZWQiLCBmYWxzZSB9LAogICAgICAgICAgICAgeyAiQ1NT T01WaWV3U21vb3RoU2Nyb2xsaW5nRW5hYmxlZCIsIGZhbHNlIH0sCi0gICAgICAgICAgICB7ICJD b2xvckZpbHRlckVuYWJsZWQiLCBmYWxzZSB9LAogICAgICAgICAgICAgeyAiQ29udGFjdFBpY2tl ckFQSUVuYWJsZWQiLCBmYWxzZSB9LAogICAgICAgICAgICAgeyAiQ29yZU1hdGhNTEVuYWJsZWQi LCBmYWxzZSB9LAotICAgICAgICAgICAgeyAiRE9NUGFzdGVBbGxvd2VkIiwgdHJ1ZSB9LAotICAg ICAgICAgICAgeyAiRGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCIsIHRydWUgfSwKLSAgICAgICAgICAg IHsgIkhpZGRlblBhZ2VET01UaW1lclRocm90dGxpbmdFbmFibGVkIiwgZmFsc2UgfSwKLSAgICAg ICAgICAgIHsgIkluc3BlY3RvckFkZGl0aW9uc0VuYWJsZWQiLCBmYWxzZSB9LAorICAgICAgICAg ICAgeyAiR2VuZXJpY0N1ZUFQSUVuYWJsZWQiLCBmYWxzZSB9LAogICAgICAgICAgICAgeyAiSW50 ZXJzZWN0aW9uT2JzZXJ2ZXJFbmFibGVkIiwgZmFsc2UgfSwKLSAgICAgICAgICAgIHsgIkphdmFT Y3JpcHRDYW5BY2Nlc3NDbGlwYm9hcmQiLCB0cnVlIH0sCi0gICAgICAgICAgICB7ICJKYXZhU2Ny aXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5IiwgdHJ1ZSB9LAotICAgICAgICAgICAgeyAi SmF2YVNjcmlwdEVuYWJsZWQiLCB0cnVlIH0sCi0gICAgICAgICAgICB7ICJLZXlnZW5FbGVtZW50 RW5hYmxlZCIsIGZhbHNlIH0sCi0gICAgICAgICAgICB7ICJMYXlvdXRGb3JtYXR0aW5nQ29udGV4 dEludGVncmF0aW9uRW5hYmxlZCIsIHRydWUgfSwKLSAgICAgICAgICAgIHsgIkxpbmVIZWlnaHRV bml0c0VuYWJsZWQiLCBmYWxzZSB9LAotICAgICAgICAgICAgeyAiTG9hZHNJbWFnZXNBdXRvbWF0 aWNhbGx5IiwgdHJ1ZSB9LAotICAgICAgICAgICAgeyAiTWFpbkNvbnRlbnRVc2VyR2VzdHVyZU92 ZXJyaWRlRW5hYmxlZCIsIGZhbHNlIH0sCi0gICAgICAgICAgICB7ICJNZW51SXRlbUVsZW1lbnRF bmFibGVkIiwgZmFsc2UgfSwKLSAgICAgICAgICAgIHsgIk1vZGVybk1lZGlhQ29udHJvbHNFbmFi bGVkIiwgdHJ1ZSB9LAotICAgICAgICAgICAgeyAiTmVlZHNTdG9yYWdlQWNjZXNzRnJvbUZpbGVV UkxzUXVpcmsiLCBmYWxzZSB9LAotICAgICAgICAgICAgeyAiT3ZlcnNjcm9sbEJlaGF2aW9yRW5h YmxlZCIsIHRydWUgfSwKLSAgICAgICAgICAgIHsgIlBsdWdpbnNFbmFibGVkIiwgdHJ1ZSB9LAot ICAgICAgICAgICAgeyAiUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRFbmFibGVkIiwgZmFsc2UgfSwK KyAgICAgICAgICAgIHsgIklzTG9nZ2VkSW5BUElFbmFibGVkIiwgZmFsc2UgfSwKKyAgICAgICAg ICAgIHsgIkxhenlJZnJhbWVMb2FkaW5nRW5hYmxlZCIsIGZhbHNlIH0sCisgICAgICAgICAgICB7 ICJMYXp5SW1hZ2VMb2FkaW5nRW5hYmxlZCIsIGZhbHNlIH0sCiAgICAgICAgICAgICB7ICJSZXF1 ZXN0SWRsZUNhbGxiYWNrRW5hYmxlZCIsIGZhbHNlIH0sCiAgICAgICAgICAgICB7ICJSZXNpemVP YnNlcnZlckVuYWJsZWQiLCBmYWxzZSB9LAotICAgICAgICAgICAgeyAiU2VsZWN0aW9uQWNyb3Nz U2hhZG93Qm91bmRhcmllc0VuYWJsZWQiLCB0cnVlIH0sCi0gICAgICAgICAgICB7ICJTaHJpbmtz U3RhbmRhbG9uZUltYWdlc1RvRml0IiwgdHJ1ZSB9LAotICAgICAgICAgICAgeyAiU3BhdGlhbE5h dmlnYXRpb25FbmFibGVkIiwgZmFsc2UgfSwKLSAgICAgICAgICAgIHsgIlRhYnNUb0xpbmtzIiwg ZmFsc2UgfSwKLSAgICAgICAgICAgIHsgIlRlbGVwaG9uZU51bWJlclBhcnNpbmdFbmFibGVkIiwg ZmFsc2UgfSwKLSAgICAgICAgICAgIHsgIlVzZXNCYWNrRm9yd2FyZENhY2hlIiwgZmFsc2UgfSwK KyAgICAgICAgICAgIHsgIldlYkF1dGhlbnRpY2F0aW9uRW5hYmxlZCIsIGZhbHNlIH0sCiAgICAg ICAgICAgICB7ICJXZWJHUFVFbmFibGVkIiwgZmFsc2UgfSwKLSAgICAgICAgICAgIHsgIlhTU0F1 ZGl0b3JFbmFibGVkIiwgZmFsc2UgfSwKICAgICAgICAgfTsKLSAgICAgICAgZmVhdHVyZXMudWlu dDMyV2ViUHJlZmVyZW5jZUZlYXR1cmVzID0gewotICAgICAgICAgICAgeyAiTWluaW11bUZvbnRT aXplIiwgMCB9LAorICAgICAgICBmZWF0dXJlcy5zdHJpbmdXZWJQcmVmZXJlbmNlRmVhdHVyZXMg PSB7CisgICAgICAgICAgICB7ICJDdXJzaXZlRm9udEZhbWlseSIsICJBcHBsZSBDaGFuY2VyeSIg fSwKKyAgICAgICAgICAgIHsgIkZhbnRhc3lGb250RmFtaWx5IiwgIlBhcHlydXMiIH0sCisgICAg ICAgICAgICB7ICJGaXhlZEZvbnRGYW1pbHkiLCAiQ291cmllciIgfSwKKyAgICAgICAgICAgIHsg IlBpY3RvZ3JhcGhGb250RmFtaWx5IiwgIkFwcGxlIENvbG9yIEVtb2ppIiB9LAorICAgICAgICAg ICAgeyAiU2Fuc1NlcmlmRm9udEZhbWlseSIsICJIZWx2ZXRpY2EiIH0sCisgICAgICAgICAgICB7 ICJTZXJpZkZvbnRGYW1pbHkiLCAiVGltZXMiIH0sCisgICAgICAgICAgICB7ICJTdGFuZGFyZEZv bnRGYW1pbHkiLCAiVGltZXMiIH0sCiAgICAgICAgIH07CiAgICAgfQogICAgIHJldHVybiBmZWF0 dXJlczsKSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS9UZXN0UnVubmVyLmgJKHJldmlzaW9uIDI3NDA0MCkK KysrIFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuaAkod29ya2luZyBjb3B5KQpAQCAt MTM1LDEwICsxMzUsNiBAQCBwdWJsaWM6CiAgICAgc2l6ZV90IHdlYkhpc3RvcnlJdGVtQ291bnQo KTsKICAgICBpbnQgd2luZG93Q291bnQoKTsKIAotI2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcp Ci0gICAgdm9pZCBzZXRUZXh0QXV0b3NpemluZ0VuYWJsZWQoYm9vbCk7Ci0jZW5kaWYKLQogICAg IHZvaWQgc2V0QWNjdW1tdWxhdGVMb2dzRm9yQ2hhbm5lbChKU1N0cmluZ1JlZik7CiAKICAgICB2 b2lkIHJ1blVJU2NyaXB0KEpTQ29udGV4dFJlZiwgSlNTdHJpbmdSZWYsIEpTVmFsdWVSZWYgY2Fs bGJhY2spOwpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5t bQkocmV2aXNpb24gMjc0MDQwKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5k ZXJUcmVlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC04NTYsMTE0ICs4NTYsNDQgQEAgc3RhdGljIE5T U3RyaW5nICpsaWJyYXJ5UGF0aEZvckR1bXBSZW5kZQogICAgICAgICByZXR1cm4gW0Aifi9MaWJy YXJ5L0FwcGxpY2F0aW9uIFN1cHBvcnQvRHVtcFJlbmRlclRyZWUiIHN0cmluZ0J5RXhwYW5kaW5n VGlsZGVJblBhdGhdOwogfQogCi0vLyBDYWxsZWQgYmVmb3JlIGVhY2ggdGVzdC4KLXN0YXRpYyB2 b2lkIHJlc2V0V2ViUHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMoV2ViUHJlZmVyZW5jZXMg KnByZWZlcmVuY2VzKQorc3RhdGljIHZvaWQgc2V0V2ViUHJlZmVyZW5jZXNGb3JUZXN0T3B0aW9u cyhXZWJQcmVmZXJlbmNlcyAqcHJlZmVyZW5jZXMsIGNvbnN0IFdUUjo6VGVzdE9wdGlvbnMmIG9w dGlvbnMpCiB7Ci0gICAgW3ByZWZlcmVuY2VzIF9yZXNldEZvclRlc3RpbmddOworICAgIFtwcmVm ZXJlbmNlcyBfYmF0Y2hVcGRhdGVQcmVmZXJlbmNlc0luQmxvY2s6XihXZWJQcmVmZXJlbmNlcyAq cHJlZmVyZW5jZXMpIHsKKyAgICAgICAgW3ByZWZlcmVuY2VzIF9yZXNldEZvclRlc3RpbmddOwog Ci0gICAgZm9yIChXZWJGZWF0dXJlICpmZWF0dXJlIGluIFtXZWJQcmVmZXJlbmNlcyBfZXhwZXJp bWVudGFsRmVhdHVyZXNdKQotICAgICAgICBbcHJlZmVyZW5jZXMgX3NldEVuYWJsZWQ6WUVTIGZv ckZlYXR1cmU6ZmVhdHVyZV07CisgICAgICAgIGZvciAoV2ViRmVhdHVyZSAqZmVhdHVyZSBpbiBb V2ViUHJlZmVyZW5jZXMgX2V4cGVyaW1lbnRhbEZlYXR1cmVzXSkKKyAgICAgICAgICAgIFtwcmVm ZXJlbmNlcyBfc2V0RW5hYmxlZDpZRVMgZm9yRmVhdHVyZTpmZWF0dXJlXTsKIAotICAgIC8vIEZJ WE1FOiBUaGVzZSBleHBlcmltZW50YWwgZmVhdHVyZXMgYXJlIGN1cnJlbnRseSB0aGUgb25seSBv bmVzIG5vdCBlbmFibGVkIGZvciBXZWJLaXRMZWdhY3ksIHdlCi0gICAgLy8gc2hvdWxkIGVpdGhl ciBlbmFibGUgdGhlbSBvciBzdG9wIGV4cG9zaW5nIHRoZW0gKGFzIHdlIGRvIHdpdGggd2l0aCBw cmVmZXJlbmNlcyBsaWtlIEhUVFAzRW5hYmxlZCkuCi0gICAgW3ByZWZlcmVuY2VzIF9zZXRCb29s UHJlZmVyZW5jZUZvclRlc3RpbmdXaXRoVmFsdWU6Tk8gZm9yS2V5OkAiV2ViS2l0R2VuZXJpY0N1 ZUFQSUVuYWJsZWQiXTsKLSAgICBbcHJlZmVyZW5jZXMgX3NldEJvb2xQcmVmZXJlbmNlRm9yVGVz dGluZ1dpdGhWYWx1ZTpOTyBmb3JLZXk6QCJXZWJLaXRJc0xvZ2dlZEluQVBJRW5hYmxlZCJdOwot ICAgIFtwcmVmZXJlbmNlcyBfc2V0Qm9vbFByZWZlcmVuY2VGb3JUZXN0aW5nV2l0aFZhbHVlOk5P IGZvcktleTpAIldlYktpdExhenlJZnJhbWVMb2FkaW5nRW5hYmxlZCJdOwotICAgIFtwcmVmZXJl bmNlcyBfc2V0Qm9vbFByZWZlcmVuY2VGb3JUZXN0aW5nV2l0aFZhbHVlOk5PIGZvcktleTpAIldl YktpdExhenlJbWFnZUxvYWRpbmdFbmFibGVkIl07Ci0gICAgW3ByZWZlcmVuY2VzIF9zZXRCb29s UHJlZmVyZW5jZUZvclRlc3RpbmdXaXRoVmFsdWU6Tk8gZm9yS2V5OkAiV2ViS2l0V2ViQXV0aGVu dGljYXRpb25FbmFibGVkIl07Ci0KLSAgICBpZiAocGVyc2lzdGVudFVzZXJTdHlsZVNoZWV0TG9j YXRpb24oKSkgewotICAgICAgICBbcHJlZmVyZW5jZXMgc2V0VXNlclN0eWxlU2hlZXRMb2NhdGlv bjpbTlNVUkwgVVJMV2l0aFN0cmluZzooX19icmlkZ2UgTlNTdHJpbmcgKilwZXJzaXN0ZW50VXNl clN0eWxlU2hlZXRMb2NhdGlvbigpLmdldCgpXV07Ci0gICAgICAgIFtwcmVmZXJlbmNlcyBzZXRV c2VyU3R5bGVTaGVldEVuYWJsZWQ6WUVTXTsKLSAgICB9IGVsc2UKLSAgICAgICAgW3ByZWZlcmVu Y2VzIHNldFVzZXJTdHlsZVNoZWV0RW5hYmxlZDpOT107CisgICAgICAgIGlmIChwZXJzaXN0ZW50 VXNlclN0eWxlU2hlZXRMb2NhdGlvbigpKSB7CisgICAgICAgICAgICBwcmVmZXJlbmNlcy51c2Vy U3R5bGVTaGVldExvY2F0aW9uID0gW05TVVJMIFVSTFdpdGhTdHJpbmc6KF9fYnJpZGdlIE5TU3Ry aW5nICopcGVyc2lzdGVudFVzZXJTdHlsZVNoZWV0TG9jYXRpb24oKS5nZXQoKV07CisgICAgICAg ICAgICBwcmVmZXJlbmNlcy51c2VyU3R5bGVTaGVldEVuYWJsZWQgPSBZRVM7CisgICAgICAgIH0g ZWxzZQorICAgICAgICAgICAgcHJlZmVyZW5jZXMudXNlclN0eWxlU2hlZXRFbmFibGVkID0gTk87 CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIC8vIEVuYWJsZSB0aGUgdHJhY2tlciBi ZWZvcmUgY3JlYXRpbmcgdGhlIGZpcnN0IFdlYlZpZXcgd2lsbAotICAgIC8vIGNhdXNlIGluaXRp YWxpemF0aW9uIHRvIHVzZSB0aGUgY29ycmVjdCBkYXRhYmFzZSBwYXRocy4KLSAgICBbcHJlZmVy ZW5jZXMgc2V0U3RvcmFnZVRyYWNrZXJFbmFibGVkOllFU107Ci0jZWxzZQotICAgIFtwcmVmZXJl bmNlcyBzZXRNb2NrU2Nyb2xsYmFyc0VuYWJsZWQ6WUVTXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0 U2hvdWxkUHJpbnRCYWNrZ3JvdW5kczpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRUZXh0QXJl YXNBcmVSZXNpemFibGU6WUVTXTsKLSNlbmRpZgotCi0gICAgW3ByZWZlcmVuY2VzIF9zZXRUZXh0 QXV0b3NpemluZ0VuYWJsZWQ6Tk9dOwotICAgIFtwcmVmZXJlbmNlcyBzZXRBY2NlbGVyYXRlZENv bXBvc2l0aW5nRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRBY2NlbGVyYXRlZERy YXdpbmdFbmFibGVkOnVzZUFjY2VsZXJhdGVkRHJhd2luZ107Ci0gICAgW3ByZWZlcmVuY2VzIHNl dEFzeW5jaHJvbm91c1NwZWxsQ2hlY2tpbmdFbmFibGVkOk5PXTsKLSAgICBbcHJlZmVyZW5jZXMg c2V0QXVkaW9QbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmU6Tk9dOwotICAgIFtwcmVmZXJlbmNl cyBzZXRDYWNoZU1vZGVsOldlYkNhY2hlTW9kZWxEb2N1bWVudEJyb3dzZXJdOwotICAgIFtwcmVm ZXJlbmNlcyBzZXRDYW52YXNVc2VzQWNjZWxlcmF0ZWREcmF3aW5nOllFU107Ci0gICAgW3ByZWZl cmVuY2VzIHNldENvbG9yRmlsdGVyRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRD dXJzaXZlRm9udEZhbWlseTpAIkFwcGxlIENoYW5jZXJ5Il07Ci0gICAgW3ByZWZlcmVuY2VzIHNl dEN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRE YXRhVHJhbnNmZXJJdGVtc0VuYWJsZWQ6WUVTXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0RGVmYXVs dEZpeGVkRm9udFNpemU6MTNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXREZWZhdWx0Rm9udFNpemU6 MTZdOwotICAgIFtwcmVmZXJlbmNlcyBzZXREZWZhdWx0VGV4dEVuY29kaW5nTmFtZTpAIklTTy04 ODU5LTEiXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0RGlyZWN0b3J5VXBsb2FkRW5hYmxlZDpZRVNd OwotICAgIFtwcmVmZXJlbmNlcyBzZXREb3dubG9hZEF0dHJpYnV0ZUVuYWJsZWQ6WUVTXTsKLSAg ICBbcHJlZmVyZW5jZXMgc2V0RWRpdGFibGVMaW5rQmVoYXZpb3I6V2ViS2l0RWRpdGFibGVMaW5r T25seUxpdmVXaXRoU2hpZnRLZXldOwotICAgIFtwcmVmZXJlbmNlcyBzZXRFbmNyeXB0ZWRNZWRp YUFQSUVuYWJsZWQ6WUVTXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0RmFudGFzeUZvbnRGYW1pbHk6 QCJQYXB5cnVzIl07Ci0gICAgW3ByZWZlcmVuY2VzIHNldEZpeGVkRm9udEZhbWlseTpAIkNvdXJp ZXIiXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0RnJhbWVGbGF0dGVuaW5nOldlYktpdEZyYW1lRmxh dHRlbmluZ0Rpc2FibGVkXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0R2FtZXBhZHNFbmFibGVkOllF U107Ci0gICAgW3ByZWZlcmVuY2VzIHNldEhpZGRlblBhZ2VDU1NBbmltYXRpb25TdXNwZW5zaW9u RW5hYmxlZDpOT107Ci0gICAgW3ByZWZlcmVuY2VzIHNldEhpZGRlblBhZ2VET01UaW1lclRocm90 dGxpbmdFbmFibGVkOk5PXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0SW52aXNpYmxlQXV0b3BsYXlO b3RQZXJtaXR0ZWQ6Tk9dOwotICAgIFtwcmVmZXJlbmNlcyBzZXRKYXZhRW5hYmxlZDpOT107Ci0g ICAgW3ByZWZlcmVuY2VzIHNldEphdmFTY3JpcHRSdW50aW1lRmxhZ3M6V2ViS2l0SmF2YVNjcmlw dFJ1bnRpbWVGbGFnc0FsbEVuYWJsZWRdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRMYXJnZUltYWdl QXN5bmNEZWNvZGluZ0VuYWJsZWQ6Tk9dOwotICAgIFtwcmVmZXJlbmNlcyBzZXRMaW5rUHJlbG9h ZEVuYWJsZWQ6WUVTXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0TG9hZHNTaXRlSWNvbnNJZ25vcmlu Z0ltYWdlTG9hZGluZ1ByZWZlcmVuY2U6Tk9dOwotICAgIFtwcmVmZXJlbmNlcyBzZXRNZWRpYUNh cGFiaWxpdGllc0VuYWJsZWQ6WUVTXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0TWVkaWFEYXRhTG9h ZHNBdXRvbWF0aWNhbGx5OllFU107Ci0gICAgW3ByZWZlcmVuY2VzIHNldE1lZGlhRGV2aWNlc0Vu YWJsZWQ6WUVTXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0TWVkaWFQbGF5YmFja0FsbG93c0lubGlu ZTpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRNZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2Vz dHVyZTpOT107Ci0gICAgW3ByZWZlcmVuY2VzIHNldE1lZGlhUHJlbG9hZGluZ0VuYWJsZWQ6WUVT XTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0TWVkaWFTb3VyY2VFbmFibGVkOllFU107Ci0gICAgW3By ZWZlcmVuY2VzIHNldE1ldGFSZWZyZXNoRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBz ZXRNb2Rlcm5NZWRpYUNvbnRyb2xzRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRP ZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQ6WUVTXTsKLSAgICBbcHJlZmVyZW5jZXMg c2V0UGljdG9ncmFwaEZvbnRGYW1pbHk6QCJBcHBsZSBDb2xvciBFbW9qaSJdOwotICAgIFtwcmVm ZXJlbmNlcyBzZXRTYW5zU2VyaWZGb250RmFtaWx5OkAiSGVsdmV0aWNhIl07Ci0gICAgW3ByZWZl cmVuY2VzIHNldFNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkOllFU107Ci0g ICAgW3ByZWZlcmVuY2VzIHNldFNlcmlmRm9udEZhbWlseTpAIlRpbWVzIl07Ci0gICAgW3ByZWZl cmVuY2VzIHNldFNvdXJjZUJ1ZmZlckNoYW5nZVR5cGVFbmFibGVkOllFU107Ci0gICAgW3ByZWZl cmVuY2VzIHNldFN0YW5kYXJkRm9udEZhbWlseTpAIlRpbWVzIl07Ci0gICAgW3ByZWZlcmVuY2Vz IHNldFN1YnBpeGVsQW50aWFsaWFzZWRMYXllclRleHRFbmFibGVkOk5PXTsKLSAgICBbcHJlZmVy ZW5jZXMgc2V0VmlkZW9QbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmU6Tk9dOwotICAgIFtwcmVm ZXJlbmNlcyBzZXRXZWJBdWRpb0VuYWJsZWQ6WUVTXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0V2Vi U1FMRW5hYmxlZDpZRVNdOworICAgICAgICBwcmVmZXJlbmNlcy5lZGl0YWJsZUxpbmtCZWhhdmlv ciA9IFdlYktpdEVkaXRhYmxlTGlua09ubHlMaXZlV2l0aFNoaWZ0S2V5OworICAgICAgICBwcmVm ZXJlbmNlcy5mcmFtZUZsYXR0ZW5pbmcgPSBXZWJLaXRGcmFtZUZsYXR0ZW5pbmdEaXNhYmxlZDsK KyAgICAgICAgcHJlZmVyZW5jZXMuY2FjaGVNb2RlbCA9IFdlYkNhY2hlTW9kZWxEb2N1bWVudEJy b3dzZXI7CiAKLSAgICBbV2ViUHJlZmVyZW5jZXMgX2NsZWFyTmV0d29ya0xvYWRlclNlc3Npb25d OwotICAgIFtXZWJQcmVmZXJlbmNlcyBfc2V0Q3VycmVudE5ldHdvcmtMb2FkZXJTZXNzaW9uQ29v a2llQWNjZXB0UG9saWN5Ok5TSFRUUENvb2tpZUFjY2VwdFBvbGljeU9ubHlGcm9tTWFpbkRvY3Vt ZW50RG9tYWluXTsKLX0KKyAgICAgICAgcHJlZmVyZW5jZXMucHJpdmF0ZUJyb3dzaW5nRW5hYmxl ZCA9IG9wdGlvbnMudXNlRXBoZW1lcmFsU2Vzc2lvbigpOwogCi10ZW1wbGF0ZTx0eXBlbmFtZSBU PiBUIHdlYlByZWZlcmVuY2VGZWF0dXJlVmFsdWUoY29uc3Qgc3RkOjpzdHJpbmcmIGtleSwgY29u c3Qgc3RkOjp1bm9yZGVyZWRfbWFwPHN0ZDo6c3RyaW5nLCBUPiYgbWFwKQotewotICAgIGF1dG8g aXQgPSBtYXAuZmluZChrZXkpOwotICAgIEFTU0VSVChpdCAhPSBtYXAuZW5kKCkpOwotICAgIHJl dHVybiBpdC0+c2Vjb25kOwotfQorICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIFtrZXksIHZhbHVl XSA6IG9wdGlvbnMuYm9vbFdlYlByZWZlcmVuY2VGZWF0dXJlcygpKQorICAgICAgICAgICAgW3By ZWZlcmVuY2VzIF9zZXRCb29sUHJlZmVyZW5jZUZvclRlc3RpbmdXaXRoVmFsdWU6dmFsdWUgZm9y S2V5OnRvTlMoV1RSOjpUZXN0T3B0aW9uczo6dG9XZWJLaXRMZWdhY3lQcmVmZXJlbmNlS2V5KGtl eSkpLmdldCgpXTsKIAotc3RhdGljIHZvaWQgc2V0V2ViUHJlZmVyZW5jZXNGb3JUZXN0T3B0aW9u cyhXZWJQcmVmZXJlbmNlcyAqcHJlZmVyZW5jZXMsIGNvbnN0IFdUUjo6VGVzdE9wdGlvbnMmIG9w dGlvbnMpCi17Ci0gICAgW3ByZWZlcmVuY2VzIF9iYXRjaFVwZGF0ZVByZWZlcmVuY2VzSW5CbG9j azpeKFdlYlByZWZlcmVuY2VzICpwcmVmZXJlbmNlcykgewotICAgICAgICByZXNldFdlYlByZWZl cmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKHByZWZlcmVuY2VzKTsKKyAgICAgICAgZm9yIChjb25z dCBhdXRvJiBba2V5LCB2YWx1ZV0gOiBvcHRpb25zLmRvdWJsZVdlYlByZWZlcmVuY2VGZWF0dXJl cygpKQorICAgICAgICAgICAgW3ByZWZlcmVuY2VzIF9zZXREb3VibGVQcmVmZXJlbmNlRm9yVGVz dGluZ1dpdGhWYWx1ZTp2YWx1ZSBmb3JLZXk6dG9OUyhXVFI6OlRlc3RPcHRpb25zOjp0b1dlYktp dExlZ2FjeVByZWZlcmVuY2VLZXkoa2V5KSkuZ2V0KCldOwogCi0gICAgICAgIHByZWZlcmVuY2Vz LnByaXZhdGVCcm93c2luZ0VuYWJsZWQgPSBvcHRpb25zLnVzZUVwaGVtZXJhbFNlc3Npb24oKTsK KyAgICAgICAgZm9yIChjb25zdCBhdXRvJiBba2V5LCB2YWx1ZV0gOiBvcHRpb25zLnVpbnQzMldl YlByZWZlcmVuY2VGZWF0dXJlcygpKQorICAgICAgICAgICAgW3ByZWZlcmVuY2VzIF9zZXRVSW50 MzJQcmVmZXJlbmNlRm9yVGVzdGluZ1dpdGhWYWx1ZTp2YWx1ZSBmb3JLZXk6dG9OUyhXVFI6OlRl c3RPcHRpb25zOjp0b1dlYktpdExlZ2FjeVByZWZlcmVuY2VLZXkoa2V5KSkuZ2V0KCldOwogCi0g ICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhlc2Ugb25jZSB0aGVyZSBpcyBhIHZpYWJsZSBtZWNo YW5pc20gZm9yIHJlc2V0aW5nIFdlYlByZWZlcmVuY2VzIGJldHdlZW4gdGVzdHMsCi0gICAgICAg IC8vIGF0IHdoaWNoIHBvaW50LCB3ZSB3aWxsIG5vdCBuZWVkIHRvIG1hbnVhbGx5IHJlc2V0IGV2 ZXJ5IHN1cHBvcnRlZCBwcmVmZXJlbmNlIGZvciBlYWNoIHRlc3QuCi0gICAgICAgIGZvciAoY29u c3QgYXV0byYga2V5IDogb3B0aW9ucy5zdXBwb3J0ZWRCb29sV2ViUHJlZmVyZW5jZUZlYXR1cmVz KCkpCi0gICAgICAgICAgICBbcHJlZmVyZW5jZXMgX3NldEJvb2xQcmVmZXJlbmNlRm9yVGVzdGlu Z1dpdGhWYWx1ZTp3ZWJQcmVmZXJlbmNlRmVhdHVyZVZhbHVlKGtleSwgb3B0aW9ucy5ib29sV2Vi UHJlZmVyZW5jZUZlYXR1cmVzKCkpIGZvcktleTp0b05TKFdUUjo6VGVzdE9wdGlvbnM6OnRvV2Vi S2l0TGVnYWN5UHJlZmVyZW5jZUtleShrZXkpKS5nZXQoKV07Ci0gICAgICAgIGZvciAoY29uc3Qg YXV0byYga2V5IDogb3B0aW9ucy5zdXBwb3J0ZWRVSW50MzJXZWJQcmVmZXJlbmNlRmVhdHVyZXMo KSkKLSAgICAgICAgICAgIFtwcmVmZXJlbmNlcyBfc2V0VUludDMyUHJlZmVyZW5jZUZvclRlc3Rp bmdXaXRoVmFsdWU6d2ViUHJlZmVyZW5jZUZlYXR1cmVWYWx1ZShrZXksIG9wdGlvbnMudWludDMy V2ViUHJlZmVyZW5jZUZlYXR1cmVzKCkpIGZvcktleTp0b05TKFdUUjo6VGVzdE9wdGlvbnM6OnRv V2ViS2l0TGVnYWN5UHJlZmVyZW5jZUtleShrZXkpKS5nZXQoKV07CisgICAgICAgIGZvciAoY29u c3QgYXV0byYgW2tleSwgdmFsdWVdIDogb3B0aW9ucy5zdHJpbmdXZWJQcmVmZXJlbmNlRmVhdHVy ZXMoKSkKKyAgICAgICAgICAgIFtwcmVmZXJlbmNlcyBfc2V0U3RyaW5nUHJlZmVyZW5jZUZvclRl c3RpbmdXaXRoVmFsdWU6dG9OUyh2YWx1ZSkuZ2V0KCkgZm9yS2V5OnRvTlMoV1RSOjpUZXN0T3B0 aW9uczo6dG9XZWJLaXRMZWdhY3lQcmVmZXJlbmNlS2V5KGtleSkpLmdldCgpXTsKKworICAgICAg ICAvLyBGSVhNRTogVGVzdHMgY3VycmVudGx5IGV4cGVjdCB0aGlzIHRvIGFsd2F5cyBiZSBmYWxz ZSBpbiBXZWJLaXRMZWdhY3kgdGVzdGluZyAtIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjI4NjQuCisgICAgICAgIFtwcmVmZXJlbmNlcyBfc2V0Qm9vbFByZWZlcmVu Y2VGb3JUZXN0aW5nV2l0aFZhbHVlOk5PIGZvcktleTpAIldlYktpdExheW91dEZvcm1hdHRpbmdD b250ZXh0RW5hYmxlZCJdOwogICAgIH1dOworCisgICAgW1dlYlByZWZlcmVuY2VzIF9jbGVhck5l dHdvcmtMb2FkZXJTZXNzaW9uXTsKKyAgICBbV2ViUHJlZmVyZW5jZXMgX3NldEN1cnJlbnROZXR3 b3JrTG9hZGVyU2Vzc2lvbkNvb2tpZUFjY2VwdFBvbGljeTpOU0hUVFBDb29raWVBY2NlcHRQb2xp Y3lPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbl07CiB9CiAKIC8vIENhbGxlZCBvbmNlIG9uIER1 bXBSZW5kZXJUcmVlIHN0YXJ0dXAuCkBAIC05ODcsOSArOTE3LDYgQEAgc3RhdGljIHZvaWQgc2V0 RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZQogICAgICAgICBAIkFwcGxlT3RoZXJIaWdobGlnaHRD b2xvciI6QCIwLjUwMDAwMCAwLjUwMDAwMCAwLjUwMDAwMCIsCiAgICAgICAgIEAiQXBwbGVMYW5n dWFnZXMiOiBAWyBAImVuIiBdLAogICAgICAgICBXZWJLaXRFbmFibGVGdWxsRG9jdW1lbnRUZWFy ZG93blByZWZlcmVuY2VLZXk6IEBZRVMsCi0gICAgICAgIFdlYktpdEZ1bGxTY3JlZW5FbmFibGVk UHJlZmVyZW5jZUtleTogQFlFUywKLSAgICAgICAgV2ViS2l0QWxsb3dzSW5saW5lTWVkaWFQbGF5 YmFja1ByZWZlcmVuY2VLZXk6IEBZRVMsCi0gICAgICAgIFdlYktpdElubGluZU1lZGlhUGxheWJh Y2tSZXF1aXJlc1BsYXlzSW5saW5lQXR0cmlidXRlS2V5OiBATk8sCiAgICAgICAgIEAiVXNlV2Vi S2l0V2ViSW5zcGVjdG9yIjogQFlFUywKICNpZiAhUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAg ICAgQCJOU1ByZWZlcnJlZFNwZWxsU2VydmVyTGFuZ3VhZ2UiOiBAImVuX1VTIiwKQEAgLTExNTgs NyArMTA4NSw3IEBAIHN0YXRpYyBCT09MIG92ZXJyaWRlSXNJbkhhcmR3YXJlS2V5Ym9hcmQKIAog c3RhdGljIHZvaWQgcHJlcGFyZUNvbnNpc3RlbnRUZXN0aW5nRW52aXJvbm1lbnQoKQogewotI2lm ICFQTEFURk9STShJT1NfRkFNSUxZKQorI2lmIFBMQVRGT1JNKE1BQykKICAgICBwb3NlQXNDbGFz cygiRHVtcFJlbmRlclRyZWVQYXN0ZWJvYXJkIiwgIk5TUGFzdGVib2FyZCIpOwogICAgIHBvc2VB c0NsYXNzKCJEdW1wUmVuZGVyVHJlZUV2ZW50IiwgIk5TRXZlbnQiKTsKICNlbHNlCkBAIC0xMTcz LDcgKzExMDAsNyBAQCBzdGF0aWMgdm9pZCBwcmVwYXJlQ29uc2lzdGVudFRlc3RpbmdFbnZpCiAK ICAgICBbV2ViUHJlZmVyZW5jZXMgX3N3aXRjaE5ldHdvcmtMb2FkZXJUb05ld1Rlc3RpbmdTZXNz aW9uXTsKIAotI2lmICFQTEFURk9STShJT1NfRkFNSUxZKQorI2lmIFBMQVRGT1JNKE1BQykKICAg ICBhZGp1c3RGb250cygpOwogICAgIHJlZ2lzdGVyTW9ja1Njcm9sbGJhcnMoKTsKIApAQCAtMTE4 MSw2ICsxMTA4LDkgQEAgc3RhdGljIHZvaWQgcHJlcGFyZUNvbnNpc3RlbnRUZXN0aW5nRW52aQog ICAgIFtbV2ViUHJlZmVyZW5jZXMgc3RhbmRhcmRQcmVmZXJlbmNlc10gc2V0TW9ja1Njcm9sbGJh cnNFbmFibGVkOllFU107CiAjZWxzZQogICAgIGFjdGl2YXRlRm9udHNJT1MoKTsKKworICAgIC8v IEVuYWJsZSB0aGUgdHJhY2tlciBiZWZvcmUgY3JlYXRpbmcgdGhlIGZpcnN0IFdlYlZpZXcgd2ls bCBjYXVzZSBpbml0aWFsaXphdGlvbiB0byB1c2UgdGhlIGNvcnJlY3QgZGF0YWJhc2UgcGF0aHMu CisgICAgW1tXZWJQcmVmZXJlbmNlcyBzdGFuZGFyZFByZWZlcmVuY2VzXSBzZXRTdG9yYWdlVHJh Y2tlckVuYWJsZWQ6WUVTXTsKICNlbmRpZgogCiAgICAgYWxsb2NhdGVHbG9iYWxDb250cm9sbGVy cygpOwo= 422515 2021-03-06 18:21:55 -0800 2021-03-07 09:41:56 -0800 Patch bug-222868-20210306182154.patch text/plain 17410 sam SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NDA0NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDIxLTAzLTA2ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKwor ICAgICAgICBUcmFuc2l0aW9uIENvY29hIER1bXBSZW5kZXJUcmVlIHRvIGFsbG93IGFueSBwcmVm ZXJlbmNlIGtleXMsIG5vdCBqdXN0IGhhcmQgY29kZWQgc3VwcG9ydGVkIG9uZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjg2OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYWxsb3dzIGFueSBw cmVmZXJlbmNlIGtleSBpbiBhIFdlYlByZWZlcmVuY2UqLnlhbWwgdG8gYmUgdXNlZCBmb3IgQ29j b2EgV2ViS2l0TGVnYWN5CisgICAgICAgIHRlc3RzIGluIHRoZSBjb21tZW50IGhlYWRlciBjb21t YW5kLCBqdXN0IGxpa2UgV2ViS2l0VGVzdFJ1bm5lci4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL1Rlc3RPcHRpb25zLmNwcDoKKyAgICAgICAgKFdUUjo6VGVzdE9wdGlvbnM6OmRlZmF1bHRz KToKKyAgICAgICAgVXBkYXRlIGRlZmF1bHRzIHRvIG9ubHkgdGhlIGRlZmF1bHQgdmFsdWVzIHRo YXQgZG9uJ3QgbWF0Y2gKKyAgICAgICAgZGVmYXVsdHMgaW4gV2ViUHJlZmVyZW5jZSoueWFtbCBm aWxlcyBhbmQgZXhwZXJpbWVudGFsIGZlYXR1cmVzCisgICAgICAgIHRoYXQgYXJlIG5vdCBzdXBw b3J0ZWQgaW4gYnV0IHN0aWxsIGRlY2xhcmUgc3VwcG9ydCBpbiB0aGUgZmlsZS4KKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuaDoKKyAgICAgICAgUmVtb3ZlIHVuaW1wbGVt ZW50ZWQgZnVuY3Rpb24gZGVjbGFyYXRpb24uCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9t YWMvRHVtcFJlbmRlclRyZWUubW06CisgICAgICAgIChzZXRXZWJQcmVmZXJlbmNlc0ZvclRlc3RP cHRpb25zKToKKyAgICAgICAgKHNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzRm9yVGVzdGlu Zyk6CisgICAgICAgIChwcmVwYXJlQ29uc2lzdGVudFRlc3RpbmdFbnZpcm9ubWVudCk6CisgICAg ICAgIChyZXNldFdlYlByZWZlcmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKTogRGVsZXRlZC4KKyAg ICAgICAgKHdlYlByZWZlcmVuY2VGZWF0dXJlVmFsdWUpOiBEZWxldGVkLgorICAgICAgICBSZXBs YWNlIG1vc3QgZXhwbGljaXQgcmVzZXRpbmcgd2l0aCB0aGUgY29tYmluYXRpb24gb2YgX3Jlc2V0 Rm9yVGVzdGluZywgYXV0b21hdGljCisgICAgICAgIGVuYWJsaW5nIGV4cGVyaW1lbnRhbCBmZWF0 dXJlcywgYW5kIHVzZSBvZiBfc2V0PHR5cGU+UHJlZmVyZW5jZUZvclRlc3RpbmdXaXRoVmFsdWUK KyAgICAgICAgZnJvbSBUZXN0T3B0aW9ucy4KKwogMjAyMS0wMy0wNiAgRGF2aWQgS2lsemVyICA8 ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIHdlYmtpdC1wYXRjaCB3b24ndCBwYXJzZSBy ZGFyOi8vbm5ubm5ubm4gVVJMcyBpbiBDaGFuZ2VMb2dzCkluZGV4OiBUb29scy9EdW1wUmVuZGVy VHJlZS9UZXN0T3B0aW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUv VGVzdE9wdGlvbnMuY3BwCShyZXZpc2lvbiAyNzQwNDUpCisrKyBUb29scy9EdW1wUmVuZGVyVHJl ZS9UZXN0T3B0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICog Q29weXJpZ2h0IChDKSAyMDE2LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICogQ29weXJpZ2h0IChDKSAyMDE2LTIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC02Myw2ICs2Myw2NSBAQCBjb25z dCBUZXN0RmVhdHVyZXMmIFRlc3RPcHRpb25zOjpkZWZhdWx0CiAgICAgc3RhdGljIFRlc3RGZWF0 dXJlcyBmZWF0dXJlczsKICAgICBpZiAoZmVhdHVyZXMuYm9vbFdlYlByZWZlcmVuY2VGZWF0dXJl cy5lbXB0eSgpKSB7CiAgICAgICAgIGZlYXR1cmVzLmJvb2xXZWJQcmVmZXJlbmNlRmVhdHVyZXMg PSB7CisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgICAgICAgICAvLyBUaGVzZSBhcmUgbm9uLWV4 cGVyaW1lbnRhbCBXZWJQcmVmZXJlbmNlIHZhbHVlcyB0aGF0IG11c3QgYWx3YXlzIGJlIHNldCBh cyB0aGV5CisgICAgICAgICAgICAvLyBkaWZmZXIgZnJvbSB0aGUgZGVmYXVsdCBzZXQgaW4gdGhl IFdlYlByZWZlcmVuY2VzKi55YW1sIGNvbmZpZ3VyYXRpb24uCisgICAgICAgICAgICB7ICJBbGxv d3NJbmxpbmVNZWRpYVBsYXliYWNrIiwgdHJ1ZSB9LAorICAgICAgICAgICAgeyAiQ2FudmFzVXNl c0FjY2VsZXJhdGVkRHJhd2luZyIsIHRydWUgfSwKKyAgICAgICAgICAgIHsgIkNvbG9yRmlsdGVy RW5hYmxlZCIsIHRydWUgfSwKKyAgICAgICAgICAgIHsgIkN1c3RvbVBhc3RlYm9hcmREYXRhRW5h YmxlZCIsIHRydWUgfSwKKyAgICAgICAgICAgIHsgIkRPTVBhc3RlQWxsb3dlZCIsIHRydWUgfSwK KyAgICAgICAgICAgIHsgIkRldmVsb3BlckV4dHJhc0VuYWJsZWQiLCB0cnVlIH0sCisgICAgICAg ICAgICB7ICJEaXJlY3RvcnlVcGxvYWRFbmFibGVkIiwgdHJ1ZSB9LAorICAgICAgICAgICAgeyAi RG93bmxvYWRBdHRyaWJ1dGVFbmFibGVkIiwgdHJ1ZSB9LAorICAgICAgICAgICAgeyAiRW5jcnlw dGVkTWVkaWFBUElFbmFibGVkIiwgdHJ1ZSB9LAorICAgICAgICAgICAgeyAiRnVsbFNjcmVlbkVu YWJsZWQiLCB0cnVlIH0sCisgICAgICAgICAgICB7ICJHYW1lcGFkc0VuYWJsZWQiLCB0cnVlIH0s CisgICAgICAgICAgICB7ICJIaWRkZW5QYWdlQ1NTQW5pbWF0aW9uU3VzcGVuc2lvbkVuYWJsZWQi LCBmYWxzZSB9LAorICAgICAgICAgICAgeyAiSW5saW5lTWVkaWFQbGF5YmFja1JlcXVpcmVzUGxh eXNJbmxpbmVBdHRyaWJ1dGUiLCBmYWxzZSB9LAorICAgICAgICAgICAgeyAiSmF2YUVuYWJsZWQi LCBmYWxzZSB9LAorICAgICAgICAgICAgeyAiSmF2YVNjcmlwdENhbkFjY2Vzc0NsaXBib2FyZCIs IHRydWUgfSwKKyAgICAgICAgICAgIHsgIkphdmFTY3JpcHRDYW5PcGVuV2luZG93c0F1dG9tYXRp Y2FsbHkiLCB0cnVlIH0sCisgICAgICAgICAgICB7ICJMYXJnZUltYWdlQXN5bmNEZWNvZGluZ0Vu YWJsZWQiLCBmYWxzZSB9LAorICAgICAgICAgICAgeyAiTGlua1ByZWxvYWRFbmFibGVkIiwgdHJ1 ZSB9LAorICAgICAgICAgICAgeyAiTWVkaWFDYXBhYmlsaXRpZXNFbmFibGVkIiwgdHJ1ZSB9LAor ICAgICAgICAgICAgeyAiTWVkaWFEYXRhTG9hZHNBdXRvbWF0aWNhbGx5IiwgdHJ1ZSB9LAorICAg ICAgICAgICAgeyAiTWVkaWFEZXZpY2VzRW5hYmxlZCIsIHRydWUgfSwKKyAgICAgICAgICAgIHsg Ik1lZGlhUHJlbG9hZGluZ0VuYWJsZWQiLCB0cnVlIH0sCisgICAgICAgICAgICB7ICJNb2NrU2Ny b2xsYmFyc0VuYWJsZWQiLCB0cnVlIH0sCisgICAgICAgICAgICB7ICJOZWVkc1N0b3JhZ2VBY2Nl c3NGcm9tRmlsZVVSTHNRdWlyayIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJPZmZsaW5lV2Vi QXBwbGljYXRpb25DYWNoZUVuYWJsZWQiLCB0cnVlIH0sCisgICAgICAgICAgICB7ICJSZXF1aXJl c1VzZXJHZXN0dXJlRm9yQXVkaW9QbGF5YmFjayIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJS ZXF1aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWFQbGF5YmFjayIsIGZhbHNlIH0sCisgICAgICAgICAg ICB7ICJSZXF1aXJlc1VzZXJHZXN0dXJlRm9yVmlkZW9QbGF5YmFjayIsIGZhbHNlIH0sCisgICAg ICAgICAgICB7ICJTaG91bGRQcmludEJhY2tncm91bmRzIiwgdHJ1ZSB9LAorICAgICAgICAgICAg eyAiU2hyaW5rc1N0YW5kYWxvbmVJbWFnZXNUb0ZpdCIsIHRydWUgfSwKKyAgICAgICAgICAgIHsg IlN1YnBpeGVsQW50aWFsaWFzZWRMYXllclRleHRFbmFibGVkIiwgZmFsc2UgfSwKKyAgICAgICAg ICAgIHsgIlRleHRBcmVhc0FyZVJlc2l6YWJsZSIsIHRydWUgfSwKKyAgICAgICAgICAgIHsgIlRl eHRBdXRvc2l6aW5nRW5hYmxlZCIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJVc2VzQmFja0Zv cndhcmRDYWNoZSIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJXZWJBdWRpb0VuYWJsZWQiLCB0 cnVlIH0sCisgICAgICAgICAgICB7ICJXZWJTUUxFbmFibGVkIiwgdHJ1ZSB9LAorICAgICAgICAg ICAgeyAiWFNTQXVkaXRvckVuYWJsZWQiLCBmYWxzZSB9LAorCisgICAgICAgICAgICAvLyBGSVhN RTogVGhlc2UgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBjdXJyZW50bHkgdGhlIG9ubHkgb25l cyBub3QgZW5hYmxlZCBmb3IgV2ViS2l0TGVnYWN5LCB3ZQorICAgICAgICAgICAgLy8gc2hvdWxk IGVpdGhlciBlbmFibGUgdGhlbSBvciBzdG9wIGV4cG9zaW5nIHRoZW0gKGFzIHdlIGRvIHdpdGgg d2l0aCBwcmVmZXJlbmNlcyBsaWtlIEhUVFAzRW5hYmxlZCkuCisgICAgICAgICAgICAvLyBBbGwg b3RoZXIgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBhdXRvbWF0aWNhbGx5IGVuYWJsZWQgcmVn YXJkbGVzcyBvZiB0aGVpciBzcGVjaWZpZWQgZGVmYXVsdHMuCisgICAgICAgICAgICB7ICJBc3Bl Y3RSYXRpb09mSW1nRnJvbVdpZHRoQW5kSGVpZ2h0RW5hYmxlZCIsIGZhbHNlIH0sCisgICAgICAg ICAgICB7ICJBc3luY0NsaXBib2FyZEFQSUVuYWJsZWQiLCBmYWxzZSB9LAorICAgICAgICAgICAg eyAiQ1NTT01WaWV3U21vb3RoU2Nyb2xsaW5nRW5hYmxlZCIsIGZhbHNlIH0sCisgICAgICAgICAg ICB7ICJDb250YWN0UGlja2VyQVBJRW5hYmxlZCIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJD b3JlTWF0aE1MRW5hYmxlZCIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJHZW5lcmljQ3VlQVBJ RW5hYmxlZCIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJJbnRlcnNlY3Rpb25PYnNlcnZlckVu YWJsZWQiLCBmYWxzZSB9LAorICAgICAgICAgICAgeyAiSXNMb2dnZWRJbkFQSUVuYWJsZWQiLCBm YWxzZSB9LAorICAgICAgICAgICAgeyAiTGF6eUlmcmFtZUxvYWRpbmdFbmFibGVkIiwgZmFsc2Ug fSwKKyAgICAgICAgICAgIHsgIkxhenlJbWFnZUxvYWRpbmdFbmFibGVkIiwgZmFsc2UgfSwKKyAg ICAgICAgICAgIHsgIlJlcXVlc3RJZGxlQ2FsbGJhY2tFbmFibGVkIiwgZmFsc2UgfSwKKyAgICAg ICAgICAgIHsgIlJlc2l6ZU9ic2VydmVyRW5hYmxlZCIsIGZhbHNlIH0sCisgICAgICAgICAgICB7 ICJXZWJBdXRoZW50aWNhdGlvbkVuYWJsZWQiLCBmYWxzZSB9LAorICAgICAgICAgICAgeyAiV2Vi R1BVRW5hYmxlZCIsIGZhbHNlIH0sCisjZWxpZiBQTEFURk9STShXSU4pCiAgICAgICAgICAgICAv LyBUaGVzZSBhcmUgV2ViUHJlZmVyZW5jZSB2YWx1ZXMgdGhhdCBtdXN0IGFsd2F5cyBiZSBzZXQg YXMgdGhleSBtYXkKICAgICAgICAgICAgIC8vIGRpZmZlciBmcm9tIHRoZSBkZWZhdWx0IHNldCBp biB0aGUgV2ViUHJlZmVyZW5jZXMqLnlhbWwgY29uZmlndXJhdGlvbi4KICAgICAgICAgICAgIHsg IkFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQiLCBmYWxzZSB9LApAQCAtMTA4LDEwICsxNjcsMjQg QEAgY29uc3QgVGVzdEZlYXR1cmVzJiBUZXN0T3B0aW9uczo6ZGVmYXVsdAogICAgICAgICAgICAg eyAiVXNlc0JhY2tGb3J3YXJkQ2FjaGUiLCBmYWxzZSB9LAogICAgICAgICAgICAgeyAiV2ViR1BV RW5hYmxlZCIsIGZhbHNlIH0sCiAgICAgICAgICAgICB7ICJYU1NBdWRpdG9yRW5hYmxlZCIsIGZh bHNlIH0sCisjZW5kaWYKICAgICAgICAgfTsKKyNpZiBQTEFURk9STShXSU4pCiAgICAgICAgIGZl YXR1cmVzLnVpbnQzMldlYlByZWZlcmVuY2VGZWF0dXJlcyA9IHsKICAgICAgICAgICAgIHsgIk1p bmltdW1Gb250U2l6ZSIsIDAgfSwKICAgICAgICAgfTsKKyNlbmRpZgorI2lmIFBMQVRGT1JNKENP Q09BKQorICAgICAgICBmZWF0dXJlcy5zdHJpbmdXZWJQcmVmZXJlbmNlRmVhdHVyZXMgPSB7Cisg ICAgICAgICAgICB7ICJDdXJzaXZlRm9udEZhbWlseSIsICJBcHBsZSBDaGFuY2VyeSIgfSwKKyAg ICAgICAgICAgIHsgIkZhbnRhc3lGb250RmFtaWx5IiwgIlBhcHlydXMiIH0sCisgICAgICAgICAg ICB7ICJGaXhlZEZvbnRGYW1pbHkiLCAiQ291cmllciIgfSwKKyAgICAgICAgICAgIHsgIlBpY3Rv Z3JhcGhGb250RmFtaWx5IiwgIkFwcGxlIENvbG9yIEVtb2ppIiB9LAorICAgICAgICAgICAgeyAi U2Fuc1NlcmlmRm9udEZhbWlseSIsICJIZWx2ZXRpY2EiIH0sCisgICAgICAgICAgICB7ICJTZXJp ZkZvbnRGYW1pbHkiLCAiVGltZXMiIH0sCisgICAgICAgICAgICB7ICJTdGFuZGFyZEZvbnRGYW1p bHkiLCAiVGltZXMiIH0sCisgICAgICAgIH07CisjZW5kaWYKICAgICB9CiAgICAgcmV0dXJuIGZl YXR1cmVzOwogfQpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdFJ1bm5lci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuaAkocmV2aXNpb24gMjc0 MDQ1KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdFJ1bm5lci5oCSh3b3JraW5nIGNvcHkp CkBAIC0xMzUsMTAgKzEzNSw2IEBAIHB1YmxpYzoKICAgICBzaXplX3Qgd2ViSGlzdG9yeUl0ZW1D b3VudCgpOwogICAgIGludCB3aW5kb3dDb3VudCgpOwogCi0jaWYgRU5BQkxFKFRFWFRfQVVUT1NJ WklORykKLSAgICB2b2lkIHNldFRleHRBdXRvc2l6aW5nRW5hYmxlZChib29sKTsKLSNlbmRpZgot CiAgICAgdm9pZCBzZXRBY2N1bW11bGF0ZUxvZ3NGb3JDaGFubmVsKEpTU3RyaW5nUmVmKTsKIAog ICAgIHZvaWQgcnVuVUlTY3JpcHQoSlNDb250ZXh0UmVmLCBKU1N0cmluZ1JlZiwgSlNWYWx1ZVJl ZiBjYWxsYmFjayk7CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRy ZWUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJU cmVlLm1tCShyZXZpc2lvbiAyNzQwNDUpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVt cFJlbmRlclRyZWUubW0JKHdvcmtpbmcgY29weSkKQEAgLTg1NiwxMTQgKzg1Niw0NSBAQCBzdGF0 aWMgTlNTdHJpbmcgKmxpYnJhcnlQYXRoRm9yRHVtcFJlbmRlCiAgICAgICAgIHJldHVybiBbQCJ+ L0xpYnJhcnkvQXBwbGljYXRpb24gU3VwcG9ydC9EdW1wUmVuZGVyVHJlZSIgc3RyaW5nQnlFeHBh bmRpbmdUaWxkZUluUGF0aF07CiB9CiAKLS8vIENhbGxlZCBiZWZvcmUgZWFjaCB0ZXN0Lgotc3Rh dGljIHZvaWQgcmVzZXRXZWJQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcyhXZWJQcmVmZXJl bmNlcyAqcHJlZmVyZW5jZXMpCitzdGF0aWMgdm9pZCBzZXRXZWJQcmVmZXJlbmNlc0ZvclRlc3RP cHRpb25zKFdlYlByZWZlcmVuY2VzICpwcmVmZXJlbmNlcywgY29uc3QgV1RSOjpUZXN0T3B0aW9u cyYgb3B0aW9ucykKIHsKLSAgICBbcHJlZmVyZW5jZXMgX3Jlc2V0Rm9yVGVzdGluZ107CisgICAg W3ByZWZlcmVuY2VzIF9iYXRjaFVwZGF0ZVByZWZlcmVuY2VzSW5CbG9jazpeKFdlYlByZWZlcmVu Y2VzICpwcmVmZXJlbmNlcykgeworICAgICAgICBbcHJlZmVyZW5jZXMgX3Jlc2V0Rm9yVGVzdGlu Z107CiAKLSAgICBmb3IgKFdlYkZlYXR1cmUgKmZlYXR1cmUgaW4gW1dlYlByZWZlcmVuY2VzIF9l eHBlcmltZW50YWxGZWF0dXJlc10pCi0gICAgICAgIFtwcmVmZXJlbmNlcyBfc2V0RW5hYmxlZDpZ RVMgZm9yRmVhdHVyZTpmZWF0dXJlXTsKKyAgICAgICAgZm9yIChXZWJGZWF0dXJlICpmZWF0dXJl IGluIFtXZWJQcmVmZXJlbmNlcyBfZXhwZXJpbWVudGFsRmVhdHVyZXNdKQorICAgICAgICAgICAg W3ByZWZlcmVuY2VzIF9zZXRFbmFibGVkOllFUyBmb3JGZWF0dXJlOmZlYXR1cmVdOwogCi0gICAg Ly8gRklYTUU6IFRoZXNlIGV4cGVyaW1lbnRhbCBmZWF0dXJlcyBhcmUgY3VycmVudGx5IHRoZSBv bmx5IG9uZXMgbm90IGVuYWJsZWQgZm9yIFdlYktpdExlZ2FjeSwgd2UKLSAgICAvLyBzaG91bGQg ZWl0aGVyIGVuYWJsZSB0aGVtIG9yIHN0b3AgZXhwb3NpbmcgdGhlbSAoYXMgd2UgZG8gd2l0aCB3 aXRoIHByZWZlcmVuY2VzIGxpa2UgSFRUUDNFbmFibGVkKS4KLSAgICBbcHJlZmVyZW5jZXMgX3Nl dEJvb2xQcmVmZXJlbmNlRm9yVGVzdGluZ1dpdGhWYWx1ZTpOTyBmb3JLZXk6QCJXZWJLaXRHZW5l cmljQ3VlQVBJRW5hYmxlZCJdOwotICAgIFtwcmVmZXJlbmNlcyBfc2V0Qm9vbFByZWZlcmVuY2VG b3JUZXN0aW5nV2l0aFZhbHVlOk5PIGZvcktleTpAIldlYktpdElzTG9nZ2VkSW5BUElFbmFibGVk Il07Ci0gICAgW3ByZWZlcmVuY2VzIF9zZXRCb29sUHJlZmVyZW5jZUZvclRlc3RpbmdXaXRoVmFs dWU6Tk8gZm9yS2V5OkAiV2ViS2l0TGF6eUlmcmFtZUxvYWRpbmdFbmFibGVkIl07Ci0gICAgW3By ZWZlcmVuY2VzIF9zZXRCb29sUHJlZmVyZW5jZUZvclRlc3RpbmdXaXRoVmFsdWU6Tk8gZm9yS2V5 OkAiV2ViS2l0TGF6eUltYWdlTG9hZGluZ0VuYWJsZWQiXTsKLSAgICBbcHJlZmVyZW5jZXMgX3Nl dEJvb2xQcmVmZXJlbmNlRm9yVGVzdGluZ1dpdGhWYWx1ZTpOTyBmb3JLZXk6QCJXZWJLaXRXZWJB dXRoZW50aWNhdGlvbkVuYWJsZWQiXTsKLQotICAgIGlmIChwZXJzaXN0ZW50VXNlclN0eWxlU2hl ZXRMb2NhdGlvbigpKSB7Ci0gICAgICAgIFtwcmVmZXJlbmNlcyBzZXRVc2VyU3R5bGVTaGVldExv Y2F0aW9uOltOU1VSTCBVUkxXaXRoU3RyaW5nOihfX2JyaWRnZSBOU1N0cmluZyAqKXBlcnNpc3Rl bnRVc2VyU3R5bGVTaGVldExvY2F0aW9uKCkuZ2V0KCldXTsKLSAgICAgICAgW3ByZWZlcmVuY2Vz IHNldFVzZXJTdHlsZVNoZWV0RW5hYmxlZDpZRVNdOwotICAgIH0gZWxzZQotICAgICAgICBbcHJl ZmVyZW5jZXMgc2V0VXNlclN0eWxlU2hlZXRFbmFibGVkOk5PXTsKKyAgICAgICAgaWYgKHBlcnNp c3RlbnRVc2VyU3R5bGVTaGVldExvY2F0aW9uKCkpIHsKKyAgICAgICAgICAgIHByZWZlcmVuY2Vz LnVzZXJTdHlsZVNoZWV0TG9jYXRpb24gPSBbTlNVUkwgVVJMV2l0aFN0cmluZzooX19icmlkZ2Ug TlNTdHJpbmcgKilwZXJzaXN0ZW50VXNlclN0eWxlU2hlZXRMb2NhdGlvbigpLmdldCgpXTsKKyAg ICAgICAgICAgIHByZWZlcmVuY2VzLnVzZXJTdHlsZVNoZWV0RW5hYmxlZCA9IFlFUzsKKyAgICAg ICAgfSBlbHNlCisgICAgICAgICAgICBwcmVmZXJlbmNlcy51c2VyU3R5bGVTaGVldEVuYWJsZWQg PSBOTzsKIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgLy8gRW5hYmxlIHRoZSB0cmFj a2VyIGJlZm9yZSBjcmVhdGluZyB0aGUgZmlyc3QgV2ViVmlldyB3aWxsCi0gICAgLy8gY2F1c2Ug aW5pdGlhbGl6YXRpb24gdG8gdXNlIHRoZSBjb3JyZWN0IGRhdGFiYXNlIHBhdGhzLgotICAgIFtw cmVmZXJlbmNlcyBzZXRTdG9yYWdlVHJhY2tlckVuYWJsZWQ6WUVTXTsKLSNlbHNlCi0gICAgW3By ZWZlcmVuY2VzIHNldE1vY2tTY3JvbGxiYXJzRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNl cyBzZXRTaG91bGRQcmludEJhY2tncm91bmRzOllFU107Ci0gICAgW3ByZWZlcmVuY2VzIHNldFRl eHRBcmVhc0FyZVJlc2l6YWJsZTpZRVNdOwotI2VuZGlmCi0KLSAgICBbcHJlZmVyZW5jZXMgX3Nl dFRleHRBdXRvc2l6aW5nRW5hYmxlZDpOT107Ci0gICAgW3ByZWZlcmVuY2VzIHNldEFjY2VsZXJh dGVkQ29tcG9zaXRpbmdFbmFibGVkOllFU107Ci0gICAgW3ByZWZlcmVuY2VzIHNldEFjY2VsZXJh dGVkRHJhd2luZ0VuYWJsZWQ6dXNlQWNjZWxlcmF0ZWREcmF3aW5nXTsKLSAgICBbcHJlZmVyZW5j ZXMgc2V0QXN5bmNocm9ub3VzU3BlbGxDaGVja2luZ0VuYWJsZWQ6Tk9dOwotICAgIFtwcmVmZXJl bmNlcyBzZXRBdWRpb1BsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZTpOT107Ci0gICAgW3ByZWZl cmVuY2VzIHNldENhY2hlTW9kZWw6V2ViQ2FjaGVNb2RlbERvY3VtZW50QnJvd3Nlcl07Ci0gICAg W3ByZWZlcmVuY2VzIHNldENhbnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmc6WUVTXTsKLSAgICBb cHJlZmVyZW5jZXMgc2V0Q29sb3JGaWx0ZXJFbmFibGVkOllFU107Ci0gICAgW3ByZWZlcmVuY2Vz IHNldEN1cnNpdmVGb250RmFtaWx5OkAiQXBwbGUgQ2hhbmNlcnkiXTsKLSAgICBbcHJlZmVyZW5j ZXMgc2V0Q3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkOllFU107Ci0gICAgW3ByZWZlcmVuY2Vz IHNldERhdGFUcmFuc2Zlckl0ZW1zRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRE ZWZhdWx0Rml4ZWRGb250U2l6ZToxM107Ci0gICAgW3ByZWZlcmVuY2VzIHNldERlZmF1bHRGb250 U2l6ZToxNl07Ci0gICAgW3ByZWZlcmVuY2VzIHNldERlZmF1bHRUZXh0RW5jb2RpbmdOYW1lOkAi SVNPLTg4NTktMSJdOwotICAgIFtwcmVmZXJlbmNlcyBzZXREaXJlY3RvcnlVcGxvYWRFbmFibGVk OllFU107Ci0gICAgW3ByZWZlcmVuY2VzIHNldERvd25sb2FkQXR0cmlidXRlRW5hYmxlZDpZRVNd OwotICAgIFtwcmVmZXJlbmNlcyBzZXRFZGl0YWJsZUxpbmtCZWhhdmlvcjpXZWJLaXRFZGl0YWJs ZUxpbmtPbmx5TGl2ZVdpdGhTaGlmdEtleV07Ci0gICAgW3ByZWZlcmVuY2VzIHNldEVuY3J5cHRl ZE1lZGlhQVBJRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRGYW50YXN5Rm9udEZh bWlseTpAIlBhcHlydXMiXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0Rml4ZWRGb250RmFtaWx5OkAi Q291cmllciJdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRGcmFtZUZsYXR0ZW5pbmc6V2ViS2l0RnJh bWVGbGF0dGVuaW5nRGlzYWJsZWRdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRHYW1lcGFkc0VuYWJs ZWQ6WUVTXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0SGlkZGVuUGFnZUNTU0FuaW1hdGlvblN1c3Bl bnNpb25FbmFibGVkOk5PXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0SGlkZGVuUGFnZURPTVRpbWVy VGhyb3R0bGluZ0VuYWJsZWQ6Tk9dOwotICAgIFtwcmVmZXJlbmNlcyBzZXRJbnZpc2libGVBdXRv cGxheU5vdFBlcm1pdHRlZDpOT107Ci0gICAgW3ByZWZlcmVuY2VzIHNldEphdmFFbmFibGVkOk5P XTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0SmF2YVNjcmlwdFJ1bnRpbWVGbGFnczpXZWJLaXRKYXZh U2NyaXB0UnVudGltZUZsYWdzQWxsRW5hYmxlZF07Ci0gICAgW3ByZWZlcmVuY2VzIHNldExhcmdl SW1hZ2VBc3luY0RlY29kaW5nRW5hYmxlZDpOT107Ci0gICAgW3ByZWZlcmVuY2VzIHNldExpbmtQ cmVsb2FkRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRMb2Fkc1NpdGVJY29uc0ln bm9yaW5nSW1hZ2VMb2FkaW5nUHJlZmVyZW5jZTpOT107Ci0gICAgW3ByZWZlcmVuY2VzIHNldE1l ZGlhQ2FwYWJpbGl0aWVzRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRNZWRpYURh dGFMb2Fkc0F1dG9tYXRpY2FsbHk6WUVTXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0TWVkaWFEZXZp Y2VzRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRNZWRpYVBsYXliYWNrQWxsb3dz SW5saW5lOllFU107Ci0gICAgW3ByZWZlcmVuY2VzIHNldE1lZGlhUGxheWJhY2tSZXF1aXJlc1Vz ZXJHZXN0dXJlOk5PXTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0TWVkaWFQcmVsb2FkaW5nRW5hYmxl ZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRNZWRpYVNvdXJjZUVuYWJsZWQ6WUVTXTsKLSAg ICBbcHJlZmVyZW5jZXMgc2V0TWV0YVJlZnJlc2hFbmFibGVkOllFU107Ci0gICAgW3ByZWZlcmVu Y2VzIHNldE1vZGVybk1lZGlhQ29udHJvbHNFbmFibGVkOllFU107Ci0gICAgW3ByZWZlcmVuY2Vz IHNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJl bmNlcyBzZXRQaWN0b2dyYXBoRm9udEZhbWlseTpAIkFwcGxlIENvbG9yIEVtb2ppIl07Ci0gICAg W3ByZWZlcmVuY2VzIHNldFNhbnNTZXJpZkZvbnRGYW1pbHk6QCJIZWx2ZXRpY2EiXTsKLSAgICBb cHJlZmVyZW5jZXMgc2V0U2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQ6WUVT XTsKLSAgICBbcHJlZmVyZW5jZXMgc2V0U2VyaWZGb250RmFtaWx5OkAiVGltZXMiXTsKLSAgICBb cHJlZmVyZW5jZXMgc2V0U291cmNlQnVmZmVyQ2hhbmdlVHlwZUVuYWJsZWQ6WUVTXTsKLSAgICBb cHJlZmVyZW5jZXMgc2V0U3RhbmRhcmRGb250RmFtaWx5OkAiVGltZXMiXTsKLSAgICBbcHJlZmVy ZW5jZXMgc2V0U3VicGl4ZWxBbnRpYWxpYXNlZExheWVyVGV4dEVuYWJsZWQ6Tk9dOwotICAgIFtw cmVmZXJlbmNlcyBzZXRWaWRlb1BsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZTpOT107Ci0gICAg W3ByZWZlcmVuY2VzIHNldFdlYkF1ZGlvRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBz ZXRXZWJTUUxFbmFibGVkOllFU107CisgICAgICAgIHByZWZlcmVuY2VzLmFjY2VsZXJhdGVkRHJh d2luZ0VuYWJsZWQgPSB1c2VBY2NlbGVyYXRlZERyYXdpbmc7CisgICAgICAgIHByZWZlcmVuY2Vz LmVkaXRhYmxlTGlua0JlaGF2aW9yID0gV2ViS2l0RWRpdGFibGVMaW5rT25seUxpdmVXaXRoU2hp ZnRLZXk7CisgICAgICAgIHByZWZlcmVuY2VzLmZyYW1lRmxhdHRlbmluZyA9IFdlYktpdEZyYW1l RmxhdHRlbmluZ0Rpc2FibGVkOworICAgICAgICBwcmVmZXJlbmNlcy5jYWNoZU1vZGVsID0gV2Vi Q2FjaGVNb2RlbERvY3VtZW50QnJvd3NlcjsKIAotICAgIFtXZWJQcmVmZXJlbmNlcyBfY2xlYXJO ZXR3b3JrTG9hZGVyU2Vzc2lvbl07Ci0gICAgW1dlYlByZWZlcmVuY2VzIF9zZXRDdXJyZW50TmV0 d29ya0xvYWRlclNlc3Npb25Db29raWVBY2NlcHRQb2xpY3k6TlNIVFRQQ29va2llQWNjZXB0UG9s aWN5T25seUZyb21NYWluRG9jdW1lbnREb21haW5dOwotfQorICAgICAgICBwcmVmZXJlbmNlcy5w cml2YXRlQnJvd3NpbmdFbmFibGVkID0gb3B0aW9ucy51c2VFcGhlbWVyYWxTZXNzaW9uKCk7CiAK LXRlbXBsYXRlPHR5cGVuYW1lIFQ+IFQgd2ViUHJlZmVyZW5jZUZlYXR1cmVWYWx1ZShjb25zdCBz dGQ6OnN0cmluZyYga2V5LCBjb25zdCBzdGQ6OnVub3JkZXJlZF9tYXA8c3RkOjpzdHJpbmcsIFQ+ JiBtYXApCi17Ci0gICAgYXV0byBpdCA9IG1hcC5maW5kKGtleSk7Ci0gICAgQVNTRVJUKGl0ICE9 IG1hcC5lbmQoKSk7Ci0gICAgcmV0dXJuIGl0LT5zZWNvbmQ7Ci19CisgICAgICAgIGZvciAoY29u c3QgYXV0byYgW2tleSwgdmFsdWVdIDogb3B0aW9ucy5ib29sV2ViUHJlZmVyZW5jZUZlYXR1cmVz KCkpCisgICAgICAgICAgICBbcHJlZmVyZW5jZXMgX3NldEJvb2xQcmVmZXJlbmNlRm9yVGVzdGlu Z1dpdGhWYWx1ZTp2YWx1ZSBmb3JLZXk6dG9OUyhXVFI6OlRlc3RPcHRpb25zOjp0b1dlYktpdExl Z2FjeVByZWZlcmVuY2VLZXkoa2V5KSkuZ2V0KCldOwogCi1zdGF0aWMgdm9pZCBzZXRXZWJQcmVm ZXJlbmNlc0ZvclRlc3RPcHRpb25zKFdlYlByZWZlcmVuY2VzICpwcmVmZXJlbmNlcywgY29uc3Qg V1RSOjpUZXN0T3B0aW9ucyYgb3B0aW9ucykKLXsKLSAgICBbcHJlZmVyZW5jZXMgX2JhdGNoVXBk YXRlUHJlZmVyZW5jZXNJbkJsb2NrOl4oV2ViUHJlZmVyZW5jZXMgKnByZWZlcmVuY2VzKSB7Ci0g ICAgICAgIHJlc2V0V2ViUHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMocHJlZmVyZW5jZXMp OworICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIFtrZXksIHZhbHVlXSA6IG9wdGlvbnMuZG91Ymxl V2ViUHJlZmVyZW5jZUZlYXR1cmVzKCkpCisgICAgICAgICAgICBbcHJlZmVyZW5jZXMgX3NldERv dWJsZVByZWZlcmVuY2VGb3JUZXN0aW5nV2l0aFZhbHVlOnZhbHVlIGZvcktleTp0b05TKFdUUjo6 VGVzdE9wdGlvbnM6OnRvV2ViS2l0TGVnYWN5UHJlZmVyZW5jZUtleShrZXkpKS5nZXQoKV07CiAK LSAgICAgICAgcHJlZmVyZW5jZXMucHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCA9IG9wdGlvbnMudXNl RXBoZW1lcmFsU2Vzc2lvbigpOworICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIFtrZXksIHZhbHVl XSA6IG9wdGlvbnMudWludDMyV2ViUHJlZmVyZW5jZUZlYXR1cmVzKCkpCisgICAgICAgICAgICBb cHJlZmVyZW5jZXMgX3NldFVJbnQzMlByZWZlcmVuY2VGb3JUZXN0aW5nV2l0aFZhbHVlOnZhbHVl IGZvcktleTp0b05TKFdUUjo6VGVzdE9wdGlvbnM6OnRvV2ViS2l0TGVnYWN5UHJlZmVyZW5jZUtl eShrZXkpKS5nZXQoKV07CiAKLSAgICAgICAgLy8gRklYTUU6IFJlbW92ZSB0aGVzZSBvbmNlIHRo ZXJlIGlzIGEgdmlhYmxlIG1lY2hhbmlzbSBmb3IgcmVzZXRpbmcgV2ViUHJlZmVyZW5jZXMgYmV0 d2VlbiB0ZXN0cywKLSAgICAgICAgLy8gYXQgd2hpY2ggcG9pbnQsIHdlIHdpbGwgbm90IG5lZWQg dG8gbWFudWFsbHkgcmVzZXQgZXZlcnkgc3VwcG9ydGVkIHByZWZlcmVuY2UgZm9yIGVhY2ggdGVz dC4KLSAgICAgICAgZm9yIChjb25zdCBhdXRvJiBrZXkgOiBvcHRpb25zLnN1cHBvcnRlZEJvb2xX ZWJQcmVmZXJlbmNlRmVhdHVyZXMoKSkKLSAgICAgICAgICAgIFtwcmVmZXJlbmNlcyBfc2V0Qm9v bFByZWZlcmVuY2VGb3JUZXN0aW5nV2l0aFZhbHVlOndlYlByZWZlcmVuY2VGZWF0dXJlVmFsdWUo a2V5LCBvcHRpb25zLmJvb2xXZWJQcmVmZXJlbmNlRmVhdHVyZXMoKSkgZm9yS2V5OnRvTlMoV1RS OjpUZXN0T3B0aW9uczo6dG9XZWJLaXRMZWdhY3lQcmVmZXJlbmNlS2V5KGtleSkpLmdldCgpXTsK LSAgICAgICAgZm9yIChjb25zdCBhdXRvJiBrZXkgOiBvcHRpb25zLnN1cHBvcnRlZFVJbnQzMldl YlByZWZlcmVuY2VGZWF0dXJlcygpKQotICAgICAgICAgICAgW3ByZWZlcmVuY2VzIF9zZXRVSW50 MzJQcmVmZXJlbmNlRm9yVGVzdGluZ1dpdGhWYWx1ZTp3ZWJQcmVmZXJlbmNlRmVhdHVyZVZhbHVl KGtleSwgb3B0aW9ucy51aW50MzJXZWJQcmVmZXJlbmNlRmVhdHVyZXMoKSkgZm9yS2V5OnRvTlMo V1RSOjpUZXN0T3B0aW9uczo6dG9XZWJLaXRMZWdhY3lQcmVmZXJlbmNlS2V5KGtleSkpLmdldCgp XTsKKyAgICAgICAgZm9yIChjb25zdCBhdXRvJiBba2V5LCB2YWx1ZV0gOiBvcHRpb25zLnN0cmlu Z1dlYlByZWZlcmVuY2VGZWF0dXJlcygpKQorICAgICAgICAgICAgW3ByZWZlcmVuY2VzIF9zZXRT dHJpbmdQcmVmZXJlbmNlRm9yVGVzdGluZ1dpdGhWYWx1ZTp0b05TKHZhbHVlKS5nZXQoKSBmb3JL ZXk6dG9OUyhXVFI6OlRlc3RPcHRpb25zOjp0b1dlYktpdExlZ2FjeVByZWZlcmVuY2VLZXkoa2V5 KSkuZ2V0KCldOworCisgICAgICAgIC8vIEZJWE1FOiBUZXN0cyBjdXJyZW50bHkgZXhwZWN0IHRo aXMgdG8gYWx3YXlzIGJlIGZhbHNlIGluIFdlYktpdExlZ2FjeSB0ZXN0aW5nIC0gaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjg2NC4KKyAgICAgICAgW3ByZWZlcmVu Y2VzIF9zZXRCb29sUHJlZmVyZW5jZUZvclRlc3RpbmdXaXRoVmFsdWU6Tk8gZm9yS2V5OkAiV2Vi S2l0TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRFbmFibGVkIl07CiAgICAgfV07CisKKyAgICBbV2Vi UHJlZmVyZW5jZXMgX2NsZWFyTmV0d29ya0xvYWRlclNlc3Npb25dOworICAgIFtXZWJQcmVmZXJl bmNlcyBfc2V0Q3VycmVudE5ldHdvcmtMb2FkZXJTZXNzaW9uQ29va2llQWNjZXB0UG9saWN5Ok5T SFRUUENvb2tpZUFjY2VwdFBvbGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluXTsKIH0KIAog Ly8gQ2FsbGVkIG9uY2Ugb24gRHVtcFJlbmRlclRyZWUgc3RhcnR1cC4KQEAgLTk4Nyw5ICs5MTgs NiBAQCBzdGF0aWMgdm9pZCBzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlCiAgICAgICAgIEAi QXBwbGVPdGhlckhpZ2hsaWdodENvbG9yIjpAIjAuNTAwMDAwIDAuNTAwMDAwIDAuNTAwMDAwIiwK ICAgICAgICAgQCJBcHBsZUxhbmd1YWdlcyI6IEBbIEAiZW4iIF0sCiAgICAgICAgIFdlYktpdEVu YWJsZUZ1bGxEb2N1bWVudFRlYXJkb3duUHJlZmVyZW5jZUtleTogQFlFUywKLSAgICAgICAgV2Vi S2l0RnVsbFNjcmVlbkVuYWJsZWRQcmVmZXJlbmNlS2V5OiBAWUVTLAotICAgICAgICBXZWJLaXRB bGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrUHJlZmVyZW5jZUtleTogQFlFUywKLSAgICAgICAgV2Vi S2l0SW5saW5lTWVkaWFQbGF5YmFja1JlcXVpcmVzUGxheXNJbmxpbmVBdHRyaWJ1dGVLZXk6IEBO TywKICAgICAgICAgQCJVc2VXZWJLaXRXZWJJbnNwZWN0b3IiOiBAWUVTLAogI2lmICFQTEFURk9S TShJT1NfRkFNSUxZKQogICAgICAgICBAIk5TUHJlZmVycmVkU3BlbGxTZXJ2ZXJMYW5ndWFnZSI6 IEAiZW5fVVMiLApAQCAtMTE1OCw3ICsxMDg2LDcgQEAgc3RhdGljIEJPT0wgb3ZlcnJpZGVJc0lu SGFyZHdhcmVLZXlib2FyZAogCiBzdGF0aWMgdm9pZCBwcmVwYXJlQ29uc2lzdGVudFRlc3RpbmdF bnZpcm9ubWVudCgpCiB7Ci0jaWYgIVBMQVRGT1JNKElPU19GQU1JTFkpCisjaWYgUExBVEZPUk0o TUFDKQogICAgIHBvc2VBc0NsYXNzKCJEdW1wUmVuZGVyVHJlZVBhc3RlYm9hcmQiLCAiTlNQYXN0 ZWJvYXJkIik7CiAgICAgcG9zZUFzQ2xhc3MoIkR1bXBSZW5kZXJUcmVlRXZlbnQiLCAiTlNFdmVu dCIpOwogI2Vsc2UKQEAgLTExNzMsNyArMTEwMSw3IEBAIHN0YXRpYyB2b2lkIHByZXBhcmVDb25z aXN0ZW50VGVzdGluZ0VudmkKIAogICAgIFtXZWJQcmVmZXJlbmNlcyBfc3dpdGNoTmV0d29ya0xv YWRlclRvTmV3VGVzdGluZ1Nlc3Npb25dOwogCi0jaWYgIVBMQVRGT1JNKElPU19GQU1JTFkpCisj aWYgUExBVEZPUk0oTUFDKQogICAgIGFkanVzdEZvbnRzKCk7CiAgICAgcmVnaXN0ZXJNb2NrU2Ny b2xsYmFycygpOwogCkBAIC0xMTgxLDYgKzExMDksOSBAQCBzdGF0aWMgdm9pZCBwcmVwYXJlQ29u c2lzdGVudFRlc3RpbmdFbnZpCiAgICAgW1tXZWJQcmVmZXJlbmNlcyBzdGFuZGFyZFByZWZlcmVu Y2VzXSBzZXRNb2NrU2Nyb2xsYmFyc0VuYWJsZWQ6WUVTXTsKICNlbHNlCiAgICAgYWN0aXZhdGVG b250c0lPUygpOworCisgICAgLy8gRW5hYmxlIHRoZSB0cmFja2VyIGJlZm9yZSBjcmVhdGluZyB0 aGUgZmlyc3QgV2ViVmlldyB3aWxsIGNhdXNlIGluaXRpYWxpemF0aW9uIHRvIHVzZSB0aGUgY29y cmVjdCBkYXRhYmFzZSBwYXRocy4KKyAgICBbW1dlYlByZWZlcmVuY2VzIHN0YW5kYXJkUHJlZmVy ZW5jZXNdIHNldFN0b3JhZ2VUcmFja2VyRW5hYmxlZDpZRVNdOwogI2VuZGlmCiAKICAgICBhbGxv Y2F0ZUdsb2JhbENvbnRyb2xsZXJzKCk7Cg==