167669 2017-01-31 15:14:17 -0800 [WebRTC][WebKit2] Support expanding the sandbox to allow microphone access at process launch 2017-01-31 22:09:19 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 124288 1 bfulgham bfulgham achristensen bfulgham commit-queue youennf oldest_to_newest 1271922 0 bfulgham 2017-01-31 15:14:17 -0800 Due to <rdar://problem/29448368> we need to expand the sandbox to encompass the microphone hardware at the launch of the WebProcess. Once this radar is fixed, lived switching between allowing and denying microphone state at the Sandbox level will work properly. This change should be viewed as a temporary workaround until the underlying bug is fixed. We do not want to limit microphone access granularity to WebProcess launch. 1271923 1 bfulgham 2017-01-31 15:14:53 -0800 <rdar://problem/29974333> 1271925 2 300269 bfulgham 2017-01-31 15:18:54 -0800 Created attachment 300269 Patch 1271971 3 300269 achristensen 2017-01-31 16:14:08 -0800 Comment on attachment 300269 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300269&action=review We definitely need this, but don't we also need to call SandboxExtension::create and consume and revoke it? > Source/WebKit2/UIProcess/WebProcessPool.cpp:579 > + // FIXME: Remove this and related parameter when <rdar://problem/29448368> is fixed. I don't think we need this comment. 1271976 4 bfulgham 2017-01-31 16:21:35 -0800 (In reply to comment #3) > Comment on attachment 300269 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=300269&action=review > > We definitely need this, but don't we also need to call > SandboxExtension::create and consume and revoke it? Isn't that handled by the SandboxExtension::consumePermanently(...) call we make in WebProcessCocoa? SandboxExtension::createHandleForGenericExtension calls into WKSandboxExtensionCreate. SandboxExtension::consumePermanently calls WKSandboxExtensionConsume and WKSandboxExtensionDestroy internally. 1271978 5 300269 youennf 2017-01-31 16:32:30 -0800 Comment on attachment 300269 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300269&action=review > Source/WebKit2/UIProcess/WebProcessPool.cpp:578 > +#if ENABLE(WEB_RTC) This should probably be ENABLE(MEDIA_STREAM) and mediaStreamEnabled() 1271992 6 300285 bfulgham 2017-01-31 17:26:25 -0800 Created attachment 300285 Patch 1272057 7 300285 commit-queue 2017-01-31 22:09:16 -0800 Comment on attachment 300285 Patch Clearing flags on attachment: 300285 Committed r211470: <http://trac.webkit.org/changeset/211470> 1272058 8 commit-queue 2017-01-31 22:09:19 -0800 All reviewed patches have been landed. Closing bug. 300269 2017-01-31 15:18:54 -0800 2017-01-31 17:26:23 -0800 Patch bug-167669-20170131151644.patch text/plain 6751 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMTQ1MCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE3LTAxLTMxICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJSVENdW1dlYktpdDJd IFN1cHBvcnQgZXhwYW5kaW5nIHRoZSBzYW5kYm94IHRvIGFsbG93IG1pY3JvcGhvbmUgYWNjZXNz IGF0IHByb2Nlc3MgbGF1bmNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjc2NjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI5OTc0MzMzPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdl IGltcGxlbWVudHMgYSB0ZW1wb3Jhcnkgd29ya2Fyb3VuZCB0byA8cmRhcjovL3Byb2JsZW0vMjk0 NDgzNjg+IHRvIGFsbG93IHVzIHRvIGRvIGxpdmUKKyAgICAgICAgdGVzdGluZyBvZiBXZWJSVEMg bWljcm9waG9uZSBhY2Nlc3MuIEl0IHNob3VsZCBiZSByZW1vdmVkIHdoZW4gdGhhdCB1bmRlcmx5 aW5nIGJ1ZyBpcyBmaXhlZC4KKworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIGEgbmV3IHByb2Nl c3MgY3JlYXRpb24gcGFyYW1ldGVyIHRoYXQgaW5kaWNhdGVzIHdoZXRoZXIgd2Ugd2lzaCB0byBl eHBhbmQgdGhlCisgICAgICAgIHNhbmRib3ggdG8gYWxsb3cgbWljcm9waG9uZSBhY2Nlc3MuCisK KyAgICAgICAgVGVzdGVkIGJ5IFdlYlJUQyBzdWl0ZSAocGFydCBvZiBhbm90aGVyIHNldCBvZiBi dWdzKS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2Rl KTogU2VyaWFsaXplIHRoZSBhdWRpbyBhY2Nlc3MgZW50aXRsZW1lbnQgaGFuZGxlLgorICAgICAg ICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOiBEaXR0by4K KyAgICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3NQb29sOjpjcmVhdGVOZXdXZWJQcm9jZXNzKTogQ3JlYXRlIGFuIGVudGl0bGVtZW50IGhh bmRsZSBhbmQgcGFzcyBhbG9uZyB0bworICAgICAgICB0aGUgY2hpbGQgcHJvY2Vzcy4KKyAgICAg ICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6IElmIGFuIGF1ZGlv IGVudGl0bGVtZW50IChmb3IgdGhlIG1pY3JvcGhvbmUpCisgICAgICAgIHdhcyBkZXNpcmVkLCBl eHBhbmQgdGhlIHNhbmRib3ggdG8gaW5jbHVkZSBhY2Nlc3MuCisKIDIwMTctMDEtMzEgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgbW9yZSBDUkFT SCBjYWxscyB0byB0cnkgdG8gZmlndXJlIG91dCB3aHkgd2UncmUgZmFpbGluZyB0byBzZW5kIG1h Y2ggcG9ydHMgb3ZlciB0aGUgd2lyZQpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMjExNDQx KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykg MjAxMC0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAo QykgMjAxMC0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNzgsNiArNzgsNyBAQCB2b2lkIFdlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnM6OmVuY29kCiAjZW5kaWYKICAgICBlbmNvZGVyIDw8IG1lZGlhS2V5U3Rv cmFnZURpcmVjdG9yeTsKICAgICBlbmNvZGVyIDw8IG1lZGlhS2V5U3RvcmFnZURpcmVjdG9yeUV4 dGVuc2lvbkhhbmRsZTsKKyAgICBlbmNvZGVyIDw8IGF1ZGlvQ2FwdHVyZUV4dGVuc2lvbkhhbmRs ZTsKICAgICBlbmNvZGVyIDw8IHNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbjsKICAgICBl bmNvZGVyIDw8IHVybFNjaGVtZXNSZWdpc3RlcmVkQXNFbXB0eURvY3VtZW50OwogICAgIGVuY29k ZXIgPDwgdXJsU2NoZW1lc1JlZ2lzdGVyZWRBc1NlY3VyZTsKQEAgLTE5NCw2ICsxOTUsOCBAQCBi b29sIFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kCiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMubWVkaWFLZXlTdG9yYWdl RGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlm ICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5hdWRpb0NhcHR1cmVFeHRlbnNpb25IYW5kbGUp KQorICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0 ZXJzLnNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbikpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVy ZWRBc0VtcHR5RG9jdW1lbnQpKQpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiAyMTE0NDEpCisrKyBT b3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMC0yMDE2 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMC0y MDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwpAQCAtODQsNiArODQsNyBAQCBzdHJ1Y3QgV2ViUHJvY2Vzc0NyZWF0aW9uUGFy YW1ldGVycyB7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIGNvbnRhaW5lclRlbXBvcmFy eURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsKICNlbmRpZgogICAgIFNhbmRib3hFeHRlbnNpb246 OkhhbmRsZSBtZWRpYUtleVN0b3JhZ2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CisgICAgU2Fu ZGJveEV4dGVuc2lvbjo6SGFuZGxlIGF1ZGlvQ2FwdHVyZUV4dGVuc2lvbkhhbmRsZTsKICAgICBT dHJpbmcgbWVkaWFLZXlTdG9yYWdlRGlyZWN0b3J5OwogCiAgICAgYm9vbCBzaG91bGRVc2VUZXN0 aW5nTmV0d29ya1Nlc3Npb247CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Bvb2wuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5jcHAJKHJldmlzaW9uIDIxMTQ0MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAv KgotICogQ29weXJpZ2h0IChDKSAyMDEwLTIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwLTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC03MSw2ICs3MSw3IEBA CiAjaW5jbHVkZSA8V2ViQ29yZS9MaW5rSGFzaC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTG9nSW5p dGlhbGl6YXRpb24uaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlUmVxdWVzdC5oPgorI2lu Y2x1ZGUgPFdlYkNvcmUvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oPgogI2luY2x1ZGUgPFdlYkNv cmUvU2Vzc2lvbklELmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9VUkxQYXJzZXIuaD4KICNpbmNsdWRl IDxydW50aW1lL0pTQ0lubGluZXMuaD4KQEAgLTU3NCw2ICs1NzUsMTIgQEAgV2ViUHJvY2Vzc1By b3h5JiBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlTgogICAgIGlmICghcGFyYW1ldGVycy5tZWRpYUtl eVN0b3JhZ2VEaXJlY3RvcnkuaXNFbXB0eSgpKQogICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpj cmVhdGVIYW5kbGVXaXRob3V0UmVzb2x2aW5nUGF0aChwYXJhbWV0ZXJzLm1lZGlhS2V5U3RvcmFn ZURpcmVjdG9yeSwgU2FuZGJveEV4dGVuc2lvbjo6UmVhZFdyaXRlLCBwYXJhbWV0ZXJzLm1lZGlh S2V5U3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAKKyNpZiBFTkFCTEUoV0VCX1JU QykKKyAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgYW5kIHJlbGF0ZWQgcGFyYW1ldGVyIHdoZW4g PHJkYXI6Ly9wcm9ibGVtLzI5NDQ4MzY4PiBpcyBmaXhlZC4KKyAgICBpZiAoUnVudGltZUVuYWJs ZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5wZWVyQ29ubmVjdGlvbkVuYWJsZWQoKSkKKyAg ICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yR2VuZXJpY0V4dGVuc2lvbigi Y29tLmFwcGxlLndlYmtpdC5taWNyb3Bob25lIiwgcGFyYW1ldGVycy5hdWRpb0NhcHR1cmVFeHRl bnNpb25IYW5kbGUpOworI2VuZGlmCisgICAgCiAgICAgcGFyYW1ldGVycy5zaG91bGRVc2VUZXN0 aW5nTmV0d29ya1Nlc3Npb24gPSBtX3Nob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbjsKIAog ICAgIHBhcmFtZXRlcnMuY2FjaGVNb2RlbCA9IGNhY2hlTW9kZWwoKTsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZp c2lvbiAyMTE0NDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nl c3NDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmln aHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0 IChDKSAyMDEwLTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC05OSw2ICs5OSw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6 cGxhdGZvcm1Jbml0aWFsaXplV2ViUHIKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVy bWFuZW50bHkocGFyYW1ldGVycy5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFu ZGxlKTsKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVy cy5tZWRpYUNhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBTYW5kYm94RXh0ZW5z aW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5tZWRpYUtleVN0b3JhZ2VEaXJlY3Rv cnlFeHRlbnNpb25IYW5kbGUpOworICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5l bnRseShwYXJhbWV0ZXJzLmF1ZGlvQ2FwdHVyZUV4dGVuc2lvbkhhbmRsZSk7CiAjaWYgUExBVEZP Uk0oSU9TKQogICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJhbWV0 ZXJzLmNvb2tpZVN0b3JhZ2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwogICAgIFNhbmRib3hF eHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJzLmNvbnRhaW5lckNhY2hlc0Rp cmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7Cg== 300285 2017-01-31 17:26:25 -0800 2017-01-31 22:09:16 -0800 Patch bug-167669-20170131172415.patch text/plain 7806 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMTQ1MCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE3LTAxLTMxICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJSVENdW1dlYktpdDJd IFN1cHBvcnQgZXhwYW5kaW5nIHRoZSBzYW5kYm94IHRvIGFsbG93IG1pY3JvcGhvbmUgYWNjZXNz IGF0IHByb2Nlc3MgbGF1bmNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjc2NjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI5OTc0MzMzPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdl IGltcGxlbWVudHMgYSB0ZW1wb3Jhcnkgd29ya2Fyb3VuZCB0byA8cmRhcjovL3Byb2JsZW0vMjk0 NDgzNjg+IHRvIGFsbG93IHVzIHRvIGRvIGxpdmUKKyAgICAgICAgdGVzdGluZyBvZiBXZWJSVEMg bWljcm9waG9uZSBhY2Nlc3MuIEl0IHNob3VsZCBiZSByZW1vdmVkIHdoZW4gdGhhdCB1bmRlcmx5 aW5nIGJ1ZyBpcyBmaXhlZC4KKworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIGEgbmV3IHByb2Nl c3MgY3JlYXRpb24gcGFyYW1ldGVyIHRoYXQgaW5kaWNhdGVzIHdoZXRoZXIgd2Ugd2lzaCB0byBl eHBhbmQgdGhlCisgICAgICAgIHNhbmRib3ggdG8gYWxsb3cgbWljcm9waG9uZSBhY2Nlc3MuCisK KyAgICAgICAgVGVzdGVkIGJ5IFdlYlJUQyBzdWl0ZSAocGFydCBvZiBhbm90aGVyIHNldCBvZiBi dWdzKS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2Rl KTogU2VyaWFsaXplIHRoZSBhdWRpbyBhY2Nlc3MgZW50aXRsZW1lbnQgaGFuZGxlLgorICAgICAg ICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOiBEaXR0by4K KyAgICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3NQb29sOjpjcmVhdGVOZXdXZWJQcm9jZXNzKTogQ3JlYXRlIGFuIGVudGl0bGVtZW50IGhh bmRsZSBhbmQgcGFzcyBhbG9uZyB0bworICAgICAgICB0aGUgY2hpbGQgcHJvY2Vzcy4KKyAgICAg ICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6IElmIGFuIGF1ZGlv IGVudGl0bGVtZW50IChmb3IgdGhlIG1pY3JvcGhvbmUpCisgICAgICAgIHdhcyBkZXNpcmVkLCBl eHBhbmQgdGhlIHNhbmRib3ggdG8gaW5jbHVkZSBhY2Nlc3MuCisKIDIwMTctMDEtMzEgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgbW9yZSBDUkFT SCBjYWxscyB0byB0cnkgdG8gZmlndXJlIG91dCB3aHkgd2UncmUgZmFpbGluZyB0byBzZW5kIG1h Y2ggcG9ydHMgb3ZlciB0aGUgd2lyZQpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMjExNDQx KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykg MjAxMC0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAo QykgMjAxMC0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNzgsNiArNzgsOSBAQCB2b2lkIFdlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnM6OmVuY29kCiAjZW5kaWYKICAgICBlbmNvZGVyIDw8IG1lZGlhS2V5U3Rv cmFnZURpcmVjdG9yeTsKICAgICBlbmNvZGVyIDw8IG1lZGlhS2V5U3RvcmFnZURpcmVjdG9yeUV4 dGVuc2lvbkhhbmRsZTsKKyNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorICAgIGVuY29kZXIgPDwg YXVkaW9DYXB0dXJlRXh0ZW5zaW9uSGFuZGxlOworI2VuZGlmCiAgICAgZW5jb2RlciA8PCBzaG91 bGRVc2VUZXN0aW5nTmV0d29ya1Nlc3Npb247CiAgICAgZW5jb2RlciA8PCB1cmxTY2hlbWVzUmVn aXN0ZXJlZEFzRW1wdHlEb2N1bWVudDsKICAgICBlbmNvZGVyIDw8IHVybFNjaGVtZXNSZWdpc3Rl cmVkQXNTZWN1cmU7CkBAIC0xOTQsNiArMTk3LDEwIEBAIGJvb2wgV2ViUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVyczo6ZGVjb2QKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rl ci5kZWNvZGUocGFyYW1ldGVycy5tZWRpYUtleVN0b3JhZ2VEaXJlY3RvcnlFeHRlbnNpb25IYW5k bGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CisjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKyAg ICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuYXVkaW9DYXB0dXJlRXh0ZW5zaW9uSGFu ZGxlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCiAgICAgaWYgKCFkZWNvZGVyLmRl Y29kZShwYXJhbWV0ZXJzLnNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbikpCiAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMudXJsU2No ZW1lc1JlZ2lzdGVyZWRBc0VtcHR5RG9jdW1lbnQpKQpJbmRleDogU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiAy MTE0NDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAo QykgMjAxMC0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdo dCAoQykgMjAxMC0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtODQsNiArODQsOSBAQCBzdHJ1Y3QgV2ViUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVycyB7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIGNvbnRh aW5lclRlbXBvcmFyeURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsKICNlbmRpZgogICAgIFNhbmRi b3hFeHRlbnNpb246OkhhbmRsZSBtZWRpYUtleVN0b3JhZ2VEaXJlY3RvcnlFeHRlbnNpb25IYW5k bGU7CisjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5k bGUgYXVkaW9DYXB0dXJlRXh0ZW5zaW9uSGFuZGxlOworI2VuZGlmCiAgICAgU3RyaW5nIG1lZGlh S2V5U3RvcmFnZURpcmVjdG9yeTsKIAogICAgIGJvb2wgc2hvdWxkVXNlVGVzdGluZ05ldHdvcmtT ZXNzaW9uOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu Y3BwCShyZXZpc2lvbiAyMTE0NDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Bvb2wuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHly aWdodCAoQykgMjAxMC0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENv cHlyaWdodCAoQykgMjAxMC0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAq CiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNjEsNiArNjEsNyBAQAogI2luY2x1ZGUg IldlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5oIgogI2luY2x1ZGUgIldlYlBhZ2VHcm91cC5o IgogI2luY2x1ZGUgIldlYlByZWZlcmVuY2VzLmgiCisjaW5jbHVkZSAiV2ViUHJlZmVyZW5jZXNL ZXlzLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIgogI2luY2x1 ZGUgIldlYlByb2Nlc3NNZXNzYWdlcy5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3NQb29sTWVzc2Fn ZXMuaCIKQEAgLTcxLDYgKzcyLDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0xpbmtIYXNoLmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9Mb2dJbml0aWFsaXphdGlvbi5oPgogI2luY2x1ZGUgPFdlYkNvcmUv UmVzb3VyY2VSZXF1ZXN0Lmg+CisjaW5jbHVkZSA8V2ViQ29yZS9SdW50aW1lRW5hYmxlZEZlYXR1 cmVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TZXNzaW9uSUQuaD4KICNpbmNsdWRlIDxXZWJDb3Jl L1VSTFBhcnNlci5oPgogI2luY2x1ZGUgPHJ1bnRpbWUvSlNDSW5saW5lcy5oPgpAQCAtNTc0LDYg KzU3NiwxMiBAQCBXZWJQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQb29sOjpjcmVhdGVOCiAgICAg aWYgKCFwYXJhbWV0ZXJzLm1lZGlhS2V5U3RvcmFnZURpcmVjdG9yeS5pc0VtcHR5KCkpCiAgICAg ICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZVdpdGhvdXRSZXNvbHZpbmdQYXRoKHBh cmFtZXRlcnMubWVkaWFLZXlTdG9yYWdlRGlyZWN0b3J5LCBTYW5kYm94RXh0ZW5zaW9uOjpSZWFk V3JpdGUsIHBhcmFtZXRlcnMubWVkaWFLZXlTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxl KTsKIAorI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCisgICAgLy8gRklYTUU6IFJlbW92ZSB0aGlz IGFuZCByZWxhdGVkIHBhcmFtZXRlciB3aGVuIDxyZGFyOi8vcHJvYmxlbS8yOTQ0ODM2OD4gaXMg Zml4ZWQuCisgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCku bWVkaWFTdHJlYW1FbmFibGVkKCkpCisgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhh bmRsZUZvckdlbmVyaWNFeHRlbnNpb24oImNvbS5hcHBsZS53ZWJraXQubWljcm9waG9uZSIsIHBh cmFtZXRlcnMuYXVkaW9DYXB0dXJlRXh0ZW5zaW9uSGFuZGxlKTsKKyNlbmRpZgorICAgIAogICAg IHBhcmFtZXRlcnMuc2hvdWxkVXNlVGVzdGluZ05ldHdvcmtTZXNzaW9uID0gbV9zaG91bGRVc2VU ZXN0aW5nTmV0d29ya1Nlc3Npb247CiAKICAgICBwYXJhbWV0ZXJzLmNhY2hlTW9kZWwgPSBjYWNo ZU1vZGVsKCk7CkBAIC03OTQsOCArODAyLDEyIEBAIFJlZjxXZWJQYWdlUHJveHk+IFdlYlByb2Nl c3NQb29sOjpjcmVhdGUKICAgICB9IGVsc2UgaWYgKHBhZ2VDb25maWd1cmF0aW9uLT5yZWxhdGVk UGFnZSgpKSB7CiAgICAgICAgIC8vIFNoYXJpbmcgcHJvY2Vzc2VzLCBlLmcuIHdoZW4gY3JlYXRp bmcgdGhlIHBhZ2UgdmlhIHdpbmRvdy5vcGVuKCkuCiAgICAgICAgIHByb2Nlc3MgPSAmcGFnZUNv bmZpZ3VyYXRpb24tPnJlbGF0ZWRQYWdlKCktPnByb2Nlc3MoKTsKLSAgICB9IGVsc2UKKyAgICB9 IGVsc2UgeworI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCisgICAgICAgIFJ1bnRpbWVFbmFibGVk RmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuc2V0TWVkaWFTdHJlYW1FbmFibGVkKHBhZ2VDb25m aWd1cmF0aW9uLT5wcmVmZXJlbmNlcygpLT5zdG9yZSgpLmdldEJvb2xWYWx1ZUZvcktleShXZWJQ cmVmZXJlbmNlc0tleTo6bWVkaWFTdHJlYW1FbmFibGVkS2V5KCkpKTsKKyNlbmRpZgogICAgICAg ICBwcm9jZXNzID0gJmNyZWF0ZU5ld1dlYlByb2Nlc3NSZXNwZWN0aW5nUHJvY2Vzc0NvdW50TGlt aXQoKTsKKyAgICB9CiAKICAgICByZXR1cm4gcHJvY2Vzcy0+Y3JlYXRlV2ViUGFnZShwYWdlQ2xp ZW50LCBXVEZNb3ZlKHBhZ2VDb25maWd1cmF0aW9uKSk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQkocmV2aXNpb24g MjExNDQxKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29j b2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChD KSAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykg MjAxMC0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucwpAQCAtOTksNiArOTksOSBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRm b3JtSW5pdGlhbGl6ZVdlYlByCiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVu dGx5KHBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7 CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMubWVk aWFDYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6 Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMubWVkaWFLZXlTdG9yYWdlRGlyZWN0b3J5RXh0 ZW5zaW9uSGFuZGxlKTsKKyNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorICAgIFNhbmRib3hFeHRl bnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJzLmF1ZGlvQ2FwdHVyZUV4dGVuc2lv bkhhbmRsZSk7CisjZW5kaWYKICNpZiBQTEFURk9STShJT1MpCiAgICAgU2FuZGJveEV4dGVuc2lv bjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMuY29va2llU3RvcmFnZURpcmVjdG9yeUV4 dGVuc2lvbkhhbmRsZSk7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5 KHBhcmFtZXRlcnMuY29udGFpbmVyQ2FjaGVzRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsK