205493 2019-12-20 03:52:10 -0800 Remove the certificate info checks related to getUserMedia 2019-12-20 09:58:22 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1600676 0 youennf 2019-12-20 03:52:10 -0800 Remove the certificate info checks related to getUserMedia 1600696 1 386207 youennf 2019-12-20 05:16:32 -0800 Created attachment 386207 Patch 1600723 2 386207 eric.carlson 2019-12-20 08:09:08 -0800 Comment on attachment 386207 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=386207&action=review > Source/WebCore/ChangeLog:8 > + Now that we make navigator.mediaDevices SecureContext, we do not need to do the same checks in UserMediaController. s/Now that we make navigator.mediaDevices SecureContext/Now that navigator.mediaDevices is SecureContext/ 1600746 3 386218 youennf 2019-12-20 08:59:02 -0800 Created attachment 386218 Patch 1600778 4 386218 commit-queue 2019-12-20 09:57:07 -0800 Comment on attachment 386218 Patch Clearing flags on attachment: 386218 Committed r253827: <https://trac.webkit.org/changeset/253827> 1600779 5 commit-queue 2019-12-20 09:57:08 -0800 All reviewed patches have been landed. Closing bug. 1600780 6 webkit-bug-importer 2019-12-20 09:58:22 -0800 <rdar://problem/58117615> 386207 2019-12-20 05:16:32 -0800 2019-12-20 08:58:57 -0800 Patch bug-205493-20191220141631.patch text/plain 4956 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzZlYTNmYzA4ZmVhOWFh ZDBjNTE4YTVhYjlmNzI0NjkxZGUwN2Q4Zi4uZmQ3ZTA5NDU5MTlmMWUyN2ZkZjdhYjQyNmU1MWQ2 ZTIwMGY5MDQwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTEyLTIwICB5b3Vl bm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdGhlIGNlcnRp ZmljYXRlIGluZm8gY2hlY2tzIHJlbGF0ZWQgdG8gZ2V0VXNlck1lZGlhCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU0OTMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3cgdGhhdCB3ZSBtYWtlIG5hdmln YXRvci5tZWRpYURldmljZXMgU2VjdXJlQ29udGV4dCwgd2UgZG8gbm90IG5lZWQgdG8gZG8gdGhl IHNhbWUgY2hlY2tzIGluIFVzZXJNZWRpYUNvbnRyb2xsZXIuCisgICAgICAgIFVzZXJNZWRpYUNv bnRyb2xsZXIgd2FzIGFsc28gY2hlY2tpbmcgdGhlIGNlcnRpZmljYXRlIGluZm8gd2hpY2ggaXMg bm90IG5lY2Vzc2FyeSBmb3IgTWVkaWFEZXZpY2VzLgorICAgICAgICBDb3ZlcmVkIGJ5IG1hbnVh bCB0ZXN0cy4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vVXNlck1lZGlhQ29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc1NlY3VyZSk6CisgICAgICAgIChXZWJDb3Jl Ojppc0FsbG93ZWRCeUZlYXR1cmVQb2xpY3kpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 aXNBbGxvd2VkVG9Vc2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6VXNlck1lZGlhQ29u dHJvbGxlcjo6Y2FuQ2FsbEdldFVzZXJNZWRpYSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpVc2VyTWVkaWFDb250cm9sbGVyOjpsb2dHZXRVc2VyTWVkaWFEZW5pYWwpOiBEZWxl dGVkLgorCiAyMDE5LTEyLTIwICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAog ICAgICAgICBET01Qcm9taXNlOjp3aGVuUHJvbWlzZUlzU2V0dGxlZCBpcyBhc3NlcnRpbmcgaW4g c2VydmljZSB3b3JrZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vVXNlck1lZGlhQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL1VzZXJNZWRpYUNvbnRyb2xsZXIuY3BwCmluZGV4IDY3YjViMjY4MzVhNTljM2E2 N2Y4Y2Q1Y2FhMzY0MDY2ZTI3MzNkZTMuLjQwZDVhNmU3Mzc2MGRkY2E4OGQ3MTM3NWQ1NDkxMjA2 NWY2YjI2NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v VXNlck1lZGlhQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9Vc2VyTWVkaWFDb250cm9sbGVyLmNwcApAQCAtNjEsMTggKzYxLDYgQEAgdm9pZCBw cm92aWRlVXNlck1lZGlhVG8oUGFnZSogcGFnZSwgVXNlck1lZGlhQ2xpZW50KiBjbGllbnQpCiAg ICAgVXNlck1lZGlhQ29udHJvbGxlcjo6cHJvdmlkZVRvKHBhZ2UsIFVzZXJNZWRpYUNvbnRyb2xs ZXI6OnN1cHBsZW1lbnROYW1lKCksIG1ha2VVbmlxdWU8VXNlck1lZGlhQ29udHJvbGxlcj4oY2xp ZW50KSk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgYm9vbCBpc1NlY3VyZShEb2N1bWVudExvYWRlciYg ZG9jdW1lbnRMb2FkZXIpCi17Ci0gICAgYXV0byYgcmVzcG9uc2UgPSBkb2N1bWVudExvYWRlci5y ZXNwb25zZSgpOwotICAgIEFTU0VSVChyZXNwb25zZS5jZXJ0aWZpY2F0ZUluZm8oKSk7Ci0KLSAg ICBpZiAoU2VjdXJpdHlPcmlnaW46OmlzTG9jYWxIb3N0T3JMb29wYmFja0lQQWRkcmVzcyhkb2N1 bWVudExvYWRlci5yZXNwb25zZSgpLnVybCgpLmhvc3QoKSkpCi0gICAgICAgIHJldHVybiB0cnVl OwotICAgIHJldHVybiBMZWdhY3lTY2hlbWVSZWdpc3RyeTo6c2hvdWxkVHJlYXRVUkxTY2hlbWVB c1NlY3VyZShyZXNwb25zZS51cmwoKS5wcm90b2NvbCgpLnRvU3RyaW5nV2l0aG91dENvcHlpbmco KSkKLSAgICAgICAgJiYgcmVzcG9uc2UuY2VydGlmaWNhdGVJbmZvKCkKLSAgICAgICAgJiYgIXJl c3BvbnNlLmNlcnRpZmljYXRlSW5mbygpLT5jb250YWluc05vblJvb3RTSEExU2lnbmVkQ2VydGlm aWNhdGUoKTsKLX0KLQogc3RhdGljIGlubGluZSBib29sIGlzQWxsb3dlZEJ5RmVhdHVyZVBvbGlj eShjb25zdCBGZWF0dXJlUG9saWN5JiBmZWF0dXJlUG9saWN5LCBjb25zdCBTZWN1cml0eU9yaWdp bkRhdGEmIG9yaWdpbiwgT3B0aW9uU2V0PFVzZXJNZWRpYUNvbnRyb2xsZXI6OkNhcHR1cmVUeXBl PiB0eXBlcykKIHsKICAgICBpZiAoKHR5cGVzICYgVXNlck1lZGlhQ29udHJvbGxlcjo6Q2FwdHVy ZVR5cGU6OkNhbWVyYSkgJiYgIWZlYXR1cmVQb2xpY3kuYWxsb3dzKEZlYXR1cmVQb2xpY3k6OlR5 cGU6OkNhbWVyYSwgb3JpZ2luKSkKQEAgLTExMiwxOSArMTAwLDkgQEAgVXNlck1lZGlhQ29udHJv bGxlcjo6R2V0VXNlck1lZGlhQWNjZXNzIFVzZXJNZWRpYUNvbnRyb2xsZXI6OmNhbkNhbGxHZXRV c2VyTWVkaWEKIHsKICAgICBBU1NFUlQoIXR5cGVzLmlzRW1wdHkoKSk7CiAKLSAgICBib29sIHJl cXVpcmVzU2VjdXJlQ29ubmVjdGlvbiA9IHRydWU7Ci0gICAgaWYgKGF1dG8gcGFnZSA9IGRvY3Vt ZW50LnBhZ2UoKSkKLSAgICAgICAgcmVxdWlyZXNTZWN1cmVDb25uZWN0aW9uID0gcGFnZS0+c2V0 dGluZ3MoKS5tZWRpYUNhcHR1cmVSZXF1aXJlc1NlY3VyZUNvbm5lY3Rpb24oKTsKLSAgICBhdXRv JiBkb2N1bWVudExvYWRlciA9ICpkb2N1bWVudC5sb2FkZXIoKTsKLSAgICBpZiAocmVxdWlyZXNT ZWN1cmVDb25uZWN0aW9uICYmICFpc1NlY3VyZShkb2N1bWVudExvYWRlcikpCi0gICAgICAgIHJl dHVybiBHZXRVc2VyTWVkaWFBY2Nlc3M6Okluc2VjdXJlRG9jdW1lbnQ7Ci0KICAgICBhdXRvJiB0 b3BEb2N1bWVudCA9IGRvY3VtZW50LnRvcERvY3VtZW50KCk7CiAgICAgaWYgKCZkb2N1bWVudCAh PSAmdG9wRG9jdW1lbnQpIHsKICAgICAgICAgZm9yIChhdXRvKiBhbmNlc3RvckRvY3VtZW50ID0g JmRvY3VtZW50OyBhbmNlc3RvckRvY3VtZW50ICE9ICZ0b3BEb2N1bWVudDsgYW5jZXN0b3JEb2N1 bWVudCA9IGFuY2VzdG9yRG9jdW1lbnQtPnBhcmVudERvY3VtZW50KCkpIHsKLSAgICAgICAgICAg IGlmIChyZXF1aXJlc1NlY3VyZUNvbm5lY3Rpb24gJiYgIWlzU2VjdXJlKCphbmNlc3RvckRvY3Vt ZW50LT5sb2FkZXIoKSkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIEdldFVzZXJNZWRpYUFjY2Vz czo6SW5zZWN1cmVQYXJlbnQ7Ci0KICAgICAgICAgICAgIGF1dG8gc3RhdHVzID0gaXNBbGxvd2Vk VG9Vc2UoKmFuY2VzdG9yRG9jdW1lbnQsIHRvcERvY3VtZW50LCB0eXBlcyk7CiAgICAgICAgICAg ICBpZiAoc3RhdHVzICE9IEdldFVzZXJNZWRpYUFjY2Vzczo6Q2FuQ2FsbCkKICAgICAgICAgICAg ICAgICByZXR1cm4gc3RhdHVzOwpAQCAtMTUyLDEyICsxMzAsNiBAQCB2b2lkIFVzZXJNZWRpYUNv bnRyb2xsZXI6OmxvZ0dldFVzZXJNZWRpYURlbmlhbChEb2N1bWVudCYgZG9jdW1lbnQsIEdldFVz ZXJNZWRpYQogICAgIH0KIAogICAgIHN3aXRjaCAoYWNjZXNzKSB7Ci0gICAgY2FzZSBVc2VyTWVk aWFDb250cm9sbGVyOjpHZXRVc2VyTWVkaWFBY2Nlc3M6Okluc2VjdXJlRG9jdW1lbnQ6Ci0gICAg ICAgIGRvbVdpbmRvdy5wcmludEVycm9yTWVzc2FnZShtYWtlU3RyaW5nKCJUcnlpbmcgdG8gY2Fs bCAiLCBjYWxsZXJOYW1lLCAiIGZyb20gYW4gaW5zZWN1cmUgZG9jdW1lbnQuIikpOwotICAgICAg ICBicmVhazsKLSAgICBjYXNlIFVzZXJNZWRpYUNvbnRyb2xsZXI6OkdldFVzZXJNZWRpYUFjY2Vz czo6SW5zZWN1cmVQYXJlbnQ6Ci0gICAgICAgIGRvbVdpbmRvdy5wcmludEVycm9yTWVzc2FnZSht YWtlU3RyaW5nKCJUcnlpbmcgdG8gY2FsbCAiLCBjYWxsZXJOYW1lLCAiIGZyb20gYSBkb2N1bWVu dCB3aXRoIGFuIGluc2VjdXJlIHBhcmVudCBmcmFtZS4iKSk7Ci0gICAgICAgIGJyZWFrOwogICAg IGNhc2UgVXNlck1lZGlhQ29udHJvbGxlcjo6R2V0VXNlck1lZGlhQWNjZXNzOjpCbG9ja2VkQnlQ YXJlbnQ6CiAgICAgICAgIGRvbVdpbmRvdy5wcmludEVycm9yTWVzc2FnZShtYWtlU3RyaW5nKCJU aGUgdG9wLWxldmVsIGZyYW1lIGhhcyBwcmV2ZW50ZWQgYSBkb2N1bWVudCB3aXRoIGEgZGlmZmVy ZW50IHNlY3VyaXR5IG9yaWdpbiBmcm9tIGNhbGxpbmcgIiwgY2FsbGVyTmFtZSwgIi4iKSk7CiAg ICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9Vc2VyTWVkaWFDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL1VzZXJNZWRpYUNvbnRyb2xsZXIuaAppbmRleCBhNDVhZTM1NTU1MDk4YmRiN2E1NmY2 YTI0Nzg3MDNjODdlZGNmYzZjLi5iZDJmY2Y0NWIwY2ZmN2I3MzIwMTI1YWM2ODRhMjNhYjRlZjli M2NkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1VzZXJN ZWRpYUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L1VzZXJNZWRpYUNvbnRyb2xsZXIuaApAQCAtNTMsOCArNTMsNiBAQCBwdWJsaWM6CiAKICAgICBl bnVtIGNsYXNzIEdldFVzZXJNZWRpYUFjY2VzcyB7CiAgICAgICAgIENhbkNhbGwsCi0gICAgICAg IEluc2VjdXJlRG9jdW1lbnQsCi0gICAgICAgIEluc2VjdXJlUGFyZW50LAogICAgICAgICBCbG9j a2VkQnlQYXJlbnQsCiAgICAgICAgIEJsb2NrZWRCeUZlYXR1cmVQb2xpY3ksCiAgICAgfTsK 386218 2019-12-20 08:59:02 -0800 2019-12-20 09:57:07 -0800 Patch bug-205493-20191220175900.patch text/plain 4956 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzODIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVlM2IwNWVjMjBhNzBl MmI0YmJhOWU4YzQxNzZjZjY2MGQxZGQxYS4uNWI5ZmY5NjNjMGZiMDgyNzgyOGVjZWY2N2JiNDA4 ZTNmZmVhZWMwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTEyLTIwICB5b3Vl bm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdGhlIGNlcnRp ZmljYXRlIGluZm8gY2hlY2tzIHJlbGF0ZWQgdG8gZ2V0VXNlck1lZGlhCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU0OTMKKworICAgICAgICBSZXZp ZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgTm93IHRoYXQgbmF2aWdhdG9yLm1lZGlh RGV2aWNlcyBpcyBTZWN1cmVDb250ZXh0LCB3ZSBkbyBub3QgbmVlZCB0byBkbyB0aGUgc2FtZSBj aGVja3MgaW4gVXNlck1lZGlhQ29udHJvbGxlci4KKyAgICAgICAgVXNlck1lZGlhQ29udHJvbGxl ciB3YXMgYWxzbyBjaGVja2luZyB0aGUgY2VydGlmaWNhdGUgaW5mbyB3aGljaCBpcyBub3QgbmVj ZXNzYXJ5IGZvciBNZWRpYURldmljZXMuCisgICAgICAgIENvdmVyZWQgYnkgbWFudWFsIHRlc3Rz LgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFDb250cm9sbGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmlzU2VjdXJlKToKKyAgICAgICAgKFdlYkNvcmU6OmlzQWxs b3dlZEJ5RmVhdHVyZVBvbGljeSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjppc0FsbG93 ZWRUb1VzZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpVc2VyTWVkaWFDb250cm9sbGVy OjpjYW5DYWxsR2V0VXNlck1lZGlhIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlVzZXJNZWRpYUNvbnRyb2xsZXI6OmxvZ0dldFVzZXJNZWRpYURlbmlhbCk6IERlbGV0ZWQuCisK IDIwMTktMTItMjAgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAg IEludmFsaWRhdGUgb25seSBhZmZlY3RlZCBlbGVtZW50cyBhZnRlciBtZWRpYSBxdWVyeSBldmFs dWF0aW9uIGNoYW5nZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vVXNlck1lZGlhQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL1VzZXJNZWRpYUNvbnRyb2xsZXIuY3BwCmluZGV4IDY3YjViMjY4MzVhNTljM2E2 N2Y4Y2Q1Y2FhMzY0MDY2ZTI3MzNkZTMuLjQwZDVhNmU3Mzc2MGRkY2E4OGQ3MTM3NWQ1NDkxMjA2 NWY2YjI2NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v VXNlck1lZGlhQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9Vc2VyTWVkaWFDb250cm9sbGVyLmNwcApAQCAtNjEsMTggKzYxLDYgQEAgdm9pZCBw cm92aWRlVXNlck1lZGlhVG8oUGFnZSogcGFnZSwgVXNlck1lZGlhQ2xpZW50KiBjbGllbnQpCiAg ICAgVXNlck1lZGlhQ29udHJvbGxlcjo6cHJvdmlkZVRvKHBhZ2UsIFVzZXJNZWRpYUNvbnRyb2xs ZXI6OnN1cHBsZW1lbnROYW1lKCksIG1ha2VVbmlxdWU8VXNlck1lZGlhQ29udHJvbGxlcj4oY2xp ZW50KSk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgYm9vbCBpc1NlY3VyZShEb2N1bWVudExvYWRlciYg ZG9jdW1lbnRMb2FkZXIpCi17Ci0gICAgYXV0byYgcmVzcG9uc2UgPSBkb2N1bWVudExvYWRlci5y ZXNwb25zZSgpOwotICAgIEFTU0VSVChyZXNwb25zZS5jZXJ0aWZpY2F0ZUluZm8oKSk7Ci0KLSAg ICBpZiAoU2VjdXJpdHlPcmlnaW46OmlzTG9jYWxIb3N0T3JMb29wYmFja0lQQWRkcmVzcyhkb2N1 bWVudExvYWRlci5yZXNwb25zZSgpLnVybCgpLmhvc3QoKSkpCi0gICAgICAgIHJldHVybiB0cnVl OwotICAgIHJldHVybiBMZWdhY3lTY2hlbWVSZWdpc3RyeTo6c2hvdWxkVHJlYXRVUkxTY2hlbWVB c1NlY3VyZShyZXNwb25zZS51cmwoKS5wcm90b2NvbCgpLnRvU3RyaW5nV2l0aG91dENvcHlpbmco KSkKLSAgICAgICAgJiYgcmVzcG9uc2UuY2VydGlmaWNhdGVJbmZvKCkKLSAgICAgICAgJiYgIXJl c3BvbnNlLmNlcnRpZmljYXRlSW5mbygpLT5jb250YWluc05vblJvb3RTSEExU2lnbmVkQ2VydGlm aWNhdGUoKTsKLX0KLQogc3RhdGljIGlubGluZSBib29sIGlzQWxsb3dlZEJ5RmVhdHVyZVBvbGlj eShjb25zdCBGZWF0dXJlUG9saWN5JiBmZWF0dXJlUG9saWN5LCBjb25zdCBTZWN1cml0eU9yaWdp bkRhdGEmIG9yaWdpbiwgT3B0aW9uU2V0PFVzZXJNZWRpYUNvbnRyb2xsZXI6OkNhcHR1cmVUeXBl PiB0eXBlcykKIHsKICAgICBpZiAoKHR5cGVzICYgVXNlck1lZGlhQ29udHJvbGxlcjo6Q2FwdHVy ZVR5cGU6OkNhbWVyYSkgJiYgIWZlYXR1cmVQb2xpY3kuYWxsb3dzKEZlYXR1cmVQb2xpY3k6OlR5 cGU6OkNhbWVyYSwgb3JpZ2luKSkKQEAgLTExMiwxOSArMTAwLDkgQEAgVXNlck1lZGlhQ29udHJv bGxlcjo6R2V0VXNlck1lZGlhQWNjZXNzIFVzZXJNZWRpYUNvbnRyb2xsZXI6OmNhbkNhbGxHZXRV c2VyTWVkaWEKIHsKICAgICBBU1NFUlQoIXR5cGVzLmlzRW1wdHkoKSk7CiAKLSAgICBib29sIHJl cXVpcmVzU2VjdXJlQ29ubmVjdGlvbiA9IHRydWU7Ci0gICAgaWYgKGF1dG8gcGFnZSA9IGRvY3Vt ZW50LnBhZ2UoKSkKLSAgICAgICAgcmVxdWlyZXNTZWN1cmVDb25uZWN0aW9uID0gcGFnZS0+c2V0 dGluZ3MoKS5tZWRpYUNhcHR1cmVSZXF1aXJlc1NlY3VyZUNvbm5lY3Rpb24oKTsKLSAgICBhdXRv JiBkb2N1bWVudExvYWRlciA9ICpkb2N1bWVudC5sb2FkZXIoKTsKLSAgICBpZiAocmVxdWlyZXNT ZWN1cmVDb25uZWN0aW9uICYmICFpc1NlY3VyZShkb2N1bWVudExvYWRlcikpCi0gICAgICAgIHJl dHVybiBHZXRVc2VyTWVkaWFBY2Nlc3M6Okluc2VjdXJlRG9jdW1lbnQ7Ci0KICAgICBhdXRvJiB0 b3BEb2N1bWVudCA9IGRvY3VtZW50LnRvcERvY3VtZW50KCk7CiAgICAgaWYgKCZkb2N1bWVudCAh PSAmdG9wRG9jdW1lbnQpIHsKICAgICAgICAgZm9yIChhdXRvKiBhbmNlc3RvckRvY3VtZW50ID0g JmRvY3VtZW50OyBhbmNlc3RvckRvY3VtZW50ICE9ICZ0b3BEb2N1bWVudDsgYW5jZXN0b3JEb2N1 bWVudCA9IGFuY2VzdG9yRG9jdW1lbnQtPnBhcmVudERvY3VtZW50KCkpIHsKLSAgICAgICAgICAg IGlmIChyZXF1aXJlc1NlY3VyZUNvbm5lY3Rpb24gJiYgIWlzU2VjdXJlKCphbmNlc3RvckRvY3Vt ZW50LT5sb2FkZXIoKSkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIEdldFVzZXJNZWRpYUFjY2Vz czo6SW5zZWN1cmVQYXJlbnQ7Ci0KICAgICAgICAgICAgIGF1dG8gc3RhdHVzID0gaXNBbGxvd2Vk VG9Vc2UoKmFuY2VzdG9yRG9jdW1lbnQsIHRvcERvY3VtZW50LCB0eXBlcyk7CiAgICAgICAgICAg ICBpZiAoc3RhdHVzICE9IEdldFVzZXJNZWRpYUFjY2Vzczo6Q2FuQ2FsbCkKICAgICAgICAgICAg ICAgICByZXR1cm4gc3RhdHVzOwpAQCAtMTUyLDEyICsxMzAsNiBAQCB2b2lkIFVzZXJNZWRpYUNv bnRyb2xsZXI6OmxvZ0dldFVzZXJNZWRpYURlbmlhbChEb2N1bWVudCYgZG9jdW1lbnQsIEdldFVz ZXJNZWRpYQogICAgIH0KIAogICAgIHN3aXRjaCAoYWNjZXNzKSB7Ci0gICAgY2FzZSBVc2VyTWVk aWFDb250cm9sbGVyOjpHZXRVc2VyTWVkaWFBY2Nlc3M6Okluc2VjdXJlRG9jdW1lbnQ6Ci0gICAg ICAgIGRvbVdpbmRvdy5wcmludEVycm9yTWVzc2FnZShtYWtlU3RyaW5nKCJUcnlpbmcgdG8gY2Fs bCAiLCBjYWxsZXJOYW1lLCAiIGZyb20gYW4gaW5zZWN1cmUgZG9jdW1lbnQuIikpOwotICAgICAg ICBicmVhazsKLSAgICBjYXNlIFVzZXJNZWRpYUNvbnRyb2xsZXI6OkdldFVzZXJNZWRpYUFjY2Vz czo6SW5zZWN1cmVQYXJlbnQ6Ci0gICAgICAgIGRvbVdpbmRvdy5wcmludEVycm9yTWVzc2FnZSht YWtlU3RyaW5nKCJUcnlpbmcgdG8gY2FsbCAiLCBjYWxsZXJOYW1lLCAiIGZyb20gYSBkb2N1bWVu dCB3aXRoIGFuIGluc2VjdXJlIHBhcmVudCBmcmFtZS4iKSk7Ci0gICAgICAgIGJyZWFrOwogICAg IGNhc2UgVXNlck1lZGlhQ29udHJvbGxlcjo6R2V0VXNlck1lZGlhQWNjZXNzOjpCbG9ja2VkQnlQ YXJlbnQ6CiAgICAgICAgIGRvbVdpbmRvdy5wcmludEVycm9yTWVzc2FnZShtYWtlU3RyaW5nKCJU aGUgdG9wLWxldmVsIGZyYW1lIGhhcyBwcmV2ZW50ZWQgYSBkb2N1bWVudCB3aXRoIGEgZGlmZmVy ZW50IHNlY3VyaXR5IG9yaWdpbiBmcm9tIGNhbGxpbmcgIiwgY2FsbGVyTmFtZSwgIi4iKSk7CiAg ICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9Vc2VyTWVkaWFDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL1VzZXJNZWRpYUNvbnRyb2xsZXIuaAppbmRleCBhNDVhZTM1NTU1MDk4YmRiN2E1NmY2 YTI0Nzg3MDNjODdlZGNmYzZjLi5iZDJmY2Y0NWIwY2ZmN2I3MzIwMTI1YWM2ODRhMjNhYjRlZjli M2NkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1VzZXJN ZWRpYUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L1VzZXJNZWRpYUNvbnRyb2xsZXIuaApAQCAtNTMsOCArNTMsNiBAQCBwdWJsaWM6CiAKICAgICBl bnVtIGNsYXNzIEdldFVzZXJNZWRpYUFjY2VzcyB7CiAgICAgICAgIENhbkNhbGwsCi0gICAgICAg IEluc2VjdXJlRG9jdW1lbnQsCi0gICAgICAgIEluc2VjdXJlUGFyZW50LAogICAgICAgICBCbG9j a2VkQnlQYXJlbnQsCiAgICAgICAgIEJsb2NrZWRCeUZlYXR1cmVQb2xpY3ksCiAgICAgfTsK