217319 2020-10-05 08:56:52 -0700 Disable media capture if an app's entitlements won't allow access to capture devices 2020-10-05 18:21:16 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson darin ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer youennf oldest_to_newest 1694712 0 eric.carlson 2020-10-05 08:56:52 -0700 Disable media capture if an app's entitlements won't allow access to capture devices 1694713 1 webkit-bug-importer 2020-10-05 08:57:09 -0700 <rdar://problem/69956112> 1694733 2 410528 eric.carlson 2020-10-05 09:37:53 -0700 Created attachment 410528 Patch 1694751 3 410528 youennf 2020-10-05 10:45:48 -0700 Comment on attachment 410528 Patch I think we can keep the patch much smaller by keeping _mediaCaptureEnabled. WKWebViewConfiguration._mediaCaptureEnabled is better than WKPReferences._mediaDevicesEnabled as we want a page to have a consistent exposure of getUserMedia throughout its lifetime. Also, not removing it will make the patch much smaller :) View in context: https://bugs.webkit.org/attachment.cgi?id=410528&action=review > Source/WebCore/page/SettingsBase.cpp:343 > + m_page->settings().setMediaDevicesEnabled(true); mock capture devices can be changed during the lifetime of the page. MediaDevicesEnabled should be set once and for all for the page so, it might be better to have two toggles for now. If we really want to have just one toggle, we should compute it in UIProcess. > Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:-123 > -@property (nonatomic, setter=_setMediaCaptureEnabled:) BOOL _mediaCaptureEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)); Why removing this one? This does not seem necessary for this patch and we should instead be removing _mediaDevicesEnabled from being exposed in WebPreferences. 1694863 4 410561 eric.carlson 2020-10-05 14:35:25 -0700 Created attachment 410561 Patch for landing 1694878 5 410565 eric.carlson 2020-10-05 14:50:59 -0700 Created attachment 410565 Patch for landing 1694919 6 410565 eric.carlson 2020-10-05 15:57:21 -0700 Comment on attachment 410565 Patch for landing The Windows test failures are unrelated 1694926 7 ews-feeder 2020-10-05 16:15:23 -0700 Committed r268012: <https://trac.webkit.org/changeset/268012> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410565. 1694952 8 410565 darin 2020-10-05 16:56:40 -0700 Comment on attachment 410565 Patch for landing Not a big fan of the word "random" in those usage messages, but I guess it’s just MiniBrowser. I would have probably written "Recording videos on behalf of websites" 1694954 9 eric.carlson 2020-10-05 16:59:48 -0700 (In reply to Darin Adler from comment #8) > Comment on attachment 410565 [details] > Patch for landing > > Not a big fan of the word "random" in those usage messages, but I guess it’s > just MiniBrowser. I would have probably written "Recording videos on behalf > of websites" Good point, I'll fix that in a followup. 1694964 10 eric.carlson 2020-10-05 17:08:36 -0700 Reopening to attach new patch. 1694965 11 410594 eric.carlson 2020-10-05 17:08:37 -0700 Created attachment 410594 Fix usage strings 1694989 12 ews-feeder 2020-10-05 18:21:15 -0700 Committed r268023: <https://trac.webkit.org/changeset/268023> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410594. 410528 2020-10-05 09:37:53 -0700 2020-10-05 14:35:24 -0700 Patch bug-217319-20201005093753.patch text/plain 30690 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3ODQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjBkODBmN2EwNmNkNWY2 MWE5NmI4M2IxYTI0OTRiMDNlMWIxNTlkMi4uNzliMTBkNDJjOTY4Zjg3NTVkYzRiOGQ3MTc0ZGM4 ODE5MGVkNTI3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTEwLTA1ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIERpc2FibGUgbWVk aWEgY2FwdHVyZSBpZiBhbiBhcHAncyBlbnRpdGxlbWVudHMgd29uJ3QgYWxsb3cgYWNjZXNzIHRv IGNhcHR1cmUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE3MzE5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82OTk1NjExMj4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMs IHRlc3RlZCBtYW51YWxseSB3aXRoIE1pbmlCcm93c2VyLgorCisgICAgICAgICogcGFnZS9TZXR0 aW5nc0Jhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3NCYXNlOjptb2NrQ2FwdHVy ZURldmljZXNFbmFibGVkQ2hhbmdlZCk6IEVuYWJsZSBtZWRpYSBjYXB0dXJlCisgICAgICAgIHdo ZW4gbW9jayBkZXZpY2VzIGFyZSBlbmFibGVkLgorCiAyMDIwLTEwLTAxICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI2Nzc4MSk6 IEFTU0VSVElPTiBGQUlMRUQ6IE9wdGlvbmFsLmgoNTI1KSA6IFQgKldURjo6T3B0aW9uYWw8V2Vi Q29yZTo6TGF5b3V0OjpMaW5lUnVuOjpUZXh0Pjo6b3BlcmF0b3ItPigpIG9uIDE2IGZhc3QvbGF5 b3V0Zm9ybWF0dGluZ2NvbnRleHQvKiB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAwNzk4NmIxNmQwYWMwOGQ1 MTZmMDQ2M2I4ZDBjMjA0ZmU2MzBiMTA5Li4yNzk5NGFkZmRkNjlmODM1YTI1NGEwNjI1OWNkZGJl ZjNjNjM3NGQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDIwLTEwLTA1ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIERpc2FibGUgbWVkaWEg Y2FwdHVyZSBpZiBhbiBhcHAncyBlbnRpdGxlbWVudHMgd29uJ3QgYWxsb3cgYWNjZXNzIHRvIGNh cHR1cmUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE3MzE5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82OTk1NjExMj4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv QVBJUGFnZUNvbmZpZ3VyYXRpb24uY3BwOgorICAgICAgICAoQVBJOjpQYWdlQ29uZmlndXJhdGlv bjo6Y29weSBjb25zdCk6IG1fbWVkaWFDYXB0dXJlRW5hYmxlZCBoYXMgYmVlbiBkZWxldGVkLgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJUGFnZUNvbmZpZ3VyYXRpb24uaDogUmVtb3ZlIG1f bWVkaWFDYXB0dXJlRW5hYmxlZAorICAgICAgICAoQVBJOjpQYWdlQ29uZmlndXJhdGlvbjo6c2V0 TWVkaWFDYXB0dXJlRW5hYmxlZCk6IERlbGV0ZWQuCisgICAgICAgIChBUEk6OlBhZ2VDb25maWd1 cmF0aW9uOjptZWRpYUNhcHR1cmVFbmFibGVkIGNvbnN0KTogRGVsZXRlZC4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAoV0tQYWdlU2V0TWVkaWFDYXB0 dXJlRW5hYmxlZCk6IERlbGV0ZWQuCisgICAgICAgIChXS1BhZ2VHZXRNZWRpYUNhcHR1cmVFbmFi bGVkKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlUHJpdmF0ZS5o OgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAg ICgtW1dLV2ViVmlldyBfc2V0dXBQYWdlQ29uZmlndXJhdGlvbjpdKTogX21lZGlhQ2FwdHVyZUVu YWJsZWQgaGFzIGJlZW4gZGVsZXRlZCBmcm9tCisgICAgICAgIFdLV2ViVmlld0NvbmZpZ3VyYXRp b24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRp b24ubW06CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gX21lZGlhQ2FwdHVyZUVu YWJsZWRdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBfc2V0 TWVkaWFDYXB0dXJlRW5hYmxlZDpdKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb25Qcml2YXRlLmg6CisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQ29jb2EvVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkubW06Cisg ICAgICAgIChXZWJLaXQ6OlVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5Ojpw ZXJtaXR0ZWRUb0NhcHR1cmVBdWRpbyk6IElmIHRoZQorICAgICAgICBhcHAgaXMgc2FuZGJveGVk LCBjaGVjayBmb3IgdGhlIGVudGl0bGVtZW50IHJlcXVpcmVkIGZvciBhdWRpbyBjYXB0dXJlLgor ICAgICAgICAoV2ViS2l0OjpVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6 cGVybWl0dGVkVG9DYXB0dXJlVmlkZW8pOiBEaXR0bworICAgICAgICBmb3IgdmlkZW8gY2FwdHVy ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJQcmVmZXJlbmNlc0NvY29hLm1tOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1Jbml0aWFsaXplU3RvcmUp OiBJbml0aWFsaXplIGBtZWRpYURldmljZXNFbmFibGVkYAorICAgICAgICBtYW51YWxseSBiZWNh dXNlIGl0cyBkZWZhdWx0IHZhbHVlIGlzIGFsd2F5cyBgZmFsc2VgIGluIHRoZSBXZWJQcm9jZXNz IGFuZCBtYXkgYmUKKyAgICAgICAgYHRydWVgIGluIHRoZSBVSVByb2Nlc3MuIFdlYlByZWZlcmVu Y2VzIGFzc3VtZXMgdGhlIGRlZmF1bHQgd2lsbCBhbHdheXMgYmUgdGhlIHNhbWUKKyAgICAgICAg aW4gYm90aCBwcm9jZXNzZXMsIGFuZCBzbyBoYXMgYW4gb3B0aW1pemF0aW9uIHRoYXQgb25seSBz ZW5kcyB2YWx1ZXMgdG8gdGhlCisgICAgICAgIFdlYlByb2Nlc3MgaWYgdGhleSBkaWZmZXIgZnJv bSB0aGUgZGVmYXVsdCB2YWx1ZS4gVGhpcyBtZWFucyBpZiB0aGUgZGVmYXVsdCBpbiB0aGUKKyAg ICAgICAgVUlQcm9jZXNzIGlzIHRydWUgaXQgd29uJ3QgYmUgcHVzaGVkIHRvIHRoZSBXZWJQcm9j ZXNzLCBzbyBjYXB0dXJlIHdvbid0IHdvcmsuCisKIDIwMjAtMTAtMDEgIEVyaWMgQ2FybHNvbiAg PGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUHJldmVudCBtZWRpYSBjYXB0dXJl IHVubGVzcyB0aGUgYXBwbGljYXRpb24gaGFzIGNvcnJlY3QgZGF0YSBmb3Igc3lzdGVtIHBlcm1p c3Npb24gcHJvbXB0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzQmFz ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzQmFzZS5jcHAKaW5kZXggNzg0Nzdh OWI5Mjg2MWE1Yjk2MTYyM2JiMWY1MDExNDE2YmNiNDBiNS4uNDNiNDE5NjRmOTUwMGZhM2VhZjE3 ZmNhZWNkOGIyMmNkYjZlZjFlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0 aW5nc0Jhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3NCYXNlLmNwcApA QCAtMzM1LDEwICszMzUsMTIgQEAgdm9pZCBTZXR0aW5nc0Jhc2U6OnNob3VsZEVuYWJsZVRleHRB dXRvc2l6aW5nQm9vc3RDaGFuZ2VkKCkKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQogdm9pZCBT ZXR0aW5nc0Jhc2U6Om1vY2tDYXB0dXJlRGV2aWNlc0VuYWJsZWRDaGFuZ2VkKCkKIHsKLSAgICBi b29sIGVuYWJsZWQgPSBmYWxzZTsKLSAgICBpZiAobV9wYWdlKQotICAgICAgICBlbmFibGVkID0g bV9wYWdlLT5zZXR0aW5ncygpLm1vY2tDYXB0dXJlRGV2aWNlc0VuYWJsZWQoKTsKKyAgICBpZiAo IW1fcGFnZSkKKyAgICAgICAgcmV0dXJuOwogCisgICAgYm9vbCBlbmFibGVkID0gbV9wYWdlLT5z ZXR0aW5ncygpLm1vY2tDYXB0dXJlRGV2aWNlc0VuYWJsZWQoKTsKKyAgICBpZiAoZW5hYmxlZCkK KyAgICAgICAgbV9wYWdlLT5zZXR0aW5ncygpLnNldE1lZGlhRGV2aWNlc0VuYWJsZWQodHJ1ZSk7 CiAgICAgTW9ja1JlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXI6OnNldE1vY2tSZWFsdGltZU1lZGlh U291cmNlQ2VudGVyRW5hYmxlZChlbmFibGVkKTsKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVBhZ2VDb25maWd1cmF0aW9uLmNwcCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQYWdlQ29uZmlndXJhdGlvbi5jcHAKaW5kZXggMDM3 NDc4MDAzOTRlMWNjODQ2ZTk3ZDhhNDkxMzVjMGI5NjllMGM5My4uZjg4MzZkNmJkNGE2YzQ4Y2Jl Yzg2NzQ4NGZhYzNjYmU5NDc3OWNlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0FQSVBhZ2VDb25maWd1cmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQVBJUGFnZUNvbmZpZ3VyYXRpb24uY3BwCkBAIC05NCw4ICs5NCw2IEBAIFJlZjxQ YWdlQ29uZmlndXJhdGlvbj4gUGFnZUNvbmZpZ3VyYXRpb246OmNvcHkoKSBjb25zdAogICAgIGNv cHktPm1fbGltaXRzTmF2aWdhdGlvbnNUb0FwcEJvdW5kRG9tYWlucyA9IHRoaXMtPm1fbGltaXRz TmF2aWdhdGlvbnNUb0FwcEJvdW5kRG9tYWluczsKICNlbmRpZgogCi0gICAgY29weS0+bV9tZWRp YUNhcHR1cmVFbmFibGVkID0gdGhpcy0+bV9tZWRpYUNhcHR1cmVFbmFibGVkOwotCiAgICAgcmV0 dXJuIGNvcHk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9B UElQYWdlQ29uZmlndXJhdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVBh Z2VDb25maWd1cmF0aW9uLmgKaW5kZXggMmJmYzE2YTg5MjExZGQxYjBiMGVkNzQ4YWVkMjMwMDJh MDcxODNiYi4uZWI1NWVkMDg1Y2UyZmNjNTAwODQ2ZWIxZWRjOWM5MGNjMGNlNDA3YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVBhZ2VDb25maWd1cmF0aW9uLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVBhZ2VDb25maWd1cmF0aW9uLmgK QEAgLTE2Miw5ICsxNjIsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRMaW1pdHNOYXZpZ2F0aW9u c1RvQXBwQm91bmREb21haW5zKGJvb2wgbGltaXRzKSB7IG1fbGltaXRzTmF2aWdhdGlvbnNUb0Fw cEJvdW5kRG9tYWlucyA9IGxpbWl0czsgfQogI2VuZGlmCiAKLSAgICB2b2lkIHNldE1lZGlhQ2Fw dHVyZUVuYWJsZWQoYm9vbCB2YWx1ZSkgeyBtX21lZGlhQ2FwdHVyZUVuYWJsZWQgPSB2YWx1ZTsg fQotICAgIGJvb2wgbWVkaWFDYXB0dXJlRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fbWVkaWFD YXB0dXJlRW5hYmxlZDsgfQotCiAgICAgdm9pZCBzZXRTaG91bGRSZWxheFRoaXJkUGFydHlDb29r aWVCbG9ja2luZyhXZWJDb3JlOjpTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZyB2 YWx1ZSkgeyBtX3Nob3VsZFJlbGF4VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nID0gdmFsdWU7IH0K ICAgICBXZWJDb3JlOjpTaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZyBzaG91bGRS ZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkUmVs YXhUaGlyZFBhcnR5Q29va2llQmxvY2tpbmc7IH0KICAgICAKQEAgLTIxNSw4ICsyMTIsNiBAQCBw cml2YXRlOgogICAgIGJvb2wgbV9saW1pdHNOYXZpZ2F0aW9uc1RvQXBwQm91bmREb21haW5zIHsg ZmFsc2UgfTsKICNlbmRpZgogCi0gICAgYm9vbCBtX21lZGlhQ2FwdHVyZUVuYWJsZWQgeyBmYWxz ZSB9OwotCiAgICAgV2ViQ29yZTo6U2hvdWxkUmVsYXhUaGlyZFBhcnR5Q29va2llQmxvY2tpbmcg bV9zaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZyB7IFdlYkNvcmU6OlNob3VsZFJl bGF4VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nOjpObyB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKaW5kZXggODEzNGI4ZmI3MTE5OGQ2MTMwNDM3MTViMThi NDEyMTIyNDIxNGE2ZC4uZDY2YjQzOGIwMWRhMDllMDI3ZTJiNzYzYWZmM2JmNzEzOTAxNGZkNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCkBAIC0yNjgxLDE2ICsy NjgxLDYgQEAgdm9pZCBXS1BhZ2VTZXRNdXRlZChXS1BhZ2VSZWYgcGFnZSwgV0tNZWRpYU11dGVk U3RhdGUgbXV0ZWQpCiAgICAgdG9JbXBsKHBhZ2UpLT5zZXRNdXRlZChtdXRlZCk7CiB9CiAKLXZv aWQgV0tQYWdlU2V0TWVkaWFDYXB0dXJlRW5hYmxlZChXS1BhZ2VSZWYgcGFnZSwgYm9vbCBlbmFi bGVkKQotewotICAgIHRvSW1wbChwYWdlKS0+c2V0TWVkaWFDYXB0dXJlRW5hYmxlZChlbmFibGVk KTsKLX0KLQotYm9vbCBXS1BhZ2VHZXRNZWRpYUNhcHR1cmVFbmFibGVkKFdLUGFnZVJlZiBwYWdl KQotewotICAgIHJldHVybiB0b0ltcGwocGFnZSktPm1lZGlhQ2FwdHVyZUVuYWJsZWQoKTsKLX0K LQogdm9pZCBXS1BhZ2VEaWRBbGxvd1BvaW50ZXJMb2NrKFdLUGFnZVJlZiBwYWdlKQogewogI2lm IEVOQUJMRShQT0lOVEVSX0xPQ0spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQy9XS1BhZ2VQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9X S1BhZ2VQcml2YXRlLmgKaW5kZXggMjBkM2VlOTZmOGFjZDNlYWQyYzdiNzM0MTJiZDA0MTZlOTNm NjRhNi4uMWU5ZTI1Y2YxNTA4NTQ0MjdkOTBjM2I0ODAyMjNjY2NkNDQyZWIzNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlUHJpdmF0ZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZVByaXZhdGUuaApAQCAtMTMyLDggKzEz Miw2IEBAIHR5cGVkZWYgdWludDMyX3QgV0tNZWRpYU11dGVkU3RhdGU7CiBXS19FWFBPUlQgdm9p ZCBXS1BhZ2VTZXRNdXRlZChXS1BhZ2VSZWYgcGFnZSwgV0tNZWRpYU11dGVkU3RhdGUgbXV0ZWQp OwogCiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VDbGVhclVzZXJNZWRpYVN0YXRlKFdLUGFnZVJlZiBw YWdlKTsKLVdLX0VYUE9SVCB2b2lkIFdLUGFnZVNldE1lZGlhQ2FwdHVyZUVuYWJsZWQoV0tQYWdl UmVmIHBhZ2UsIGJvb2wgZW5hYmxlZCk7Ci1XS19FWFBPUlQgYm9vbCBXS1BhZ2VHZXRNZWRpYUNh cHR1cmVFbmFibGVkKFdLUGFnZVJlZiBwYWdlKTsKIAogV0tfRVhQT1JUIHZvaWQgV0tQYWdlRGlk QWxsb3dQb2ludGVyTG9jayhXS1BhZ2VSZWYgcGFnZSk7CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VE aWREZW55UG9pbnRlckxvY2soV0tQYWdlUmVmIHBhZ2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMGQ2MTc3MDUyMmNhMjQwOTNkYTMw ZWM1ZGM5MmJmODg2NDgyYzJmMy4uOTkzYWFkZGU0OGEyZTgxODJjZTkwZjY2YTJlMzAzOGZiMzI3 MTZmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tCkBAIC01MDgsMTEgKzUwOCw3IEBAIHN0YXRpYyB2b2lkIGhhcmR3YXJlS2V5Ym9hcmRBdmFp bGFiaWxpdHlDaGFuZ2VkQ2FsbGJhY2soQ0ZOb3RpZmljYXRpb25DZW50ZXJSZWYsCiAgICAgcGFn ZUNvbmZpZ3VyYXRpb24tPnByZWZlcmVuY2VzKCktPnNldE5lZWRzU3RvcmFnZUFjY2Vzc0Zyb21G aWxlVVJMc1F1aXJrKCEhW19jb25maWd1cmF0aW9uIF9uZWVkc1N0b3JhZ2VBY2Nlc3NGcm9tRmls ZVVSTHNRdWlya10pOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5wcmVmZXJlbmNlcygpLT5zZXRN ZWRpYUNvbnRlbnRUeXBlc1JlcXVpcmluZ0hhcmR3YXJlU3VwcG9ydChTdHJpbmcoW19jb25maWd1 cmF0aW9uIF9tZWRpYUNvbnRlbnRUeXBlc1JlcXVpcmluZ0hhcmR3YXJlU3VwcG9ydF0pKTsKICAg ICBwYWdlQ29uZmlndXJhdGlvbi0+cHJlZmVyZW5jZXMoKS0+c2V0QWxsb3dNZWRpYUNvbnRlbnRU eXBlc1JlcXVpcmluZ0hhcmR3YXJlU3VwcG9ydEFzRmFsbGJhY2soISFbX2NvbmZpZ3VyYXRpb24g X2FsbG93TWVkaWFDb250ZW50VHlwZXNSZXF1aXJpbmdIYXJkd2FyZVN1cHBvcnRBc0ZhbGxiYWNr XSk7Ci0gICAgaWYgKCFwYWdlQ29uZmlndXJhdGlvbi0+cHJlZmVyZW5jZXMoKS0+bWVkaWFEZXZp Y2VzRW5hYmxlZCgpKQotICAgICAgICBwYWdlQ29uZmlndXJhdGlvbi0+cHJlZmVyZW5jZXMoKS0+ c2V0TWVkaWFEZXZpY2VzRW5hYmxlZCghIVtfY29uZmlndXJhdGlvbiBfbWVkaWFDYXB0dXJlRW5h YmxlZF0pOwotCiAgICAgcGFnZUNvbmZpZ3VyYXRpb24tPnByZWZlcmVuY2VzKCktPnNldENvbG9y RmlsdGVyRW5hYmxlZCghIVtfY29uZmlndXJhdGlvbiBfY29sb3JGaWx0ZXJFbmFibGVkXSk7Ci0K ICAgICBwYWdlQ29uZmlndXJhdGlvbi0+cHJlZmVyZW5jZXMoKS0+c2V0VW5kb01hbmFnZXJBUElF bmFibGVkKCEhW19jb25maWd1cmF0aW9uIF91bmRvTWFuYWdlckFQSUVuYWJsZWRdKTsKIAogI2lm IEVOQUJMRShMRUdBQ1lfRU5DUllQVEVEX01FRElBKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24ubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbQppbmRl eCA5MzZkMmE2MzM2YjkwOTZmMDYzMjBhODA5ZTI4ODRlOTgxZDI3NGEwLi5jZjdiYTk3MTE3Mjc5 ZTNlNzFlY2YwMDFlM2RlZmI1OTA5ZDY0YmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbQpAQCAt MTE5NywxNiArMTE5Nyw2IEBAIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogICAg IHJldHVybiBfYWxsb3dNZWRpYUNvbnRlbnRUeXBlc1JlcXVpcmluZ0hhcmR3YXJlU3VwcG9ydEFz RmFsbGJhY2s7CiB9CiAKLS0gKEJPT0wpX21lZGlhQ2FwdHVyZUVuYWJsZWQKLXsKLSAgICByZXR1 cm4gX3BhZ2VDb25maWd1cmF0aW9uLT5tZWRpYUNhcHR1cmVFbmFibGVkKCk7Ci19Ci0KLS0gKHZv aWQpX3NldE1lZGlhQ2FwdHVyZUVuYWJsZWQ6KEJPT0wpZW5hYmxlZAotewotICAgIF9wYWdlQ29u ZmlndXJhdGlvbi0+c2V0TWVkaWFDYXB0dXJlRW5hYmxlZChlbmFibGVkKTsKLX0KLQogLSAodm9p ZClfc2V0VW5kb01hbmFnZXJBUElFbmFibGVkOihCT09MKWVuYWJsZWQKIHsKICAgICBfdW5kb01h bmFnZXJBUElFbmFibGVkID0gZW5hYmxlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9uUHJpdmF0ZS5oIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb25Qcml2YXRl LmgKaW5kZXggNjE1YmE2NjA5MzQwMmFlOTZjZTkxZTdlYWNkNzEzMmU3ZGFjYjYxMC4uN2VkMjZk ZTg1M2IwN2M0YTAxY2IyYzQyYjgwMDIxYTNjZTdiNTk4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb25Qcml2YXRlLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3Vy YXRpb25Qcml2YXRlLmgKQEAgLTEyMCw4ICsxMjAsNiBAQCB0eXBlZGVmIE5TX0VOVU0oTlNVSW50 ZWdlciwgX1dLV2ViVmlld0NhdGVnb3J5KSB7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVy PV9zZXRMZWdhY3lFbmNyeXB0ZWRNZWRpYUFQSUVuYWJsZWQ6KSBCT09MIF9sZWdhY3lFbmNyeXB0 ZWRNZWRpYUFQSUVuYWJsZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4xMyksIGlvcygxMS4w KSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRBbGxvd01lZGlhQ29udGVudFR5 cGVzUmVxdWlyaW5nSGFyZHdhcmVTdXBwb3J0QXNGYWxsYmFjazopIEJPT0wgX2FsbG93TWVkaWFD b250ZW50VHlwZXNSZXF1aXJpbmdIYXJkd2FyZVN1cHBvcnRBc0ZhbGxiYWNrIFdLX0FQSV9BVkFJ TEFCTEUobWFjb3MoMTAuMTMpLCBpb3MoMTEuMCkpOwogCi1AcHJvcGVydHkgKG5vbmF0b21pYywg c2V0dGVyPV9zZXRNZWRpYUNhcHR1cmVFbmFibGVkOikgQk9PTCBfbWVkaWFDYXB0dXJlRW5hYmxl ZCBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwot CiAvLyBUaGUgaW5wdXQgb2YgdGhpcyBTUEkgaXMgYW4gYXJyYXkgb2YgaW1hZ2UgVVRJIChVbmlm b3JtIFR5cGUgSWRlbnRpZmllcikuCiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSwgc2V0dGVy PV9zZXRBZGRpdGlvbmFsU3VwcG9ydGVkSW1hZ2VUeXBlczopIE5TQXJyYXk8TlNTdHJpbmcgKj4g Kl9hZGRpdGlvbmFsU3VwcG9ydGVkSW1hZ2VUeXBlcyBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEw LjE0LjQpLCBpb3MoMTIuMikpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db2NvYS9Vc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdl clByb3h5Lm1tCmluZGV4IDVjMjhkNzFmNDkxNGZmYWFiYjA0MGVjM2UxNTg1MDg0YzczMzNiODQu LjkzMmMzNGY5Yzg3M2I4ZmNkMDU2MDA5NjBmYTI5ZjJiMmU5MTg0YmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFu YWdlclByb3h5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VzZXJNZWRp YVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5Lm1tCkBAIC0yNiwxMSArMjYsMzEgQEAKICNp bXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCAiVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5h Z2VyUHJveHkuaCIKIAorI2ltcG9ydCAiU2FuZGJveFV0aWxpdGllcy5oIgorI2ltcG9ydCA8d3Rm L3NwaS9kYXJ3aW4vU2FuZGJveFNQSS5oPgorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogYm9vbCBV c2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6cGVybWl0dGVkVG9DYXB0dXJl QXVkaW8oKQogewogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCisKKyNpZiBQTEFURk9STShNQUMp CisgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFnOworICAgIHN0YXRpYyBib29sIGVu dGl0bGVkID0gdHJ1ZTsKKyAgICBzdGQ6OmNhbGxfb25jZShvbmNlRmxhZywgW10geworICAgICAg ICBpZiAoIWN1cnJlbnRQcm9jZXNzSXNTYW5kYm94ZWQoKSkKKyAgICAgICAgICAgIHJldHVybjsK KworICAgICAgICBpbnQgcmVzdWx0ID0gc2FuZGJveF9jaGVjayhnZXRwaWQoKSwgImRldmljZS1t aWNyb3Bob25lIiwgU0FOREJPWF9GSUxURVJfTk9ORSk7CisgICAgICAgIGVudGl0bGVkID0gIXJl c3VsdDsKKyAgICAgICAgaWYgKHJlc3VsdCA9PSAtMSkKKyAgICAgICAgICAgIFdURkxvZ0Fsd2F5 cygiRXJyb3IgY2hlY2tpbmcgJ2RldmljZS1taWNyb3Bob25lJyBzYW5kYm94IGFjY2VzcywgZXJy bm89JWxkIiwgKGxvbmcpZXJybm8pOworICAgIH0pOworICAgIGlmICghZW50aXRsZWQpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZiAvLyBQTEFURk9STShNQUMpCisKICAgICBzdGF0aWMg Ym9vbCBpc1Blcm1pdHRlZCA9IGR5bmFtaWNfb2JqY19jYXN0PE5TU3RyaW5nPihOU0J1bmRsZS5t YWluQnVuZGxlLmluZm9EaWN0aW9uYXJ5W0AiTlNNaWNyb3Bob25lVXNhZ2VEZXNjcmlwdGlvbiJd KS5sZW5ndGg7CiAgICAgcmV0dXJuIGlzUGVybWl0dGVkOwogI2Vsc2UKQEAgLTQxLDYgKzYxLDIz IEBAIGJvb2wgVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6OnBlcm1pdHRl ZFRvQ2FwdHVyZUF1ZGlvKCkKIGJvb2wgVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2Vy UHJveHk6OnBlcm1pdHRlZFRvQ2FwdHVyZVZpZGVvKCkKIHsKICNpZiBFTkFCTEUoTUVESUFfU1RS RUFNKQorCisjaWYgUExBVEZPUk0oTUFDKQorICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxhZyBvbmNl RmxhZzsKKyAgICBzdGF0aWMgYm9vbCBlbnRpdGxlZCA9IHRydWU7CisgICAgc3RkOjpjYWxsX29u Y2Uob25jZUZsYWcsIFtdIHsKKyAgICAgICAgaWYgKCFjdXJyZW50UHJvY2Vzc0lzU2FuZGJveGVk KCkpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaW50IHJlc3VsdCA9IHNhbmRib3hf Y2hlY2soZ2V0cGlkKCksICJkZXZpY2UtY2FtZXJhIiwgU0FOREJPWF9GSUxURVJfTk9ORSk7Cisg ICAgICAgIGVudGl0bGVkID0gIXJlc3VsdDsKKyAgICAgICAgaWYgKHJlc3VsdCA9PSAtMSkKKyAg ICAgICAgICAgIFdURkxvZ0Fsd2F5cygiRXJyb3IgY2hlY2tpbmcgJ2RldmljZS1jYW1lcmEnIHNh bmRib3ggYWNjZXNzLCBlcnJubz0lbGQiLCAobG9uZyllcnJubyk7CisgICAgfSk7CisgICAgaWYg KCFlbnRpdGxlZCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmIC8vIFBMQVRGT1JNKE1B QykKKwogICAgIHN0YXRpYyBib29sIGlzUGVybWl0dGVkID0gZHluYW1pY19vYmpjX2Nhc3Q8TlNT dHJpbmc+KE5TQnVuZGxlLm1haW5CdW5kbGUuaW5mb0RpY3Rpb25hcnlbQCJOU0NhbWVyYVVzYWdl RGVzY3JpcHRpb24iXSkubGVuZ3RoOwogICAgIHJldHVybiBpc1Blcm1pdHRlZDsKICNlbHNlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcmVmZXJlbmNlc0Nv Y29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJlZmVyZW5jZXNDb2Nv YS5tbQppbmRleCBiOGQyNmJmMDM4MzAxOTM0MWI3Yzc0NmYzZDU4ZWRhNzNhNjQyNzM1Li40MWM5 NjJjYjMyODg1MDYzMTdkMjRhOGZjZTk1OTZiNGJlZGI1OWMzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcmVmZXJlbmNlc0NvY29hLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByZWZlcmVuY2VzQ29jb2EubW0KQEAgLTMwLDYg KzMwLDEwIEBACiAjaW1wb3J0ICJXZWJQcmVmZXJlbmNlc0tleXMuaCIKICNpbXBvcnQgPHd0Zi90 ZXh0L1N0cmluZ0NvbmNhdGVuYXRlLmg+CiAKKyNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorI2lu Y2x1ZGUgIlVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5LmgiCisjZW5kaWYK KwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIHN0YXRpYyBpbmxpbmUgTlNTdHJpbmcgKm1ha2VLZXko Y29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGtleVByZWZpeCwgY29uc3Qg U3RyaW5nJiBrZXkpCkBAIC0xMzksNiArMTQzLDE1IEBAIHN0YXRpYyB2b2lkIHNldERlYnVnVUlu dDMyVmFsdWVJZkluVXNlckRlZmF1bHRzKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3QK IHZvaWQgV2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtSW5pdGlhbGl6ZVN0b3JlKCkKIHsKICAgICBA YXV0b3JlbGVhc2Vwb29sIHsKKyNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorICAgICAgICAvLyBO T1RFOiBUaGlzIGlzIHNldCBoZXJlLCBhbmQgaXMgbm90IHNldHRpbmcgdGhlIGRlZmF1bHQgdXNp bmcgdGhlICdkZWZhdWx0VmFsdWUnIG1lY2hhbmlzbSwgYmVjYXVzZSB0aGUKKyAgICAgICAgLy8g J2RlZmF1bHRWYWx1ZScgbXVzdCBiZSB0aGUgc2FtZSBpbiBib3RoIHRoZSBVSVByb2Nlc3MgYW5k IFdlYlByb2Nlc3MsIHdoaWNoIG1heSBub3QgYmUgdHJ1ZSBmb3IgYXVkaW8KKyAgICAgICAgLy8g YW5kIHZpZGVvIGNhcHR1cmUgc3RhdGUgYXMgdGhlIFdlYlByb2Nlc3MgaXMgbm90IGVudGl0bGVk IHRvIHVzZSB0aGUgY2FtZXJhIG9yIG1pY3JvcGhvbmUgYnkgZGVmYXVsdC4KKyAgICAgICAgLy8g SWYgb3RoZXIgcHJlZmVyZW5jZXMgbmVlZCB0byBkeW5hbWljYWxseSBzZXQgdGhlIGluaXRpYWwg dmFsdWUgYmFzZWQgb24gaG9zdCBhcHAgc3RhdGUsIHdlIHNob3VsZCBleHRlbmRlZAorICAgICAg ICAvLyB0aGUgZGVjbGFyYXRpdmUgZm9ybWF0IHJhdGhlciB0aGFuIGFkZGluZyBtb3JlIHNwZWNp YWwgY2FzZXMgaGVyZS4KKyAgICAgICAgbV9zdG9yZS5zZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJl ZmVyZW5jZXNLZXk6Om1lZGlhRGV2aWNlc0VuYWJsZWRLZXkoKSwgVXNlck1lZGlhUGVybWlzc2lv blJlcXVlc3RNYW5hZ2VyUHJveHk6OnBlcm1pdHRlZFRvQ2FwdHVyZUF1ZGlvKCkgfHwgVXNlck1l ZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6OnBlcm1pdHRlZFRvQ2FwdHVyZVZpZGVv KCkpOworI2VuZGlmCisKICNkZWZpbmUgSU5JVElBTElaRV9ERUJVR19QUkVGRVJFTkNFX0ZST01f TlNVU0VSREVGQVVMVFMoS2V5VXBwZXIsIEtleUxvd2VyLCBUeXBlTmFtZSwgVHlwZSwgRGVmYXVs dFZhbHVlLCBIdW1hblJlYWRhYmxlTmFtZSwgSHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uKSBcCiAg ICAgICAgIHNldERlYnVnIyNUeXBlTmFtZSMjVmFsdWVJZkluVXNlckRlZmF1bHRzKG1faWRlbnRp ZmllciwgbV9rZXlQcmVmaXgsIG1fZ2xvYmFsRGVidWdLZXlQcmVmaXgsIFdlYlByZWZlcmVuY2Vz S2V5OjpLZXlMb3dlciMjS2V5KCksIG1fc3RvcmUpOwogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2U5YmVlOTg5MDQ3YWEzY2UzNzNlNzhkYjFh NTlhYzljMjMwYWY5NS4uN2E3NjQ3ODA3MTZmYjY0YzRkMDU3NzUzM2UzMDZiYTFjMjhhZjliZiAx MDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDMzIEBACisyMDIwLTEwLTA1ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUu Y29tPgorCisgICAgICAgIERpc2FibGUgbWVkaWEgY2FwdHVyZSBpZiBhbiBhcHAncyBlbnRpdGxl bWVudHMgd29uJ3QgYWxsb3cgYWNjZXNzIHRvIGNhcHR1cmUgZGV2aWNlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MzE5CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS82OTk1NjExMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKyAgICAgICAgCisgICAgICAgIFdLV2ViVmlld0NvbmZpZ3VyYXRpb24uX21lZGlhQ2FwdHVy ZUVuYWJsZWQgaGFzIGJlZW4gcmVtb3ZlZCwgZW5hYmxlIGNhcHR1cmUgCisgICAgICAgIHdpdGgg dGhlIHByZWZlcmVuY2UuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUu bToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVnYXRlIGRlZmF1bHRDb25maWd1cmF0aW9uXSk6 CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL0luZm8ucGxpc3Q6CisgICAgICAgICogVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXQvR2V0VXNlck1lZGlhLm1tOgorICAgICAgICAoVGVzdFdlYktp dEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvR2V0VXNl ck1lZGlhTmF2aWdhdGlvbi5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L0dldFVzZXJNZWRpYVJlcHJvbXB0Lm1t OgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQvTWVkaWFTdHJlYW1UcmFja0RldGFjaGVkLm1tOgorICAgICAgICAoVGVz dFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9HZXREaXNwbGF5TWVkaWEubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpHZXREaXNw bGF5TWVkaWFUZXN0OjpTZXRVcCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbToKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1VzZXJNZWRpYURpc2FibGVkLm1tOgorICAgICAgICAoTWVk aWFDYXB0dXJlRGlzYWJsZWRUZXN0OjpTZXRVcCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9Vc2VyTWVkaWFTaW11bGF0ZUZhaWxlZFNhbmRib3gubW06CisgICAg ICAgIChNZWRpYUNhcHR1cmVTaW11bGF0ZUZhaWxlZFNhbmRib3g6OlNldFVwKToKKwogMjAyMC0x MC0wMSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBQ cmV2ZW50IG1lZGlhIGNhcHR1cmUgdW5sZXNzIHRoZSBhcHBsaWNhdGlvbiBoYXMgY29ycmVjdCBk YXRhIGZvciBzeXN0ZW0gcGVybWlzc2lvbiBwcm9tcHQKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlC cm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5tIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0FwcERlbGVn YXRlLm0KaW5kZXggNDkyOTI1YjE5N2RhZjkxNzhmMTliMmE2MGY2YzQ1YjExMDA4NDQ5Yy4uN2Q1 MzVlYzEzNzVkNjE3NzFmZmI4ZTc4NjFiZTY0YjlmMTQzOWVkMiAxMDA2NDQKLS0tIGEvVG9vbHMv TWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0KKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFj L0FwcERlbGVnYXRlLm0KQEAgLTEzOSw3ICsxMzksNiBAQCAtIChXS1dlYlZpZXdDb25maWd1cmF0 aW9uICopZGVmYXVsdENvbmZpZ3VyYXRpb24KICAgICAgICAgICAgIFtjb25maWd1cmF0aW9uLnBy ZWZlcmVuY2VzIF9zZXRFbmFibGVkOmVuYWJsZWQgZm9ySW50ZXJuYWxEZWJ1Z0ZlYXR1cmU6ZmVh dHVyZV07CiAgICAgICAgIH0KIAotICAgICAgICBjb25maWd1cmF0aW9uLl9tZWRpYUNhcHR1cmVF bmFibGVkID0gWUVTOwogICAgICAgICBjb25maWd1cmF0aW9uLnByZWZlcmVuY2VzLl9mdWxsU2Ny ZWVuRW5hYmxlZCA9IFlFUzsKICAgICAgICAgY29uZmlndXJhdGlvbi5wcmVmZXJlbmNlcy5fYWxs b3dzUGljdHVyZUluUGljdHVyZU1lZGlhUGxheWJhY2sgPSBZRVM7CiAgICAgICAgIGNvbmZpZ3Vy YXRpb24ucHJlZmVyZW5jZXMuX2RldmVsb3BlckV4dHJhc0VuYWJsZWQgPSBZRVM7CmRpZmYgLS1n aXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvSW5mby5wbGlzdCBiL1Rvb2xzL01pbmlCcm93c2Vy L21hYy9JbmZvLnBsaXN0CmluZGV4IDUzZDYzODc0NjFlNzdhOWUxNWJkMDA2ZGNiNTc3ZjkyYjNi ZWFiY2YuLjQ4NWFhYjdjNjgzNDQ2OTgxNmQ4Y2UyYTgyM2JhNDA4NzQxMjU4ZDggMTAwNjQ0Ci0t LSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9JbmZvLnBsaXN0CisrKyBiL1Rvb2xzL01pbmlCcm93 c2VyL21hYy9JbmZvLnBsaXN0CkBAIC01MiwxMCArNTIsNiBAQAogCQkJPHN0cmluZz5FZGl0b3I8 L3N0cmluZz4KIAkJPC9kaWN0PgogCTwvYXJyYXk+Ci0gICAgPGtleT5jb20uYXBwbGUuc2VjdXJp dHkuZGV2aWNlLmNhbWVyYTwva2V5PgotICAgIDx0cnVlLz4KLSAgICA8a2V5PmNvbS5hcHBsZS5z ZWN1cml0eS5kZXZpY2UubWljcm9waG9uZTwva2V5PgotICAgIDx0cnVlLz4KICAgICA8a2V5Pk5T Q2FtZXJhVXNhZ2VEZXNjcmlwdGlvbjwva2V5PgogICAgIDxzdHJpbmc+UmVjb3JkaW5nIHJhbmRv bSB2aWRlb3M8L3N0cmluZz4KICAgICA8a2V5Pk5TTWljcm9waG9uZVVzYWdlRGVzY3JpcHRpb248 L2tleT4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L0dldFVz ZXJNZWRpYS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L0dldFVzZXJNZWRp YS5tbQppbmRleCBhNGUyMTg5NDA3MmZlNjFlY2M1NzFmM2RmZWRlZWU0MWUyM2FmM2Q4Li4yZTc5 NGUxNmU5Yzg0MzZiM2MxYmJiNGFjYmVmNjkwYjg5M2YyOTU0IDEwMDY0NAotLS0gYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9HZXRVc2VyTWVkaWEubW0KKysrIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvR2V0VXNlck1lZGlhLm1tCkBAIC0xMjAsNyArMTIwLDcg QEAgVEVTVChXZWJLaXQyLCBDYXB0dXJlTXV0ZSkKICAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmln ID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOwog ICAgIGF1dG8gcHJlZmVyZW5jZXMgPSBbY29uZmlndXJhdGlvbiBwcmVmZXJlbmNlc107CiAgICAg cHJlZmVyZW5jZXMuX21lZGlhQ2FwdHVyZVJlcXVpcmVzU2VjdXJlQ29ubmVjdGlvbiA9IE5POwot ICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkuX21lZGlhQ2FwdHVyZUVuYWJsZWQgPSBZRVM7CisgICAg cHJlZmVyZW5jZXMuX21lZGlhRGV2aWNlc0VuYWJsZWQgPSBZRVM7CiAgICAgcHJlZmVyZW5jZXMu X21vY2tDYXB0dXJlRGV2aWNlc0VuYWJsZWQgPSBZRVM7CiAgICAgYXV0byB3ZWJWaWV3ID0gW1tU ZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgMzIwLCA1 MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKSBwcm9jZXNzUG9vbENvbmZpZ3Vy YXRpb246cHJvY2Vzc1Bvb2xDb25maWcuZ2V0KCldOwogICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9w dE5TKFtbR2V0VXNlck1lZGlhQ2FwdHVyZVVJRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKQEAgLTE2 OSw3ICsxNjksNyBAQCBURVNUKFdlYktpdDIsIENhcHR1cmVTdG9wKQogICAgIGF1dG8gcHJvY2Vz c1Bvb2xDb25maWcgPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9j XSBpbml0XSk7CiAgICAgYXV0byBwcmVmZXJlbmNlcyA9IFtjb25maWd1cmF0aW9uIHByZWZlcmVu Y2VzXTsKICAgICBwcmVmZXJlbmNlcy5fbWVkaWFDYXB0dXJlUmVxdWlyZXNTZWN1cmVDb25uZWN0 aW9uID0gTk87Ci0gICAgY29uZmlndXJhdGlvbi5nZXQoKS5fbWVkaWFDYXB0dXJlRW5hYmxlZCA9 IFlFUzsKKyAgICBwcmVmZXJlbmNlcy5fbWVkaWFEZXZpY2VzRW5hYmxlZCA9IFlFUzsKICAgICBw cmVmZXJlbmNlcy5fbW9ja0NhcHR1cmVEZXZpY2VzRW5hYmxlZCA9IFlFUzsKIAogICAgIGF1dG8g bWVzc2FnZUhhbmRsZXIgPSBhZG9wdE5TKFtbR1VNTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRd KTsKQEAgLTIxMSw3ICsyMTEsNyBAQCBURVNUKFdlYktpdDIsIENhcHR1cmVJbmRpY2F0b3JEZWxh eSkKICAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlnID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29s Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOwogICAgIGF1dG8gcHJlZmVyZW5jZXMgPSBbY29u ZmlndXJhdGlvbiBwcmVmZXJlbmNlc107CiAgICAgcHJlZmVyZW5jZXMuX21lZGlhQ2FwdHVyZVJl cXVpcmVzU2VjdXJlQ29ubmVjdGlvbiA9IE5POwotICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkuX21l ZGlhQ2FwdHVyZUVuYWJsZWQgPSBZRVM7CisgICAgcHJlZmVyZW5jZXMuX21lZGlhRGV2aWNlc0Vu YWJsZWQgPSBZRVM7CiAgICAgcHJlZmVyZW5jZXMuX21vY2tDYXB0dXJlRGV2aWNlc0VuYWJsZWQg PSBZRVM7CiAKICAgICBhdXRvIG1lc3NhZ2VIYW5kbGVyID0gYWRvcHROUyhbW0dVTU1lc3NhZ2VI YW5kbGVyIGFsbG9jXSBpbml0XSk7CkBAIC0yNDgsNyArMjQ4LDcgQEAgVEVTVChXZWJLaXQyLCBH ZXRDYXBhYmlsaXRpZXMpCiAgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZyA9IGFkb3B0TlMoW1tf V0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKICAgICBhdXRvIHByZWZl cmVuY2VzID0gW2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNdOwogICAgIHByZWZlcmVuY2VzLl9t ZWRpYUNhcHR1cmVSZXF1aXJlc1NlY3VyZUNvbm5lY3Rpb24gPSBOTzsKLSAgICBjb25maWd1cmF0 aW9uLmdldCgpLl9tZWRpYUNhcHR1cmVFbmFibGVkID0gWUVTOworICAgIHByZWZlcmVuY2VzLl9t ZWRpYURldmljZXNFbmFibGVkID0gWUVTOwogICAgIHByZWZlcmVuY2VzLl9tb2NrQ2FwdHVyZURl dmljZXNFbmFibGVkID0gWUVTOwogCiAgICAgYXV0byBtZXNzYWdlSGFuZGxlciA9IGFkb3B0TlMo W1tHVU1NZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0pOwpAQCAtMjgzLDcgKzI4Myw3IEBAIFRF U1QoV2ViS2l0LCBXZWJBdWRpb0FuZEdldFVzZXJNZWRpYSkKIAogICAgIGF1dG8gcHJlZmVyZW5j ZXMgPSBbY29uZmlndXJhdGlvbiBwcmVmZXJlbmNlc107CiAgICAgcHJlZmVyZW5jZXMuX21lZGlh Q2FwdHVyZVJlcXVpcmVzU2VjdXJlQ29ubmVjdGlvbiA9IE5POwotICAgIGNvbmZpZ3VyYXRpb24u Z2V0KCkuX21lZGlhQ2FwdHVyZUVuYWJsZWQgPSBZRVM7CisgICAgcHJlZmVyZW5jZXMuX21lZGlh RGV2aWNlc0VuYWJsZWQgPSBZRVM7CiAgICAgcHJlZmVyZW5jZXMuX21vY2tDYXB0dXJlRGV2aWNl c0VuYWJsZWQgPSBZRVM7CiAKICAgICBhdXRvIG1lc3NhZ2VIYW5kbGVyID0gYWRvcHROUyhbW0dV TU1lc3NhZ2VIYW5kbGVyIGFsbG9jXSBpbml0XSk7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdC9HZXRVc2VyTWVkaWFOYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvR2V0VXNlck1lZGlhTmF2aWdhdGlvbi5tbQppbmRleCBk MWRlNjU4ZjEwZjk4M2M5MDM4MGVkNGU0MGI3ZGUxYTM0NGRhOTg4Li4zYmQ0YTE2YWYxOTU3N2E0 NjRhMGQ1MDFjYzNiMzgxMzIxM2ZjNGI4IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdC9HZXRVc2VyTWVkaWFOYXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0L0dldFVzZXJNZWRpYU5hdmlnYXRpb24ubW0KQEAgLTczLDcg KzczLDcgQEAgVEVTVChXZWJLaXQsIE5hdmlnYXRlRHVyaW5nR2V0VXNlck1lZGlhUHJvbXB0KQog ICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWcgPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CiAgICAgYXV0byBwcmVmZXJlbmNlcyA9IFtjb25maWd1 cmF0aW9uIHByZWZlcmVuY2VzXTsKICAgICBwcmVmZXJlbmNlcy5fbWVkaWFDYXB0dXJlUmVxdWly ZXNTZWN1cmVDb25uZWN0aW9uID0gTk87Ci0gICAgY29uZmlndXJhdGlvbi5nZXQoKS5fbWVkaWFD YXB0dXJlRW5hYmxlZCA9IFlFUzsKKyAgICBwcmVmZXJlbmNlcy5fbWVkaWFEZXZpY2VzRW5hYmxl ZCA9IFlFUzsKICAgICBwcmVmZXJlbmNlcy5fbW9ja0NhcHR1cmVEZXZpY2VzRW5hYmxlZCA9IFlF UzsKICAgICBhdXRvIHdlYlZpZXcgPSBbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJh bWU6Q0dSZWN0TWFrZSgwLCAwLCAzMjAsIDUwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9u LmdldCgpIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZy5nZXQoKV07 CiAgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tOYXZpZ2F0aW9uV2hpbGVHZXRVc2VyTWVk aWFQcm9tcHREaXNwbGF5ZWRVSURlbGVnYXRlIGFsbG9jXSBpbml0XSk7CkBAIC05MCw3ICs5MCw3 IEBAIFRFU1QoV2ViS2l0LCBOYXZpZ2F0ZUR1cmluZ0RldmljZUVudW1lcmF0aW9uKQogICAgIGF1 dG8gcHJvY2Vzc1Bvb2xDb25maWcgPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uIGFsbG9jXSBpbml0XSk7CiAgICAgYXV0byBwcmVmZXJlbmNlcyA9IFtjb25maWd1cmF0aW9u IHByZWZlcmVuY2VzXTsKICAgICBwcmVmZXJlbmNlcy5fbWVkaWFDYXB0dXJlUmVxdWlyZXNTZWN1 cmVDb25uZWN0aW9uID0gTk87Ci0gICAgY29uZmlndXJhdGlvbi5nZXQoKS5fbWVkaWFDYXB0dXJl RW5hYmxlZCA9IFlFUzsKKyAgICBwcmVmZXJlbmNlcy5fbWVkaWFEZXZpY2VzRW5hYmxlZCA9IFlF UzsKICAgICBwcmVmZXJlbmNlcy5fbW9ja0NhcHR1cmVEZXZpY2VzRW5hYmxlZCA9IFlFUzsKICAg ICBhdXRvIHdlYlZpZXcgPSBbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dS ZWN0TWFrZSgwLCAwLCAzMjAsIDUwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgp IHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZy5nZXQoKV07CiAgICAg YXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tOYXZpZ2F0aW9uV2hpbGVHZXRVc2VyTWVkaWFQcm9t cHREaXNwbGF5ZWRVSURlbGVnYXRlIGFsbG9jXSBpbml0XSk7CkBAIC0xMTYsNyArMTE2LDcgQEAg VEVTVChXZWJLaXQsIERldmljZUlkSGFzaFNhbHRzRGlyZWN0b3J5KQogICAgIGF1dG8gcHJvY2Vz c1Bvb2xDb25maWcgPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9j XSBpbml0XSk7CiAgICAgYXV0byBwcmVmZXJlbmNlcyA9IFtjb25maWd1cmF0aW9uIHByZWZlcmVu Y2VzXTsKICAgICBwcmVmZXJlbmNlcy5fbWVkaWFDYXB0dXJlUmVxdWlyZXNTZWN1cmVDb25uZWN0 aW9uID0gTk87Ci0gICAgY29uZmlndXJhdGlvbi5nZXQoKS5fbWVkaWFDYXB0dXJlRW5hYmxlZCA9 IFlFUzsKKyAgICBwcmVmZXJlbmNlcy5fbWVkaWFEZXZpY2VzRW5hYmxlZCA9IFlFUzsKICAgICBw cmVmZXJlbmNlcy5fbW9ja0NhcHR1cmVEZXZpY2VzRW5hYmxlZCA9IFlFUzsKICAgICBhdXRvIHdl YlZpZXcgPSBbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgw LCAwLCAzMjAsIDUwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpIHByb2Nlc3NQ b29sQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZy5nZXQoKV07CiAgICAgYXV0byBkZWxl Z2F0ZSA9IGFkb3B0TlMoW1tOYXZpZ2F0aW9uV2hpbGVHZXRVc2VyTWVkaWFQcm9tcHREaXNwbGF5 ZWRVSURlbGVnYXRlIGFsbG9jXSBpbml0XSk7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdC9HZXRVc2VyTWVkaWFSZXByb21wdC5tbSBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0L0dldFVzZXJNZWRpYVJlcHJvbXB0Lm1tCmluZGV4IDFmMzZmOGQx NDk2ZDJkYTBiY2E2YzczM2UzZTEwM2IwY2JjYzE4NDAuLjkyNGMxNDhiNjk5OWY3NjQ5NDVhNGY5 Zjk0ODVhNDQxMDk0YmNiZTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0L0dldFVzZXJNZWRpYVJlcHJvbXB0Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0L0dldFVzZXJNZWRpYVJlcHJvbXB0Lm1tCkBAIC0xMDYsNyArMTA2LDcgQEAg VEVTVChXZWJLaXQyLCBHZXRVc2VyTWVkaWFSZXByb21wdCkKICAgICBhdXRvIHByb2Nlc3NQb29s Q29uZmlnID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5p dF0pOwogICAgIGF1dG8gcHJlZmVyZW5jZXMgPSBbY29uZmlndXJhdGlvbiBwcmVmZXJlbmNlc107 CiAgICAgcHJlZmVyZW5jZXMuX21lZGlhQ2FwdHVyZVJlcXVpcmVzU2VjdXJlQ29ubmVjdGlvbiA9 IE5POwotICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkuX21lZGlhQ2FwdHVyZUVuYWJsZWQgPSBZRVM7 CisgICAgcHJlZmVyZW5jZXMuX21lZGlhRGV2aWNlc0VuYWJsZWQgPSBZRVM7CiAgICAgcHJlZmVy ZW5jZXMuX21vY2tDYXB0dXJlRGV2aWNlc0VuYWJsZWQgPSBZRVM7CiAgICAgYXV0byB3ZWJWaWV3 ID0gW1tHZXRVc2VyTWVkaWFSZXByb21wdFRlc3RWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNH UmVjdE1ha2UoMCwgMCwgMzIwLCA1MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQo KSBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWcuZ2V0KCldOwogICAg IGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbR2V0VXNlck1lZGlhUmVwcm9tcHRVSURlbGVnYXRl IGFsbG9jXSBpbml0XSk7CkBAIC0xNDUsNyArMTQ1LDcgQEAgVEVTVChXZWJLaXQyLCBHZXRVc2Vy TWVkaWFSZXByb21wdEFmdGVyQXVkaW9WaWRlb0JlaW5nRGVuaWVkKQogICAgIGF1dG8gcHJvY2Vz c1Bvb2xDb25maWcgPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9j XSBpbml0XSk7CiAgICAgYXV0byBwcmVmZXJlbmNlcyA9IFtjb25maWd1cmF0aW9uIHByZWZlcmVu Y2VzXTsKICAgICBwcmVmZXJlbmNlcy5fbWVkaWFDYXB0dXJlUmVxdWlyZXNTZWN1cmVDb25uZWN0 aW9uID0gTk87Ci0gICAgY29uZmlndXJhdGlvbi5nZXQoKS5fbWVkaWFDYXB0dXJlRW5hYmxlZCA9 IFlFUzsKKyAgICBwcmVmZXJlbmNlcy5fbWVkaWFEZXZpY2VzRW5hYmxlZCA9IFlFUzsKICAgICBw cmVmZXJlbmNlcy5fbW9ja0NhcHR1cmVEZXZpY2VzRW5hYmxlZCA9IFlFUzsKICAgICBhdXRvIHdl YlZpZXcgPSBbW0dldFVzZXJNZWRpYVJlcHJvbXB0VGVzdFZpZXcgYWxsb2NdIGluaXRXaXRoRnJh bWU6Q0dSZWN0TWFrZSgwLCAwLCAzMjAsIDUwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9u LmdldCgpIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZy5nZXQoKV07 CiAgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tHZXRVc2VyTWVkaWFPbmx5QXVkaW9VSURl bGVnYXRlIGFsbG9jXSBpbml0XSk7CkBAIC0xNjgsNyArMTY4LDcgQEAgVEVTVChXZWJLaXQyLCBN dWx0aXBsZUdldFVzZXJNZWRpYVN5bmNocm9ub3VzbHkpCiAgICAgYXV0byBwcm9jZXNzUG9vbENv bmZpZyA9IGFkb3B0TlMoW1tfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRd KTsKICAgICBhdXRvIHByZWZlcmVuY2VzID0gW2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNdOwog ICAgIHByZWZlcmVuY2VzLl9tZWRpYUNhcHR1cmVSZXF1aXJlc1NlY3VyZUNvbm5lY3Rpb24gPSBO TzsKLSAgICBjb25maWd1cmF0aW9uLmdldCgpLl9tZWRpYUNhcHR1cmVFbmFibGVkID0gWUVTOwor ICAgIHByZWZlcmVuY2VzLl9tZWRpYURldmljZXNFbmFibGVkID0gWUVTOwogICAgIHByZWZlcmVu Y2VzLl9tb2NrQ2FwdHVyZURldmljZXNFbmFibGVkID0gWUVTOwogICAgIGF1dG8gd2ViVmlldyA9 IFtbR2V0VXNlck1lZGlhUmVwcm9tcHRUZXN0VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1Jl Y3RNYWtlKDAsIDAsIDMyMCwgNTAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCkg cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uOnByb2Nlc3NQb29sQ29uZmlnLmdldCgpXTsKICAgICBh dXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW0dldFVzZXJNZWRpYVJlcHJvbXB0VUlEZWxlZ2F0ZSBh bGxvY10gaW5pdF0pOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQvTWVkaWFTdHJlYW1UcmFja0RldGFjaGVkLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQvTWVkaWFTdHJlYW1UcmFja0RldGFjaGVkLm1tCmluZGV4IDI4M2JmMTRkMTJlYWRj ZjQzYWFjNTZkNWRmOGJhOWY3MDlkNTRkZmYuLjE2YzY5ZDdiMWY1ZmM5YWY3ZGU2M2E3ZDA4Yzcz YWIzMjc1YmY0YjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 L01lZGlhU3RyZWFtVHJhY2tEZXRhY2hlZC5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdC9NZWRpYVN0cmVhbVRyYWNrRGV0YWNoZWQubW0KQEAgLTY5LDcgKzY5LDcgQEAg VEVTVChXZWJLaXQsIE1lZGlhU3RyZWFtVHJhY2tEZXRhY2hlZCkKICAgICBhdXRvIHByb2Nlc3NQ b29sQ29uZmlnID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10g aW5pdF0pOwogICAgIGF1dG8gcHJlZmVyZW5jZXMgPSBbY29uZmlndXJhdGlvbiBwcmVmZXJlbmNl c107CiAgICAgcHJlZmVyZW5jZXMuX21lZGlhQ2FwdHVyZVJlcXVpcmVzU2VjdXJlQ29ubmVjdGlv biA9IE5POwotICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkuX21lZGlhQ2FwdHVyZUVuYWJsZWQgPSBZ RVM7CisgICAgcHJlZmVyZW5jZXMuX21lZGlhRGV2aWNlc0VuYWJsZWQgPSBZRVM7CiAgICAgcHJl ZmVyZW5jZXMuX21vY2tDYXB0dXJlRGV2aWNlc0VuYWJsZWQgPSBZRVM7CiAgICAgYXV0byB3ZWJW aWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0 TWFrZSgwLCAwLCAzMjAsIDUwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpIHBy b2Nlc3NQb29sQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZy5nZXQoKV0pOwogICAgIGF1 dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbTWVkaWFTdHJlYW1UcmFja0RldGFjaGVkVUlEZWxlZ2F0 ZSBhbGxvY10gaW5pdF0pOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9HZXREaXNwbGF5TWVkaWEubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL0dldERpc3BsYXlNZWRpYS5tbQppbmRleCAxMGQ1NjI3MmVjYTQxZWVmNzRj NTBiMTU5YzY5NWE0ZjIwN2FhOTBiLi5jZTFiMjI2OWI4YmI5YjQ4Zjc2NTU3M2Y4NDM3NmZhNzQy MjIxMmVmIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L0dldERpc3BsYXlNZWRpYS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL0dldERpc3BsYXlNZWRpYS5tbQpAQCAtMTAyLDcgKzEwMiw3IEBAIHB1YmxpYzoKIAog ICAgICAgICBhdXRvIHByZWZlcmVuY2VzID0gW21fY29uZmlndXJhdGlvbiBwcmVmZXJlbmNlc107 CiAgICAgICAgIHByZWZlcmVuY2VzLl9tZWRpYUNhcHR1cmVSZXF1aXJlc1NlY3VyZUNvbm5lY3Rp b24gPSBOTzsKLSAgICAgICAgbV9jb25maWd1cmF0aW9uLmdldCgpLl9tZWRpYUNhcHR1cmVFbmFi bGVkID0gWUVTOworICAgICAgICBwcmVmZXJlbmNlcy5fbWVkaWFEZXZpY2VzRW5hYmxlZCA9IFlF UzsKICAgICAgICAgcHJlZmVyZW5jZXMuX21vY2tDYXB0dXJlRGV2aWNlc0VuYWJsZWQgPSBZRVM7 CiAgICAgICAgIHByZWZlcmVuY2VzLl9zY3JlZW5DYXB0dXJlRW5hYmxlZCA9IFlFUzsKIApkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dh cE9uTmF2aWdhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev UHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KaW5kZXggMGVlY2E0OTliZDQ0N2ZkNTIyM2Q0NzJh ZGM3Mzg2YTIzNjhmMTkxYy4uZGYzMjBkNjRkYWRiZGQxZWUyODNmODY1YzE0NDIzZjNhYzU1NjRi ZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9j ZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCkBAIC02NDQwLDcgKzY0NDAsNyBA QCBURVNUKFByb2Nlc3NTd2FwLCBHZXRVc2VyTWVkaWFDYXB0dXJlU3RhdGUpCiAgICAgYXV0byB3 ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFs bG9jXSBpbml0XSk7CiAgICAgYXV0byBwcmVmZXJlbmNlcyA9IFt3ZWJWaWV3Q29uZmlndXJhdGlv bi5nZXQoKSBwcmVmZXJlbmNlc107CiAgICAgcHJlZmVyZW5jZXMuX21lZGlhQ2FwdHVyZVJlcXVp cmVzU2VjdXJlQ29ubmVjdGlvbiA9IE5POwotICAgIHdlYlZpZXdDb25maWd1cmF0aW9uLmdldCgp Ll9tZWRpYUNhcHR1cmVFbmFibGVkID0gWUVTOworICAgIHByZWZlcmVuY2VzLl9tZWRpYURldmlj ZXNFbmFibGVkID0gWUVTOwogICAgIHByZWZlcmVuY2VzLl9tb2NrQ2FwdHVyZURldmljZXNFbmFi bGVkID0gWUVTOwogCiAgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnBy b2Nlc3NQb29sLmdldCgpXTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvVXNlck1lZGlhRGlzYWJsZWQubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1VzZXJNZWRpYURpc2FibGVkLm1tCmluZGV4IDE2M2EyYWMyNGJjOGFl ODhmNjY2MjA0ODlkMzcwZGQ1YjZmM2YzZTguLjVhYTUzZmI1NDg0YTA0NGViYjZiZTg5YmVkZTU5 Zjc2ZTgwNzY2MDkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvVXNlck1lZGlhRGlzYWJsZWQubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9Vc2VyTWVkaWFEaXNhYmxlZC5tbQpAQCAtODQsNyArODQsNiBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCB2b2lkIFNldFVwKCkKICAgICB7CiAgICAgICAgIG1fY29uZmlndXJh dGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7Ci0g ICAgICAgIG1fY29uZmlndXJhdGlvbi5nZXQoKS5fbWVkaWFDYXB0dXJlRW5hYmxlZCA9IFlFUzsK IAogICAgICAgICBSZXRhaW5QdHI8VXNlck1lZGlhTWVzc2FnZUhhbmRsZXI+IGhhbmRsZXIgPSBh ZG9wdE5TKFtbVXNlck1lZGlhTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKICAgICAgICAg W1ttX2NvbmZpZ3VyYXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdl SGFuZGxlcjpoYW5kbGVyLmdldCgpIG5hbWU6QCJ0ZXN0SGFuZGxlciJdOwpAQCAtOTMsNiArOTIs NyBAQCBwdWJsaWM6CiAKICAgICAgICAgYXV0byBwcmVmZXJlbmNlcyA9IFttX3dlYlZpZXcgY29u ZmlndXJhdGlvbl0ucHJlZmVyZW5jZXM7CiAgICAgICAgIHByZWZlcmVuY2VzLl9tb2NrQ2FwdHVy ZURldmljZXNFbmFibGVkID0gWUVTOworICAgICAgICBwcmVmZXJlbmNlcy5fbWVkaWFEZXZpY2Vz RW5hYmxlZCA9IFlFUzsKICAgICAgICAgcHJlZmVyZW5jZXMuX21lZGlhQ2FwdHVyZVJlcXVpcmVz U2VjdXJlQ29ubmVjdGlvbiA9IE5POwogCiAgICAgICAgIG1fdWlEZWxlZ2F0ZSA9IGFkb3B0TlMo W1tVc2VyTWVkaWFVSURlbGVnYXRlIGFsbG9jXSBpbml0XSk7CmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1VzZXJNZWRpYVNpbXVsYXRlRmFpbGVkU2Fu ZGJveC5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVXNlck1lZGlh U2ltdWxhdGVGYWlsZWRTYW5kYm94Lm1tCmluZGV4IDg0MTMzZDY3ZThiYWM4NzA0MGNkNmIzNzJi Mjg1NGQ1YzY3ODhiMDAuLjdkZGNjMTAxMjI5MzEzMmEzMDhhZWZhMzM3ODY1YmNhMTJlZGNlMzcg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVXNlck1l ZGlhU2ltdWxhdGVGYWlsZWRTYW5kYm94Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvVXNlck1lZGlhU2ltdWxhdGVGYWlsZWRTYW5kYm94Lm1tCkBAIC04NCw3 ICs4NCw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgU2V0VXAoKQogICAgIHsKICAgICAg ICAgbV9jb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxs b2NdIGluaXRdKTsKLSAgICAgICAgbV9jb25maWd1cmF0aW9uLmdldCgpLl9tZWRpYUNhcHR1cmVF bmFibGVkID0gWUVTOwogCiAgICAgICAgIFJldGFpblB0cjxTaW11bGF0ZUZhaWxlZFNhbmRib3hN ZXNzYWdlSGFuZGxlcj4gaGFuZGxlciA9IGFkb3B0TlMoW1tTaW11bGF0ZUZhaWxlZFNhbmRib3hN ZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0pOwogICAgICAgICBbW21fY29uZmlndXJhdGlvbiB1 c2VyQ29udGVudENvbnRyb2xsZXJdIGFkZFNjcmlwdE1lc3NhZ2VIYW5kbGVyOmhhbmRsZXIuZ2V0 KCkgbmFtZTpAInRlc3RIYW5kbGVyIl07CkBAIC05Miw2ICs5MSw3IEBAIHB1YmxpYzoKICAgICAg ICAgbV93ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJh bWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjptX2NvbmZpZ3VyYXRp b24uZ2V0KCldKTsKIAogICAgICAgICBhdXRvIHByZWZlcmVuY2VzID0gW21fd2ViVmlldyBjb25m aWd1cmF0aW9uXS5wcmVmZXJlbmNlczsKKyAgICAgICAgcHJlZmVyZW5jZXMuX21lZGlhRGV2aWNl c0VuYWJsZWQgPSBZRVM7CiAgICAgICAgIHByZWZlcmVuY2VzLl9tb2NrQ2FwdHVyZURldmljZXNF bmFibGVkID0gWUVTOwogICAgICAgICBwcmVmZXJlbmNlcy5fbWVkaWFDYXB0dXJlUmVxdWlyZXNT ZWN1cmVDb25uZWN0aW9uID0gTk87CiAK 410561 2020-10-05 14:35:25 -0700 2020-10-05 15:10:19 -0700 Patch for landing bug-217319-20201005143524.patch text/plain 9945 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3ODQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA3OTg2YjE2ZDBhYzA4ZDUx NmYwNDYzYjhkMGMyMDRmZTYzMGIxMDkuLjNiYmViOGI2OGQ0ZTlmZjdlNzdhNzkyN2ZhOGYyMWRh M2VkZjIwNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjAtMTAtMDUgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGlzYWJsZSBtZWRpYSBj YXB0dXJlIGlmIGFuIGFwcCdzIGVudGl0bGVtZW50cyB3b24ndCBhbGxvdyBhY2Nlc3MgdG8gY2Fw dHVyZSBkZXZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTczMTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5OTU2MTEyPgorCisgICAgICAg IFJldmlld2VkIGJ5IFlvdWVubiBGYWJsZXQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB0ZXN0 ZWQgbWFudWFsbHkgd2l0aCBNaW5pQnJvd3NlciBhbmQgU2FmYXJpLgorCisgICAgICAgICogVUlQ cm9jZXNzL0NvY29hL1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5Lm1tOgor ICAgICAgICAoV2ViS2l0OjpVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6 cGVybWl0dGVkVG9DYXB0dXJlQXVkaW8pOiBJZiB0aGUKKyAgICAgICAgYXBwIGlzIHNhbmRib3hl ZCwgY2hlY2sgZm9yIHRoZSBlbnRpdGxlbWVudCByZXF1aXJlZCBmb3IgYXVkaW8gY2FwdHVyZS4g RG9uJ3QKKyAgICAgICAgYm90aGVyIGNoZWNraW5nIGZvciB1c2FnZSBzdHJpbmcgaWYgVENDIGhh cyBhbHJlYWR5IGF1dGhvcml6ZWQgY2FwdHVyZS4KKyAgICAgICAgKFdlYktpdDo6VXNlck1lZGlh UGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6OnBlcm1pdHRlZFRvQ2FwdHVyZVZpZGVvKTog RGl0dG8KKyAgICAgICAgZm9yIHZpZGVvIGNhcHR1cmUuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv Q29jb2EvV2ViUHJlZmVyZW5jZXNDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJlZmVy ZW5jZXM6OnBsYXRmb3JtSW5pdGlhbGl6ZVN0b3JlKTogSW5pdGlhbGl6ZSBgbWVkaWFEZXZpY2Vz RW5hYmxlZGAKKyAgICAgICAgbWFudWFsbHkgYmVjYXVzZSBpdHMgZGVmYXVsdCB2YWx1ZSBpcyBh bHdheXMgYGZhbHNlYCBpbiB0aGUgV2ViUHJvY2VzcyBhbmQgbWF5IGJlCisgICAgICAgIGB0cnVl YCBpbiB0aGUgVUlQcm9jZXNzLiBXZWJQcmVmZXJlbmNlcyBhc3N1bWVzIHRoZSBkZWZhdWx0IHdp bGwgYWx3YXlzIGJlIHRoZSBzYW1lCisgICAgICAgIGluIGJvdGggcHJvY2Vzc2VzLCBhbmQgc28g aGFzIGFuIG9wdGltaXphdGlvbiB0aGF0IG9ubHkgc2VuZHMgdmFsdWVzIHRvIHRoZQorICAgICAg ICBXZWJQcm9jZXNzIGlmIHRoZXkgZGlmZmVyIGZyb20gdGhlIGRlZmF1bHQgdmFsdWUuIFRoaXMg bWVhbnMgaWYgdGhlIGRlZmF1bHQgaW4gdGhlCisgICAgICAgIFVJUHJvY2VzcyBpcyB0cnVlIGl0 IHdvbid0IGJlIHB1c2hlZCB0byB0aGUgV2ViUHJvY2Vzcywgc28gY2FwdHVyZSB3b24ndCB3b3Jr LgorCiAyMDIwLTEwLTAxICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgog CiAgICAgICAgIFByZXZlbnQgbWVkaWEgY2FwdHVyZSB1bmxlc3MgdGhlIGFwcGxpY2F0aW9uIGhh cyBjb3JyZWN0IGRhdGEgZm9yIHN5c3RlbSBwZXJtaXNzaW9uIHByb21wdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RN YW5hZ2VyUHJveHkubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9Vc2VyTWVkaWFQ ZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5tbQppbmRleCA1YzI4ZDcxZjQ5MTRmZmFhYmIw NDBlYzNlMTU4NTA4NGM3MzMzYjg0Li4xNzcwMTk4ZjA2M2NhZjllZmFiNzRmNWUzZTk3NDQ5OTE2 YjY5MGQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9Vc2VyTWVk aWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9Vc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5tbQpA QCAtMjYsMTEgKzI2LDQzIEBACiAjaW1wb3J0ICJjb25maWcuaCIKICNpbXBvcnQgIlVzZXJNZWRp YVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5LmgiCiAKKyNpbXBvcnQgIlNhbmRib3hVdGls aXRpZXMuaCIKKyNpbXBvcnQgIlRDQ1NQSS5oIgorI2ltcG9ydCA8d3RmL1NvZnRMaW5raW5nLmg+ CisjaW1wb3J0IDx3dGYvc3BpL2Rhcndpbi9TYW5kYm94U1BJLmg+CisKK1NPRlRfTElOS19QUklW QVRFX0ZSQU1FV09SSyhUQ0MpCitTT0ZUX0xJTksoVENDLCBUQ0NBY2Nlc3NQcmVmbGlnaHQsIFRD Q0FjY2Vzc1ByZWZsaWdodFJlc3VsdCwgKENGU3RyaW5nUmVmIHNlcnZpY2UsIENGRGljdGlvbmFy eVJlZiBvcHRpb25zKSwgKHNlcnZpY2UsIG9wdGlvbnMpKQorU09GVF9MSU5LKFRDQywgVENDQWNj ZXNzUHJlZmxpZ2h0V2l0aEF1ZGl0VG9rZW4sIFRDQ0FjY2Vzc1ByZWZsaWdodFJlc3VsdCwgKENG U3RyaW5nUmVmIHNlcnZpY2UsIGF1ZGl0X3Rva2VuX3QgdG9rZW4sIENGRGljdGlvbmFyeVJlZiBv cHRpb25zKSwgKHNlcnZpY2UsIHRva2VuLCBvcHRpb25zKSkKK1NPRlRfTElOS19DT05TVEFOVChU Q0MsIGtUQ0NTZXJ2aWNlTWljcm9waG9uZSwgQ0ZTdHJpbmdSZWYpCitTT0ZUX0xJTktfQ09OU1RB TlQoVENDLCBrVENDU2VydmljZUNhbWVyYSwgQ0ZTdHJpbmdSZWYpCisKIG5hbWVzcGFjZSBXZWJL aXQgewogCiBib29sIFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5OjpwZXJt aXR0ZWRUb0NhcHR1cmVBdWRpbygpCiB7CiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKworI2lm IFBMQVRGT1JNKE1BQykKKyAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcgb25jZUZsYWc7CisgICAg c3RhdGljIGJvb2wgZW50aXRsZWQgPSB0cnVlOworICAgIHN0ZDo6Y2FsbF9vbmNlKG9uY2VGbGFn LCBbXSB7CisgICAgICAgIGlmICghY3VycmVudFByb2Nlc3NJc1NhbmRib3hlZCgpKQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIGludCByZXN1bHQgPSBzYW5kYm94X2NoZWNrKGdldHBp ZCgpLCAiZGV2aWNlLW1pY3JvcGhvbmUiLCBTQU5EQk9YX0ZJTFRFUl9OT05FKTsKKyAgICAgICAg ZW50aXRsZWQgPSAhcmVzdWx0OworICAgICAgICBpZiAocmVzdWx0ID09IC0xKQorICAgICAgICAg ICAgV1RGTG9nQWx3YXlzKCJFcnJvciBjaGVja2luZyAnZGV2aWNlLW1pY3JvcGhvbmUnIHNhbmRi b3ggYWNjZXNzLCBlcnJubz0lbGQiLCAobG9uZyllcnJubyk7CisgICAgfSk7CisgICAgaWYgKCFl bnRpdGxlZCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykK KworICAgIHN0YXRpYyBUQ0NBY2Nlc3NQcmVmbGlnaHRSZXN1bHQgYWNjZXNzID0gVENDQWNjZXNz UHJlZmxpZ2h0KGdldGtUQ0NTZXJ2aWNlTWljcm9waG9uZSgpLCBOVUxMKTsKKyAgICBpZiAoYWNj ZXNzID09IGtUQ0NBY2Nlc3NQcmVmbGlnaHRHcmFudGVkKQorICAgICAgICByZXR1cm4gdHJ1ZTsK KwogICAgIHN0YXRpYyBib29sIGlzUGVybWl0dGVkID0gZHluYW1pY19vYmpjX2Nhc3Q8TlNTdHJp bmc+KE5TQnVuZGxlLm1haW5CdW5kbGUuaW5mb0RpY3Rpb25hcnlbQCJOU01pY3JvcGhvbmVVc2Fn ZURlc2NyaXB0aW9uIl0pLmxlbmd0aDsKICAgICByZXR1cm4gaXNQZXJtaXR0ZWQ7CiAjZWxzZQpA QCAtNDEsNiArNzMsMjcgQEAgYm9vbCBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQ cm94eTo6cGVybWl0dGVkVG9DYXB0dXJlQXVkaW8oKQogYm9vbCBVc2VyTWVkaWFQZXJtaXNzaW9u UmVxdWVzdE1hbmFnZXJQcm94eTo6cGVybWl0dGVkVG9DYXB0dXJlVmlkZW8oKQogewogI2lmIEVO QUJMRShNRURJQV9TVFJFQU0pCisKKyNpZiBQTEFURk9STShNQUMpCisgICAgc3RhdGljIHN0ZDo6 b25jZV9mbGFnIG9uY2VGbGFnOworICAgIHN0YXRpYyBib29sIGVudGl0bGVkID0gdHJ1ZTsKKyAg ICBzdGQ6OmNhbGxfb25jZShvbmNlRmxhZywgW10geworICAgICAgICBpZiAoIWN1cnJlbnRQcm9j ZXNzSXNTYW5kYm94ZWQoKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBpbnQgcmVz dWx0ID0gc2FuZGJveF9jaGVjayhnZXRwaWQoKSwgImRldmljZS1jYW1lcmEiLCBTQU5EQk9YX0ZJ TFRFUl9OT05FKTsKKyAgICAgICAgZW50aXRsZWQgPSAhcmVzdWx0OworICAgICAgICBpZiAocmVz dWx0ID09IC0xKQorICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJFcnJvciBjaGVja2luZyAnZGV2 aWNlLWNhbWVyYScgc2FuZGJveCBhY2Nlc3MsIGVycm5vPSVsZCIsIChsb25nKWVycm5vKTsKKyAg ICB9KTsKKyAgICBpZiAoIWVudGl0bGVkKQorICAgICAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYg Ly8gUExBVEZPUk0oTUFDKQorCisgICAgc3RhdGljIFRDQ0FjY2Vzc1ByZWZsaWdodFJlc3VsdCBh Y2Nlc3MgPSBUQ0NBY2Nlc3NQcmVmbGlnaHQoZ2V0a1RDQ1NlcnZpY2VDYW1lcmEoKSwgTlVMTCk7 CisgICAgaWYgKGFjY2VzcyA9PSBrVENDQWNjZXNzUHJlZmxpZ2h0R3JhbnRlZCkKKyAgICAgICAg cmV0dXJuIHRydWU7CisKICAgICBzdGF0aWMgYm9vbCBpc1Blcm1pdHRlZCA9IGR5bmFtaWNfb2Jq Y19jYXN0PE5TU3RyaW5nPihOU0J1bmRsZS5tYWluQnVuZGxlLmluZm9EaWN0aW9uYXJ5W0AiTlND YW1lcmFVc2FnZURlc2NyaXB0aW9uIl0pLmxlbmd0aDsKICAgICByZXR1cm4gaXNQZXJtaXR0ZWQ7 CiAjZWxzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJl ZmVyZW5jZXNDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByZWZl cmVuY2VzQ29jb2EubW0KaW5kZXggYjhkMjZiZjAzODMwMTkzNDFiN2M3NDZmM2Q1OGVkYTczYTY0 MjczNS4uY2U3YWNhM2NlZGU4YTUyMzkzNjRkNDE4MDU2NjNiYWU3MzVhM2U1NCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJlZmVyZW5jZXNDb2NvYS5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcmVmZXJlbmNlc0NvY29hLm1t CkBAIC0zMCw2ICszMCwxMCBAQAogI2ltcG9ydCAiV2ViUHJlZmVyZW5jZXNLZXlzLmgiCiAjaW1w b3J0IDx3dGYvdGV4dC9TdHJpbmdDb25jYXRlbmF0ZS5oPgogCisjaWYgRU5BQkxFKE1FRElBX1NU UkVBTSkKKyNpbmNsdWRlICJVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5o IgorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBzdGF0aWMgaW5saW5lIE5TU3RyaW5n ICptYWtlS2V5KGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBrZXlQcmVm aXgsIGNvbnN0IFN0cmluZyYga2V5KQpAQCAtMTM5LDYgKzE0MywxNSBAQCBzdGF0aWMgdm9pZCBz ZXREZWJ1Z1VJbnQzMlZhbHVlSWZJblVzZXJEZWZhdWx0cyhjb25zdCBTdHJpbmcmIGlkZW50aWZp ZXIsIGNvbnN0CiB2b2lkIFdlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybUluaXRpYWxpemVTdG9yZSgp CiB7CiAgICAgQGF1dG9yZWxlYXNlcG9vbCB7CisjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKyAg ICAgICAgLy8gTk9URTogVGhpcyBpcyBzZXQgaGVyZSwgYW5kIGRvZXMgbm90IHNldHRpbmcgdGhl IGRlZmF1bHQgdXNpbmcgdGhlICdkZWZhdWx0VmFsdWUnIG1lY2hhbmlzbSwgYmVjYXVzZSB0aGUK KyAgICAgICAgLy8gJ2RlZmF1bHRWYWx1ZScgbXVzdCBiZSB0aGUgc2FtZSBpbiBib3RoIHRoZSBV SVByb2Nlc3MgYW5kIFdlYlByb2Nlc3MsIHdoaWNoIG1heSBub3QgYmUgdHJ1ZSBmb3IgYXVkaW8K KyAgICAgICAgLy8gYW5kIHZpZGVvIGNhcHR1cmUgc3RhdGUgYXMgdGhlIFdlYlByb2Nlc3MgaXMg bm90IGVudGl0bGVkIHRvIHVzZSB0aGUgY2FtZXJhIG9yIG1pY3JvcGhvbmUgYnkgZGVmYXVsdC4K KyAgICAgICAgLy8gSWYgb3RoZXIgcHJlZmVyZW5jZXMgbmVlZCB0byBkeW5hbWljYWxseSBzZXQg dGhlIGluaXRpYWwgdmFsdWUgYmFzZWQgb24gaG9zdCBhcHAgc3RhdGUsIHdlIHNob3VsZCBleHRl bmRlZAorICAgICAgICAvLyB0aGUgZGVjbGFyYXRpdmUgZm9ybWF0IHJhdGhlciB0aGFuIGFkZGlu ZyBtb3JlIHNwZWNpYWwgY2FzZXMgaGVyZS4KKyAgICAgICAgbV9zdG9yZS5zZXRCb29sVmFsdWVG b3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Om1lZGlhRGV2aWNlc0VuYWJsZWRLZXkoKSwgVXNlck1l ZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6OnBlcm1pdHRlZFRvQ2FwdHVyZUF1ZGlv KCkgfHwgVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6OnBlcm1pdHRlZFRv Q2FwdHVyZVZpZGVvKCkpOworI2VuZGlmCisKICNkZWZpbmUgSU5JVElBTElaRV9ERUJVR19QUkVG RVJFTkNFX0ZST01fTlNVU0VSREVGQVVMVFMoS2V5VXBwZXIsIEtleUxvd2VyLCBUeXBlTmFtZSwg VHlwZSwgRGVmYXVsdFZhbHVlLCBIdW1hblJlYWRhYmxlTmFtZSwgSHVtYW5SZWFkYWJsZURlc2Ny aXB0aW9uKSBcCiAgICAgICAgIHNldERlYnVnIyNUeXBlTmFtZSMjVmFsdWVJZkluVXNlckRlZmF1 bHRzKG1faWRlbnRpZmllciwgbV9rZXlQcmVmaXgsIG1fZ2xvYmFsRGVidWdLZXlQcmVmaXgsIFdl YlByZWZlcmVuY2VzS2V5OjpLZXlMb3dlciMjS2V5KCksIG1fc3RvcmUpOwogCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2U5YmVlOTg5MDQ3YWEz Y2UzNzNlNzhkYjFhNTlhYzljMjMwYWY5NS4uNWJjNWI1M2I5MzY1MzA5YTMxOGFlMmJkM2FiYzZj NzY1NWRmMmY2MCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEwLTA1ICBFcmljIENhcmxzb24gIDxlcmljLmNh cmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIERpc2FibGUgbWVkaWEgY2FwdHVyZSBpZiBhbiBh cHAncyBlbnRpdGxlbWVudHMgd29uJ3QgYWxsb3cgYWNjZXNzIHRvIGNhcHR1cmUgZGV2aWNlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MzE5Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS82OTk1NjExMj4KKworICAgICAgICBSZXZpZXdlZCBieSBZ b3Vlbm4gRmFibGV0LgorCisgICAgICAgICogTWluaUJyb3dzZXIvTWluaUJyb3dzZXIueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdh dGUubToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVnYXRlIGRlZmF1bHRDb25maWd1cmF0aW9u XSk6IERvbid0IHNldCBjb25maWd1cmF0aW9uLl9tZWRpYUNhcHR1cmVFbmFibGVkLAorICAgICAg ICBpdCBzaG91bGQgbm8gbG9uZ2VyIGJlIG5lY2Vzc2FyeS4KKworICAgICAgICAqIE1pbmlCcm93 c2VyL21hYy9JbmZvLnBsaXN0OiBSZW1vdmUgdW5uZWVkZWQga2V5cy4KKworICAgICAgICAqIE1v YmlsZU1pbmlCcm93c2VyL01vYmlsZU1pbmlCcm93c2VyL0luZm8ucGxpc3Q6IERpdHRvLiBBZGQg dXNhZ2Ugc3RyaW5ncy4KKwogMjAyMC0xMC0wMSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29u QGFwcGxlLmNvbT4KIAogICAgICAgICBQcmV2ZW50IG1lZGlhIGNhcHR1cmUgdW5sZXNzIHRoZSBh cHBsaWNhdGlvbiBoYXMgY29ycmVjdCBkYXRhIGZvciBzeXN0ZW0gcGVybWlzc2lvbiBwcm9tcHQK ZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5tIGIvVG9vbHMv TWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0KaW5kZXggNDkyOTI1YjE5N2RhZjkxNzhmMTli MmE2MGY2YzQ1YjExMDA4NDQ5Yy4uN2Q1MzVlYzEzNzVkNjE3NzFmZmI4ZTc4NjFiZTY0YjlmMTQz OWVkMiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0KKysr IGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0KQEAgLTEzOSw3ICsxMzksNiBA QCAtIChXS1dlYlZpZXdDb25maWd1cmF0aW9uICopZGVmYXVsdENvbmZpZ3VyYXRpb24KICAgICAg ICAgICAgIFtjb25maWd1cmF0aW9uLnByZWZlcmVuY2VzIF9zZXRFbmFibGVkOmVuYWJsZWQgZm9y SW50ZXJuYWxEZWJ1Z0ZlYXR1cmU6ZmVhdHVyZV07CiAgICAgICAgIH0KIAotICAgICAgICBjb25m aWd1cmF0aW9uLl9tZWRpYUNhcHR1cmVFbmFibGVkID0gWUVTOwogICAgICAgICBjb25maWd1cmF0 aW9uLnByZWZlcmVuY2VzLl9mdWxsU2NyZWVuRW5hYmxlZCA9IFlFUzsKICAgICAgICAgY29uZmln dXJhdGlvbi5wcmVmZXJlbmNlcy5fYWxsb3dzUGljdHVyZUluUGljdHVyZU1lZGlhUGxheWJhY2sg PSBZRVM7CiAgICAgICAgIGNvbmZpZ3VyYXRpb24ucHJlZmVyZW5jZXMuX2RldmVsb3BlckV4dHJh c0VuYWJsZWQgPSBZRVM7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvSW5mby5w bGlzdCBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9JbmZvLnBsaXN0CmluZGV4IDUzZDYzODc0NjFl NzdhOWUxNWJkMDA2ZGNiNTc3ZjkyYjNiZWFiY2YuLjQ4NWFhYjdjNjgzNDQ2OTgxNmQ4Y2UyYTgy M2JhNDA4NzQxMjU4ZDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9JbmZvLnBs aXN0CisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9JbmZvLnBsaXN0CkBAIC01MiwxMCArNTIs NiBAQAogCQkJPHN0cmluZz5FZGl0b3I8L3N0cmluZz4KIAkJPC9kaWN0PgogCTwvYXJyYXk+Ci0g ICAgPGtleT5jb20uYXBwbGUuc2VjdXJpdHkuZGV2aWNlLmNhbWVyYTwva2V5PgotICAgIDx0cnVl Lz4KLSAgICA8a2V5PmNvbS5hcHBsZS5zZWN1cml0eS5kZXZpY2UubWljcm9waG9uZTwva2V5Pgot ICAgIDx0cnVlLz4KICAgICA8a2V5Pk5TQ2FtZXJhVXNhZ2VEZXNjcmlwdGlvbjwva2V5PgogICAg IDxzdHJpbmc+UmVjb3JkaW5nIHJhbmRvbSB2aWRlb3M8L3N0cmluZz4KICAgICA8a2V5Pk5TTWlj cm9waG9uZVVzYWdlRGVzY3JpcHRpb248L2tleT4KZGlmZiAtLWdpdCBhL1Rvb2xzL01vYmlsZU1p bmlCcm93c2VyL01vYmlsZU1pbmlCcm93c2VyL0luZm8ucGxpc3QgYi9Ub29scy9Nb2JpbGVNaW5p QnJvd3Nlci9Nb2JpbGVNaW5pQnJvd3Nlci9JbmZvLnBsaXN0CmluZGV4IDY1MWJhNTc0YzJkZTE4 M2I5YzYwMTdlNzQ1NjFjNDBjZTM2NjU2Y2QuLjY2YjVmMDkyNjQ5ZmQ4ZTk2MTdmMzRiM2Q4OTc5 OWVjNzc0NzRmNjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL01vYmlsZU1pbmlCcm93c2VyL01vYmlsZU1p bmlCcm93c2VyL0luZm8ucGxpc3QKKysrIGIvVG9vbHMvTW9iaWxlTWluaUJyb3dzZXIvTW9iaWxl TWluaUJyb3dzZXIvSW5mby5wbGlzdApAQCAtNTQsMTEgKzU0LDkgQEAKIAkJPGtleT5OU0FsbG93 c0FyYml0cmFyeUxvYWRzSW5XZWJDb250ZW50PC9rZXk+CiAJCTx0cnVlLz4KIAk8L2RpY3Q+Ci0g ICAgPGtleT5jb20uYXBwbGUuc2VjdXJpdHkuZGV2aWNlLmNhbWVyYTwva2V5PgotICAgIDx0cnVl Lz4KLSAgICA8a2V5PmNvbS5hcHBsZS5zZWN1cml0eS5kZXZpY2UubWljcm9waG9uZTwva2V5Pgot ICAgIDx0cnVlLz4KICAgICA8a2V5Pk5TQ2FtZXJhVXNhZ2VEZXNjcmlwdGlvbjwva2V5PgotICAg IDxzdHJpbmc+Q2FtZXJhIHVzYWdlIGRlc2NyaXB0aW9uPC9zdHJpbmc+CisgICAgPHN0cmluZz5S ZWNvcmRpbmcgcmFuZG9tIHZpZGVvczwvc3RyaW5nPgorICAgIDxrZXk+TlNNaWNyb3Bob25lVXNh Z2VEZXNjcmlwdGlvbjwva2V5PgorICAgIDxzdHJpbmc+UmVjb3JkaW5nIHJhbmRvbSBhdWRpbzwv c3RyaW5nPgogPC9kaWN0PgogPC9wbGlzdD4K 410565 2020-10-05 14:50:59 -0700 2020-10-05 16:15:23 -0700 Patch for landing bug-217319-20201005145059.patch text/plain 10765 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3ODQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA3OTg2YjE2ZDBhYzA4ZDUx NmYwNDYzYjhkMGMyMDRmZTYzMGIxMDkuLjY2ZjMwMGJlMTIwN2NhMzYwZDM1ZjBhNGVlMDg5MWFk YzJiNDAzYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjAtMTAtMDUgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGlzYWJsZSBtZWRpYSBj YXB0dXJlIGlmIGFuIGFwcCdzIGVudGl0bGVtZW50cyB3b24ndCBhbGxvdyBhY2Nlc3MgdG8gY2Fw dHVyZSBkZXZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTczMTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5OTU2MTEyPgorCisgICAgICAg IFJldmlld2VkIGJ5IFlvdWVubiBGYWJsZXQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB0ZXN0 ZWQgbWFudWFsbHkgd2l0aCBNaW5pQnJvd3NlciBhbmQgU2FmYXJpLgorCisgICAgICAgICogVUlQ cm9jZXNzL0NvY29hL1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5Lm1tOgor ICAgICAgICAoV2ViS2l0OjpVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6 cGVybWl0dGVkVG9DYXB0dXJlQXVkaW8pOiBJZiB0aGUKKyAgICAgICAgYXBwIGlzIHNhbmRib3hl ZCwgY2hlY2sgZm9yIHRoZSBlbnRpdGxlbWVudCByZXF1aXJlZCBmb3IgYXVkaW8gY2FwdHVyZS4g RG9uJ3QKKyAgICAgICAgYm90aGVyIGNoZWNraW5nIGZvciB1c2FnZSBzdHJpbmcgaWYgVENDIGhh cyBhbHJlYWR5IGF1dGhvcml6ZWQgY2FwdHVyZS4KKyAgICAgICAgKFdlYktpdDo6VXNlck1lZGlh UGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6OnBlcm1pdHRlZFRvQ2FwdHVyZVZpZGVvKTog RGl0dG8KKyAgICAgICAgZm9yIHZpZGVvIGNhcHR1cmUuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv Q29jb2EvV2ViUHJlZmVyZW5jZXNDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJlZmVy ZW5jZXM6OnBsYXRmb3JtSW5pdGlhbGl6ZVN0b3JlKTogSW5pdGlhbGl6ZSBgbWVkaWFEZXZpY2Vz RW5hYmxlZGAKKyAgICAgICAgbWFudWFsbHkgYmVjYXVzZSBpdHMgZGVmYXVsdCB2YWx1ZSBpcyBh bHdheXMgYGZhbHNlYCBpbiB0aGUgV2ViUHJvY2VzcyBhbmQgbWF5IGJlCisgICAgICAgIGB0cnVl YCBpbiB0aGUgVUlQcm9jZXNzLiBXZWJQcmVmZXJlbmNlcyBhc3N1bWVzIHRoZSBkZWZhdWx0IHdp bGwgYWx3YXlzIGJlIHRoZSBzYW1lCisgICAgICAgIGluIGJvdGggcHJvY2Vzc2VzLCBhbmQgc28g aGFzIGFuIG9wdGltaXphdGlvbiB0aGF0IG9ubHkgc2VuZHMgdmFsdWVzIHRvIHRoZQorICAgICAg ICBXZWJQcm9jZXNzIGlmIHRoZXkgZGlmZmVyIGZyb20gdGhlIGRlZmF1bHQgdmFsdWUuIFRoaXMg bWVhbnMgaWYgdGhlIGRlZmF1bHQgaW4gdGhlCisgICAgICAgIFVJUHJvY2VzcyBpcyB0cnVlIGl0 IHdvbid0IGJlIHB1c2hlZCB0byB0aGUgV2ViUHJvY2Vzcywgc28gY2FwdHVyZSB3b24ndCB3b3Jr LgorCisgICAgICAgICogUGxhdGZvcm0vc3BpL2lvcy9UQ0NTUEkuaDogVXBkYXRlIFRDQ0FjY2Vz c1ByZWZsaWdodFJlc3VsdC4KKwogMjAyMC0xMC0wMSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJs c29uQGFwcGxlLmNvbT4KIAogICAgICAgICBQcmV2ZW50IG1lZGlhIGNhcHR1cmUgdW5sZXNzIHRo ZSBhcHBsaWNhdGlvbiBoYXMgY29ycmVjdCBkYXRhIGZvciBzeXN0ZW0gcGVybWlzc2lvbiBwcm9t cHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9UQ0NTUEkuaCBi L1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9UQ0NTUEkuaAppbmRleCBlNGFjNWY1NzRm ZTg3ZGMxNjM3ZDQ5OTdlNzZjZWNhZDIxYTZkZGVkLi5kNzJkNGE1ODg1NmQ4NmVkZmI5NWFlY2Fj MWZkZGVhZjVkNThkZmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9p b3MvVENDU1BJLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1RDQ1NQSS5o CkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTQtMjAyMCBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAg LTMwLDcgKzMwLDggQEAKICNlbHNlCiAKIHR5cGVkZWYgZW51bSB7Ci0gICAga1RDQ0FjY2Vzc1By ZWZsaWdodERlbmllZCA9IDEsCisgICAga1RDQ0FjY2Vzc1ByZWZsaWdodEdyYW50ZWQsCisgICAg a1RDQ0FjY2Vzc1ByZWZsaWdodERlbmllZCwKIH0gVENDQWNjZXNzUHJlZmxpZ2h0UmVzdWx0Owog CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VzZXJN ZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5Lm1tIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkubW0KaW5k ZXggNWMyOGQ3MWY0OTE0ZmZhYWJiMDQwZWMzZTE1ODUwODRjNzMzM2I4NC4uMTc3MDE5OGYwNjNj YWY5ZWZhYjc0ZjVlM2U5NzQ0OTkxNmI2OTBkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVXNlck1lZGlhUGVybWlzc2lvblJl cXVlc3RNYW5hZ2VyUHJveHkubW0KQEAgLTI2LDExICsyNiw0MyBAQAogI2ltcG9ydCAiY29uZmln LmgiCiAjaW1wb3J0ICJVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5oIgog CisjaW1wb3J0ICJTYW5kYm94VXRpbGl0aWVzLmgiCisjaW1wb3J0ICJUQ0NTUEkuaCIKKyNpbXBv cnQgPHd0Zi9Tb2Z0TGlua2luZy5oPgorI2ltcG9ydCA8d3RmL3NwaS9kYXJ3aW4vU2FuZGJveFNQ SS5oPgorCitTT0ZUX0xJTktfUFJJVkFURV9GUkFNRVdPUksoVENDKQorU09GVF9MSU5LKFRDQywg VENDQWNjZXNzUHJlZmxpZ2h0LCBUQ0NBY2Nlc3NQcmVmbGlnaHRSZXN1bHQsIChDRlN0cmluZ1Jl ZiBzZXJ2aWNlLCBDRkRpY3Rpb25hcnlSZWYgb3B0aW9ucyksIChzZXJ2aWNlLCBvcHRpb25zKSkK K1NPRlRfTElOSyhUQ0MsIFRDQ0FjY2Vzc1ByZWZsaWdodFdpdGhBdWRpdFRva2VuLCBUQ0NBY2Nl c3NQcmVmbGlnaHRSZXN1bHQsIChDRlN0cmluZ1JlZiBzZXJ2aWNlLCBhdWRpdF90b2tlbl90IHRv a2VuLCBDRkRpY3Rpb25hcnlSZWYgb3B0aW9ucyksIChzZXJ2aWNlLCB0b2tlbiwgb3B0aW9ucykp CitTT0ZUX0xJTktfQ09OU1RBTlQoVENDLCBrVENDU2VydmljZU1pY3JvcGhvbmUsIENGU3RyaW5n UmVmKQorU09GVF9MSU5LX0NPTlNUQU5UKFRDQywga1RDQ1NlcnZpY2VDYW1lcmEsIENGU3RyaW5n UmVmKQorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogYm9vbCBVc2VyTWVkaWFQZXJtaXNzaW9uUmVx dWVzdE1hbmFnZXJQcm94eTo6cGVybWl0dGVkVG9DYXB0dXJlQXVkaW8oKQogewogI2lmIEVOQUJM RShNRURJQV9TVFJFQU0pCisKKyNpZiBQTEFURk9STShNQUMpCisgICAgc3RhdGljIHN0ZDo6b25j ZV9mbGFnIG9uY2VGbGFnOworICAgIHN0YXRpYyBib29sIGVudGl0bGVkID0gdHJ1ZTsKKyAgICBz dGQ6OmNhbGxfb25jZShvbmNlRmxhZywgW10geworICAgICAgICBpZiAoIWN1cnJlbnRQcm9jZXNz SXNTYW5kYm94ZWQoKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBpbnQgcmVzdWx0 ID0gc2FuZGJveF9jaGVjayhnZXRwaWQoKSwgImRldmljZS1taWNyb3Bob25lIiwgU0FOREJPWF9G SUxURVJfTk9ORSk7CisgICAgICAgIGVudGl0bGVkID0gIXJlc3VsdDsKKyAgICAgICAgaWYgKHJl c3VsdCA9PSAtMSkKKyAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiRXJyb3IgY2hlY2tpbmcgJ2Rl dmljZS1taWNyb3Bob25lJyBzYW5kYm94IGFjY2VzcywgZXJybm89JWxkIiwgKGxvbmcpZXJybm8p OworICAgIH0pOworICAgIGlmICghZW50aXRsZWQpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyNl bmRpZiAvLyBQTEFURk9STShNQUMpCisKKyAgICBzdGF0aWMgVENDQWNjZXNzUHJlZmxpZ2h0UmVz dWx0IGFjY2VzcyA9IFRDQ0FjY2Vzc1ByZWZsaWdodChnZXRrVENDU2VydmljZU1pY3JvcGhvbmUo KSwgTlVMTCk7CisgICAgaWYgKGFjY2VzcyA9PSBrVENDQWNjZXNzUHJlZmxpZ2h0R3JhbnRlZCkK KyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBzdGF0aWMgYm9vbCBpc1Blcm1pdHRlZCA9IGR5 bmFtaWNfb2JqY19jYXN0PE5TU3RyaW5nPihOU0J1bmRsZS5tYWluQnVuZGxlLmluZm9EaWN0aW9u YXJ5W0AiTlNNaWNyb3Bob25lVXNhZ2VEZXNjcmlwdGlvbiJdKS5sZW5ndGg7CiAgICAgcmV0dXJu IGlzUGVybWl0dGVkOwogI2Vsc2UKQEAgLTQxLDYgKzczLDI3IEBAIGJvb2wgVXNlck1lZGlhUGVy bWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6OnBlcm1pdHRlZFRvQ2FwdHVyZUF1ZGlvKCkKIGJv b2wgVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6OnBlcm1pdHRlZFRvQ2Fw dHVyZVZpZGVvKCkKIHsKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorCisjaWYgUExBVEZPUk0o TUFDKQorICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxhZyBvbmNlRmxhZzsKKyAgICBzdGF0aWMgYm9v bCBlbnRpdGxlZCA9IHRydWU7CisgICAgc3RkOjpjYWxsX29uY2Uob25jZUZsYWcsIFtdIHsKKyAg ICAgICAgaWYgKCFjdXJyZW50UHJvY2Vzc0lzU2FuZGJveGVkKCkpCisgICAgICAgICAgICByZXR1 cm47CisKKyAgICAgICAgaW50IHJlc3VsdCA9IHNhbmRib3hfY2hlY2soZ2V0cGlkKCksICJkZXZp Y2UtY2FtZXJhIiwgU0FOREJPWF9GSUxURVJfTk9ORSk7CisgICAgICAgIGVudGl0bGVkID0gIXJl c3VsdDsKKyAgICAgICAgaWYgKHJlc3VsdCA9PSAtMSkKKyAgICAgICAgICAgIFdURkxvZ0Fsd2F5 cygiRXJyb3IgY2hlY2tpbmcgJ2RldmljZS1jYW1lcmEnIHNhbmRib3ggYWNjZXNzLCBlcnJubz0l bGQiLCAobG9uZyllcnJubyk7CisgICAgfSk7CisgICAgaWYgKCFlbnRpdGxlZCkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKKworICAgIHN0YXRpYyBUQ0NB Y2Nlc3NQcmVmbGlnaHRSZXN1bHQgYWNjZXNzID0gVENDQWNjZXNzUHJlZmxpZ2h0KGdldGtUQ0NT ZXJ2aWNlQ2FtZXJhKCksIE5VTEwpOworICAgIGlmIChhY2Nlc3MgPT0ga1RDQ0FjY2Vzc1ByZWZs aWdodEdyYW50ZWQpCisgICAgICAgIHJldHVybiB0cnVlOworCiAgICAgc3RhdGljIGJvb2wgaXNQ ZXJtaXR0ZWQgPSBkeW5hbWljX29iamNfY2FzdDxOU1N0cmluZz4oTlNCdW5kbGUubWFpbkJ1bmRs ZS5pbmZvRGljdGlvbmFyeVtAIk5TQ2FtZXJhVXNhZ2VEZXNjcmlwdGlvbiJdKS5sZW5ndGg7CiAg ICAgcmV0dXJuIGlzUGVybWl0dGVkOwogI2Vsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1dlYlByZWZlcmVuY2VzQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9XZWJQcmVmZXJlbmNlc0NvY29hLm1tCmluZGV4IGI4ZDI2YmYwMzgzMDE5 MzQxYjdjNzQ2ZjNkNThlZGE3M2E2NDI3MzUuLmNlN2FjYTNjZWRlOGE1MjM5MzY0ZDQxODA1NjYz YmFlNzM1YTNlNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl YlByZWZlcmVuY2VzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev V2ViUHJlZmVyZW5jZXNDb2NvYS5tbQpAQCAtMzAsNiArMzAsMTAgQEAKICNpbXBvcnQgIldlYlBy ZWZlcmVuY2VzS2V5cy5oIgogI2ltcG9ydCA8d3RmL3RleHQvU3RyaW5nQ29uY2F0ZW5hdGUuaD4K IAorI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCisjaW5jbHVkZSAiVXNlck1lZGlhUGVybWlzc2lv blJlcXVlc3RNYW5hZ2VyUHJveHkuaCIKKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAog c3RhdGljIGlubGluZSBOU1N0cmluZyAqbWFrZUtleShjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIs IGNvbnN0IFN0cmluZyYga2V5UHJlZml4LCBjb25zdCBTdHJpbmcmIGtleSkKQEAgLTEzOSw2ICsx NDMsMTUgQEAgc3RhdGljIHZvaWQgc2V0RGVidWdVSW50MzJWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMo Y29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdAogdm9pZCBXZWJQcmVmZXJlbmNlczo6cGxh dGZvcm1Jbml0aWFsaXplU3RvcmUoKQogewogICAgIEBhdXRvcmVsZWFzZXBvb2wgeworI2lmIEVO QUJMRShNRURJQV9TVFJFQU0pCisgICAgICAgIC8vIE5PVEU6IFRoaXMgaXMgc2V0IGhlcmUsIGFu ZCBkb2VzIG5vdCBzZXR0aW5nIHRoZSBkZWZhdWx0IHVzaW5nIHRoZSAnZGVmYXVsdFZhbHVlJyBt ZWNoYW5pc20sIGJlY2F1c2UgdGhlCisgICAgICAgIC8vICdkZWZhdWx0VmFsdWUnIG11c3QgYmUg dGhlIHNhbWUgaW4gYm90aCB0aGUgVUlQcm9jZXNzIGFuZCBXZWJQcm9jZXNzLCB3aGljaCBtYXkg bm90IGJlIHRydWUgZm9yIGF1ZGlvCisgICAgICAgIC8vIGFuZCB2aWRlbyBjYXB0dXJlIHN0YXRl IGFzIHRoZSBXZWJQcm9jZXNzIGlzIG5vdCBlbnRpdGxlZCB0byB1c2UgdGhlIGNhbWVyYSBvciBt aWNyb3Bob25lIGJ5IGRlZmF1bHQuCisgICAgICAgIC8vIElmIG90aGVyIHByZWZlcmVuY2VzIG5l ZWQgdG8gZHluYW1pY2FsbHkgc2V0IHRoZSBpbml0aWFsIHZhbHVlIGJhc2VkIG9uIGhvc3QgYXBw IHN0YXRlLCB3ZSBzaG91bGQgZXh0ZW5kZWQKKyAgICAgICAgLy8gdGhlIGRlY2xhcmF0aXZlIGZv cm1hdCByYXRoZXIgdGhhbiBhZGRpbmcgbW9yZSBzcGVjaWFsIGNhc2VzIGhlcmUuCisgICAgICAg IG1fc3RvcmUuc2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjptZWRpYURldmlj ZXNFbmFibGVkS2V5KCksIFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5Ojpw ZXJtaXR0ZWRUb0NhcHR1cmVBdWRpbygpIHx8IFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFu YWdlclByb3h5OjpwZXJtaXR0ZWRUb0NhcHR1cmVWaWRlbygpKTsKKyNlbmRpZgorCiAjZGVmaW5l IElOSVRJQUxJWkVfREVCVUdfUFJFRkVSRU5DRV9GUk9NX05TVVNFUkRFRkFVTFRTKEtleVVwcGVy LCBLZXlMb3dlciwgVHlwZU5hbWUsIFR5cGUsIERlZmF1bHRWYWx1ZSwgSHVtYW5SZWFkYWJsZU5h bWUsIEh1bWFuUmVhZGFibGVEZXNjcmlwdGlvbikgXAogICAgICAgICBzZXREZWJ1ZyMjVHlwZU5h bWUjI1ZhbHVlSWZJblVzZXJEZWZhdWx0cyhtX2lkZW50aWZpZXIsIG1fa2V5UHJlZml4LCBtX2ds b2JhbERlYnVnS2V5UHJlZml4LCBXZWJQcmVmZXJlbmNlc0tleTo6S2V5TG93ZXIjI0tleSgpLCBt X3N0b3JlKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IGNlOWJlZTk4OTA0N2FhM2NlMzczZTc4ZGIxYTU5YWM5YzIzMGFmOTUuLjViYzViNTNi OTM2NTMwOWEzMThhZTJiZDNhYmM2Yzc2NTVkZjJmNjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAyMC0xMC0wNSAg RXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBEaXNhYmxl IG1lZGlhIGNhcHR1cmUgaWYgYW4gYXBwJ3MgZW50aXRsZW1lbnRzIHdvbid0IGFsbG93IGFjY2Vz cyB0byBjYXB0dXJlIGRldmljZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNzMxOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjk5NTYxMTI+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICAqIE1pbmlCcm93 c2VyL01pbmlCcm93c2VyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogTWlu aUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm06CisgICAgICAgICgtW0Jyb3dzZXJBcHBEZWxlZ2F0 ZSBkZWZhdWx0Q29uZmlndXJhdGlvbl0pOiBEb24ndCBzZXQgY29uZmlndXJhdGlvbi5fbWVkaWFD YXB0dXJlRW5hYmxlZCwKKyAgICAgICAgaXQgc2hvdWxkIG5vIGxvbmdlciBiZSBuZWNlc3Nhcnku CisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvSW5mby5wbGlzdDogUmVtb3ZlIHVubmVlZGVk IGtleXMuCisKKyAgICAgICAgKiBNb2JpbGVNaW5pQnJvd3Nlci9Nb2JpbGVNaW5pQnJvd3Nlci9J bmZvLnBsaXN0OiBEaXR0by4gQWRkIHVzYWdlIHN0cmluZ3MuCisKIDIwMjAtMTAtMDEgIEVyaWMg Q2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUHJldmVudCBtZWRp YSBjYXB0dXJlIHVubGVzcyB0aGUgYXBwbGljYXRpb24gaGFzIGNvcnJlY3QgZGF0YSBmb3Igc3lz dGVtIHBlcm1pc3Npb24gcHJvbXB0CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMv QXBwRGVsZWdhdGUubSBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5tCmluZGV4 IDQ5MjkyNWIxOTdkYWY5MTc4ZjE5YjJhNjBmNmM0NWIxMTAwODQ0OWMuLjdkNTM1ZWMxMzc1ZDYx NzcxZmZiOGU3ODYxYmU2NGI5ZjE0MzllZDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2Vy L21hYy9BcHBEZWxlZ2F0ZS5tCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0 ZS5tCkBAIC0xMzksNyArMTM5LDYgQEAgLSAoV0tXZWJWaWV3Q29uZmlndXJhdGlvbiAqKWRlZmF1 bHRDb25maWd1cmF0aW9uCiAgICAgICAgICAgICBbY29uZmlndXJhdGlvbi5wcmVmZXJlbmNlcyBf c2V0RW5hYmxlZDplbmFibGVkIGZvckludGVybmFsRGVidWdGZWF0dXJlOmZlYXR1cmVdOwogICAg ICAgICB9CiAKLSAgICAgICAgY29uZmlndXJhdGlvbi5fbWVkaWFDYXB0dXJlRW5hYmxlZCA9IFlF UzsKICAgICAgICAgY29uZmlndXJhdGlvbi5wcmVmZXJlbmNlcy5fZnVsbFNjcmVlbkVuYWJsZWQg PSBZRVM7CiAgICAgICAgIGNvbmZpZ3VyYXRpb24ucHJlZmVyZW5jZXMuX2FsbG93c1BpY3R1cmVJ blBpY3R1cmVNZWRpYVBsYXliYWNrID0gWUVTOwogICAgICAgICBjb25maWd1cmF0aW9uLnByZWZl cmVuY2VzLl9kZXZlbG9wZXJFeHRyYXNFbmFibGVkID0gWUVTOwpkaWZmIC0tZ2l0IGEvVG9vbHMv TWluaUJyb3dzZXIvbWFjL0luZm8ucGxpc3QgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvSW5mby5w bGlzdAppbmRleCA1M2Q2Mzg3NDYxZTc3YTllMTViZDAwNmRjYjU3N2Y5MmIzYmVhYmNmLi40ODVh YWI3YzY4MzQ0Njk4MTZkOGNlMmE4MjNiYTQwODc0MTI1OGQ4IDEwMDY0NAotLS0gYS9Ub29scy9N aW5pQnJvd3Nlci9tYWMvSW5mby5wbGlzdAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvSW5m by5wbGlzdApAQCAtNTIsMTAgKzUyLDYgQEAKIAkJCTxzdHJpbmc+RWRpdG9yPC9zdHJpbmc+CiAJ CTwvZGljdD4KIAk8L2FycmF5PgotICAgIDxrZXk+Y29tLmFwcGxlLnNlY3VyaXR5LmRldmljZS5j YW1lcmE8L2tleT4KLSAgICA8dHJ1ZS8+Ci0gICAgPGtleT5jb20uYXBwbGUuc2VjdXJpdHkuZGV2 aWNlLm1pY3JvcGhvbmU8L2tleT4KLSAgICA8dHJ1ZS8+CiAgICAgPGtleT5OU0NhbWVyYVVzYWdl RGVzY3JpcHRpb248L2tleT4KICAgICA8c3RyaW5nPlJlY29yZGluZyByYW5kb20gdmlkZW9zPC9z dHJpbmc+CiAgICAgPGtleT5OU01pY3JvcGhvbmVVc2FnZURlc2NyaXB0aW9uPC9rZXk+CmRpZmYg LS1naXQgYS9Ub29scy9Nb2JpbGVNaW5pQnJvd3Nlci9Nb2JpbGVNaW5pQnJvd3Nlci9JbmZvLnBs aXN0IGIvVG9vbHMvTW9iaWxlTWluaUJyb3dzZXIvTW9iaWxlTWluaUJyb3dzZXIvSW5mby5wbGlz dAppbmRleCA2NTFiYTU3NGMyZGUxODNiOWM2MDE3ZTc0NTYxYzQwY2UzNjY1NmNkLi42NmI1ZjA5 MjY0OWZkOGU5NjE3ZjM0YjNkODk3OTllYzc3NDc0ZjY4IDEwMDY0NAotLS0gYS9Ub29scy9Nb2Jp bGVNaW5pQnJvd3Nlci9Nb2JpbGVNaW5pQnJvd3Nlci9JbmZvLnBsaXN0CisrKyBiL1Rvb2xzL01v YmlsZU1pbmlCcm93c2VyL01vYmlsZU1pbmlCcm93c2VyL0luZm8ucGxpc3QKQEAgLTU0LDExICs1 NCw5IEBACiAJCTxrZXk+TlNBbGxvd3NBcmJpdHJhcnlMb2Fkc0luV2ViQ29udGVudDwva2V5Pgog CQk8dHJ1ZS8+CiAJPC9kaWN0PgotICAgIDxrZXk+Y29tLmFwcGxlLnNlY3VyaXR5LmRldmljZS5j YW1lcmE8L2tleT4KLSAgICA8dHJ1ZS8+Ci0gICAgPGtleT5jb20uYXBwbGUuc2VjdXJpdHkuZGV2 aWNlLm1pY3JvcGhvbmU8L2tleT4KLSAgICA8dHJ1ZS8+CiAgICAgPGtleT5OU0NhbWVyYVVzYWdl RGVzY3JpcHRpb248L2tleT4KLSAgICA8c3RyaW5nPkNhbWVyYSB1c2FnZSBkZXNjcmlwdGlvbjwv c3RyaW5nPgorICAgIDxzdHJpbmc+UmVjb3JkaW5nIHJhbmRvbSB2aWRlb3M8L3N0cmluZz4KKyAg ICA8a2V5Pk5TTWljcm9waG9uZVVzYWdlRGVzY3JpcHRpb248L2tleT4KKyAgICA8c3RyaW5nPlJl Y29yZGluZyByYW5kb20gYXVkaW88L3N0cmluZz4KIDwvZGljdD4KIDwvcGxpc3Q+Cg== 410594 2020-10-05 17:08:37 -0700 2020-10-05 18:21:16 -0700 Fix usage strings bug-217319-20201005170836.patch text/plain 2118 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MDE3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTg1NWI4ZTBlNGRkMGQ1YWUyYTE4ODRiZGZiZjViN2Rj MWM3ZjI4Ny4uOTFmOTMxMDk2YmNiMjY3N2UxOTZhMDY5OTI3ZWM2OTM1ZTUxZmQzMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIwLTEwLTA1ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgor CisgICAgICAgIERpc2FibGUgbWVkaWEgY2FwdHVyZSBpZiBhbiBhcHAncyBlbnRpdGxlbWVudHMg d29uJ3QgYWxsb3cgYWNjZXNzIHRvIGNhcHR1cmUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MzE5CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS82OTk1NjExMj4KKworICAgICAgICBVbnJldmlld2VkLCBhZGRyZXNzIHBvc3QtcmV2aWV3 IGNvbW1lbnRzLgorCisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL0luZm8ucGxpc3Q6IFVwZGF0 ZSBtZWRpYSBjYXB0dXJlIHVzYWdlIHN0cmluZ3MuCisgICAgICAgICogTW9iaWxlTWluaUJyb3dz ZXIvTW9iaWxlTWluaUJyb3dzZXIvSW5mby5wbGlzdDogRGl0dG8uCisKIDIwMjAtMTAtMDUgIEVy aWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRGlzYWJsZSBt ZWRpYSBjYXB0dXJlIGlmIGFuIGFwcCdzIGVudGl0bGVtZW50cyB3b24ndCBhbGxvdyBhY2Nlc3Mg dG8gY2FwdHVyZSBkZXZpY2VzCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvSW5m by5wbGlzdCBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9JbmZvLnBsaXN0CmluZGV4IDQ4NWFhYjdj NjgzNDQ2OTgxNmQ4Y2UyYTgyM2JhNDA4NzQxMjU4ZDguLjRlMmIxZjQ4MTlhZDUxMDNlNGNmMTcw OWI3YzUzYTY2ZThiMzk1ZTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9JbmZv LnBsaXN0CisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9JbmZvLnBsaXN0CkBAIC01Myw4ICs1 Myw4IEBACiAJCTwvZGljdD4KIAk8L2FycmF5PgogICAgIDxrZXk+TlNDYW1lcmFVc2FnZURlc2Ny aXB0aW9uPC9rZXk+Ci0gICAgPHN0cmluZz5SZWNvcmRpbmcgcmFuZG9tIHZpZGVvczwvc3RyaW5n PgorICAgIDxzdHJpbmc+UmVjb3JkaW5nIHZpZGVvIG9uIGJlaGFsZiBvZiB3ZWJzaXRlczwvc3Ry aW5nPgogICAgIDxrZXk+TlNNaWNyb3Bob25lVXNhZ2VEZXNjcmlwdGlvbjwva2V5PgotICAgIDxz dHJpbmc+UmVjb3JkaW5nIHJhbmRvbSBhdWRpbzwvc3RyaW5nPgorICAgIDxzdHJpbmc+UmVjb3Jk aW5nIGF1ZGlvIG9uIGJlaGFsZiBvZiB3ZWJzaXRlczwvc3RyaW5nPgogPC9kaWN0PgogPC9wbGlz dD4KZGlmZiAtLWdpdCBhL1Rvb2xzL01vYmlsZU1pbmlCcm93c2VyL01vYmlsZU1pbmlCcm93c2Vy L0luZm8ucGxpc3QgYi9Ub29scy9Nb2JpbGVNaW5pQnJvd3Nlci9Nb2JpbGVNaW5pQnJvd3Nlci9J bmZvLnBsaXN0CmluZGV4IDY2YjVmMDkyNjQ5ZmQ4ZTk2MTdmMzRiM2Q4OTc5OWVjNzc0NzRmNjgu LjJkMWJjNTgyZmJlNzY1Y2ZkYzQxMDVlZmU5ZWNjMWQ4MzIwY2M5NTkgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01vYmlsZU1pbmlCcm93c2VyL01vYmlsZU1pbmlCcm93c2VyL0luZm8ucGxpc3QKKysrIGIv VG9vbHMvTW9iaWxlTWluaUJyb3dzZXIvTW9iaWxlTWluaUJyb3dzZXIvSW5mby5wbGlzdApAQCAt NTUsOCArNTUsOCBAQAogCQk8dHJ1ZS8+CiAJPC9kaWN0PgogICAgIDxrZXk+TlNDYW1lcmFVc2Fn ZURlc2NyaXB0aW9uPC9rZXk+Ci0gICAgPHN0cmluZz5SZWNvcmRpbmcgcmFuZG9tIHZpZGVvczwv c3RyaW5nPgorICAgIDxzdHJpbmc+UmVjb3JkaW5nIHZpZGVvIG9uIGJlaGFsZiBvZiB3ZWJzaXRl czwvc3RyaW5nPgogICAgIDxrZXk+TlNNaWNyb3Bob25lVXNhZ2VEZXNjcmlwdGlvbjwva2V5Pgot ICAgIDxzdHJpbmc+UmVjb3JkaW5nIHJhbmRvbSBhdWRpbzwvc3RyaW5nPgorICAgIDxzdHJpbmc+ UmVjb3JkaW5nIGF1ZGlvIG9uIGJlaGFsZiBvZiB3ZWJzaXRlczwvc3RyaW5nPgogPC9kaWN0Pgog PC9wbGlzdD4K