206906 2020-01-28 14:16:08 -0800 Limit access to 'com.apple.SecurityService' and 'com.apple.ocspd' to systems that require it 2020-01-29 10:16:01 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED WONTFIX https://bugs.webkit.org/show_bug.cgi?id=206895 InRadar P2 Normal --- 206832 1 bfulgham bfulgham ap bfulgham pvollan webkit-bug-importer oldest_to_newest 1612164 0 bfulgham 2020-01-28 14:16:08 -0800 Make use of the Sandbox parameter features to allow WebKit to hint to the sandbox that it is running on a version of macOS that can benefit from updated system components. 1612216 1 webkit-bug-importer 2020-01-28 15:21:29 -0800 <rdar://problem/58971886> 1612219 2 389077 bfulgham 2020-01-28 15:25:00 -0800 Created attachment 389077 Patch 1612224 3 389077 pvollan 2020-01-28 15:38:44 -0800 Comment on attachment 389077 Patch R=me. 1612291 4 389077 ap 2020-01-28 18:05:21 -0800 Comment on attachment 389077 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=389077&action=review > Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:622 > + if (osVersionParts.size() < 3 || osVersionParts[2].toInt() <= 3) The logic looks wrong here. It seems exceeding unlikely that you are getting the right set of versions here. This means that 10.14.3 and 10.15.3 both need the parameter, but .4 updates do not. > Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:623 > + sandboxParameters.addParameter("_OS_NEEDS_EME_QUIRK", "YES"); We control all parameter names, what is the need for the leading underscore? 1612296 5 389100 bfulgham 2020-01-28 18:24:32 -0800 Created attachment 389100 Patch 1612297 6 389077 bfulgham 2020-01-28 18:33:39 -0800 Comment on attachment 389077 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=389077&action=review >> Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:622 >> + if (osVersionParts.size() < 3 || osVersionParts[2].toInt() <= 3) > > The logic looks wrong here. It seems exceeding unlikely that you are getting the right set of versions here. > > This means that 10.14.3 and 10.15.3 both need the parameter, but .4 updates do not. Doh! >> Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:623 >> + sandboxParameters.addParameter("_OS_NEEDS_EME_QUIRK", "YES"); > > We control all parameter names, what is the need for the leading underscore? Consistency with the other parameters that work like this. _OS_VERSION 1612309 7 389100 ap 2020-01-28 19:56:59 -0800 Comment on attachment 389100 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=389100&action=review > Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:621 > + if (osVersionParts[0].toInt() == 10 && osVersionParts[1].toInt() <= 15) { Can you put this into an #if block too, so that it’s easier to remove in the future? > Source/WebKit/WebProcess/com.apple.WebProcess.sb.in:674 > +(if (equal? (param "_OS_NEEDS_EME_QUIRK") "YES") Did you check how this behaves on old OS versions? I vaguely remember that profile may fail to compile when an undefined param is used. 1612531 8 bfulgham 2020-01-29 10:16:01 -0800 After talking with a few other people, we're going to do this slightly differently. 389077 2020-01-28 15:25:00 -0800 2020-01-28 18:24:30 -0800 Patch bug-206906-20200128152459.patch text/plain 4208 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1MzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdlYjllOGMxZTE4ZjM2YjFm OGRmZGY5NGViNjA5ZWNhOGY3YjI3ZTYuLjExNmYzMGRkMmZlMDFkMTIzMWZkYmM0NzQzZjg4MmUw MzgxNDA4MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDEtMjggIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgTGltaXQgYWNjZXNzIHRvICdj b20uYXBwbGUuU2VjdXJpdHlTZXJ2aWNlJyBhbmQgJ2NvbS5hcHBsZS5vY3NwZCcgdG8gc3lzdGVt cyB0aGF0IHJlcXVpcmUgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwNjkwNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTg5NzE4ODY+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDIwNjg5NSBz aG93ZWQgdGhhdCB3ZSBjb3VsZG4ndCBsaW1pdCBhY2Nlc3MgdG8gU2VjdXJpdHlTZXJ2aWNlL29j c3BkIGFjcm9zcyB0aGUgYm9hcmQuCisgICAgICAgIEluc3RlYWQsIHdlIHNob3VsZCBjaGVjayB0 aGUgcnVudGltZSBlbnZpcm9ubWVudCBhbmQgb25seSBvcGVuIHRoZSBtYWNoIGNvbm5lY3Rpb25z IHdoZW4KKyAgICAgICAgdGhlIHBsYXRmb3JtIHJlcXVpcmVzIGl0LgorCisgICAgICAgIFRlc3Rl ZCBieSBwbGF0Zm9ybS9tYWMvbWVkaWEvbWVkaWFjYXBhYmlsaXRpZXMvaGV2Yy1kZWNvZGluZ0lu Zm8taGRyLmh0bWwKKworICAgICAgICAqIEdQVVByb2Nlc3MvbWFjL2NvbS5hcHBsZS5XZWJLaXQu R1BVUHJvY2Vzcy5zYi5pbjogT25seSBvcGVuIHRoZSBzYW5kYm94IHdoZW4gbmVlZGVkLgorICAg ICAgICAqIFNoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbToKKyAgICAgICAgKFdlYktp dDo6aW5pdGlhbGl6ZVNhbmRib3hQYXJhbWV0ZXJzKTogQWRkIG5ldyBwYXJhbWV0ZXIgdG8gaW5k aWNhdGUgdGhlIHF1aXJrIGlzIG5lZWRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvbS5hcHBs ZS5XZWJQcm9jZXNzLnNiLmluOiBPbmx5IG9wZW4gdGhlIHNhbmRib3ggd2hlbiBuZWVkZWQuCisK IDIwMjAtMDEtMjggIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCB0ZXN0IGZpeCBhZnRlciByMjU1MjE3CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L0dQVVByb2Nlc3MvbWFjL2NvbS5hcHBsZS5XZWJLaXQuR1BVUHJvY2Vzcy5zYi5pbiBi L1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5HUFVQcm9jZXNz LnNiLmluCmluZGV4IDMyYTRlMjE4YzRkOWIwYmNlODRiOWQ2OGUxYWMzNTg0ZDllYmQ1MjcuLmVm NmUyNGJhZDUzOGY3NWI2ZmM0ZjM4ZmE5MWMyYjc2ZjRmZTFkODQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvR1BVUHJvY2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5HUFVQcm9jZXNzLnNiLmlu CisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5HUFVQ cm9jZXNzLnNiLmluCkBAIC02NDcsMTAgKzY0NywxMSBAQAogI2VuZGlmCiAKICNpZiBfX01BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxNjAwCi07OyBOZWVkZWQgdG8gc3VwcG9ydCBl bmNyeXB0ZWQgbWVkaWEgcGxheWJhY2sgPHJkYXI6Ly9wcm9ibGVtLzQwMDM4NDc4PgotKGFsbG93 IG1hY2gtbG9va3VwCi0gICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuU2VjdXJpdHlTZXJ2ZXIi KQotICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLm9jc3BkIikpCisoaWYgKGVxdWFsPyAocGFy YW0gIl9PU19ORUVEU19FTUVfUVVJUksiKSAiWUVTIikKKyAgICA7OyBOZWVkZWQgdG8gc3VwcG9y dCBlbmNyeXB0ZWQgbWVkaWEgcGxheWJhY2sgPHJkYXI6Ly9wcm9ibGVtLzQwMDM4NDc4PgorICAg IChhbGxvdyBtYWNoLWxvb2t1cAorICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5TZWN1 cml0eVNlcnZlciIpCisgICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLm9jc3BkIikpKQog I2VuZGlmCiAKIChhbGxvdyBmaWxlLXJlYWQqIGZpbGUtd3JpdGUqIChzdWJwYXRoICIvcHJpdmF0 ZS92YXIvZGIvbWRzL3N5c3RlbSIpKSA7OyBGSVhNRTogVGhpcyBzaG91bGQgYmUgcmVtb3ZlZCB3 aGVuIDxyZGFyOi8vcHJvYmxlbS85NTM4NDE0PiBpcyBmaXhlZC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tIGIvU291cmNlL1dlYktp dC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0KaW5kZXggMzhkYmIwY2I0MzdhM2Vm MDZhOTNkOWNjYzM3NzVmZjhmNTBhYTY0Ny4uOTk3YTVjNzZlYzNkZWZlZjcwNDNiYzY2YzdkZjU3 OTYxZGIxMDI2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFy eVByb2Nlc3NNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVBy b2Nlc3NNYWMubW0KQEAgLTYxOCw2ICs2MTgsMTAgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVNh bmRib3hQYXJhbWV0ZXJzKGNvbnN0IEF1eGlsaWFyeVByb2Nlc3NJbml0aWFsaXphdGlvblBhcmEK ICAgICAgICAgV1RGTG9nQWx3YXlzKCIlczogQ291bGRuJ3QgZmluZCBPUyBWZXJzaW9uXG4iLCBn ZXRwcm9nbmFtZSgpKTsKICAgICAgICAgZXhpdChFWF9OT1BFUk0pOwogICAgIH0KKyAgICBpZiAo b3NWZXJzaW9uUGFydHNbMF0udG9JbnQoKSA9PSAxMCAmJiBvc1ZlcnNpb25QYXJ0c1sxXS50b0lu dCgpIDw9IDE1KSB7CisgICAgICAgIGlmIChvc1ZlcnNpb25QYXJ0cy5zaXplKCkgPCAzIHx8IG9z VmVyc2lvblBhcnRzWzJdLnRvSW50KCkgPD0gMykKKyAgICAgICAgICAgIHNhbmRib3hQYXJhbWV0 ZXJzLmFkZFBhcmFtZXRlcigiX09TX05FRURTX0VNRV9RVUlSSyIsICJZRVMiKTsKKyAgICB9CiAg ICAgU3RyaW5nIG9zVmVyc2lvbiA9IG9zVmVyc2lvblBhcnRzWzBdICsgJy4nICsgb3NWZXJzaW9u UGFydHNbMV07CiAgICAgc2FuZGJveFBhcmFtZXRlcnMuYWRkUGFyYW1ldGVyKCJfT1NfVkVSU0lP TiIsIG9zVmVyc2lvbi51dGY4KCkuZGF0YSgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCmluZGV4IDViOTgxZjliODcxNzlm ZTAzZWVkMGE3NTRkNjA0NWUzMDAyYjI4MjUuLmZkYWI3OTMxMGQ0MjQ4ODViOTdjZjEyZWQ4MDQy ZDE5NmE2ODIyZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBw bGUuV2ViUHJvY2Vzcy5zYi5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFw cGxlLldlYlByb2Nlc3Muc2IuaW4KQEAgLTY3MSwxMCArNjcxLDExIEBACiAjZW5kaWYKIAogI2lm IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMDE2MDAKLTs7IE5lZWRlZCB0byBz dXBwb3J0IGVuY3J5cHRlZCBtZWRpYSBwbGF5YmFjayA8cmRhcjovL3Byb2JsZW0vNDAwMzg0Nzg+ Ci0oYWxsb3cgbWFjaC1sb29rdXAKLSAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5TZWN1cml0 eVNlcnZlciIpCi0gICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUub2NzcGQiKSkKKyhpZiAoZXF1 YWw/IChwYXJhbSAiX09TX05FRURTX0VNRV9RVUlSSyIpICJZRVMiKQorICAgIDs7IE5lZWRlZCB0 byBzdXBwb3J0IGVuY3J5cHRlZCBtZWRpYSBwbGF5YmFjayA8cmRhcjovL3Byb2JsZW0vNDAwMzg0 Nzg+CisgICAgKGFsbG93IG1hY2gtbG9va3VwCisgICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFw cGxlLlNlY3VyaXR5U2VydmVyIikKKyAgICAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUub2Nz cGQiKSkpCiAjZW5kaWYKIAogKGFsbG93IGZpbGUtcmVhZCogZmlsZS13cml0ZSogKHN1YnBhdGgg Ii9wcml2YXRlL3Zhci9kYi9tZHMvc3lzdGVtIikpIDs7IEZJWE1FOiBUaGlzIHNob3VsZCBiZSBy ZW1vdmVkIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzk1Mzg0MTQ+IGlzIGZpeGVkLgo= 389100 2020-01-28 18:24:32 -0800 2020-01-28 19:56:59 -0800 Patch bug-206906-20200128182431.patch text/plain 4242 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1MzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdlYjllOGMxZTE4ZjM2YjFm OGRmZGY5NGViNjA5ZWNhOGY3YjI3ZTYuLjExNmYzMGRkMmZlMDFkMTIzMWZkYmM0NzQzZjg4MmUw MzgxNDA4MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDEtMjggIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgTGltaXQgYWNjZXNzIHRvICdj b20uYXBwbGUuU2VjdXJpdHlTZXJ2aWNlJyBhbmQgJ2NvbS5hcHBsZS5vY3NwZCcgdG8gc3lzdGVt cyB0aGF0IHJlcXVpcmUgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwNjkwNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTg5NzE4ODY+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDIwNjg5NSBz aG93ZWQgdGhhdCB3ZSBjb3VsZG4ndCBsaW1pdCBhY2Nlc3MgdG8gU2VjdXJpdHlTZXJ2aWNlL29j c3BkIGFjcm9zcyB0aGUgYm9hcmQuCisgICAgICAgIEluc3RlYWQsIHdlIHNob3VsZCBjaGVjayB0 aGUgcnVudGltZSBlbnZpcm9ubWVudCBhbmQgb25seSBvcGVuIHRoZSBtYWNoIGNvbm5lY3Rpb25z IHdoZW4KKyAgICAgICAgdGhlIHBsYXRmb3JtIHJlcXVpcmVzIGl0LgorCisgICAgICAgIFRlc3Rl ZCBieSBwbGF0Zm9ybS9tYWMvbWVkaWEvbWVkaWFjYXBhYmlsaXRpZXMvaGV2Yy1kZWNvZGluZ0lu Zm8taGRyLmh0bWwKKworICAgICAgICAqIEdQVVByb2Nlc3MvbWFjL2NvbS5hcHBsZS5XZWJLaXQu R1BVUHJvY2Vzcy5zYi5pbjogT25seSBvcGVuIHRoZSBzYW5kYm94IHdoZW4gbmVlZGVkLgorICAg ICAgICAqIFNoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbToKKyAgICAgICAgKFdlYktp dDo6aW5pdGlhbGl6ZVNhbmRib3hQYXJhbWV0ZXJzKTogQWRkIG5ldyBwYXJhbWV0ZXIgdG8gaW5k aWNhdGUgdGhlIHF1aXJrIGlzIG5lZWRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvbS5hcHBs ZS5XZWJQcm9jZXNzLnNiLmluOiBPbmx5IG9wZW4gdGhlIHNhbmRib3ggd2hlbiBuZWVkZWQuCisK IDIwMjAtMDEtMjggIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCB0ZXN0IGZpeCBhZnRlciByMjU1MjE3CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L0dQVVByb2Nlc3MvbWFjL2NvbS5hcHBsZS5XZWJLaXQuR1BVUHJvY2Vzcy5zYi5pbiBi L1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5HUFVQcm9jZXNz LnNiLmluCmluZGV4IDMyYTRlMjE4YzRkOWIwYmNlODRiOWQ2OGUxYWMzNTg0ZDllYmQ1MjcuLmVm NmUyNGJhZDUzOGY3NWI2ZmM0ZjM4ZmE5MWMyYjc2ZjRmZTFkODQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvR1BVUHJvY2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5HUFVQcm9jZXNzLnNiLmlu CisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5HUFVQ cm9jZXNzLnNiLmluCkBAIC02NDcsMTAgKzY0NywxMSBAQAogI2VuZGlmCiAKICNpZiBfX01BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxNjAwCi07OyBOZWVkZWQgdG8gc3VwcG9ydCBl bmNyeXB0ZWQgbWVkaWEgcGxheWJhY2sgPHJkYXI6Ly9wcm9ibGVtLzQwMDM4NDc4PgotKGFsbG93 IG1hY2gtbG9va3VwCi0gICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuU2VjdXJpdHlTZXJ2ZXIi KQotICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLm9jc3BkIikpCisoaWYgKGVxdWFsPyAocGFy YW0gIl9PU19ORUVEU19FTUVfUVVJUksiKSAiWUVTIikKKyAgICA7OyBOZWVkZWQgdG8gc3VwcG9y dCBlbmNyeXB0ZWQgbWVkaWEgcGxheWJhY2sgPHJkYXI6Ly9wcm9ibGVtLzQwMDM4NDc4PgorICAg IChhbGxvdyBtYWNoLWxvb2t1cAorICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5TZWN1 cml0eVNlcnZlciIpCisgICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLm9jc3BkIikpKQog I2VuZGlmCiAKIChhbGxvdyBmaWxlLXJlYWQqIGZpbGUtd3JpdGUqIChzdWJwYXRoICIvcHJpdmF0 ZS92YXIvZGIvbWRzL3N5c3RlbSIpKSA7OyBGSVhNRTogVGhpcyBzaG91bGQgYmUgcmVtb3ZlZCB3 aGVuIDxyZGFyOi8vcHJvYmxlbS85NTM4NDE0PiBpcyBmaXhlZC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tIGIvU291cmNlL1dlYktp dC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0KaW5kZXggMzhkYmIwY2I0MzdhM2Vm MDZhOTNkOWNjYzM3NzVmZjhmNTBhYTY0Ny4uN2Q4NTI5OWI5ZDRmZmNmYTMwNDI5OWFjNTA3Yjc0 OTA3OWQwYmQ5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFy eVByb2Nlc3NNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVBy b2Nlc3NNYWMubW0KQEAgLTYxOCw2ICs2MTgsMTAgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVNh bmRib3hQYXJhbWV0ZXJzKGNvbnN0IEF1eGlsaWFyeVByb2Nlc3NJbml0aWFsaXphdGlvblBhcmEK ICAgICAgICAgV1RGTG9nQWx3YXlzKCIlczogQ291bGRuJ3QgZmluZCBPUyBWZXJzaW9uXG4iLCBn ZXRwcm9nbmFtZSgpKTsKICAgICAgICAgZXhpdChFWF9OT1BFUk0pOwogICAgIH0KKyAgICBpZiAo b3NWZXJzaW9uUGFydHNbMF0udG9JbnQoKSA9PSAxMCAmJiBvc1ZlcnNpb25QYXJ0c1sxXS50b0lu dCgpIDw9IDE1KSB7CisgICAgICAgIGlmIChvc1ZlcnNpb25QYXJ0c1sxXS50b0ludCgpIDwgMTUg fHwgb3NWZXJzaW9uUGFydHMuc2l6ZSgpIDwgMyB8fCBvc1ZlcnNpb25QYXJ0c1syXS50b0ludCgp IDw9IDMpCisgICAgICAgICAgICBzYW5kYm94UGFyYW1ldGVycy5hZGRQYXJhbWV0ZXIoIl9PU19O RUVEU19FTUVfUVVJUksiLCAiWUVTIik7CisgICAgfQogICAgIFN0cmluZyBvc1ZlcnNpb24gPSBv c1ZlcnNpb25QYXJ0c1swXSArICcuJyArIG9zVmVyc2lvblBhcnRzWzFdOwogICAgIHNhbmRib3hQ YXJhbWV0ZXJzLmFkZFBhcmFtZXRlcigiX09TX1ZFUlNJT04iLCBvc1ZlcnNpb24udXRmOCgpLmRh dGEoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUu V2ViUHJvY2Vzcy5zYi5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2Vi UHJvY2Vzcy5zYi5pbgppbmRleCA1Yjk4MWY5Yjg3MTc5ZmUwM2VlZDBhNzU0ZDYwNDVlMzAwMmIy ODI1Li5mZGFiNzkzMTBkNDI0ODg1Yjk3Y2YxMmVkODA0MmQxOTZhNjgyMmZmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4KKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCkBA IC02NzEsMTAgKzY3MSwxMSBAQAogI2VuZGlmCiAKICNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlO X1JFUVVJUkVEIDwgMTAxNjAwCi07OyBOZWVkZWQgdG8gc3VwcG9ydCBlbmNyeXB0ZWQgbWVkaWEg cGxheWJhY2sgPHJkYXI6Ly9wcm9ibGVtLzQwMDM4NDc4PgotKGFsbG93IG1hY2gtbG9va3VwCi0g ICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuU2VjdXJpdHlTZXJ2ZXIiKQotICAgIChnbG9iYWwt bmFtZSAiY29tLmFwcGxlLm9jc3BkIikpCisoaWYgKGVxdWFsPyAocGFyYW0gIl9PU19ORUVEU19F TUVfUVVJUksiKSAiWUVTIikKKyAgICA7OyBOZWVkZWQgdG8gc3VwcG9ydCBlbmNyeXB0ZWQgbWVk aWEgcGxheWJhY2sgPHJkYXI6Ly9wcm9ibGVtLzQwMDM4NDc4PgorICAgIChhbGxvdyBtYWNoLWxv b2t1cAorICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5TZWN1cml0eVNlcnZlciIpCisg ICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLm9jc3BkIikpKQogI2VuZGlmCiAKIChhbGxv dyBmaWxlLXJlYWQqIGZpbGUtd3JpdGUqIChzdWJwYXRoICIvcHJpdmF0ZS92YXIvZGIvbWRzL3N5 c3RlbSIpKSA7OyBGSVhNRTogVGhpcyBzaG91bGQgYmUgcmVtb3ZlZCB3aGVuIDxyZGFyOi8vcHJv YmxlbS85NTM4NDE0PiBpcyBmaXhlZC4K