213527 2020-06-23 12:49:57 -0700 Make HTTP/3 experimental feature work on iOS and only create storage directory if enabled 2020-06-23 23:05:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen ggaren guoye_zhang sam webkit-bug-importer oldest_to_newest 1665506 0 achristensen 2020-06-23 12:49:57 -0700 Make HTTP/3 experimental feature work on iOS and only create storage directory if enabled 1665509 1 402583 achristensen 2020-06-23 12:53:33 -0700 Created attachment 402583 Patch 1665518 2 402583 sam 2020-06-23 13:25:28 -0700 Comment on attachment 402583 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402583&action=review > Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:212 > +#if PLATFORM(MAC) > + NSString *format = @"Experimental%@"; > +#else > + NSString *format = @"WebKitExperimental%@"; > +#endif Is this correct for Catalyst? 1665520 3 achristensen 2020-06-23 13:32:03 -0700 I don't know but it doesn't matter in this case. This is so users can use Safari's experimental features menu to turn on HTTP/3, and Safari is not a Catalyst app. 1665522 4 guoye_zhang 2020-06-23 13:38:45 -0700 WebKit currently has this: > configuration._allowsHTTP3 = parameters.http3Enabled; It’d be better if this is done instead: > if (parameters.http3Enabled) { > configuration._allowsHTTP3 = YES; > } Which won't override system level "enable HTTP/3 by default" 1665528 5 402586 achristensen 2020-06-23 13:52:00 -0700 Created attachment 402586 Patch 1665539 6 ggaren 2020-06-23 14:13:49 -0700 Seems like a great thing to add a regression test for. 1665573 7 402600 achristensen 2020-06-23 15:50:37 -0700 Created attachment 402600 Patch 1665577 8 402602 achristensen 2020-06-23 16:06:41 -0700 Created attachment 402602 Patch 1665623 9 402602 ggaren 2020-06-23 19:15:07 -0700 Comment on attachment 402602 Patch r=me 1665648 10 ews-feeder 2020-06-23 23:04:30 -0700 Committed r263441: <https://trac.webkit.org/changeset/263441> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402602. 1665649 11 webkit-bug-importer 2020-06-23 23:05:18 -0700 <rdar://problem/64685323> 402583 2020-06-23 12:53:33 -0700 2020-06-23 13:51:58 -0700 Patch bug-213527-20200623125332.patch text/plain 6586 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjM0MTMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA2LTIzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBIVFRQLzMg ZXhwZXJpbWVudGFsIGZlYXR1cmUgd29yayBvbiBpT1MgYW5kIG9ubHkgY3JlYXRlIHN0b3JhZ2Ug ZGlyZWN0b3J5IGlmIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxMzUyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJlYWRpbmcgdGhlIGV4cGVyaW1lbnRhbCBmZWF0dXJlIHdhc24ndCB3b3Jr aW5nIG9uIGlPUyBiZWNhdXNlIHRoZSB1c2VyIGRlZmF1bHRzIHByZWZpeCBpcyBkaWZmZXJlbnQu CisgICAgICAgIEFsc28sIG9ubHkgcmVzb2x2ZSBhbmQgY3JlYXRlIHRoZSBkaXJlY3RvcnkgaWYg aXQgaXMgZW5hYmxlZC4gIFRoaXMgc2hvdWxkIGhlbHAgd2l0aCBzdGFydHVwIHRpbWUsIHdoaWNo CisgICAgICAgIGhhcyB0byB3YWl0IGZvciBhbGwgZGlyZWN0b3JpZXMgdG8gYmUgcmVzb2x2ZWQg YW5kIGNyZWF0ZWQuICBTZWUgcmRhcjovL3Byb2JsZW0vNjQyNjMyMjggd2hpY2ggdGhpcyBzaG91 bGQgaGVscCB3aXRoLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNv Y29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpwbGF0Zm9ybVNldE5l dHdvcmtQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6aHR0 cDNFbmFibGVkKToKKwogMjAyMC0wNi0yMyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgogCiAgICAgICAgIEV4cG9zZSBhbHJlYWR5LWF2YWlsYWJsZSBXS05hdmln YXRpb25BY3Rpb24ucmVxdWVzdC5IVFRQQm9keSB0aHJvdWdoIHRoZSBBUEkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJKHJldmlzaW9uIDI2MzI3OCkK KysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjczLDEwICs2NzMsMTIgQEAgTmV0d29ya1Byb2Nlc3NQcm94eSYgV2ViUHJvY2Vz c1Bvb2w6OmVucwogICAgIH0KIAogI2lmIEhBVkUoQ0ZORVRXT1JLX0FMVEVSTkFUSVZFX1NFUlZJ Q0UpCi0gICAgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3b3JrU2Vz c2lvblBhcmFtZXRlcnMuYWx0ZXJuYXRpdmVTZXJ2aWNlRGlyZWN0b3J5ID0gV2Vic2l0ZURhdGFT dG9yZTo6ZGVmYXVsdEFsdGVybmF0aXZlU2VydmljZXNEaXJlY3RvcnkoKTsKLSAgICBpZiAoIXBh cmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0 ZXJzLmFsdGVybmF0aXZlU2VydmljZURpcmVjdG9yeS5pc0VtcHR5KCkpCi0gICAgICAgIFNhbmRi b3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShwYXJhbWV0ZXJz LmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5hbHRl cm5hdGl2ZVNlcnZpY2VEaXJlY3RvcnksIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFt ZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmFsdGVybmF0aXZlU2VydmljZURpcmVjdG9y eUV4dGVuc2lvbkhhbmRsZSk7Ci0gICAgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1l dGVycy5uZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuaHR0cDNFbmFibGVkID0gV2Vic2l0ZURhdGFT dG9yZTo6aHR0cDNFbmFibGVkKCk7CisgICAgaWYgKFdlYnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5h YmxlZCgpKSB7CisgICAgICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMu bmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmFsdGVybmF0aXZlU2VydmljZURpcmVjdG9yeSA9IFdl YnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRBbHRlcm5hdGl2ZVNlcnZpY2VzRGlyZWN0b3J5KCk7Cisg ICAgICAgIGlmICghcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3b3Jr U2Vzc2lvblBhcmFtZXRlcnMuYWx0ZXJuYXRpdmVTZXJ2aWNlRGlyZWN0b3J5LmlzRW1wdHkoKSkK KyAgICAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURp cmVjdG9yeShwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNz aW9uUGFyYW1ldGVycy5hbHRlcm5hdGl2ZVNlcnZpY2VEaXJlY3RvcnksIHBhcmFtZXRlcnMuZGVm YXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmFsdGVybmF0 aXZlU2VydmljZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CisgICAgICAgIHBhcmFtZXRlcnMu ZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmh0dHAz RW5hYmxlZCA9IHRydWU7CisgICAgfQogI2VuZGlmCiAgICAgYm9vbCBpc0l0cFN0YXRlRXhwbGlj aXRseVNldCA9IGZhbHNlOwogICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRl cnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NQYXJhbWV0 ZXJzID0gUmVzb3VyY2VMb2FkU3RhdGlzdGljc1BhcmFtZXRlcnMgewpJbmRleDogU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9y ZS5jcHAJKHJldmlzaW9uIDI2MzI3OCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNp dGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTcsNyArMjE3 LDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpyZXNvbHZlRGlyZWN0b3JpZQogICAgICAgICBt X3Jlc29sdmVkQ29uZmlndXJhdGlvbi0+c2V0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkocmVzb2x2 ZUFuZENyZWF0ZVJlYWRXcml0ZURpcmVjdG9yeUZvclNhbmRib3hFeHRlbnNpb24obV9jb25maWd1 cmF0aW9uLT53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSgpKSk7CiAgICAgaWYgKCFtX2NvbmZpZ3Vy YXRpb24tPmluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCkuaXNFbXB0eSgpKQogICAgICAgICBt X3Jlc29sdmVkQ29uZmlndXJhdGlvbi0+c2V0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkocmVz b2x2ZUFuZENyZWF0ZVJlYWRXcml0ZURpcmVjdG9yeUZvclNhbmRib3hFeHRlbnNpb24obV9jb25m aWd1cmF0aW9uLT5pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgpKSk7Ci0gICAgaWYgKCFtX2Nv bmZpZ3VyYXRpb24tPmFsdGVybmF0aXZlU2VydmljZXNEaXJlY3RvcnkoKS5pc0VtcHR5KCkpCisg ICAgaWYgKCFtX2NvbmZpZ3VyYXRpb24tPmFsdGVybmF0aXZlU2VydmljZXNEaXJlY3RvcnkoKS5p c0VtcHR5KCkgJiYgV2Vic2l0ZURhdGFTdG9yZTo6aHR0cDNFbmFibGVkKCkpCiAgICAgICAgIG1f cmVzb2x2ZWRDb25maWd1cmF0aW9uLT5zZXRBbHRlcm5hdGl2ZVNlcnZpY2VzRGlyZWN0b3J5KHJl c29sdmVBbmRDcmVhdGVSZWFkV3JpdGVEaXJlY3RvcnlGb3JTYW5kYm94RXh0ZW5zaW9uKG1fY29u ZmlndXJhdGlvbi0+YWx0ZXJuYXRpdmVTZXJ2aWNlc0RpcmVjdG9yeSgpKSk7CiAgICAgaWYgKCFt X2NvbmZpZ3VyYXRpb24tPmRldmljZUlkSGFzaFNhbHRzU3RvcmFnZURpcmVjdG9yeSgpLmlzRW1w dHkoKSkKICAgICAgICAgbV9yZXNvbHZlZENvbmZpZ3VyYXRpb24tPnNldERldmljZUlkSGFzaFNh bHRzU3RvcmFnZURpcmVjdG9yeShyZXNvbHZlQW5kQ3JlYXRlUmVhZFdyaXRlRGlyZWN0b3J5Rm9y U2FuZGJveEV4dGVuc2lvbihtX2NvbmZpZ3VyYXRpb24tPmRldmljZUlkSGFzaFNhbHRzU3RvcmFn ZURpcmVjdG9yeSgpKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1t CShyZXZpc2lvbiAyNjMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE1Niwx MSArMTU2LDE0IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cGxhdGZvcm1TZXROZXR3b3IKICAg ICAgICAgaHR0cHNQcm94eSA9IFVSTChVUkwoKSwgW2RlZmF1bHRzIHN0cmluZ0ZvcktleTooTlNT dHJpbmcgKilXZWJLaXQySFRUUFNQcm94eURlZmF1bHRzS2V5XSk7CiAKICNpZiBIQVZFKENGTkVU V09SS19BTFRFUk5BVElWRV9TRVJWSUNFKQotICAgIFN0cmluZyBhbHRlcm5hdGl2ZVNlcnZpY2VT dG9yYWdlRGlyZWN0b3J5ID0gcmVzb2x2ZWRBbHRlcm5hdGl2ZVNlcnZpY2VzU3RvcmFnZURpcmVj dG9yeSgpOwotICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBhbHRlcm5hdGl2ZVNlcnZpY2VT dG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwotICAgIGlmICghYWx0ZXJuYXRpdmVTZXJ2 aWNlU3RvcmFnZURpcmVjdG9yeS5pc0VtcHR5KCkpCi0gICAgICAgIFNhbmRib3hFeHRlbnNpb246 OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShhbHRlcm5hdGl2ZVNlcnZpY2VTdG9y YWdlRGlyZWN0b3J5LCBhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9u SGFuZGxlKTsKICAgICBib29sIGh0dHAzRW5hYmxlZCA9IFdlYnNpdGVEYXRhU3RvcmU6Omh0dHAz RW5hYmxlZCgpOworICAgIFN0cmluZyBhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5 OworICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdl RGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOworICAgIGlmIChodHRwM0VuYWJsZWQpIHsKKyAgICAg ICAgYWx0ZXJuYXRpdmVTZXJ2aWNlU3RvcmFnZURpcmVjdG9yeSA9IHJlc29sdmVkQWx0ZXJuYXRp dmVTZXJ2aWNlc1N0b3JhZ2VEaXJlY3RvcnkoKTsKKyAgICAgICAgaWYgKCFhbHRlcm5hdGl2ZVNl cnZpY2VTdG9yYWdlRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIFNhbmRib3hFeHRl bnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShhbHRlcm5hdGl2ZVNlcnZp Y2VTdG9yYWdlRGlyZWN0b3J5LCBhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5RXh0 ZW5zaW9uSGFuZGxlKTsKKyAgICB9CiAjZW5kaWYKIAogICAgIGJvb2wgc2hvdWxkSW5jbHVkZUxv Y2FsaG9zdEluUmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IGlzU2FmYXJpOwpAQCAtMjAyLDcgKzIw NSwxMiBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnBsYXRmb3JtU2V0TmV0d29yCiBib29sIFdl YnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxlZCgpCiB7CiAjaWYgSEFWRShDRk5FVFdPUktfQUxU RVJOQVRJVkVfU0VSVklDRSkKLSAgICByZXR1cm4gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVz ZXJEZWZhdWx0c10gYm9vbEZvcktleTpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIkV4cGVy aW1lbnRhbCVAIiwgKE5TU3RyaW5nICopV2ViUHJlZmVyZW5jZXNLZXk6Omh0dHAzRW5hYmxlZEtl eSgpXV07CisjaWYgUExBVEZPUk0oTUFDKQorICAgIE5TU3RyaW5nICpmb3JtYXQgPSBAIkV4cGVy aW1lbnRhbCVAIjsKKyNlbHNlCisgICAgTlNTdHJpbmcgKmZvcm1hdCA9IEAiV2ViS2l0RXhwZXJp bWVudGFsJUAiOworI2VuZGlmCisgICAgcmV0dXJuIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRV c2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6Zm9ybWF0 LCAoTlNTdHJpbmcgKilXZWJQcmVmZXJlbmNlc0tleTo6aHR0cDNFbmFibGVkS2V5KCldXTsKICNl bHNlCiAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCg== 402586 2020-06-23 13:52:00 -0700 2020-06-23 15:50:36 -0700 Patch bug-213527-20200623135159.patch text/plain 7528 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjM0MTMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA2LTIzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBIVFRQLzMg ZXhwZXJpbWVudGFsIGZlYXR1cmUgd29yayBvbiBpT1MgYW5kIG9ubHkgY3JlYXRlIHN0b3JhZ2Ug ZGlyZWN0b3J5IGlmIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxMzUyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJlYWRpbmcgdGhlIGV4cGVyaW1lbnRhbCBmZWF0dXJlIHdhc24ndCB3b3Jr aW5nIG9uIGlPUyBiZWNhdXNlIHRoZSB1c2VyIGRlZmF1bHRzIHByZWZpeCBpcyBkaWZmZXJlbnQu CisgICAgICAgIEFsc28sIG9ubHkgcmVzb2x2ZSBhbmQgY3JlYXRlIHRoZSBkaXJlY3RvcnkgaWYg aXQgaXMgZW5hYmxlZC4gIFRoaXMgc2hvdWxkIGhlbHAgd2l0aCBzdGFydHVwIHRpbWUsIHdoaWNo CisgICAgICAgIGhhcyB0byB3YWl0IGZvciBhbGwgZGlyZWN0b3JpZXMgdG8gYmUgcmVzb2x2ZWQg YW5kIGNyZWF0ZWQuICBTZWUgcmRhcjovL3Byb2JsZW0vNjQyNjMyMjggd2hpY2ggdGhpcyBzaG91 bGQgaGVscCB3aXRoLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNv Y29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpwbGF0Zm9ybVNldE5l dHdvcmtQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6aHR0 cDNFbmFibGVkKToKKwogMjAyMC0wNi0yMyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgogCiAgICAgICAgIEV4cG9zZSBhbHJlYWR5LWF2YWlsYWJsZSBXS05hdmln YXRpb25BY3Rpb24ucmVxdWVzdC5IVFRQQm9keSB0aHJvdWdoIHRoZSBBUEkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNz aW9uQ29jb2EubW0JKHJldmlzaW9uIDI2MzI3OCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTIw Miw3ICsxMjAyLDggQEAgTmV0d29ya1Nlc3Npb25Db2NvYTo6TmV0d29ya1Nlc3Npb25Db2NvYQog ICAgICAgICBjb25maWd1cmF0aW9uLl9hbHRlcm5hdGl2ZVNlcnZpY2VzU3RvcmFnZSA9IFtbW19O U0hUVFBBbHRlcm5hdGl2ZVNlcnZpY2VzU3RvcmFnZSBhbGxvY10gaW5pdFBlcnNpc3RlbnRTdG9y ZVdpdGhVUkw6W1tOU1VSTCBmaWxlVVJMV2l0aFBhdGg6cGFyYW1ldGVycy5hbHRlcm5hdGl2ZVNl cnZpY2VEaXJlY3RvcnkgaXNEaXJlY3Rvcnk6WUVTXSBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25l bnQ6QCJBbHRlcm5hdGl2ZVNlcnZpY2Uuc3FsaXRlIl1dIGF1dG9yZWxlYXNlXTsKICAgICB9IGVs c2UKICAgICAgICAgQVNTRVJUKG1fc2Vzc2lvbklELmlzRXBoZW1lcmFsKCkpOwotICAgIGNvbmZp Z3VyYXRpb24uX2FsbG93c0hUVFAzID0gcGFyYW1ldGVycy5odHRwM0VuYWJsZWQ7CisgICAgaWYg KHBhcmFtZXRlcnMuaHR0cDNFbmFibGVkKQorICAgICAgICBjb25maWd1cmF0aW9uLl9hbGxvd3NI VFRQMyA9IFlFUzsKICNlbmRpZgogCiAgICAgY29uZmlndXJhdGlvbi5fcHJldmVudHNTeXN0ZW1I VFRQUHJveHlBdXRoZW50aWNhdGlvbiA9IHBhcmFtZXRlcnMucHJldmVudHNTeXN0ZW1IVFRQUHJv eHlBdXRoZW50aWNhdGlvbjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl c3NQb29sLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUG9vbC5jcHAJKHJldmlzaW9uIDI2MzI3OCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQb29sLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjczLDEwICs2NzMsMTIgQEAg TmV0d29ya1Byb2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmVucwogICAgIH0KIAogI2lmIEhB VkUoQ0ZORVRXT1JLX0FMVEVSTkFUSVZFX1NFUlZJQ0UpCi0gICAgcGFyYW1ldGVycy5kZWZhdWx0 RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuYWx0ZXJuYXRpdmVT ZXJ2aWNlRGlyZWN0b3J5ID0gV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdEFsdGVybmF0aXZlU2Vy dmljZXNEaXJlY3RvcnkoKTsKLSAgICBpZiAoIXBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBh cmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmFsdGVybmF0aXZlU2VydmljZURpcmVj dG9yeS5pc0VtcHR5KCkpCi0gICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZv clJlYWRXcml0ZURpcmVjdG9yeShwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJz Lm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5hbHRlcm5hdGl2ZVNlcnZpY2VEaXJlY3RvcnksIHBh cmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0 ZXJzLmFsdGVybmF0aXZlU2VydmljZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7Ci0gICAgcGFy YW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3b3JrU2Vzc2lvblBhcmFtZXRl cnMuaHR0cDNFbmFibGVkID0gV2Vic2l0ZURhdGFTdG9yZTo6aHR0cDNFbmFibGVkKCk7CisgICAg aWYgKFdlYnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxlZCgpKSB7CisgICAgICAgIHBhcmFtZXRl cnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmFs dGVybmF0aXZlU2VydmljZURpcmVjdG9yeSA9IFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRBbHRl cm5hdGl2ZVNlcnZpY2VzRGlyZWN0b3J5KCk7CisgICAgICAgIGlmICghcGFyYW1ldGVycy5kZWZh dWx0RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuYWx0ZXJuYXRp dmVTZXJ2aWNlRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIFNhbmRib3hFeHRlbnNp b246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShwYXJhbWV0ZXJzLmRlZmF1bHRE YXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5hbHRlcm5hdGl2ZVNl cnZpY2VEaXJlY3RvcnksIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0 d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmFsdGVybmF0aXZlU2VydmljZURpcmVjdG9yeUV4dGVuc2lv bkhhbmRsZSk7CisgICAgICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMu bmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmh0dHAzRW5hYmxlZCA9IHRydWU7CisgICAgfQogI2Vu ZGlmCiAgICAgYm9vbCBpc0l0cFN0YXRlRXhwbGljaXRseVNldCA9IGZhbHNlOwogICAgIHBhcmFt ZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJz LnJlc291cmNlTG9hZFN0YXRpc3RpY3NQYXJhbWV0ZXJzID0gUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1BhcmFtZXRlcnMgewpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEv V2Vic2l0ZURhdGFTdG9yZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAJKHJldmlzaW9uIDI2MzI3OCkKKysr IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yMTcsNyArMjE3LDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3Jl OjpyZXNvbHZlRGlyZWN0b3JpZQogICAgICAgICBtX3Jlc29sdmVkQ29uZmlndXJhdGlvbi0+c2V0 V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkocmVzb2x2ZUFuZENyZWF0ZVJlYWRXcml0ZURpcmVjdG9y eUZvclNhbmRib3hFeHRlbnNpb24obV9jb25maWd1cmF0aW9uLT53ZWJTUUxEYXRhYmFzZURpcmVj dG9yeSgpKSk7CiAgICAgaWYgKCFtX2NvbmZpZ3VyYXRpb24tPmluZGV4ZWREQkRhdGFiYXNlRGly ZWN0b3J5KCkuaXNFbXB0eSgpKQogICAgICAgICBtX3Jlc29sdmVkQ29uZmlndXJhdGlvbi0+c2V0 SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkocmVzb2x2ZUFuZENyZWF0ZVJlYWRXcml0ZURpcmVj dG9yeUZvclNhbmRib3hFeHRlbnNpb24obV9jb25maWd1cmF0aW9uLT5pbmRleGVkREJEYXRhYmFz ZURpcmVjdG9yeSgpKSk7Ci0gICAgaWYgKCFtX2NvbmZpZ3VyYXRpb24tPmFsdGVybmF0aXZlU2Vy dmljZXNEaXJlY3RvcnkoKS5pc0VtcHR5KCkpCisgICAgaWYgKCFtX2NvbmZpZ3VyYXRpb24tPmFs dGVybmF0aXZlU2VydmljZXNEaXJlY3RvcnkoKS5pc0VtcHR5KCkgJiYgV2Vic2l0ZURhdGFTdG9y ZTo6aHR0cDNFbmFibGVkKCkpCiAgICAgICAgIG1fcmVzb2x2ZWRDb25maWd1cmF0aW9uLT5zZXRB bHRlcm5hdGl2ZVNlcnZpY2VzRGlyZWN0b3J5KHJlc29sdmVBbmRDcmVhdGVSZWFkV3JpdGVEaXJl Y3RvcnlGb3JTYW5kYm94RXh0ZW5zaW9uKG1fY29uZmlndXJhdGlvbi0+YWx0ZXJuYXRpdmVTZXJ2 aWNlc0RpcmVjdG9yeSgpKSk7CiAgICAgaWYgKCFtX2NvbmZpZ3VyYXRpb24tPmRldmljZUlkSGFz aFNhbHRzU3RvcmFnZURpcmVjdG9yeSgpLmlzRW1wdHkoKSkKICAgICAgICAgbV9yZXNvbHZlZENv bmZpZ3VyYXRpb24tPnNldERldmljZUlkSGFzaFNhbHRzU3RvcmFnZURpcmVjdG9yeShyZXNvbHZl QW5kQ3JlYXRlUmVhZFdyaXRlRGlyZWN0b3J5Rm9yU2FuZGJveEV4dGVuc2lvbihtX2NvbmZpZ3Vy YXRpb24tPmRldmljZUlkSGFzaFNhbHRzU3RvcmFnZURpcmVjdG9yeSgpKSk7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29j b2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEv Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCShyZXZpc2lvbiAyNjMyNzgpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29j b2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE1NiwxMSArMTU2LDE0IEBAIHZvaWQgV2Vic2l0ZURh dGFTdG9yZTo6cGxhdGZvcm1TZXROZXR3b3IKICAgICAgICAgaHR0cHNQcm94eSA9IFVSTChVUkwo KSwgW2RlZmF1bHRzIHN0cmluZ0ZvcktleTooTlNTdHJpbmcgKilXZWJLaXQySFRUUFNQcm94eURl ZmF1bHRzS2V5XSk7CiAKICNpZiBIQVZFKENGTkVUV09SS19BTFRFUk5BVElWRV9TRVJWSUNFKQot ICAgIFN0cmluZyBhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5ID0gcmVzb2x2ZWRB bHRlcm5hdGl2ZVNlcnZpY2VzU3RvcmFnZURpcmVjdG9yeSgpOwotICAgIFNhbmRib3hFeHRlbnNp b246OkhhbmRsZSBhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFu ZGxlOwotICAgIGlmICghYWx0ZXJuYXRpdmVTZXJ2aWNlU3RvcmFnZURpcmVjdG9yeS5pc0VtcHR5 KCkpCi0gICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURp cmVjdG9yeShhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5LCBhbHRlcm5hdGl2ZVNl cnZpY2VTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBib29sIGh0dHAzRW5h YmxlZCA9IFdlYnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxlZCgpOworICAgIFN0cmluZyBhbHRl cm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5OworICAgIFNhbmRib3hFeHRlbnNpb246Okhh bmRsZSBhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwor ICAgIGlmIChodHRwM0VuYWJsZWQpIHsKKyAgICAgICAgYWx0ZXJuYXRpdmVTZXJ2aWNlU3RvcmFn ZURpcmVjdG9yeSA9IHJlc29sdmVkQWx0ZXJuYXRpdmVTZXJ2aWNlc1N0b3JhZ2VEaXJlY3Rvcnko KTsKKyAgICAgICAgaWYgKCFhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5LmlzRW1w dHkoKSkKKyAgICAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRX cml0ZURpcmVjdG9yeShhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5LCBhbHRlcm5h dGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKKyAgICB9CiAjZW5k aWYKIAogICAgIGJvb2wgc2hvdWxkSW5jbHVkZUxvY2FsaG9zdEluUmVzb3VyY2VMb2FkU3RhdGlz dGljcyA9IGlzU2FmYXJpOwpAQCAtMjAyLDcgKzIwNSwxMiBAQCB2b2lkIFdlYnNpdGVEYXRhU3Rv cmU6OnBsYXRmb3JtU2V0TmV0d29yCiBib29sIFdlYnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxl ZCgpCiB7CiAjaWYgSEFWRShDRk5FVFdPUktfQUxURVJOQVRJVkVfU0VSVklDRSkKLSAgICByZXR1 cm4gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gYm9vbEZvcktleTpbTlNT dHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIkV4cGVyaW1lbnRhbCVAIiwgKE5TU3RyaW5nICopV2Vi UHJlZmVyZW5jZXNLZXk6Omh0dHAzRW5hYmxlZEtleSgpXV07CisjaWYgUExBVEZPUk0oTUFDKQor ICAgIE5TU3RyaW5nICpmb3JtYXQgPSBAIkV4cGVyaW1lbnRhbCVAIjsKKyNlbHNlCisgICAgTlNT dHJpbmcgKmZvcm1hdCA9IEAiV2ViS2l0RXhwZXJpbWVudGFsJUAiOworI2VuZGlmCisgICAgcmV0 dXJuIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6W05T U3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6Zm9ybWF0LCAoTlNTdHJpbmcgKilXZWJQcmVmZXJlbmNl c0tleTo6aHR0cDNFbmFibGVkS2V5KCldXTsKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwogI2Vu ZGlmCg== 402600 2020-06-23 15:50:37 -0700 2020-06-23 16:06:39 -0700 Patch bug-213527-20200623155036.patch text/plain 12848 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjM0MTMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA2LTIzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBIVFRQLzMg ZXhwZXJpbWVudGFsIGZlYXR1cmUgd29yayBvbiBpT1MgYW5kIG9ubHkgY3JlYXRlIHN0b3JhZ2Ug ZGlyZWN0b3J5IGlmIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxMzUyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJlYWRpbmcgdGhlIGV4cGVyaW1lbnRhbCBmZWF0dXJlIHdhc24ndCB3b3Jr aW5nIG9uIGlPUyBiZWNhdXNlIHRoZSB1c2VyIGRlZmF1bHRzIHByZWZpeCBpcyBkaWZmZXJlbnQu CisgICAgICAgIEFsc28sIG9ubHkgcmVzb2x2ZSBhbmQgY3JlYXRlIHRoZSBkaXJlY3RvcnkgaWYg aXQgaXMgZW5hYmxlZC4gIFRoaXMgc2hvdWxkIGhlbHAgd2l0aCBzdGFydHVwIHRpbWUsIHdoaWNo CisgICAgICAgIGhhcyB0byB3YWl0IGZvciBhbGwgZGlyZWN0b3JpZXMgdG8gYmUgcmVzb2x2ZWQg YW5kIGNyZWF0ZWQuICBTZWUgcmRhcjovL3Byb2JsZW0vNjQyNjMyMjggd2hpY2ggdGhpcyBzaG91 bGQgaGVscCB3aXRoLgorICAgICAgICBXZSBhbHNvIHJlc3BlY3QgdGhlIHN5c3RlbSBkZWZhdWx0 IHVubGVzcyBleHBsaWNpdGx5IHR1cm5lZCBvbiwgd2hpY2ggc2hvdWxkIG1ha2UgaXQgZWFzaWVy IGZvciBDRk5ldHdvcmsgdG8gY2hhbmdlIHRoaW5ncy4KKworICAgICAgICBJIGFkZGVkIGFuIEFQ SSB0ZXN0IHRoYXQgdmVyaWZpZXMgdGhhdCB0aGUgZGVmYXVsdCBhbHQtc3ZjIHN0b3JhZ2UgZGly ZWN0b3J5IGlzIG5vdCBjcmVhdGVkIHdoZW4gd2UgZG9uJ3Qgd2FudCBpdCB0byBiZS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NQb29sOjplbnN1cmVOZXR3b3JrUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNz L1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbToKKyAgICAgICAgKFdl YktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cGxhdGZvcm1TZXROZXR3b3JrUGFyYW1ldGVycyk6Cisg ICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxlZCk6CisKIDIwMjAt MDYtMjMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBFeHBvc2UgYWxyZWFkeS1hdmFpbGFibGUgV0tOYXZpZ2F0aW9uQWN0aW9uLnJlcXVlc3Qu SFRUUEJvZHkgdGhyb3VnaCB0aGUgQVBJCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCShyZXZpc2lv biAyNjMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtT ZXNzaW9uQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyMDIsNyArMTIwMiw4IEBAIE5ldHdv cmtTZXNzaW9uQ29jb2E6Ok5ldHdvcmtTZXNzaW9uQ29jb2EKICAgICAgICAgY29uZmlndXJhdGlv bi5fYWx0ZXJuYXRpdmVTZXJ2aWNlc1N0b3JhZ2UgPSBbW1tfTlNIVFRQQWx0ZXJuYXRpdmVTZXJ2 aWNlc1N0b3JhZ2UgYWxsb2NdIGluaXRQZXJzaXN0ZW50U3RvcmVXaXRoVVJMOltbTlNVUkwgZmls ZVVSTFdpdGhQYXRoOnBhcmFtZXRlcnMuYWx0ZXJuYXRpdmVTZXJ2aWNlRGlyZWN0b3J5IGlzRGly ZWN0b3J5OllFU10gVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiQWx0ZXJuYXRpdmVTZXJ2 aWNlLnNxbGl0ZSJdXSBhdXRvcmVsZWFzZV07CiAgICAgfSBlbHNlCiAgICAgICAgIEFTU0VSVCht X3Nlc3Npb25JRC5pc0VwaGVtZXJhbCgpKTsKLSAgICBjb25maWd1cmF0aW9uLl9hbGxvd3NIVFRQ MyA9IHBhcmFtZXRlcnMuaHR0cDNFbmFibGVkOworICAgIGlmIChwYXJhbWV0ZXJzLmh0dHAzRW5h YmxlZCkKKyAgICAgICAgY29uZmlndXJhdGlvbi5fYWxsb3dzSFRUUDMgPSBZRVM7CiAjZW5kaWYK IAogICAgIGNvbmZpZ3VyYXRpb24uX3ByZXZlbnRzU3lzdGVtSFRUUFByb3h5QXV0aGVudGljYXRp b24gPSBwYXJhbWV0ZXJzLnByZXZlbnRzU3lzdGVtSFRUUFByb3h5QXV0aGVudGljYXRpb247Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCShyZXZpc2lv biAyNjMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTY3MywxMCArNjczLDEyIEBAIE5ldHdvcmtQcm9jZXNzUHJveHkm IFdlYlByb2Nlc3NQb29sOjplbnMKICAgICB9CiAKICNpZiBIQVZFKENGTkVUV09SS19BTFRFUk5B VElWRV9TRVJWSUNFKQotICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMu bmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmFsdGVybmF0aXZlU2VydmljZURpcmVjdG9yeSA9IFdl YnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRBbHRlcm5hdGl2ZVNlcnZpY2VzRGlyZWN0b3J5KCk7Ci0g ICAgaWYgKCFwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNz aW9uUGFyYW1ldGVycy5hbHRlcm5hdGl2ZVNlcnZpY2VEaXJlY3RvcnkuaXNFbXB0eSgpKQotICAg ICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JSZWFkV3JpdGVEaXJlY3Rvcnko cGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3b3JrU2Vzc2lvblBhcmFt ZXRlcnMuYWx0ZXJuYXRpdmVTZXJ2aWNlRGlyZWN0b3J5LCBwYXJhbWV0ZXJzLmRlZmF1bHREYXRh U3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5hbHRlcm5hdGl2ZVNlcnZp Y2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwotICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFT dG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmh0dHAzRW5hYmxlZCA9IFdl YnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxlZCgpOworICAgIGlmIChXZWJzaXRlRGF0YVN0b3Jl OjpodHRwM0VuYWJsZWQoKSkgeworICAgICAgICBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQ YXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5hbHRlcm5hdGl2ZVNlcnZpY2VEaXJl Y3RvcnkgPSBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0QWx0ZXJuYXRpdmVTZXJ2aWNlc0RpcmVj dG9yeSgpOworICAgICAgICBpZiAoIXBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRl cnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmFsdGVybmF0aXZlU2VydmljZURpcmVjdG9yeS5p c0VtcHR5KCkpCisgICAgICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JS ZWFkV3JpdGVEaXJlY3RvcnkocGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5u ZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuYWx0ZXJuYXRpdmVTZXJ2aWNlRGlyZWN0b3J5LCBwYXJh bWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVy cy5hbHRlcm5hdGl2ZVNlcnZpY2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOworICAgICAgICBw YXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1l dGVycy5odHRwM0VuYWJsZWQgPSB0cnVlOworICAgIH0KICNlbmRpZgogICAgIGJvb2wgaXNJdHBT dGF0ZUV4cGxpY2l0bHlTZXQgPSBmYWxzZTsKICAgICBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3Rv cmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0 aWNzUGFyYW1ldGVycyA9IFJlc291cmNlTG9hZFN0YXRpc3RpY3NQYXJhbWV0ZXJzIHsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNp dGVEYXRhU3RvcmUuY3BwCShyZXZpc2lvbiAyNjMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjE3LDcgKzIxNyw3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVzb2x2ZURpcmVjdG9yaWUK ICAgICAgICAgbV9yZXNvbHZlZENvbmZpZ3VyYXRpb24tPnNldFdlYlNRTERhdGFiYXNlRGlyZWN0 b3J5KHJlc29sdmVBbmRDcmVhdGVSZWFkV3JpdGVEaXJlY3RvcnlGb3JTYW5kYm94RXh0ZW5zaW9u KG1fY29uZmlndXJhdGlvbi0+d2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKSkpOwogICAgIGlmICgh bV9jb25maWd1cmF0aW9uLT5pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgpLmlzRW1wdHkoKSkK ICAgICAgICAgbV9yZXNvbHZlZENvbmZpZ3VyYXRpb24tPnNldEluZGV4ZWREQkRhdGFiYXNlRGly ZWN0b3J5KHJlc29sdmVBbmRDcmVhdGVSZWFkV3JpdGVEaXJlY3RvcnlGb3JTYW5kYm94RXh0ZW5z aW9uKG1fY29uZmlndXJhdGlvbi0+aW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoKSkpOwotICAg IGlmICghbV9jb25maWd1cmF0aW9uLT5hbHRlcm5hdGl2ZVNlcnZpY2VzRGlyZWN0b3J5KCkuaXNF bXB0eSgpKQorICAgIGlmICghbV9jb25maWd1cmF0aW9uLT5hbHRlcm5hdGl2ZVNlcnZpY2VzRGly ZWN0b3J5KCkuaXNFbXB0eSgpICYmIFdlYnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxlZCgpKQog ICAgICAgICBtX3Jlc29sdmVkQ29uZmlndXJhdGlvbi0+c2V0QWx0ZXJuYXRpdmVTZXJ2aWNlc0Rp cmVjdG9yeShyZXNvbHZlQW5kQ3JlYXRlUmVhZFdyaXRlRGlyZWN0b3J5Rm9yU2FuZGJveEV4dGVu c2lvbihtX2NvbmZpZ3VyYXRpb24tPmFsdGVybmF0aXZlU2VydmljZXNEaXJlY3RvcnkoKSkpOwog ICAgIGlmICghbV9jb25maWd1cmF0aW9uLT5kZXZpY2VJZEhhc2hTYWx0c1N0b3JhZ2VEaXJlY3Rv cnkoKS5pc0VtcHR5KCkpCiAgICAgICAgIG1fcmVzb2x2ZWRDb25maWd1cmF0aW9uLT5zZXREZXZp Y2VJZEhhc2hTYWx0c1N0b3JhZ2VEaXJlY3RvcnkocmVzb2x2ZUFuZENyZWF0ZVJlYWRXcml0ZURp cmVjdG9yeUZvclNhbmRib3hFeHRlbnNpb24obV9jb25maWd1cmF0aW9uLT5kZXZpY2VJZEhhc2hT YWx0c1N0b3JhZ2VEaXJlY3RvcnkoKSkpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAkocmV2aXNpb24gMjYz Mjc4KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFT dG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMTgsNyArMzE4LDcgQEAgcHJpdmF0ZToKIAogICAg IGVudW0gY2xhc3MgU2hvdWxkQ3JlYXRlRGlyZWN0b3J5IHsgTm8sIFllcyB9OwogICAgIHN0YXRp YyBXVEY6OlN0cmluZyB0ZW1wRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0 IFdURjo6U3RyaW5nJiBkaXJlY3RvcnlOYW1lLCBTaG91bGRDcmVhdGVEaXJlY3RvcnkgPSBTaG91 bGRDcmVhdGVEaXJlY3Rvcnk6Olllcyk7Ci0gICAgc3RhdGljIFdURjo6U3RyaW5nIGNhY2hlRGly ZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0IFdURjo6U3RyaW5nJiBkaXJlY3Rv cnlOYW1lKTsKKyAgICBzdGF0aWMgV1RGOjpTdHJpbmcgY2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVt UmVwcmVzZW50YXRpb24oY29uc3QgV1RGOjpTdHJpbmcmIGRpcmVjdG9yeU5hbWUsIFNob3VsZENy ZWF0ZURpcmVjdG9yeSA9IFNob3VsZENyZWF0ZURpcmVjdG9yeTo6WWVzKTsKICAgICBzdGF0aWMg V1RGOjpTdHJpbmcgd2Vic2l0ZURhdGFEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24o Y29uc3QgV1RGOjpTdHJpbmcmIGRpcmVjdG9yeU5hbWUpOwogCiAgICAgSGFzaFNldDxSZWZQdHI8 V2ViUHJvY2Vzc1Bvb2w+PiBwcm9jZXNzUG9vbHMoc2l6ZV90IGxpbWl0ID0gc3RkOjpudW1lcmlj X2xpbWl0czxzaXplX3Q+OjptYXgoKSkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURh dGFTdG9yZUNvY29hLm1tCShyZXZpc2lvbiAyNjMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0JKHdvcmtpbmcg Y29weSkKQEAgLTE1NiwxMSArMTU2LDE0IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cGxhdGZv cm1TZXROZXR3b3IKICAgICAgICAgaHR0cHNQcm94eSA9IFVSTChVUkwoKSwgW2RlZmF1bHRzIHN0 cmluZ0ZvcktleTooTlNTdHJpbmcgKilXZWJLaXQySFRUUFNQcm94eURlZmF1bHRzS2V5XSk7CiAK ICNpZiBIQVZFKENGTkVUV09SS19BTFRFUk5BVElWRV9TRVJWSUNFKQotICAgIFN0cmluZyBhbHRl cm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5ID0gcmVzb2x2ZWRBbHRlcm5hdGl2ZVNlcnZp Y2VzU3RvcmFnZURpcmVjdG9yeSgpOwotICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBhbHRl cm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwotICAgIGlmICgh YWx0ZXJuYXRpdmVTZXJ2aWNlU3RvcmFnZURpcmVjdG9yeS5pc0VtcHR5KCkpCi0gICAgICAgIFNh bmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShhbHRlcm5h dGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5LCBhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGly ZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBib29sIGh0dHAzRW5hYmxlZCA9IFdlYnNpdGVE YXRhU3RvcmU6Omh0dHAzRW5hYmxlZCgpOworICAgIFN0cmluZyBhbHRlcm5hdGl2ZVNlcnZpY2VT dG9yYWdlRGlyZWN0b3J5OworICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBhbHRlcm5hdGl2 ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOworICAgIGlmIChodHRwM0Vu YWJsZWQpIHsKKyAgICAgICAgYWx0ZXJuYXRpdmVTZXJ2aWNlU3RvcmFnZURpcmVjdG9yeSA9IHJl c29sdmVkQWx0ZXJuYXRpdmVTZXJ2aWNlc1N0b3JhZ2VEaXJlY3RvcnkoKTsKKyAgICAgICAgaWYg KCFhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAg ICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShh bHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5LCBhbHRlcm5hdGl2ZVNlcnZpY2VTdG9y YWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKKyAgICB9CiAjZW5kaWYKIAogICAgIGJvb2wg c2hvdWxkSW5jbHVkZUxvY2FsaG9zdEluUmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IGlzU2FmYXJp OwpAQCAtMjAyLDcgKzIwNSwxMiBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnBsYXRmb3JtU2V0 TmV0d29yCiBib29sIFdlYnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxlZCgpCiB7CiAjaWYgSEFW RShDRk5FVFdPUktfQUxURVJOQVRJVkVfU0VSVklDRSkKLSAgICByZXR1cm4gW1tOU1VzZXJEZWZh dWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gYm9vbEZvcktleTpbTlNTdHJpbmcgc3RyaW5nV2l0 aEZvcm1hdDpAIkV4cGVyaW1lbnRhbCVAIiwgKE5TU3RyaW5nICopV2ViUHJlZmVyZW5jZXNLZXk6 Omh0dHAzRW5hYmxlZEtleSgpXV07CisjaWYgUExBVEZPUk0oTUFDKQorICAgIE5TU3RyaW5nICpm b3JtYXQgPSBAIkV4cGVyaW1lbnRhbCVAIjsKKyNlbHNlCisgICAgTlNTdHJpbmcgKmZvcm1hdCA9 IEAiV2ViS2l0RXhwZXJpbWVudGFsJUAiOworI2VuZGlmCisgICAgcmV0dXJuIFtbTlNVc2VyRGVm YXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6W05TU3RyaW5nIHN0cmluZ1dp dGhGb3JtYXQ6Zm9ybWF0LCAoTlNTdHJpbmcgKilXZWJQcmVmZXJlbmNlc0tleTo6aHR0cDNFbmFi bGVkS2V5KCldXTsKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCkBAIC0yNjEsNyAr MjY5LDcgQEAgV1RGOjpTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdE5ldAogCiBXVEY6 OlN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0QWx0ZXJuYXRpdmVTZXJ2aWNlc0RpcmVj dG9yeSgpCiB7Ci0gICAgcmV0dXJuIGNhY2hlRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0 aW9uKCJBbHRlcm5hdGl2ZVNlcnZpY2VzIik7CisgICAgcmV0dXJuIGNhY2hlRGlyZWN0b3J5Rmls ZVN5c3RlbVJlcHJlc2VudGF0aW9uKCJBbHRlcm5hdGl2ZVNlcnZpY2VzIiwgU2hvdWxkQ3JlYXRl RGlyZWN0b3J5OjpObyk7CiB9CiAKIFdURjo6U3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1 bHRNZWRpYUNhY2hlRGlyZWN0b3J5KCkKQEAgLTMzMyw3ICszNDEsNyBAQCBXVEY6OlN0cmluZyBX ZWJzaXRlRGF0YVN0b3JlOjp0ZW1wRGlyZWN0CiAgICAgcmV0dXJuIHVybC5hYnNvbHV0ZVVSTC5w YXRoLmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbjsKIH0KIAotV1RGOjpTdHJpbmcgV2Vic2l0ZURh dGFTdG9yZTo6Y2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oY29uc3QgV1RG OjpTdHJpbmcmIGRpcmVjdG9yeU5hbWUpCitXVEY6OlN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpj YWNoZURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihjb25zdCBXVEY6OlN0cmluZyYg ZGlyZWN0b3J5TmFtZSwgU2hvdWxkQ3JlYXRlRGlyZWN0b3J5IHNob3VsZENyZWF0ZURpcmVjdG9y eSkKIHsKICAgICBzdGF0aWMgZGlzcGF0Y2hfb25jZV90IG9uY2VUb2tlbjsKICAgICBzdGF0aWMg TlNVUkwgKmNhY2hlVVJMOwpAQCAtMzU0LDcgKzM2Miw4IEBAIFdURjo6U3RyaW5nIFdlYnNpdGVE YXRhU3RvcmU6OmNhY2hlRGlyZWMKICAgICB9KTsKIAogICAgIE5TVVJMICp1cmwgPSBbY2FjaGVV UkwgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OmRpcmVjdG9yeU5hbWUgaXNEaXJlY3Rvcnk6 WUVTXTsKLSAgICBpZiAoIVtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gY3JlYXRlRGly ZWN0b3J5QXRVUkw6dXJsIHdpdGhJbnRlcm1lZGlhdGVEaXJlY3RvcmllczpZRVMgYXR0cmlidXRl czpuaWwgZXJyb3I6bnVsbHB0cl0pCisgICAgaWYgKHNob3VsZENyZWF0ZURpcmVjdG9yeSA9PSBT aG91bGRDcmVhdGVEaXJlY3Rvcnk6OlllcworICAgICAgICAmJiAhW1tOU0ZpbGVNYW5hZ2VyIGRl ZmF1bHRNYW5hZ2VyXSBjcmVhdGVEaXJlY3RvcnlBdFVSTDp1cmwgd2l0aEludGVybWVkaWF0ZURp cmVjdG9yaWVzOllFUyBhdHRyaWJ1dGVzOm5pbCBlcnJvcjpudWxscHRyXSkKICAgICAgICAgTE9H X0VSUk9SKCJGYWlsZWQgdG8gY3JlYXRlIGRpcmVjdG9yeSAlQCIsIHVybCk7CiAKICAgICByZXR1 cm4gdXJsLmFic29sdXRlVVJMLnBhdGguZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uOwpJbmRleDog VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24g MjYzNDI1KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMg QEAKKzIwMjAtMDYtMjMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9y Zz4KKworICAgICAgICBNYWtlIEhUVFAvMyBleHBlcmltZW50YWwgZmVhdHVyZSB3b3JrIG9uIGlP UyBhbmQgb25seSBjcmVhdGUgc3RvcmFnZSBkaXJlY3RvcnkgaWYgZW5hYmxlZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzNTI3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbToKKyAgICAgICAg KFRFU1QpOgorCiAyMDIwLTA2LTIzICBEaWVnbyBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5j b20+CiAKICAgICAgICAgW2V3c10gQWxsb3cgYXJjaGl2aW5nICdqc2MnIHByb2R1Y3QKSW5kZXg6 IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1 c3RvbVBhdGhzLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCShyZXZpc2lvbiAyNjMyNzgp CisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3Rv cmVDdXN0b21QYXRocy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDM2LDYgKzQzNiwzNyBAQCBURVNU KFdlYktpdCwgV2Vic2l0ZURhdGFTdG9yZUVwaGVtZXJhbCkKICAgICBbW05TRmlsZU1hbmFnZXIg ZGVmYXVsdE1hbmFnZXJdIHJlbW92ZUl0ZW1BdFVSTDpkZWZhdWx0UmVzb3VyY2VMb2FkU3RhdGlz dGljc1BhdGggZXJyb3I6bmlsXTsKIH0KIAorVEVTVChXZWJLaXQsIEFsdGVybmF0aXZlU2Vydmlj ZXNEZWZhdWx0RGlyZWN0b3J5Q3JlYXRpb24pCit7CisgICAgTlNVUkwgKmRlZmF1bHREaXJlY3Rv cnkgPSBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOltAIn4vTGlicmFyeS9DYWNoZXMvY29tLmFwcGxl LldlYktpdC5UZXN0V2ViS2l0QVBJL1dlYktpdC9BbHRlcm5hdGl2ZVNlcnZpY2VzIiBzdHJpbmdC eUV4cGFuZGluZ1RpbGRlSW5QYXRoXSBpc0RpcmVjdG9yeTpZRVNdOworICAgIFtbTlNGaWxlTWFu YWdlciBkZWZhdWx0TWFuYWdlcl0gcmVtb3ZlSXRlbUF0VVJMOmRlZmF1bHREaXJlY3RvcnkgZXJy b3I6bmlsXTsKKyAgICAKKyAgICBUZXN0V0tXZWJWaWV3ICp3ZWJWaWV3MSA9IFtbW1Rlc3RXS1dl YlZpZXcgYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKKyAgICBbd2ViVmlldzEgc3luY2hyb25v dXNseUxvYWRIVE1MU3RyaW5nOkAic3RhcnQgYXV4aWxpYXJ5IHByb2Nlc3NlcyIgYmFzZVVSTDpu aWxdOworCisgICAgRVhQRUNUX0ZBTFNFKFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0g ZmlsZUV4aXN0c0F0UGF0aDpkZWZhdWx0RGlyZWN0b3J5LnBhdGhdKTsKKyAgICAKKyNpZiBIQVZF KENGTkVUV09SS19BTFRFUk5BVElWRV9TRVJWSUNFKQorCisjaWYgUExBVEZPUk0oTUFDKQorICAg IE5TU3RyaW5nICprZXkgPSBAIkV4cGVyaW1lbnRhbEhUVFAzRW5hYmxlZCI7CisjZWxzZQorICAg IE5TU3RyaW5nICprZXkgPSBAIldlYktpdEV4cGVyaW1lbnRhbEhUVFAzRW5hYmxlZCI7CisjZW5k aWYKKyAgICAKKyAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRP YmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10gZm9yS2V5OmtleV07CisKKyAgICBU ZXN0V0tXZWJWaWV3ICp3ZWJWaWV3MiA9IFtbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRdIGF1 dG9yZWxlYXNlXTsKKyAgICBbd2ViVmlldzIgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAi c3RhcnQgYXV4aWxpYXJ5IHByb2Nlc3NlcyIgYmFzZVVSTDpuaWxdOworCisgICAgRVhQRUNUX1RS VUUoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOmRlZmF1 bHREaXJlY3RvcnkucGF0aF0pOworCisgICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJE ZWZhdWx0c10gcmVtb3ZlT2JqZWN0Rm9yS2V5OmtleV07CisgICAgW1tOU0ZpbGVNYW5hZ2VyIGRl ZmF1bHRNYW5hZ2VyXSByZW1vdmVJdGVtQXRVUkw6ZGVmYXVsdERpcmVjdG9yeSBlcnJvcjpuaWxd OworCisjZW5kaWYgLy8gSEFWRShDRk5FVFdPUktfQUxURVJOQVRJVkVfU0VSVklDRSkKK30KKwog VEVTVChXZWJLaXQsIFdlYnNpdGVEYXRhU3RvcmVFcGhlbWVyYWxWaWFDb25maWd1cmF0aW9uKQog ewogICAgIFJldGFpblB0cjxXZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHNNZXNzYWdlSGFuZGxl cj4gaGFuZGxlciA9IGFkb3B0TlMoW1tXZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHNNZXNzYWdl SGFuZGxlciBhbGxvY10gaW5pdF0pOwo= 402602 2020-06-23 16:06:41 -0700 2020-06-23 23:04:31 -0700 Patch bug-213527-20200623160640.patch text/plain 15161 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjM0MTMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA2LTIzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBIVFRQLzMg ZXhwZXJpbWVudGFsIGZlYXR1cmUgd29yayBvbiBpT1MgYW5kIG9ubHkgY3JlYXRlIHN0b3JhZ2Ug ZGlyZWN0b3J5IGlmIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxMzUyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJlYWRpbmcgdGhlIGV4cGVyaW1lbnRhbCBmZWF0dXJlIHdhc24ndCB3b3Jr aW5nIG9uIGlPUyBiZWNhdXNlIHRoZSB1c2VyIGRlZmF1bHRzIHByZWZpeCBpcyBkaWZmZXJlbnQu CisgICAgICAgIEFsc28sIG9ubHkgcmVzb2x2ZSBhbmQgY3JlYXRlIHRoZSBkaXJlY3RvcnkgaWYg aXQgaXMgZW5hYmxlZC4gIFRoaXMgc2hvdWxkIGhlbHAgd2l0aCBzdGFydHVwIHRpbWUsIHdoaWNo CisgICAgICAgIGhhcyB0byB3YWl0IGZvciBhbGwgZGlyZWN0b3JpZXMgdG8gYmUgcmVzb2x2ZWQg YW5kIGNyZWF0ZWQuICBTZWUgcmRhcjovL3Byb2JsZW0vNjQyNjMyMjggd2hpY2ggdGhpcyBzaG91 bGQgaGVscCB3aXRoLgorICAgICAgICBXZSBhbHNvIHJlc3BlY3QgdGhlIHN5c3RlbSBkZWZhdWx0 IHVubGVzcyBleHBsaWNpdGx5IHR1cm5lZCBvbiwgd2hpY2ggc2hvdWxkIG1ha2UgaXQgZWFzaWVy IGZvciBDRk5ldHdvcmsgdG8gY2hhbmdlIHRoaW5ncy4KKworICAgICAgICBJIGFkZGVkIGFuIEFQ SSB0ZXN0IHRoYXQgdmVyaWZpZXMgdGhhdCB0aGUgZGVmYXVsdCBhbHQtc3ZjIHN0b3JhZ2UgZGly ZWN0b3J5IGlzIG5vdCBjcmVhdGVkIHdoZW4gd2UgZG9uJ3Qgd2FudCBpdCB0byBiZS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NQb29sOjplbnN1cmVOZXR3b3JrUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNz L1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbToKKyAgICAgICAgKFdl YktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cGxhdGZvcm1TZXROZXR3b3JrUGFyYW1ldGVycyk6Cisg ICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxlZCk6CisKIDIwMjAt MDYtMjMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBFeHBvc2UgYWxyZWFkeS1hdmFpbGFibGUgV0tOYXZpZ2F0aW9uQWN0aW9uLnJlcXVlc3Qu SFRUUEJvZHkgdGhyb3VnaCB0aGUgQVBJCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCShyZXZpc2lv biAyNjMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtT ZXNzaW9uQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyMDIsNyArMTIwMiw4IEBAIE5ldHdv cmtTZXNzaW9uQ29jb2E6Ok5ldHdvcmtTZXNzaW9uQ29jb2EKICAgICAgICAgY29uZmlndXJhdGlv bi5fYWx0ZXJuYXRpdmVTZXJ2aWNlc1N0b3JhZ2UgPSBbW1tfTlNIVFRQQWx0ZXJuYXRpdmVTZXJ2 aWNlc1N0b3JhZ2UgYWxsb2NdIGluaXRQZXJzaXN0ZW50U3RvcmVXaXRoVVJMOltbTlNVUkwgZmls ZVVSTFdpdGhQYXRoOnBhcmFtZXRlcnMuYWx0ZXJuYXRpdmVTZXJ2aWNlRGlyZWN0b3J5IGlzRGly ZWN0b3J5OllFU10gVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiQWx0ZXJuYXRpdmVTZXJ2 aWNlLnNxbGl0ZSJdXSBhdXRvcmVsZWFzZV07CiAgICAgfSBlbHNlCiAgICAgICAgIEFTU0VSVCht X3Nlc3Npb25JRC5pc0VwaGVtZXJhbCgpKTsKLSAgICBjb25maWd1cmF0aW9uLl9hbGxvd3NIVFRQ MyA9IHBhcmFtZXRlcnMuaHR0cDNFbmFibGVkOworICAgIGlmIChwYXJhbWV0ZXJzLmh0dHAzRW5h YmxlZCkKKyAgICAgICAgY29uZmlndXJhdGlvbi5fYWxsb3dzSFRUUDMgPSBZRVM7CiAjZW5kaWYK IAogICAgIGNvbmZpZ3VyYXRpb24uX3ByZXZlbnRzU3lzdGVtSFRUUFByb3h5QXV0aGVudGljYXRp b24gPSBwYXJhbWV0ZXJzLnByZXZlbnRzU3lzdGVtSFRUUFByb3h5QXV0aGVudGljYXRpb247Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCShyZXZpc2lv biAyNjMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTY3MywxMCArNjczLDEyIEBAIE5ldHdvcmtQcm9jZXNzUHJveHkm IFdlYlByb2Nlc3NQb29sOjplbnMKICAgICB9CiAKICNpZiBIQVZFKENGTkVUV09SS19BTFRFUk5B VElWRV9TRVJWSUNFKQotICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMu bmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmFsdGVybmF0aXZlU2VydmljZURpcmVjdG9yeSA9IFdl YnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRBbHRlcm5hdGl2ZVNlcnZpY2VzRGlyZWN0b3J5KCk7Ci0g ICAgaWYgKCFwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNz aW9uUGFyYW1ldGVycy5hbHRlcm5hdGl2ZVNlcnZpY2VEaXJlY3RvcnkuaXNFbXB0eSgpKQotICAg ICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JSZWFkV3JpdGVEaXJlY3Rvcnko cGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3b3JrU2Vzc2lvblBhcmFt ZXRlcnMuYWx0ZXJuYXRpdmVTZXJ2aWNlRGlyZWN0b3J5LCBwYXJhbWV0ZXJzLmRlZmF1bHREYXRh U3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5hbHRlcm5hdGl2ZVNlcnZp Y2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwotICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFT dG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmh0dHAzRW5hYmxlZCA9IFdl YnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxlZCgpOworICAgIGlmIChXZWJzaXRlRGF0YVN0b3Jl OjpodHRwM0VuYWJsZWQoKSkgeworICAgICAgICBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQ YXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5hbHRlcm5hdGl2ZVNlcnZpY2VEaXJl Y3RvcnkgPSBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0QWx0ZXJuYXRpdmVTZXJ2aWNlc0RpcmVj dG9yeSgpOworICAgICAgICBpZiAoIXBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRl cnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmFsdGVybmF0aXZlU2VydmljZURpcmVjdG9yeS5p c0VtcHR5KCkpCisgICAgICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JS ZWFkV3JpdGVEaXJlY3RvcnkocGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5u ZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuYWx0ZXJuYXRpdmVTZXJ2aWNlRGlyZWN0b3J5LCBwYXJh bWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVy cy5hbHRlcm5hdGl2ZVNlcnZpY2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOworICAgICAgICBw YXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1l dGVycy5odHRwM0VuYWJsZWQgPSB0cnVlOworICAgIH0KICNlbmRpZgogICAgIGJvb2wgaXNJdHBT dGF0ZUV4cGxpY2l0bHlTZXQgPSBmYWxzZTsKICAgICBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3Rv cmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0 aWNzUGFyYW1ldGVycyA9IFJlc291cmNlTG9hZFN0YXRpc3RpY3NQYXJhbWV0ZXJzIHsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNp dGVEYXRhU3RvcmUuY3BwCShyZXZpc2lvbiAyNjMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjE3LDcgKzIxNyw3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVzb2x2ZURpcmVjdG9yaWUK ICAgICAgICAgbV9yZXNvbHZlZENvbmZpZ3VyYXRpb24tPnNldFdlYlNRTERhdGFiYXNlRGlyZWN0 b3J5KHJlc29sdmVBbmRDcmVhdGVSZWFkV3JpdGVEaXJlY3RvcnlGb3JTYW5kYm94RXh0ZW5zaW9u KG1fY29uZmlndXJhdGlvbi0+d2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKSkpOwogICAgIGlmICgh bV9jb25maWd1cmF0aW9uLT5pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgpLmlzRW1wdHkoKSkK ICAgICAgICAgbV9yZXNvbHZlZENvbmZpZ3VyYXRpb24tPnNldEluZGV4ZWREQkRhdGFiYXNlRGly ZWN0b3J5KHJlc29sdmVBbmRDcmVhdGVSZWFkV3JpdGVEaXJlY3RvcnlGb3JTYW5kYm94RXh0ZW5z aW9uKG1fY29uZmlndXJhdGlvbi0+aW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoKSkpOwotICAg IGlmICghbV9jb25maWd1cmF0aW9uLT5hbHRlcm5hdGl2ZVNlcnZpY2VzRGlyZWN0b3J5KCkuaXNF bXB0eSgpKQorICAgIGlmICghbV9jb25maWd1cmF0aW9uLT5hbHRlcm5hdGl2ZVNlcnZpY2VzRGly ZWN0b3J5KCkuaXNFbXB0eSgpICYmIFdlYnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxlZCgpKQog ICAgICAgICBtX3Jlc29sdmVkQ29uZmlndXJhdGlvbi0+c2V0QWx0ZXJuYXRpdmVTZXJ2aWNlc0Rp cmVjdG9yeShyZXNvbHZlQW5kQ3JlYXRlUmVhZFdyaXRlRGlyZWN0b3J5Rm9yU2FuZGJveEV4dGVu c2lvbihtX2NvbmZpZ3VyYXRpb24tPmFsdGVybmF0aXZlU2VydmljZXNEaXJlY3RvcnkoKSkpOwog ICAgIGlmICghbV9jb25maWd1cmF0aW9uLT5kZXZpY2VJZEhhc2hTYWx0c1N0b3JhZ2VEaXJlY3Rv cnkoKS5pc0VtcHR5KCkpCiAgICAgICAgIG1fcmVzb2x2ZWRDb25maWd1cmF0aW9uLT5zZXREZXZp Y2VJZEhhc2hTYWx0c1N0b3JhZ2VEaXJlY3RvcnkocmVzb2x2ZUFuZENyZWF0ZVJlYWRXcml0ZURp cmVjdG9yeUZvclNhbmRib3hFeHRlbnNpb24obV9jb25maWd1cmF0aW9uLT5kZXZpY2VJZEhhc2hT YWx0c1N0b3JhZ2VEaXJlY3RvcnkoKSkpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAkocmV2aXNpb24gMjYz Mjc4KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFT dG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMTgsNyArMzE4LDcgQEAgcHJpdmF0ZToKIAogICAg IGVudW0gY2xhc3MgU2hvdWxkQ3JlYXRlRGlyZWN0b3J5IHsgTm8sIFllcyB9OwogICAgIHN0YXRp YyBXVEY6OlN0cmluZyB0ZW1wRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0 IFdURjo6U3RyaW5nJiBkaXJlY3RvcnlOYW1lLCBTaG91bGRDcmVhdGVEaXJlY3RvcnkgPSBTaG91 bGRDcmVhdGVEaXJlY3Rvcnk6Olllcyk7Ci0gICAgc3RhdGljIFdURjo6U3RyaW5nIGNhY2hlRGly ZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0IFdURjo6U3RyaW5nJiBkaXJlY3Rv cnlOYW1lKTsKKyAgICBzdGF0aWMgV1RGOjpTdHJpbmcgY2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVt UmVwcmVzZW50YXRpb24oY29uc3QgV1RGOjpTdHJpbmcmIGRpcmVjdG9yeU5hbWUsIFNob3VsZENy ZWF0ZURpcmVjdG9yeSA9IFNob3VsZENyZWF0ZURpcmVjdG9yeTo6WWVzKTsKICAgICBzdGF0aWMg V1RGOjpTdHJpbmcgd2Vic2l0ZURhdGFEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24o Y29uc3QgV1RGOjpTdHJpbmcmIGRpcmVjdG9yeU5hbWUpOwogCiAgICAgSGFzaFNldDxSZWZQdHI8 V2ViUHJvY2Vzc1Bvb2w+PiBwcm9jZXNzUG9vbHMoc2l6ZV90IGxpbWl0ID0gc3RkOjpudW1lcmlj X2xpbWl0czxzaXplX3Q+OjptYXgoKSkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURh dGFTdG9yZUNvY29hLm1tCShyZXZpc2lvbiAyNjMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0JKHdvcmtpbmcg Y29weSkKQEAgLTE1NiwxMSArMTU2LDE0IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cGxhdGZv cm1TZXROZXR3b3IKICAgICAgICAgaHR0cHNQcm94eSA9IFVSTChVUkwoKSwgW2RlZmF1bHRzIHN0 cmluZ0ZvcktleTooTlNTdHJpbmcgKilXZWJLaXQySFRUUFNQcm94eURlZmF1bHRzS2V5XSk7CiAK ICNpZiBIQVZFKENGTkVUV09SS19BTFRFUk5BVElWRV9TRVJWSUNFKQotICAgIFN0cmluZyBhbHRl cm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5ID0gcmVzb2x2ZWRBbHRlcm5hdGl2ZVNlcnZp Y2VzU3RvcmFnZURpcmVjdG9yeSgpOwotICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBhbHRl cm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwotICAgIGlmICgh YWx0ZXJuYXRpdmVTZXJ2aWNlU3RvcmFnZURpcmVjdG9yeS5pc0VtcHR5KCkpCi0gICAgICAgIFNh bmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShhbHRlcm5h dGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5LCBhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGly ZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBib29sIGh0dHAzRW5hYmxlZCA9IFdlYnNpdGVE YXRhU3RvcmU6Omh0dHAzRW5hYmxlZCgpOworICAgIFN0cmluZyBhbHRlcm5hdGl2ZVNlcnZpY2VT dG9yYWdlRGlyZWN0b3J5OworICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBhbHRlcm5hdGl2 ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOworICAgIGlmIChodHRwM0Vu YWJsZWQpIHsKKyAgICAgICAgYWx0ZXJuYXRpdmVTZXJ2aWNlU3RvcmFnZURpcmVjdG9yeSA9IHJl c29sdmVkQWx0ZXJuYXRpdmVTZXJ2aWNlc1N0b3JhZ2VEaXJlY3RvcnkoKTsKKyAgICAgICAgaWYg KCFhbHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAg ICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShh bHRlcm5hdGl2ZVNlcnZpY2VTdG9yYWdlRGlyZWN0b3J5LCBhbHRlcm5hdGl2ZVNlcnZpY2VTdG9y YWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKKyAgICB9CiAjZW5kaWYKIAogICAgIGJvb2wg c2hvdWxkSW5jbHVkZUxvY2FsaG9zdEluUmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IGlzU2FmYXJp OwpAQCAtMjAyLDcgKzIwNSwxMiBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnBsYXRmb3JtU2V0 TmV0d29yCiBib29sIFdlYnNpdGVEYXRhU3RvcmU6Omh0dHAzRW5hYmxlZCgpCiB7CiAjaWYgSEFW RShDRk5FVFdPUktfQUxURVJOQVRJVkVfU0VSVklDRSkKLSAgICByZXR1cm4gW1tOU1VzZXJEZWZh dWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gYm9vbEZvcktleTpbTlNTdHJpbmcgc3RyaW5nV2l0 aEZvcm1hdDpAIkV4cGVyaW1lbnRhbCVAIiwgKE5TU3RyaW5nICopV2ViUHJlZmVyZW5jZXNLZXk6 Omh0dHAzRW5hYmxlZEtleSgpXV07CisjaWYgUExBVEZPUk0oTUFDKQorICAgIE5TU3RyaW5nICpm b3JtYXQgPSBAIkV4cGVyaW1lbnRhbCVAIjsKKyNlbHNlCisgICAgTlNTdHJpbmcgKmZvcm1hdCA9 IEAiV2ViS2l0RXhwZXJpbWVudGFsJUAiOworI2VuZGlmCisgICAgcmV0dXJuIFtbTlNVc2VyRGVm YXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6W05TU3RyaW5nIHN0cmluZ1dp dGhGb3JtYXQ6Zm9ybWF0LCAoTlNTdHJpbmcgKilXZWJQcmVmZXJlbmNlc0tleTo6aHR0cDNFbmFi bGVkS2V5KCldXTsKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCkBAIC0yNjEsNyAr MjY5LDcgQEAgV1RGOjpTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdE5ldAogCiBXVEY6 OlN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0QWx0ZXJuYXRpdmVTZXJ2aWNlc0RpcmVj dG9yeSgpCiB7Ci0gICAgcmV0dXJuIGNhY2hlRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0 aW9uKCJBbHRlcm5hdGl2ZVNlcnZpY2VzIik7CisgICAgcmV0dXJuIGNhY2hlRGlyZWN0b3J5Rmls ZVN5c3RlbVJlcHJlc2VudGF0aW9uKCJBbHRlcm5hdGl2ZVNlcnZpY2VzIiwgU2hvdWxkQ3JlYXRl RGlyZWN0b3J5OjpObyk7CiB9CiAKIFdURjo6U3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1 bHRNZWRpYUNhY2hlRGlyZWN0b3J5KCkKQEAgLTMzMyw3ICszNDEsNyBAQCBXVEY6OlN0cmluZyBX ZWJzaXRlRGF0YVN0b3JlOjp0ZW1wRGlyZWN0CiAgICAgcmV0dXJuIHVybC5hYnNvbHV0ZVVSTC5w YXRoLmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbjsKIH0KIAotV1RGOjpTdHJpbmcgV2Vic2l0ZURh dGFTdG9yZTo6Y2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oY29uc3QgV1RG OjpTdHJpbmcmIGRpcmVjdG9yeU5hbWUpCitXVEY6OlN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpj YWNoZURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihjb25zdCBXVEY6OlN0cmluZyYg ZGlyZWN0b3J5TmFtZSwgU2hvdWxkQ3JlYXRlRGlyZWN0b3J5IHNob3VsZENyZWF0ZURpcmVjdG9y eSkKIHsKICAgICBzdGF0aWMgZGlzcGF0Y2hfb25jZV90IG9uY2VUb2tlbjsKICAgICBzdGF0aWMg TlNVUkwgKmNhY2hlVVJMOwpAQCAtMzU0LDcgKzM2Miw4IEBAIFdURjo6U3RyaW5nIFdlYnNpdGVE YXRhU3RvcmU6OmNhY2hlRGlyZWMKICAgICB9KTsKIAogICAgIE5TVVJMICp1cmwgPSBbY2FjaGVV UkwgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OmRpcmVjdG9yeU5hbWUgaXNEaXJlY3Rvcnk6 WUVTXTsKLSAgICBpZiAoIVtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gY3JlYXRlRGly ZWN0b3J5QXRVUkw6dXJsIHdpdGhJbnRlcm1lZGlhdGVEaXJlY3RvcmllczpZRVMgYXR0cmlidXRl czpuaWwgZXJyb3I6bnVsbHB0cl0pCisgICAgaWYgKHNob3VsZENyZWF0ZURpcmVjdG9yeSA9PSBT aG91bGRDcmVhdGVEaXJlY3Rvcnk6OlllcworICAgICAgICAmJiAhW1tOU0ZpbGVNYW5hZ2VyIGRl ZmF1bHRNYW5hZ2VyXSBjcmVhdGVEaXJlY3RvcnlBdFVSTDp1cmwgd2l0aEludGVybWVkaWF0ZURp cmVjdG9yaWVzOllFUyBhdHRyaWJ1dGVzOm5pbCBlcnJvcjpudWxscHRyXSkKICAgICAgICAgTE9H X0VSUk9SKCJGYWlsZWQgdG8gY3JlYXRlIGRpcmVjdG9yeSAlQCIsIHVybCk7CiAKICAgICByZXR1 cm4gdXJsLmFic29sdXRlVVJMLnBhdGguZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uOwpJbmRleDog U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvcGxheXN0YXRpb24vV2Vic2l0ZURh dGFTdG9yZVBsYXlTdGF0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJzaXRlRGF0YS9wbGF5c3RhdGlvbi9XZWJzaXRlRGF0YVN0b3JlUGxheVN0YXRpb24u Y3BwCShyZXZpc2lvbiAyNjMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRl RGF0YS9wbGF5c3RhdGlvbi9XZWJzaXRlRGF0YVN0b3JlUGxheVN0YXRpb24uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC05MSw3ICs5MSw3IEBAIFN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0 UmVzb3VyY2UKICAgICByZXR1cm4geyB9OwogfQogCi1TdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6 Y2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oY29uc3QgU3RyaW5nJiBkaXJl Y3RvcnlOYW1lKQorU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmNhY2hlRGlyZWN0b3J5RmlsZVN5 c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0IFN0cmluZyYgZGlyZWN0b3J5TmFtZSwgU2hvdWxkQ3Jl YXRlRGlyZWN0b3J5KQogewogICAgIHJldHVybiB7IH07CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS93aW4vV2Vic2l0ZURhdGFTdG9yZVdpbi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvd2luL1dlYnNpdGVE YXRhU3RvcmVXaW4uY3BwCShyZXZpc2lvbiAyNjMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJzaXRlRGF0YS93aW4vV2Vic2l0ZURhdGFTdG9yZVdpbi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTkxLDcgKzkxLDcgQEAgU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRSZXNv dXJjZQogICAgIHJldHVybiBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoRmls ZVN5c3RlbTo6bG9jYWxVc2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0b3J5KCksICJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzIik7CiB9CiAKLVN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpjYWNoZURpcmVj dG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihjb25zdCBTdHJpbmcmIGRpcmVjdG9yeU5hbWUp CitTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6Y2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVz ZW50YXRpb24oY29uc3QgU3RyaW5nJiBkaXJlY3RvcnlOYW1lLCBTaG91bGRDcmVhdGVEaXJlY3Rv cnkpCiB7CiAgICAgcmV0dXJuIEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChG aWxlU3lzdGVtOjpsb2NhbFVzZXJTcGVjaWZpY1N0b3JhZ2VEaXJlY3RvcnkoKSwgZGlyZWN0b3J5 TmFtZSk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9nbGliL1dlYnNpdGVEYXRh U3RvcmVHTGliLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9nbGli L1dlYnNpdGVEYXRhU3RvcmVHTGliLmNwcAkocmV2aXNpb24gMjYzMjc4KQorKysgU291cmNlL1dl YktpdC9VSVByb2Nlc3MvZ2xpYi9XZWJzaXRlRGF0YVN0b3JlR0xpYi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTk0LDcgKzk0LDcgQEAgV1RGOjpTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVs dFJlcwogICAgIHJldHVybiB3ZWJzaXRlRGF0YURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRh dGlvbihCQVNFX0RJUkVDVE9SWSBHX0RJUl9TRVBBUkFUT1JfUyAiaXRwIik7CiB9CiAKLVdURjo6 U3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmNhY2hlRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2Vu dGF0aW9uKGNvbnN0IFdURjo6U3RyaW5nJiBkaXJlY3RvcnlOYW1lKQorV1RGOjpTdHJpbmcgV2Vi c2l0ZURhdGFTdG9yZTo6Y2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oY29u c3QgV1RGOjpTdHJpbmcmIGRpcmVjdG9yeU5hbWUsIFNob3VsZENyZWF0ZURpcmVjdG9yeSkKIHsK ICAgICByZXR1cm4gRmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KEZpbGVTeXN0 ZW06OnN0cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oZ19nZXRfdXNlcl9jYWNoZV9k aXIoKSksIGRpcmVjdG9yeU5hbWUpOwogfQpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjYzNDI1KQorKysgVG9vbHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDYtMjMgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBNYWtlIEhUVFAv MyBleHBlcmltZW50YWwgZmVhdHVyZSB3b3JrIG9uIGlPUyBhbmQgb25seSBjcmVhdGUgc3RvcmFn ZSBkaXJlY3RvcnkgaWYgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEzNTI3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVE YXRhU3RvcmVDdXN0b21QYXRocy5tbToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIwLTA2LTIzICBE aWVnbyBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2V3c10gQWxs b3cgYXJjaGl2aW5nICdqc2MnIHByb2R1Y3QKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9y ZUN1c3RvbVBhdGhzLm1tCShyZXZpc2lvbiAyNjMyNzgpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNDM2LDYgKzQzNiwzNyBAQCBURVNUKFdlYktpdCwgV2Vic2l0ZURhdGFTdG9y ZUVwaGVtZXJhbCkKICAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIHJlbW92ZUl0 ZW1BdFVSTDpkZWZhdWx0UmVzb3VyY2VMb2FkU3RhdGlzdGljc1BhdGggZXJyb3I6bmlsXTsKIH0K IAorVEVTVChXZWJLaXQsIEFsdGVybmF0aXZlU2VydmljZXNEZWZhdWx0RGlyZWN0b3J5Q3JlYXRp b24pCit7CisgICAgTlNVUkwgKmRlZmF1bHREaXJlY3RvcnkgPSBbTlNVUkwgZmlsZVVSTFdpdGhQ YXRoOltAIn4vTGlicmFyeS9DYWNoZXMvY29tLmFwcGxlLldlYktpdC5UZXN0V2ViS2l0QVBJL1dl YktpdC9BbHRlcm5hdGl2ZVNlcnZpY2VzIiBzdHJpbmdCeUV4cGFuZGluZ1RpbGRlSW5QYXRoXSBp c0RpcmVjdG9yeTpZRVNdOworICAgIFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gcmVt b3ZlSXRlbUF0VVJMOmRlZmF1bHREaXJlY3RvcnkgZXJyb3I6bmlsXTsKKyAgICAKKyAgICBUZXN0 V0tXZWJWaWV3ICp3ZWJWaWV3MSA9IFtbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRdIGF1dG9y ZWxlYXNlXTsKKyAgICBbd2ViVmlldzEgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAic3Rh cnQgYXV4aWxpYXJ5IHByb2Nlc3NlcyIgYmFzZVVSTDpuaWxdOworCisgICAgRVhQRUNUX0ZBTFNF KFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0aDpkZWZhdWx0 RGlyZWN0b3J5LnBhdGhdKTsKKyAgICAKKyNpZiBIQVZFKENGTkVUV09SS19BTFRFUk5BVElWRV9T RVJWSUNFKQorCisjaWYgUExBVEZPUk0oTUFDKQorICAgIE5TU3RyaW5nICprZXkgPSBAIkV4cGVy aW1lbnRhbEhUVFAzRW5hYmxlZCI7CisjZWxzZQorICAgIE5TU3RyaW5nICprZXkgPSBAIldlYktp dEV4cGVyaW1lbnRhbEhUVFAzRW5hYmxlZCI7CisjZW5kaWYKKyAgICAKKyAgICBbW05TVXNlckRl ZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldp dGhCb29sOllFU10gZm9yS2V5OmtleV07CisKKyAgICBUZXN0V0tXZWJWaWV3ICp3ZWJWaWV3MiA9 IFtbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKKyAgICBbd2ViVmll dzIgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAic3RhcnQgYXV4aWxpYXJ5IHByb2Nlc3Nl cyIgYmFzZVVSTDpuaWxdOworCisgICAgRVhQRUNUX1RSVUUoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1 bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOmRlZmF1bHREaXJlY3RvcnkucGF0aF0pOworCisg ICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gcmVtb3ZlT2JqZWN0Rm9y S2V5OmtleV07CisgICAgW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSByZW1vdmVJdGVt QXRVUkw6ZGVmYXVsdERpcmVjdG9yeSBlcnJvcjpuaWxdOworCisjZW5kaWYgLy8gSEFWRShDRk5F VFdPUktfQUxURVJOQVRJVkVfU0VSVklDRSkKK30KKwogVEVTVChXZWJLaXQsIFdlYnNpdGVEYXRh U3RvcmVFcGhlbWVyYWxWaWFDb25maWd1cmF0aW9uKQogewogICAgIFJldGFpblB0cjxXZWJzaXRl RGF0YVN0b3JlQ3VzdG9tUGF0aHNNZXNzYWdlSGFuZGxlcj4gaGFuZGxlciA9IGFkb3B0TlMoW1tX ZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHNNZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0pOwo=