234283 2021-12-13 18:40:47 -0800 REGRESSION(r286993): 2021-12-13 18:43:20 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 234180 1 commit-queue commit-queue bfulgham pascoe webkit-bug-importer oldest_to_newest 1823870 0 commit-queue 2021-12-13 18:40:47 -0800 https://commits.webkit.org/r286993 introduced a regression: This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1823872 1 447093 commit-queue 2021-12-13 18:40:58 -0800 Created attachment 447093 REVERT of r286993 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1823873 2 447093 pascoe 2021-12-13 18:42:51 -0800 Comment on attachment 447093 REVERT of r286993 Clearing flags on attachment: 447093 Committed r287002 (245213@trunk): <https://commits.webkit.org/245213@trunk> 1823874 3 pascoe 2021-12-13 18:42:54 -0800 All reviewed patches have been landed. Closing bug. 1823875 4 webkit-bug-importer 2021-12-13 18:43:20 -0800 <rdar://problem/86445521> 447093 2021-12-13 18:40:58 -0800 2021-12-13 18:41:45 -0800 REVERT of r286993 bug-234283-20211213184057.patch text/plain 33084 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY0YTc1N2ZmMmU2ZThm MzI4OTY0ODk3YjViOTdiOTFhODIyN2NjMi4uYWQxOTEwNDFjOGFlOTVhOTYzNDYwMjFmOGM3Mjdj YzM3NGIxYWI0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEyLTEzICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByZXZlcnRpbmcgcjI4Njk5My4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzNDI4MworCisKKyAgICAgICAgUmV2ZXJ0ZWQgY2hhbmdlc2V0OgorCisg ICAgICAgICJbV2ViQXV0aG5dIEFsbG93IHNhbWUtc2l0ZSwgY3Jvc3Mtb3JpZ2luIGlmcmFtZSBn ZXQoKSIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz NDE4MAorICAgICAgICBodHRwczovL2NvbW1pdHMud2Via2l0Lm9yZy9yMjg2OTkzCisKIDIwMjEt MTItMTMgIENocmlzdG9waGVyIFJlaWQgIDxjaHJpcy5yZWlkQHNvbnkuY29tPgogCiAgICAgICAg IFtDdXJsXSBJbXByb3ZlIGN1cmwncyBjb29raWUgY29uZm9ybWFuY2UgaW4gV1BUCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmlu ZGV4IDU1MDY0NzNiNDQzMGZmOTExNjE1ZDJiNzEzMDc5YWEzYmRhYjA5OGEuLmZhOGUxMjg1Yzk3 YzNjNjA4MDljOGMxY2E4NDhhZjViZmI1ZGY5MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMjEtMTItMTMgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgorCisg ICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjg2OTkzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MjgzCisKKworICAgICAgICBSZXZlcnRl ZCBjaGFuZ2VzZXQ6CisKKyAgICAgICAgIltXZWJBdXRobl0gQWxsb3cgc2FtZS1zaXRlLCBjcm9z cy1vcmlnaW4gaWZyYW1lIGdldCgpIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM0MTgwCisgICAgICAgIGh0dHBzOi8vY29tbWl0cy53ZWJraXQub3Jn L3IyODY5OTMKKwogMjAyMS0xMi0xMyAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxl LmNvbT4KIAogICAgICAgICBNb21lbnR1bSBFdmVudCBEaXNwYXRjaGVyOiBFeGNlc3NpdmUgImtp Y2siIGF0IHRoZSBiZWdpbm5pbmcgb2Ygc2Nyb2xsaW5nIChlc3BlY2lhbGx5IG9uIDYwZnBzIGRp c3BsYXlzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jcmVkZW50aWFsbWFu YWdlbWVudC9DcmVkZW50aWFsc0NvbnRhaW5lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2NyZWRlbnRpYWxtYW5hZ2VtZW50L0NyZWRlbnRpYWxzQ29udGFpbmVyLmNwcAppbmRleCBkNTZj NWRhNjk3NDlkYzUyMjhjZDQzZmUyYWQxYWNmMmIzYmEwM2IxLi5kMzA5ZDhiYTRkNTNjN2MyOTc2 OTJhODE3ZmEzZWFjYWIwMTkzNzkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2NyZWRlbnRpYWxtYW5hZ2VtZW50L0NyZWRlbnRpYWxzQ29udGFpbmVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2NyZWRlbnRpYWxtYW5hZ2VtZW50L0NyZWRlbnRpYWxzQ29udGFp bmVyLmNwcApAQCAtMzcsNyArMzcsNiBAQAogI2luY2x1ZGUgIkpTRE9NUHJvbWlzZURlZmVycmVk LmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCi0jaW5j bHVkZSAiV2ViQXV0aGVudGljYXRpb25Db25zdGFudHMuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCkBAIC00NiwyNyArNDUsMTkgQEAgQ3JlZGVudGlhbHNDb250YWluZXI6OkNyZWRlbnRpYWxz Q29udGFpbmVyKFdlYWtQdHI8RG9jdW1lbnQ+JiYgZG9jdW1lbnQpCiB7CiB9CiAKLVdlYkF1dGhu OjpTY29wZSBDcmVkZW50aWFsc0NvbnRhaW5lcjo6c2NvcGUoKQorYm9vbCBDcmVkZW50aWFsc0Nv bnRhaW5lcjo6ZG9lc0hhdmVTYW1lT3JpZ2luQXNJdHNBbmNlc3RvcnMoKQogeworICAgIC8vIFRo ZSBmb2xsb3dpbmcgaW1wbGVtZW50cyBodHRwczovL3czYy5naXRodWIuaW8vd2ViYXBwc2VjLWNy ZWRlbnRpYWwtbWFuYWdlbWVudC8jc2FtZS1vcmlnaW4td2l0aC1pdHMtYW5jZXN0b3JzCisgICAg Ly8gYXMgb2YgMTQgTm92ZW1iZXIgMjAxNy4KICAgICBpZiAoIW1fZG9jdW1lbnQpCi0gICAgICAg IHJldHVybiBXZWJBdXRobjo6U2NvcGU6OkNyb3NzT3JpZ2luOwotICAgIAotICAgIGJvb2wgaXNT YW1lT3JpZ2luID0gdHJ1ZTsKLSAgICBib29sIGlzU2FtZVNpdGUgPSB0cnVlOworICAgICAgICBy ZXR1cm4gZmFsc2U7CisKICAgICBhdXRvJiBvcmlnaW4gPSBtX2RvY3VtZW50LT5zZWN1cml0eU9y aWdpbigpOwotICAgIGF1dG8mIHVybCA9IG1fZG9jdW1lbnQtPnVybCgpOwogICAgIGZvciAoYXV0 byogZG9jdW1lbnQgPSBtX2RvY3VtZW50LT5wYXJlbnREb2N1bWVudCgpOyBkb2N1bWVudDsgZG9j dW1lbnQgPSBkb2N1bWVudC0+cGFyZW50RG9jdW1lbnQoKSkgewotICAgICAgICBpZiAoIW9yaWdp bi5pc1NhbWVPcmlnaW5Eb21haW4oZG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luKCkpICYmICFhcmVS ZWdpc3RyYWJsZURvbWFpbnNFcXVhbCh1cmwsIGRvY3VtZW50LT51cmwoKSkpCi0gICAgICAgICAg ICBpc1NhbWVTaXRlID0gZmFsc2U7CiAgICAgICAgIGlmICghb3JpZ2luLmlzU2FtZU9yaWdpbkFz KGRvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpKSkKLSAgICAgICAgICAgIGlzU2FtZU9yaWdpbiA9 IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KLQotICAgIGlmIChpc1Nh bWVPcmlnaW4pCi0gICAgICAgIHJldHVybiBXZWJBdXRobjo6U2NvcGU6OlNhbWVPcmlnaW47Ci0g ICAgaWYgKGlzU2FtZVNpdGUpCi0gICAgICAgIHJldHVybiBXZWJBdXRobjo6U2NvcGU6OlNhbWVT aXRlOwotICAgIHJldHVybiBXZWJBdXRobjo6U2NvcGU6OkNyb3NzT3JpZ2luOworICAgIHJldHVy biB0cnVlOwogfQogCiB2b2lkIENyZWRlbnRpYWxzQ29udGFpbmVyOjpnZXQoQ3JlZGVudGlhbFJl cXVlc3RPcHRpb25zJiYgb3B0aW9ucywgQ3JlZGVudGlhbFByb21pc2UmJiBwcm9taXNlKQpAQCAt OTgsNyArODksNyBAQCB2b2lkIENyZWRlbnRpYWxzQ29udGFpbmVyOjpnZXQoQ3JlZGVudGlhbFJl cXVlc3RPcHRpb25zJiYgb3B0aW9ucywgQ3JlZGVudGlhbFBybwogICAgICAgICByZXR1cm47CiAg ICAgfQogCi0gICAgbV9kb2N1bWVudC0+cGFnZSgpLT5hdXRoZW50aWNhdG9yQ29vcmRpbmF0b3Io KS5kaXNjb3ZlckZyb21FeHRlcm5hbFNvdXJjZSgqbV9kb2N1bWVudCwgb3B0aW9ucy5wdWJsaWNL ZXkudmFsdWUoKSwgc2NvcGUoKSwgV1RGTW92ZShvcHRpb25zLnNpZ25hbCksIFdURk1vdmUocHJv bWlzZSkpOworICAgIG1fZG9jdW1lbnQtPnBhZ2UoKS0+YXV0aGVudGljYXRvckNvb3JkaW5hdG9y KCkuZGlzY292ZXJGcm9tRXh0ZXJuYWxTb3VyY2UoKm1fZG9jdW1lbnQsIG9wdGlvbnMucHVibGlj S2V5LnZhbHVlKCksIGRvZXNIYXZlU2FtZU9yaWdpbkFzSXRzQW5jZXN0b3JzKCksIFdURk1vdmUo b3B0aW9ucy5zaWduYWwpLCBXVEZNb3ZlKHByb21pc2UpKTsKIH0KIAogdm9pZCBDcmVkZW50aWFs c0NvbnRhaW5lcjo6c3RvcmUoY29uc3QgQmFzaWNDcmVkZW50aWFsJiwgQ3JlZGVudGlhbFByb21p c2UmJiBwcm9taXNlKQpAQCAtMTMzLDcgKzEyNCw3IEBAIHZvaWQgQ3JlZGVudGlhbHNDb250YWlu ZXI6OmlzQ3JlYXRlKENyZWRlbnRpYWxDcmVhdGlvbk9wdGlvbnMmJiBvcHRpb25zLCBDcmVkZW50 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBtX2RvY3VtZW50LT5wYWdlKCktPmF1dGhl bnRpY2F0b3JDb29yZGluYXRvcigpLmNyZWF0ZSgqbV9kb2N1bWVudCwgb3B0aW9ucy5wdWJsaWNL ZXkudmFsdWUoKSwgc2NvcGUoKSwgV1RGTW92ZShvcHRpb25zLnNpZ25hbCksIFdURk1vdmUocHJv bWlzZSkpOworICAgIG1fZG9jdW1lbnQtPnBhZ2UoKS0+YXV0aGVudGljYXRvckNvb3JkaW5hdG9y KCkuY3JlYXRlKCptX2RvY3VtZW50LCBvcHRpb25zLnB1YmxpY0tleS52YWx1ZSgpLCBkb2VzSGF2 ZVNhbWVPcmlnaW5Bc0l0c0FuY2VzdG9ycygpLCBXVEZNb3ZlKG9wdGlvbnMuc2lnbmFsKSwgV1RG TW92ZShwcm9taXNlKSk7CiB9CiAKIHZvaWQgQ3JlZGVudGlhbHNDb250YWluZXI6OnByZXZlbnRT aWxlbnRBY2Nlc3MoRE9NUHJvbWlzZURlZmVycmVkPHZvaWQ+JiYgcHJvbWlzZSkgY29uc3QKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY3JlZGVudGlhbG1hbmFnZW1lbnQvQ3Jl ZGVudGlhbHNDb250YWluZXIuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY3JlZGVudGlhbG1h bmFnZW1lbnQvQ3JlZGVudGlhbHNDb250YWluZXIuaAppbmRleCA5YTZiMTJkZGMyMjI5OGY0N2Mx ZTMyOTYyYjZhNmNmMzllYjVkOTEyLi40ZTFiYjRlNWJlNWU1MjU1YTM3Nzg2ZjhlZjY5YjhhNzdk YWY1M2M3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2NyZWRlbnRpYWxtYW5h Z2VtZW50L0NyZWRlbnRpYWxzQ29udGFpbmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9jcmVkZW50aWFsbWFuYWdlbWVudC9DcmVkZW50aWFsc0NvbnRhaW5lci5oCkBAIC0zMiwxMCAr MzIsNiBAQAogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5jbHVkZSA8d3RmL1dlYWtQ dHIuaD4KIAotbmFtZXNwYWNlIFdlYkF1dGhuIHsKLWVudW0gY2xhc3MgU2NvcGU7Ci19Ci0KIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgRG9jdW1lbnQ7CkBAIC01OCw3ICs1NCw3IEBAIHB1 YmxpYzoKIHByaXZhdGU6CiAgICAgQ3JlZGVudGlhbHNDb250YWluZXIoV2Vha1B0cjxEb2N1bWVu dD4mJik7CiAKLSAgICBXZWJBdXRobjo6U2NvcGUgc2NvcGUoKTsKKyAgICBib29sIGRvZXNIYXZl U2FtZU9yaWdpbkFzSXRzQW5jZXN0b3JzKCk7CiAKICAgICBXZWFrUHRyPERvY3VtZW50PiBtX2Rv Y3VtZW50OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXV0aG4v QXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi YXV0aG4vQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmNwcAppbmRleCA1ZDQ3NzdiOGMwM2EwOTJm NzE5MWRlNDQ0NTQ4ZWE3ZjljNmYzYzc2Li40OTBmNjVhZTJlMTU1ZTE4YWNlOGMzNTJmNjFkNDA4 NGRmYzkwZmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1dGhuL0F1 dGhlbnRpY2F0b3JDb29yZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJhdXRobi9BdXRoZW50aWNhdG9yQ29vcmRpbmF0b3IuY3BwCkBAIC0zNCw3ICszNCw2IEBACiAj aW5jbHVkZSAiQXV0aGVudGljYXRvckNvb3JkaW5hdG9yQ2xpZW50LmgiCiAjaW5jbHVkZSAiQXV0 aGVudGljYXRvclJlc3BvbnNlRGF0YS5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCi0jaW5jbHVk ZSAiRmVhdHVyZVBvbGljeS5oIgogI2luY2x1ZGUgIkpTQmFzaWNDcmVkZW50aWFsLmgiCiAjaW5j bHVkZSAiSlNET01Qcm9taXNlRGVmZXJyZWQuaCIKICNpbmNsdWRlICJQdWJsaWNLZXlDcmVkZW50 aWFsLmgiCkBAIC0xMDUsNyArMTA0LDcgQEAgdm9pZCBBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6 OnNldENsaWVudChzdGQ6OnVuaXF1ZV9wdHI8QXV0aGVudGljYXRvckNvb3JkaW5hdG8KICAgICBt X2NsaWVudCA9IFdURk1vdmUoY2xpZW50KTsKIH0KIAotdm9pZCBBdXRoZW50aWNhdG9yQ29vcmRp bmF0b3I6OmNyZWF0ZShjb25zdCBEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFB1YmxpY0tleUNy ZWRlbnRpYWxDcmVhdGlvbk9wdGlvbnMmIG9wdGlvbnMsIFdlYkF1dGhuOjpTY29wZSBzY29wZSwg UmVmUHRyPEFib3J0U2lnbmFsPiYmIGFib3J0U2lnbmFsLCBDcmVkZW50aWFsUHJvbWlzZSYmIHBy b21pc2UpIGNvbnN0Cit2b2lkIEF1dGhlbnRpY2F0b3JDb29yZGluYXRvcjo6Y3JlYXRlKGNvbnN0 IERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgUHVibGljS2V5Q3JlZGVudGlhbENyZWF0aW9uT3B0 aW9ucyYgb3B0aW9ucywgYm9vbCBzYW1lT3JpZ2luV2l0aEFuY2VzdG9ycywgUmVmUHRyPEFib3J0 U2lnbmFsPiYmIGFib3J0U2lnbmFsLCBDcmVkZW50aWFsUHJvbWlzZSYmIHByb21pc2UpIGNvbnN0 CiB7CiAgICAgdXNpbmcgbmFtZXNwYWNlIEF1dGhlbnRpY2F0b3JDb29yZGluYXRvckludGVybmFs OwogCkBAIC0xMTUsNyArMTE0LDcgQEAgdm9pZCBBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6OmNy ZWF0ZShjb25zdCBEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFB1YmxpY0tleUMKICAgICAvLyBU aGUgZm9sbG93aW5nIGltcGxlbWVudHMgaHR0cHM6Ly93d3cudzMub3JnL1RSL3dlYmF1dGhuLyNj cmVhdGVDcmVkZW50aWFsIGFzIG9mIDUgRGVjZW1iZXIgMjAxNy4KICAgICAvLyBTdGVwIDEsIDMs IDE2IGFyZSBoYW5kbGVkIGJ5IHRoZSBjYWxsZXIuCiAgICAgLy8gU3RlcCAyLgotICAgIGlmIChz Y29wZSAhPSBXZWJBdXRobjo6U2NvcGU6OlNhbWVPcmlnaW4pIHsKKyAgICBpZiAoIXNhbWVPcmln aW5XaXRoQW5jZXN0b3JzKSB7CiAgICAgICAgIHByb21pc2UucmVqZWN0KEV4Y2VwdGlvbiB7IE5v dEFsbG93ZWRFcnJvciwgIlRoZSBvcmlnaW4gb2YgdGhlIGRvY3VtZW50IGlzIG5vdCB0aGUgc2Ft ZSBhcyBpdHMgYW5jZXN0b3JzLiJfcyB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTE0 OSw3ICsxNDgsNyBAQCB2b2lkIEF1dGhlbnRpY2F0b3JDb29yZGluYXRvcjo6Y3JlYXRlKGNvbnN0 IERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgUHVibGljS2V5QwogICAgIG9wdGlvbnMuZXh0ZW5z aW9ucyA9IEF1dGhlbnRpY2F0aW9uRXh0ZW5zaW9uc0NsaWVudElucHV0cyB7IFN0cmluZygpLCBw cm9jZXNzR29vZ2xlTGVnYWN5QXBwSWRTdXBwb3J0RXh0ZW5zaW9uKG9wdGlvbnMuZXh0ZW5zaW9u cywgb3B0aW9ucy5ycC5pZCkgfTsKIAogICAgIC8vIFN0ZXAgMTMtMTUuCi0gICAgYXV0byBjbGll bnREYXRhSnNvbiA9IGJ1aWxkQ2xpZW50RGF0YUpzb24oQ2xpZW50RGF0YVR5cGU6OkNyZWF0ZSwg b3B0aW9ucy5jaGFsbGVuZ2UsIGNhbGxlck9yaWdpbiwgc2NvcGUpOworICAgIGF1dG8gY2xpZW50 RGF0YUpzb24gPSBidWlsZENsaWVudERhdGFKc29uKENsaWVudERhdGFUeXBlOjpDcmVhdGUsIG9w dGlvbnMuY2hhbGxlbmdlLCBjYWxsZXJPcmlnaW4pOwogICAgIGF1dG8gY2xpZW50RGF0YUpzb25I YXNoID0gYnVpbGRDbGllbnREYXRhSnNvbkhhc2goY2xpZW50RGF0YUpzb24pOwogCiAgICAgLy8g U3RlcCA0LCAxNy0yMS4KQEAgLTE3Niw3ICsxNzUsNyBAQCB2b2lkIEF1dGhlbnRpY2F0b3JDb29y ZGluYXRvcjo6Y3JlYXRlKGNvbnN0IERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgUHVibGljS2V5 QwogICAgIG1fY2xpZW50LT5tYWtlQ3JlZGVudGlhbCgqZnJhbWUsIGNhbGxlck9yaWdpbiwgY2xp ZW50RGF0YUpzb25IYXNoLCBvcHRpb25zLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CiB9CiAKLXZvaWQg QXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjpkaXNjb3ZlckZyb21FeHRlcm5hbFNvdXJjZShjb25z dCBEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFB1YmxpY0tleUNyZWRlbnRpYWxSZXF1ZXN0T3B0 aW9ucyYgb3B0aW9ucywgV2ViQXV0aG46OlNjb3BlIHNjb3BlLCBSZWZQdHI8QWJvcnRTaWduYWw+ JiYgYWJvcnRTaWduYWwsIENyZWRlbnRpYWxQcm9taXNlJiYgcHJvbWlzZSkgY29uc3QKK3ZvaWQg QXV0aGVudGljYXRvckNvb3JkaW5hdG9yOjpkaXNjb3ZlckZyb21FeHRlcm5hbFNvdXJjZShjb25z dCBEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFB1YmxpY0tleUNyZWRlbnRpYWxSZXF1ZXN0T3B0 aW9ucyYgb3B0aW9ucywgYm9vbCBzYW1lT3JpZ2luV2l0aEFuY2VzdG9ycywgUmVmUHRyPEFib3J0 U2lnbmFsPiYmIGFib3J0U2lnbmFsLCBDcmVkZW50aWFsUHJvbWlzZSYmIHByb21pc2UpIGNvbnN0 CiB7CiAgICAgdXNpbmcgbmFtZXNwYWNlIEF1dGhlbnRpY2F0b3JDb29yZGluYXRvckludGVybmFs OwogCkBAIC0xODYsOCArMTg1LDcgQEAgdm9pZCBBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3I6OmRp c2NvdmVyRnJvbUV4dGVybmFsU291cmNlKGNvbnN0IERvY3VtZW50JiBkb2N1bWUKICAgICAvLyBU aGUgZm9sbG93aW5nIGltcGxlbWVudHMgaHR0cHM6Ly93d3cudzMub3JnL1RSL3dlYmF1dGhuLyNj cmVhdGVDcmVkZW50aWFsIGFzIG9mIDUgRGVjZW1iZXIgMjAxNy4KICAgICAvLyBTdGVwIDEsIDMs IDEzIGFyZSBoYW5kbGVkIGJ5IHRoZSBjYWxsZXIuCiAgICAgLy8gU3RlcCAyLgotICAgIC8vIFRo aXMgaW1wbGVtZW50cyBodHRwczovL3d3dy53My5vcmcvVFIvd2ViYXV0aG4tMi8jc2N0bi1wZXJt aXNzaW9ucy1wb2xpY3kgZXhjZXB0IG9ubHkgc2FtZS1zaXRlLCBjcm9zcy1vcmlnaW4gaXMgcGVy bWl0dGVkLgotICAgIGlmIChzY29wZSAhPSBXZWJBdXRobjo6U2NvcGU6OlNhbWVPcmlnaW4gJiYg IShzY29wZSA9PSBXZWJBdXRobjo6U2NvcGU6OlNhbWVTaXRlICYmIGlzRmVhdHVyZVBvbGljeUFs bG93ZWRCeURvY3VtZW50QW5kQWxsT3duZXJzKEZlYXR1cmVQb2xpY3k6OlR5cGU6OlB1YmxpY2tl eUNyZWRlbnRpYWxzR2V0UnVsZSwgZG9jdW1lbnQsIExvZ0ZlYXR1cmVQb2xpY3lGYWlsdXJlOjpO bykpKSB7CisgICAgaWYgKCFzYW1lT3JpZ2luV2l0aEFuY2VzdG9ycykgewogICAgICAgICBwcm9t aXNlLnJlamVjdChFeGNlcHRpb24geyBOb3RBbGxvd2VkRXJyb3IsICJUaGUgb3JpZ2luIG9mIHRo ZSBkb2N1bWVudCBpcyBub3QgdGhlIHNhbWUgYXMgaXRzIGFuY2VzdG9ycy4iX3MgfSk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CkBAIC0yMjEsNyArMjE5LDcgQEAgdm9pZCBBdXRoZW50aWNhdG9y Q29vcmRpbmF0b3I6OmRpc2NvdmVyRnJvbUV4dGVybmFsU291cmNlKGNvbnN0IERvY3VtZW50JiBk b2N1bWUKICAgICB9CiAKICAgICAvLyBTdGVwIDEwLTEyLgotICAgIGF1dG8gY2xpZW50RGF0YUpz b24gPSBidWlsZENsaWVudERhdGFKc29uKENsaWVudERhdGFUeXBlOjpHZXQsIG9wdGlvbnMuY2hh bGxlbmdlLCBjYWxsZXJPcmlnaW4sIHNjb3BlKTsKKyAgICBhdXRvIGNsaWVudERhdGFKc29uID0g YnVpbGRDbGllbnREYXRhSnNvbihDbGllbnREYXRhVHlwZTo6R2V0LCBvcHRpb25zLmNoYWxsZW5n ZSwgY2FsbGVyT3JpZ2luKTsKICAgICBhdXRvIGNsaWVudERhdGFKc29uSGFzaCA9IGJ1aWxkQ2xp ZW50RGF0YUpzb25IYXNoKGNsaWVudERhdGFKc29uKTsKIAogICAgIC8vIFN0ZXAgNCwgMTQtMTku CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1dGhuL0F1dGhlbnRpY2F0 b3JDb29yZGluYXRvci5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdXRobi9BdXRoZW50 aWNhdG9yQ29vcmRpbmF0b3IuaAppbmRleCBmNDk1MDMwODZjOWFjYzc5MTkzMzg3Zjc2ZmI2YTVi ZWEyMDc4MGFiLi5mZmZlMjBiMDAxNzRlZDI0ZTY4N2Y0NzdjOTA0NDJmNzViNjEzNTVlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1dGhuL0F1dGhlbnRpY2F0b3JDb29y ZGluYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXV0aG4vQXV0aGVudGlj YXRvckNvb3JkaW5hdG9yLmgKQEAgLTMxLDEwICszMSw2IEBACiAjaW5jbHVkZSA8d3RmL0Zvcndh cmQuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KIAotbmFtZXNwYWNlIFdlYkF1dGhu IHsKLWVudW0gY2xhc3MgU2NvcGU7Ci19Ci0KIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3Mg QWJvcnRTaWduYWw7CkBAIC01Nyw4ICs1Myw4IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9S VCB2b2lkIHNldENsaWVudChzdGQ6OnVuaXF1ZV9wdHI8QXV0aGVudGljYXRvckNvb3JkaW5hdG9y Q2xpZW50PiYmKTsKIAogICAgIC8vIFRoZSBmb2xsb3dpbmcgbWV0aG9kcyBpbXBsZW1lbnQgc3Rh dGljIG1ldGhvZHMgb2YgUHVibGljS2V5Q3JlZGVudGlhbC4KLSAgICB2b2lkIGNyZWF0ZShjb25z dCBEb2N1bWVudCYsIGNvbnN0IFB1YmxpY0tleUNyZWRlbnRpYWxDcmVhdGlvbk9wdGlvbnMmLCBX ZWJBdXRobjo6U2NvcGUsIFJlZlB0cjxBYm9ydFNpZ25hbD4mJiwgQ3JlZGVudGlhbFByb21pc2Um JikgY29uc3Q7Ci0gICAgdm9pZCBkaXNjb3ZlckZyb21FeHRlcm5hbFNvdXJjZShjb25zdCBEb2N1 bWVudCYsIGNvbnN0IFB1YmxpY0tleUNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9ucyYsIFdlYkF1dGhu OjpTY29wZSwgUmVmUHRyPEFib3J0U2lnbmFsPiYmLCBDcmVkZW50aWFsUHJvbWlzZSYmKSBjb25z dDsKKyAgICB2b2lkIGNyZWF0ZShjb25zdCBEb2N1bWVudCYsIGNvbnN0IFB1YmxpY0tleUNyZWRl bnRpYWxDcmVhdGlvbk9wdGlvbnMmLCBib29sIHNhbWVPcmlnaW5XaXRoQW5jZXN0b3JzLCBSZWZQ dHI8QWJvcnRTaWduYWw+JiYsIENyZWRlbnRpYWxQcm9taXNlJiYpIGNvbnN0OworICAgIHZvaWQg ZGlzY292ZXJGcm9tRXh0ZXJuYWxTb3VyY2UoY29uc3QgRG9jdW1lbnQmLCBjb25zdCBQdWJsaWNL ZXlDcmVkZW50aWFsUmVxdWVzdE9wdGlvbnMmLCBib29sIHNhbWVPcmlnaW5XaXRoQW5jZXN0b3Jz LCBSZWZQdHI8QWJvcnRTaWduYWw+JiYsIENyZWRlbnRpYWxQcm9taXNlJiYpIGNvbnN0OwogICAg IHZvaWQgaXNVc2VyVmVyaWZ5aW5nUGxhdGZvcm1BdXRoZW50aWNhdG9yQXZhaWxhYmxlKERPTVBy b21pc2VEZWZlcnJlZDxJRExCb29sZWFuPiYmKSBjb25zdDsKIAogICAgIHZvaWQgcmVzZXRVc2Vy R2VzdHVyZVJlcXVpcmVtZW50KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3dlYmF1dGhuL1dlYkF1dGhlbnRpY2F0aW9uQ29uc3RhbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYmF1dGhuL1dlYkF1dGhlbnRpY2F0aW9uQ29uc3RhbnRzLmgKaW5kZXggODRhNzdi ZWM3YmEyYTNjOTlhNzBjMzA0MzQyZDkxYTRmMTk3OTFhNC4uNDUxZmYzM2IyOGVkNTBiNWJhZjdi OWEzOWNlYTgyMDc3ZTUzMTE1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJhdXRobi9XZWJBdXRoZW50aWNhdGlvbkNvbnN0YW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViYXV0aG4vV2ViQXV0aGVudGljYXRpb25Db25zdGFudHMuaApAQCAtODAsMTMg KzgwLDMgQEAgZW51bSBjbGFzcyBDbGllbnREYXRhVHlwZSA6IGJvb2wgewogY29uc3QgY2hhciBM b2NhbEF1dGhlbnRpY2F0aW9yQWNjZXNzR3JvdXBbXSA9ICJjb20uYXBwbGUud2Via2l0LndlYmF1 dGhuIjsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQotCi1uYW1lc3BhY2UgV2ViQXV0aG4gewot Ci1lbnVtIGNsYXNzIFNjb3BlIHsKLSAgICBDcm9zc09yaWdpbiwKLSAgICBTYW1lT3JpZ2luLAot ICAgIFNhbWVTaXRlCi19OwotCi19IC8vIG5hbWVzcGFjZSBXZWJBdXRobgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdXRobi9XZWJBdXRoZW50aWNhdGlvblV0aWxzLmNw cCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXV0aG4vV2ViQXV0aGVudGljYXRpb25VdGls cy5jcHAKaW5kZXggOGQ0NzNjYTI1OWYyYzZiYzBmNWI1YTI2YjBjMmQyYTg0MGNkZjVmZS4uYzhl MGQyODJkNTNiMDg2ZDIxOTQ3ZmZlMTBmZDhmNjk4ZWQwNDg5NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJhdXRobi9XZWJBdXRoZW50aWNhdGlvblV0aWxzLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1dGhuL1dlYkF1dGhlbnRpY2F0aW9uVXRpbHMu Y3BwCkBAIC0xMzQsNyArMTM0LDcgQEAgVmVjdG9yPHVpbnQ4X3Q+IGJ1aWxkQXR0ZXN0YXRpb25P YmplY3QoVmVjdG9yPHVpbnQ4X3Q+JiYgYXV0aERhdGEsIFN0cmluZyYmIGZvcm0KIH0KIAogLy8g RklYTUUoMTgxOTQ4KTogQWRkIHRva2VuIGJpbmRpbmcgSUQuCi1SZWY8QXJyYXlCdWZmZXI+IGJ1 aWxkQ2xpZW50RGF0YUpzb24oQ2xpZW50RGF0YVR5cGUgdHlwZSwgY29uc3QgQnVmZmVyU291cmNl JiBjaGFsbGVuZ2UsIGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBvcmlnaW4sIFdlYkF1dGhuOjpTY29w ZSBzY29wZSkKK1JlZjxBcnJheUJ1ZmZlcj4gYnVpbGRDbGllbnREYXRhSnNvbihDbGllbnREYXRh VHlwZSB0eXBlLCBjb25zdCBCdWZmZXJTb3VyY2UmIGNoYWxsZW5nZSwgY29uc3QgU2VjdXJpdHlP cmlnaW4mIG9yaWdpbikKIHsKICAgICBhdXRvIG9iamVjdCA9IEpTT046Ok9iamVjdDo6Y3JlYXRl KCk7CiAgICAgc3dpdGNoICh0eXBlKSB7CkBAIC0xNDcsOCArMTQ3LDYgQEAgUmVmPEFycmF5QnVm ZmVyPiBidWlsZENsaWVudERhdGFKc29uKENsaWVudERhdGFUeXBlIHR5cGUsIGNvbnN0IEJ1ZmZl clNvdXJjZSYgY2gKICAgICB9CiAgICAgb2JqZWN0LT5zZXRTdHJpbmcoImNoYWxsZW5nZSJfcywg YmFzZTY0VVJMRW5jb2RlVG9TdHJpbmcoY2hhbGxlbmdlLmRhdGEoKSwgY2hhbGxlbmdlLmxlbmd0 aCgpKSk7CiAgICAgb2JqZWN0LT5zZXRTdHJpbmcoIm9yaWdpbiJfcywgb3JpZ2luLnRvUmF3U3Ry aW5nKCkpOwotICAgIGlmIChzY29wZSAhPSBXZWJBdXRobjo6U2NvcGU6OlNhbWVPcmlnaW4pCi0g ICAgICAgIG9iamVjdC0+c2V0Qm9vbGVhbigiY3Jvc3NPcmlnaW4iX3MsIHNjb3BlICE9IFdlYkF1 dGhuOjpTY29wZTo6U2FtZU9yaWdpbik7CiAKICAgICBhdXRvIHV0ZjhKU09OU3RyaW5nID0gb2Jq ZWN0LT50b0pTT05TdHJpbmcoKS51dGY4KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViYXV0aG4vV2ViQXV0aGVudGljYXRpb25VdGlscy5oIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy93ZWJhdXRobi9XZWJBdXRoZW50aWNhdGlvblV0aWxzLmgKaW5kZXggYTY0MjU0 NGQ0YTY1ODY4YmI0ZGE5NzMyZGFlMDI4Y2RmYzU1OGMwYi4uYTA3OTIxMWRlYjE3YzhlMjZiYmYx ZTg5ZDMyMGYxMWM4NTkzN2U1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJhdXRobi9XZWJBdXRoZW50aWNhdGlvblV0aWxzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy93ZWJhdXRobi9XZWJBdXRoZW50aWNhdGlvblV0aWxzLmgKQEAgLTUyLDcgKzUyLDcgQEAg V0VCQ09SRV9FWFBPUlQgVmVjdG9yPHVpbnQ4X3Q+IGJ1aWxkQXV0aERhdGEoY29uc3QgU3RyaW5n JiBycElkLCBjb25zdCB1aW50OF90IGYKIC8vIGh0dHBzOi8vd3d3LnczLm9yZy9UUi93ZWJhdXRo bi8jYXR0ZXN0YXRpb24tb2JqZWN0CiBXRUJDT1JFX0VYUE9SVCBWZWN0b3I8dWludDhfdD4gYnVp bGRBdHRlc3RhdGlvbk9iamVjdChWZWN0b3I8dWludDhfdD4mJiBhdXRoRGF0YSwgU3RyaW5nJiYg Zm9ybWF0LCBjYm9yOjpDQk9SVmFsdWU6Ok1hcFZhbHVlJiYgc3RhdGVtZW50TWFwLCBjb25zdCBB dHRlc3RhdGlvbkNvbnZleWFuY2VQcmVmZXJlbmNlJik7CiAKLVdFQkNPUkVfRVhQT1JUIFJlZjxB cnJheUJ1ZmZlcj4gYnVpbGRDbGllbnREYXRhSnNvbihDbGllbnREYXRhVHlwZSAvKnR5cGUqLywg Y29uc3QgQnVmZmVyU291cmNlJiBjaGFsbGVuZ2UsIGNvbnN0IFNlY3VyaXR5T3JpZ2luJiAvKm9y aWdpbiovLCBXZWJBdXRobjo6U2NvcGUpOworV0VCQ09SRV9FWFBPUlQgUmVmPEFycmF5QnVmZmVy PiBidWlsZENsaWVudERhdGFKc29uKENsaWVudERhdGFUeXBlIC8qdHlwZSovLCBjb25zdCBCdWZm ZXJTb3VyY2UmIGNoYWxsZW5nZSwgY29uc3QgU2VjdXJpdHlPcmlnaW4mIC8qb3JpZ2luKi8pOwog CiBXRUJDT1JFX0VYUE9SVCBWZWN0b3I8dWludDhfdD4gYnVpbGRDbGllbnREYXRhSnNvbkhhc2go Y29uc3QgQXJyYXlCdWZmZXImIGNsaWVudERhdGFKc29uKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9GZWF0dXJlUG9saWN5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmVh dHVyZVBvbGljeS5jcHAKaW5kZXggNTg0OGQwYWI5YzJkNzU2NGYwOGY0ODc1MmI5MzVlMTgxMGIx MTgxNy4uNTYwMGNhMWFiYjA0Yjk0YmJmZmM0ZmVkNTA0MzViMTM0NTI5NjNlNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9GZWF0dXJlUG9saWN5LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0ZlYXR1cmVQb2xpY3kuY3BwCkBAIC02NywxMCArNjcsNiBAQCBzdGF0aWMgY29u c3QgY2hhciogcG9saWN5VHlwZU5hbWUoRmVhdHVyZVBvbGljeTo6VHlwZSB0eXBlKQogICAgIGNh c2UgRmVhdHVyZVBvbGljeTo6VHlwZTo6TWFnbmV0b21ldGVyOgogICAgICAgICByZXR1cm4gIk1h Z25ldG9tZXRlciI7CiAjZW5kaWYKLSNpZiBFTkFCTEUoV0VCX0FVVEhOKQotICAgIGNhc2UgRmVh dHVyZVBvbGljeTo6VHlwZTo6UHVibGlja2V5Q3JlZGVudGlhbHNHZXRSdWxlOgotICAgICAgICBy ZXR1cm4gIlB1YmxpY2tleUNyZWRlbnRpYWxzR2V0IjsKLSNlbmRpZgogI2lmIEVOQUJMRShXRUJY UikKICAgICBjYXNlIEZlYXR1cmVQb2xpY3k6OlR5cGU6OlhSU3BhdGlhbFRyYWNraW5nOgogICAg ICAgICByZXR1cm4gIlhSU3BhdGlhbFRyYWNraW5nIjsKQEAgLTE4OCw5ICsxODQsNiBAQCBGZWF0 dXJlUG9saWN5IEZlYXR1cmVQb2xpY3k6OnBhcnNlKERvY3VtZW50JiBkb2N1bWVudCwgY29uc3Qg SFRNTElGcmFtZUVsZW1lbnQmCiAgICAgYm9vbCBpc0FjY2VsZXJvbWV0ZXJJbml0aWFsaXplZCA9 IGZhbHNlOwogICAgIGJvb2wgaXNNYWduZXRvbWV0ZXJJbml0aWFsaXplZCA9IGZhbHNlOwogI2Vu ZGlmCi0jaWYgRU5BQkxFKFdFQl9BVVRITikKLSAgICBib29sIGlzUHVibGlja2V5Q3JlZGVudGlh bHNHZXRJbml0aWFsaXplZCA9IGZhbHNlOwotI2VuZGlmCiAjaWYgRU5BQkxFKFdFQlhSKQogICAg IGJvb2wgaXNYUlNwYXRpYWxUcmFja2luZ0luaXRpYWxpemVkID0gZmFsc2U7CiAjZW5kaWYKQEAg LTI1OCwxMyArMjUxLDYgQEAgRmVhdHVyZVBvbGljeSBGZWF0dXJlUG9saWN5OjpwYXJzZShEb2N1 bWVudCYgZG9jdW1lbnQsIGNvbnN0IEhUTUxJRnJhbWVFbGVtZW50JgogICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgIH0KICNlbmRpZgotI2lmIEVOQUJMRShXRUJfQVVUSE4pCi0gICAgICAg IGlmIChpdGVtLnN0YXJ0c1dpdGgoInB1YmxpY2tleS1jcmVkZW50aWFscy1nZXQiKSkgewotICAg ICAgICAgICAgaXNQdWJsaWNrZXlDcmVkZW50aWFsc0dldEluaXRpYWxpemVkID0gdHJ1ZTsKLSAg ICAgICAgICAgIHVwZGF0ZUxpc3QoZG9jdW1lbnQsIHBvbGljeS5tX3B1YmxpY2tleUNyZWRlbnRp YWxzR2V0UnVsZSwgaXRlbS5zdWJzdHJpbmcoMjYpKTsKLSAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICB9Ci0jZW5kaWYKICNpZiBFTkFCTEUoV0VCWFIpCiAgICAgICAgIGlmIChpdGVtLnN0 YXJ0c1dpdGgoInhyLXNwYXRpYWwtdHJhY2tpbmciKSkgewogICAgICAgICAgICAgaXNYUlNwYXRp YWxUcmFja2luZ0luaXRpYWxpemVkID0gdHJ1ZTsKQEAgLTI5NywxMCArMjgzLDYgQEAgRmVhdHVy ZVBvbGljeSBGZWF0dXJlUG9saWN5OjpwYXJzZShEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IEhU TUxJRnJhbWVFbGVtZW50JgogICAgIGlmICghaXNNYWduZXRvbWV0ZXJJbml0aWFsaXplZCkKICAg ICAgICAgcG9saWN5Lm1fbWFnbmV0b21ldGVyUnVsZS5hbGxvd2VkTGlzdC5hZGQoZG9jdW1lbnQu c2VjdXJpdHlPcmlnaW4oKS5kYXRhKCkpOwogI2VuZGlmCi0jaWYgRU5BQkxFKFdFQl9BVVRITikK LSAgICBpZiAoIWlzUHVibGlja2V5Q3JlZGVudGlhbHNHZXRJbml0aWFsaXplZCkKLSAgICAgICAg cG9saWN5Lm1fcHVibGlja2V5Q3JlZGVudGlhbHNHZXRSdWxlLmFsbG93ZWRMaXN0LmFkZChkb2N1 bWVudC5zZWN1cml0eU9yaWdpbigpLmRhdGEoKSk7Ci0jZW5kaWYKICNpZiBFTkFCTEUoV0VCWFIp CiAgICAgaWYgKCFpc1hSU3BhdGlhbFRyYWNraW5nSW5pdGlhbGl6ZWQpCiAgICAgICAgIHBvbGlj eS5tX3hyU3BhdGlhbFRyYWNraW5nUnVsZS5hbGxvd2VkTGlzdC5hZGQoZG9jdW1lbnQuc2VjdXJp dHlPcmlnaW4oKS5kYXRhKCkpOwpAQCAtMzU2LDEwICszMzgsNiBAQCBib29sIEZlYXR1cmVQb2xp Y3k6OmFsbG93cyhUeXBlIHR5cGUsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgb3JpZ2luKSBj b25zdAogICAgIGNhc2UgVHlwZTo6TWFnbmV0b21ldGVyOgogICAgICAgICByZXR1cm4gaXNBbGxv d2VkQnlGZWF0dXJlUG9saWN5KG1fbWFnbmV0b21ldGVyUnVsZSwgb3JpZ2luKTsKICNlbmRpZgot I2lmIEVOQUJMRShXRUJfQVVUSE4pCi0gICAgY2FzZSBUeXBlOjpQdWJsaWNrZXlDcmVkZW50aWFs c0dldFJ1bGU6Ci0gICAgICAgIHJldHVybiBpc0FsbG93ZWRCeUZlYXR1cmVQb2xpY3kobV9wdWJs aWNrZXlDcmVkZW50aWFsc0dldFJ1bGUsIG9yaWdpbik7Ci0jZW5kaWYKICNpZiBFTkFCTEUoV0VC WFIpCiAgICAgY2FzZSBUeXBlOjpYUlNwYXRpYWxUcmFja2luZzoKICAgICAgICAgcmV0dXJuIGlz QWxsb3dlZEJ5RmVhdHVyZVBvbGljeShtX3hyU3BhdGlhbFRyYWNraW5nUnVsZSwgb3JpZ2luKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmVhdHVyZVBvbGljeS5oIGIvU291cmNl L1dlYkNvcmUvaHRtbC9GZWF0dXJlUG9saWN5LmgKaW5kZXggMjhlZmEzMTU4NTEwOTAzMWI5NzM0 ZDBmMTIzNTFmOTNkZWJlMzQ4Zi4uZTY0MGY4YTVkNzIzZGUwMWU5YTY0YjUxMDY2NmI5M2E2Nzk3 YTc5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9GZWF0dXJlUG9saWN5LmgKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9GZWF0dXJlUG9saWN5LmgKQEAgLTUzLDkgKzUzLDYgQEAg cHVibGljOgogICAgICAgICBBY2NlbGVyb21ldGVyLAogICAgICAgICBNYWduZXRvbWV0ZXIsCiAj ZW5kaWYKLSNpZiBFTkFCTEUoV0VCX0FVVEhOKQotICAgICAgICBQdWJsaWNrZXlDcmVkZW50aWFs c0dldFJ1bGUsCi0jZW5kaWYKICNpZiBFTkFCTEUoV0VCWFIpCiAgICAgICAgIFhSU3BhdGlhbFRy YWNraW5nLAogI2VuZGlmCkBAIC04NCw5ICs4MSw2IEBAIHByaXZhdGU6CiAgICAgQWxsb3dSdWxl IG1fYWNjZWxlcm9tZXRlclJ1bGU7CiAgICAgQWxsb3dSdWxlIG1fbWFnbmV0b21ldGVyUnVsZTsK ICNlbmRpZgotI2lmIEVOQUJMRShXRUJfQVVUSE4pCi0gICAgQWxsb3dSdWxlIG1fcHVibGlja2V5 Q3JlZGVudGlhbHNHZXRSdWxlOwotI2VuZGlmCiAjaWYgRU5BQkxFKFdFQlhSKQogICAgIEFsbG93 UnVsZSBtX3hyU3BhdGlhbFRyYWNraW5nUnVsZTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQXV0aGVudGljYXRpb25TZXJ2aWNlc0NvcmVTUEku aCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL0NvY29hL0F1dGhlbnRpY2F0aW9uU2Vydmlj ZXNDb3JlU1BJLmgKaW5kZXggZDZhYzY4NTY3YjZhOGI5MjgxMjRkNDYzZTA0ODM4ZDdjMTlkNDUx OS4uMzk0ODIyZDU1MGU5NTJhMmVkOTdhOGIyNmNiNTVkMTI2NzExYjE3ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQXV0aGVudGljYXRpb25TZXJ2aWNlc0Nv cmVTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9Db2NvYS9BdXRoZW50aWNh dGlvblNlcnZpY2VzQ29yZVNQSS5oCkBAIC0xMDcsOCArMTA3LDcgQEAgdHlwZWRlZiBOU19FTlVN KE5TSW50ZWdlciwgQVNDU2VjdXJpdHlLZXlQdWJsaWNLZXlDcmVkZW50aWFsS2luZCkgewogCiBA aW50ZXJmYWNlIEFTQ1B1YmxpY0tleUNyZWRlbnRpYWxDcmVhdGlvbk9wdGlvbnMgOiBOU09iamVj dCA8TlNTZWN1cmVDb2Rpbmc+CiAKLUBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29w eSkgTlNEYXRhICpjaGFsbGVuZ2U7Ci1AcHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNv cHkpIE5TRGF0YSAqY2xpZW50RGF0YUhhc2g7CitAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkg TlNEYXRhICpjaGFsbGVuZ2U7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkgTlNTdHJpbmcg KnJlbHlpbmdQYXJ0eUlkZW50aWZpZXI7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkgTlNT dHJpbmcgKnVzZXJOYW1lOwogQHByb3BlcnR5IChub25hdG9taWMsIGNvcHkpIE5TRGF0YSAqdXNl cklkZW50aWZpZXI7CkBAIC0xMTksMTMgKzExOCw2IEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVn ZXIsIEFTQ1NlY3VyaXR5S2V5UHVibGljS2V5Q3JlZGVudGlhbEtpbmQpIHsKIAogQGVuZAogCi1A aW50ZXJmYWNlIEFTQ1B1YmxpY0tleUNyZWRlbnRpYWxBc3NlcnRpb25PcHRpb25zIDogTlNPYmpl Y3QgPE5TU2VjdXJlQ29kaW5nPgotQHByb3BlcnR5IChub25hdG9taWMsIGNvcHksIHJlYWRvbmx5 KSBOU1N0cmluZyAqcmVseWluZ1BhcnR5SWRlbnRpZmllcjsKLUBwcm9wZXJ0eSAobm9uYXRvbWlj LCBudWxsYWJsZSwgY29weSwgcmVhZG9ubHkpIE5TRGF0YSAqY2hhbGxlbmdlOwotQHByb3BlcnR5 IChub25hdG9taWMsIG51bGxhYmxlLCBjb3B5KSBOU0RhdGEgKmNsaWVudERhdGFIYXNoOwotQHBy b3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCByZWFkb25seSwgY29weSkgTlNTdHJpbmcgKnVz ZXJWZXJpZmljYXRpb25QcmVmZXJlbmNlOwotQGVuZAotCiBAaW50ZXJmYWNlIEFTQ1NlY3VyaXR5 S2V5UHVibGljS2V5Q3JlZGVudGlhbExvZ2luQ2hvaWNlIDogTlNPYmplY3QgPEFTQ0xvZ2luQ2hv aWNlUHJvdG9jb2w+CiAKIC0gKGluc3RhbmNldHlwZSlpbml0UmVnaXN0cmF0aW9uQ2hvaWNlV2l0 aE9wdGlvbnM6KEFTQ1B1YmxpY0tleUNyZWRlbnRpYWxDcmVhdGlvbk9wdGlvbnMgKilvcHRpb25z OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1 dGhlbnRpY2F0aW9uUGFuZWwubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev X1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQppbmRleCA0YjkxNGU0MDE0YzNiYWU4NTgzZDM3 ODExMjZjMTE2YjBmODg1ZDMxLi5lNWY5ZDZlNGY3MTFjZmFkMDE4MTNmNTRhMjQ4MTIwZTdjY2Yz MGY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vi QXV0aGVudGljYXRpb25QYW5lbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQpAQCAtODcsNyArODcsNyBAQCBzdGF0 aWMgUmV0YWluUHRyPE5TRGF0YT4gcHJvZHVjZUNsaWVudERhdGFKc29uKF9XS1dlYkF1dGhlbnRp Y2F0aW9uVHlwZSB0eXBlLCBOUwogICAgIGF1dG8gY2hhbGxlbmdlQnVmZmVyID0gQXJyYXlCdWZm ZXI6OnRyeUNyZWF0ZShyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihjaGFsbGVuZ2Uu Ynl0ZXMpLCBjaGFsbGVuZ2UubGVuZ3RoKTsKICAgICBhdXRvIHNlY3VyaXR5T3JpZ2luID0gV2Vi Q29yZTo6U2VjdXJpdHlPcmlnaW46OmNyZWF0ZUZyb21TdHJpbmcob3JpZ2luKTsKIAotICAgIGF1 dG8gY2xpZW50RGF0YUpzb24gPSBidWlsZENsaWVudERhdGFKc29uKGNsaWVudERhdGFUeXBlLCBX ZWJDb3JlOjpCdWZmZXJTb3VyY2UoY2hhbGxlbmdlQnVmZmVyKSwgc2VjdXJpdHlPcmlnaW4sIFdl YkF1dGhuOjpTY29wZTo6U2FtZU9yaWdpbik7CisgICAgYXV0byBjbGllbnREYXRhSnNvbiA9IGJ1 aWxkQ2xpZW50RGF0YUpzb24oY2xpZW50RGF0YVR5cGUsIFdlYkNvcmU6OkJ1ZmZlclNvdXJjZShj aGFsbGVuZ2VCdWZmZXIpLCBzZWN1cml0eU9yaWdpbik7CiAgICAgcmV0dXJuIGFkb3B0TlMoW1tO U0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6Y2xpZW50RGF0YUpzb24tPmRhdGEoKSBsZW5ndGg6 Y2xpZW50RGF0YUpzb24tPmJ5dGVMZW5ndGgoKV0pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRoZW50aWNhdG9y Q29vcmRpbmF0b3JQcm94eS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRp Y2F0aW9uL0NvY29hL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Lm1tCmluZGV4IDNi MjE4M2UyZTVhYjlkMGY5MmI5Yzk2NjViYWJjNzk2YjdlOGEzNWMuLjNmMDljMGQ3MDAwZDMwZjZk NDAzYWEzNzI5YzlhOThkZDI5MjRiOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclBy b3h5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0Nv Y29hL1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Lm1tCkBAIC0xNDUsNyArMTQ1LDcg QEAgc3RhdGljIGlubGluZSBSZXRhaW5QdHI8QVNDUHVibGljS2V5Q3JlZGVudGlhbERlc2NyaXB0 b3I+IHRvQVNDRGVzY3JpcHRvcihQdWJsaWMKICAgICByZXR1cm4gYWRvcHROUyhbYWxsb2NBU0NQ dWJsaWNLZXlDcmVkZW50aWFsRGVzY3JpcHRvckluc3RhbmNlKCkgaW5pdFdpdGhDcmVkZW50aWFs SUQ6V2ViQ29yZTo6dG9OU0RhdGEoZGVzY3JpcHRvci5pZCkuZ2V0KCkgdHJhbnNwb3J0czp0cmFu c3BvcnRzLmdldCgpXSk7CiB9CiAKLXN0YXRpYyBSZXRhaW5QdHI8QVNDQ3JlZGVudGlhbFJlcXVl c3RDb250ZXh0PiBjb25maWd1cmVSZWdpc3RyYXRpb25SZXF1ZXN0Q29udGV4dChjb25zdCBQdWJs aWNLZXlDcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zJiBvcHRpb25zLCBOU0RhdGEgKmhhc2gpCitz dGF0aWMgUmV0YWluUHRyPEFTQ0NyZWRlbnRpYWxSZXF1ZXN0Q29udGV4dD4gY29uZmlndXJlUmVn aXN0cmF0aW9uUmVxdWVzdENvbnRleHQoY29uc3QgUHVibGljS2V5Q3JlZGVudGlhbENyZWF0aW9u T3B0aW9ucyYgb3B0aW9ucykKIHsKICAgICBBU0NDcmVkZW50aWFsUmVxdWVzdFR5cGVzIHJlcXVl c3RUeXBlcyA9IEFTQ0NyZWRlbnRpYWxSZXF1ZXN0VHlwZVBsYXRmb3JtUHVibGljS2V5UmVnaXN0 cmF0aW9uIHwgQVNDQ3JlZGVudGlhbFJlcXVlc3RUeXBlU2VjdXJpdHlLZXlQdWJsaWNLZXlSZWdp c3RyYXRpb247CiAKQEAgLTE2OSwxMCArMTY5LDcgQEAgc3RhdGljIFJldGFpblB0cjxBU0NDcmVk ZW50aWFsUmVxdWVzdENvbnRleHQ+IGNvbmZpZ3VyZVJlZ2lzdHJhdGlvblJlcXVlc3RDb250ZXgK IAogICAgIGF1dG8gY3JlZGVudGlhbENyZWF0aW9uT3B0aW9ucyA9IGFkb3B0TlMoW2FsbG9jQVND UHVibGljS2V5Q3JlZGVudGlhbENyZWF0aW9uT3B0aW9uc0luc3RhbmNlKCkgaW5pdF0pOwogCi0g ICAgaWYgKFtjcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3Ioc2V0Q2xpZW50RGF0YUhhc2g6KV0pCi0gICAgICAgIFtjcmVkZW50aWFsQ3JlYXRpb25P cHRpb25zIHNldENsaWVudERhdGFIYXNoOnRvTlNEYXRhKGhhc2gpLmdldCgpXTsKLSAgICBlbHNl Ci0gICAgICAgIFtjcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zIHNldENoYWxsZW5nZTpXZWJDb3Jl Ojp0b05TRGF0YShvcHRpb25zLmNoYWxsZW5nZSkuZ2V0KCldOworICAgIFtjcmVkZW50aWFsQ3Jl YXRpb25PcHRpb25zIHNldENoYWxsZW5nZTpXZWJDb3JlOjp0b05TRGF0YShvcHRpb25zLmNoYWxs ZW5nZSkuZ2V0KCldOwogICAgIFtjcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zIHNldFJlbHlpbmdQ YXJ0eUlkZW50aWZpZXI6b3B0aW9ucy5ycC5pZF07CiAgICAgW2NyZWRlbnRpYWxDcmVhdGlvbk9w dGlvbnMgc2V0VXNlck5hbWU6b3B0aW9ucy51c2VyLm5hbWVdOwogICAgIFtjcmVkZW50aWFsQ3Jl YXRpb25PcHRpb25zIHNldFVzZXJJZGVudGlmaWVyOldlYkNvcmU6OnRvTlNEYXRhKG9wdGlvbnMu dXNlci5pZCkuZ2V0KCldOwpAQCAtMjA1LDcgKzIwMiw3IEBAIHN0YXRpYyBSZXRhaW5QdHI8QVND Q3JlZGVudGlhbFJlcXVlc3RDb250ZXh0PiBjb25maWd1cmVSZWdpc3RyYXRpb25SZXF1ZXN0Q29u dGV4CiAgICAgcmV0dXJuIHJlcXVlc3RDb250ZXh0OwogfQogCi1zdGF0aWMgUmV0YWluUHRyPEFT Q0NyZWRlbnRpYWxSZXF1ZXN0Q29udGV4dD4gY29uZmlndXJhdGlvbkFzc2VydGlvblJlcXVlc3RD b250ZXh0KGNvbnN0IFB1YmxpY0tleUNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9ucyYgb3B0aW9ucywg VmVjdG9yPHVpbnRfOD4gaGFzaCkKK3N0YXRpYyBSZXRhaW5QdHI8QVNDQ3JlZGVudGlhbFJlcXVl c3RDb250ZXh0PiBjb25maWd1cmF0aW9uQXNzZXJ0aW9uUmVxdWVzdENvbnRleHQoY29uc3QgUHVi bGljS2V5Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25zJiBvcHRpb25zKQogewogICAgIEFTQ0NyZWRl bnRpYWxSZXF1ZXN0VHlwZXMgcmVxdWVzdFR5cGVzID0gQVNDQ3JlZGVudGlhbFJlcXVlc3RUeXBl UGxhdGZvcm1QdWJsaWNLZXlBc3NlcnRpb24gfCBBU0NDcmVkZW50aWFsUmVxdWVzdFR5cGVTZWN1 cml0eUtleVB1YmxpY0tleUFzc2VydGlvbjsKIApAQCAtMjMwLDMwICsyMjcsMTMgQEAgc3RhdGlj IFJldGFpblB0cjxBU0NDcmVkZW50aWFsUmVxdWVzdENvbnRleHQ+IGNvbmZpZ3VyYXRpb25Bc3Nl cnRpb25SZXF1ZXN0Q29udGUKICAgICBhdXRvIHJlcXVlc3RDb250ZXh0ID0gYWRvcHROUyhbYWxs b2NBU0NDcmVkZW50aWFsUmVxdWVzdENvbnRleHRJbnN0YW5jZSgpIGluaXRXaXRoUmVxdWVzdFR5 cGVzOnJlcXVlc3RUeXBlc10pOwogICAgIFtyZXF1ZXN0Q29udGV4dCBzZXRSZWx5aW5nUGFydHlJ ZGVudGlmaWVyOm9wdGlvbnMucnBJZF07CiAKLSAgICBpZiAocmVxdWVzdFR5cGVzICYgQVNDQ3Jl ZGVudGlhbFJlcXVlc3RUeXBlUGxhdGZvcm1QdWJsaWNLZXlBc3NlcnRpb24pIHsKLSAgICAgICAg YXV0byBhc3NlcnRpb25PcHRpb25zID0gYWRvcHROUyhhbGxvY0FTQ1B1YmxpY0tleUNyZWRlbnRp YWxBc3NlcnRpb25PcHRpb25zSW5zdGFuY2UoKSk7Ci0gICAgICAgIGlmIChbYXNzZXJ0aW9uT3B0 aW9ucyByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGluaXRXaXRoS2luZDpyZWx5aW5nUGFy dHlJZGVudGlmaWVyOmNsaWVudERhdGFIYXNoOnVzZXJWZXJpZmljYXRpb25QcmVmZXJlbmNlOmFs bG93ZWRDcmVkZW50aWFsczopXSkgewotICAgICAgICAgICAgYXV0byBuc0hhc2ggPSB0b05TRGF0 YShoYXNoKTsKLSAgICAgICAgICAgIFthc3NlcnRpb25PcHRpb25zIGluaXRXaXRoS2luZDpBU0NQ dWJsaWNLZXlDcmVkZW50aWFsS2luZFBsYXRmb3JtIHJlbHlpbmdQYXJ0eUlkZW50aWZpZXI6b3B0 aW9ucy5ycElkIGNsaWVudERhdGFIYXNoOm5zSGFzaCB1c2VyVmVyaWZpY2F0aW9uUHJlZmVyZW5j ZTp1c2VyVmVyaWZpY2F0aW9uLmdldCgpIGFsbG93ZWRDcmVkZW50aWFsczphbGxvd2VkQ3JlZGVu dGlhbHMuZ2V0KCldCi0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBhdXRvIGNoYWxsZW5n ZSA9IFdlYkNvcmU6OnRvTlNEYXRhKG9wdGlvbnMuY2hhbGxlbmdlKTsKLSAgICAgICAgICAgIFth c3NlcnRpb25PcHRpb25zIGluaXRXaXRoS2luZDpBU0NQdWJsaWNLZXlDcmVkZW50aWFsS2luZFBs YXRmb3JtIHJlbHlpbmdQYXJ0eUlkZW50aWZpZXI6b3B0aW9ucy5ycElkIGNoYWxsZW5nZTpjaGFs bGVuZ2UuZ2V0KCkgdXNlclZlcmlmaWNhdGlvblByZWZlcmVuY2U6dXNlclZlcmlmaWNhdGlvbi5n ZXQoKSBhbGxvd2VkQ3JlZGVudGlhbHM6YWxsb3dlZENyZWRlbnRpYWxzLmdldCgpXQotICAgICAg ICB9CisgICAgYXV0byBjaGFsbGVuZ2UgPSBXZWJDb3JlOjp0b05TRGF0YShvcHRpb25zLmNoYWxs ZW5nZSk7CiAKLSAgICAgICAgW3JlcXVlc3RDb250ZXh0IHNldFBsYXRmb3JtS2V5Q3JlZGVudGlh bEFzc2VydGlvbk9wdGlvbnM6YXNzZXJ0aW9uT3B0aW9ucy5nZXQoKV07Ci0gICAgfQorICAgIGlm IChyZXF1ZXN0VHlwZXMgJiBBU0NDcmVkZW50aWFsUmVxdWVzdFR5cGVQbGF0Zm9ybVB1YmxpY0tl eUFzc2VydGlvbikKKyAgICAgICAgW3JlcXVlc3RDb250ZXh0IHNldFBsYXRmb3JtS2V5Q3JlZGVu dGlhbEFzc2VydGlvbk9wdGlvbnM6W2FsbG9jQVNDUHVibGljS2V5Q3JlZGVudGlhbEFzc2VydGlv bk9wdGlvbnNJbnN0YW5jZSgpIGluaXRXaXRoS2luZDpBU0NQdWJsaWNLZXlDcmVkZW50aWFsS2lu ZFBsYXRmb3JtIHJlbHlpbmdQYXJ0eUlkZW50aWZpZXI6b3B0aW9ucy5ycElkIGNoYWxsZW5nZTpj aGFsbGVuZ2UuZ2V0KCkgdXNlclZlcmlmaWNhdGlvblByZWZlcmVuY2U6dXNlclZlcmlmaWNhdGlv bi5nZXQoKSBhbGxvd2VkQ3JlZGVudGlhbHM6YWxsb3dlZENyZWRlbnRpYWxzLmdldCgpXV07CiAK LSAgICBpZiAocmVxdWVzdFR5cGVzICYgQVNDQ3JlZGVudGlhbFJlcXVlc3RUeXBlU2VjdXJpdHlL ZXlQdWJsaWNLZXlBc3NlcnRpb24pIHsKLSAgICAgICAgYXV0byBhc3NlcnRpb25PcHRpb25zID0g YWRvcHROUyhhbGxvY0FTQ1B1YmxpY0tleUNyZWRlbnRpYWxBc3NlcnRpb25PcHRpb25zSW5zdGFu Y2UoKSk7Ci0gICAgICAgIGlmIChbYXNzZXJ0aW9uT3B0aW9ucyByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKGluaXRXaXRoS2luZDpyZWx5aW5nUGFydHlJZGVudGlmaWVyOmNsaWVudERhdGFI YXNoOnVzZXJWZXJpZmljYXRpb25QcmVmZXJlbmNlOmFsbG93ZWRDcmVkZW50aWFsczopXSkgewot ICAgICAgICAgICAgYXV0byBuc0hhc2ggPSB0b05TRGF0YShoYXNoKTsKLSAgICAgICAgICAgIFth c3NlcnRpb25PcHRpb25zIGluaXRXaXRoS2luZDpBU0NQdWJsaWNLZXlDcmVkZW50aWFsS2luZFNl Y3VyaXR5S2V5IHJlbHlpbmdQYXJ0eUlkZW50aWZpZXI6b3B0aW9ucy5ycElkIGNsaWVudERhdGFI YXNoOm5zSGFzaCB1c2VyVmVyaWZpY2F0aW9uUHJlZmVyZW5jZTp1c2VyVmVyaWZpY2F0aW9uLmdl dCgpIGFsbG93ZWRDcmVkZW50aWFsczphbGxvd2VkQ3JlZGVudGlhbHMuZ2V0KCldXTsKLSAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGF1dG8gY2hhbGxlbmdlID0gV2ViQ29yZTo6dG9OU0Rh dGEob3B0aW9ucy5jaGFsbGVuZ2UpOwotICAgICAgICAgICAgW2Fzc2VydGlvbk9wdGlvbnMgaW5p dFdpdGhLaW5kOkFTQ1B1YmxpY0tleUNyZWRlbnRpYWxLaW5kU2VjdXJpdHlLZXkgcmVseWluZ1Bh cnR5SWRlbnRpZmllcjpvcHRpb25zLnJwSWQgY2hhbGxlbmdlOmNoYWxsZW5nZS5nZXQoKSB1c2Vy VmVyaWZpY2F0aW9uUHJlZmVyZW5jZTp1c2VyVmVyaWZpY2F0aW9uLmdldCgpIGFsbG93ZWRDcmVk ZW50aWFsczphbGxvd2VkQ3JlZGVudGlhbHMuZ2V0KCldXTsKLSAgICAgICAgfQotICAgICAgICBb cmVxdWVzdENvbnRleHQgc2V0U2VjdXJpdHlLZXlDcmVkZW50aWFsQXNzZXJ0aW9uT3B0aW9uczph c3NlcnRpb25PcHRpb25zLmdldCgpXTsKLSAgICB9CisgICAgaWYgKHJlcXVlc3RUeXBlcyAmIEFT Q0NyZWRlbnRpYWxSZXF1ZXN0VHlwZVNlY3VyaXR5S2V5UHVibGljS2V5QXNzZXJ0aW9uKQorICAg ICAgICBbcmVxdWVzdENvbnRleHQgc2V0U2VjdXJpdHlLZXlDcmVkZW50aWFsQXNzZXJ0aW9uT3B0 aW9uczpbYWxsb2NBU0NQdWJsaWNLZXlDcmVkZW50aWFsQXNzZXJ0aW9uT3B0aW9uc0luc3RhbmNl KCkgaW5pdFdpdGhLaW5kOkFTQ1B1YmxpY0tleUNyZWRlbnRpYWxLaW5kU2VjdXJpdHlLZXkgcmVs eWluZ1BhcnR5SWRlbnRpZmllcjpvcHRpb25zLnJwSWQgY2hhbGxlbmdlOmNoYWxsZW5nZS5nZXQo KSB1c2VyVmVyaWZpY2F0aW9uUHJlZmVyZW5jZTp1c2VyVmVyaWZpY2F0aW9uLmdldCgpIGFsbG93 ZWRDcmVkZW50aWFsczphbGxvd2VkQ3JlZGVudGlhbHMuZ2V0KCldXTsKIAogICAgIHJldHVybiBy ZXF1ZXN0Q29udGV4dDsKIH0KQEAgLTI2Miw5ICsyNDIsOSBAQCBSZXRhaW5QdHI8QVNDQ3JlZGVu dGlhbFJlcXVlc3RDb250ZXh0PiBXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eTo6Y29u dGV4dAogewogICAgIFJldGFpblB0cjxBU0NDcmVkZW50aWFsUmVxdWVzdENvbnRleHQ+IHJlc3Vs dDsKICAgICBXVEY6OnN3aXRjaE9uKHJlcXVlc3REYXRhLm9wdGlvbnMsIFsmXShjb25zdCBQdWJs aWNLZXlDcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zJiBvcHRpb25zKSB7Ci0gICAgICAgIHJlc3Vs dCA9IGNvbmZpZ3VyZVJlZ2lzdHJhdGlvblJlcXVlc3RDb250ZXh0KG9wdGlvbnMsIHJlcXVlc3RE YXRhLmhhc2gpOworICAgICAgICByZXN1bHQgPSBjb25maWd1cmVSZWdpc3RyYXRpb25SZXF1ZXN0 Q29udGV4dChvcHRpb25zKTsKICAgICB9LCBbJl0oY29uc3QgUHVibGljS2V5Q3JlZGVudGlhbFJl cXVlc3RPcHRpb25zJiBvcHRpb25zKSB7Ci0gICAgICAgIHJlc3VsdCA9IGNvbmZpZ3VyYXRpb25B c3NlcnRpb25SZXF1ZXN0Q29udGV4dChvcHRpb25zLCByZXF1ZXN0RGF0YS5oYXNoKTsKKyAgICAg ICAgcmVzdWx0ID0gY29uZmlndXJhdGlvbkFzc2VydGlvblJlcXVlc3RDb250ZXh0KG9wdGlvbnMp OwogICAgIH0pOwogICAgIHJldHVybiByZXN1bHQ7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggM2IwZGQ0OTMyYjExNzQ3 MWE1NTFmMTAwMTBkYjlhZjllNjJjMjNlYS4uNDUzMzVhODljZjg0MjQ2NTdmNTMyZDgyNTkyODll ZGU1ZjFkZTQ4YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEyLTEzICBDb21taXQgUXVl dWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2VkLCByZXZl cnRpbmcgcjI4Njk5My4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNDI4MworCisKKyAgICAgICAgUmV2ZXJ0ZWQgY2hhbmdlc2V0OgorCisgICAgICAg ICJbV2ViQXV0aG5dIEFsbG93IHNhbWUtc2l0ZSwgY3Jvc3Mtb3JpZ2luIGlmcmFtZSBnZXQoKSIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDE4MAor ICAgICAgICBodHRwczovL2NvbW1pdHMud2Via2l0Lm9yZy9yMjg2OTkzCisKIDIwMjEtMTItMTMg IENocmlzdG9waGVyIFJlaWQgIDxjaHJpcy5yZWlkQHNvbnkuY29tPgogCiAgICAgICAgIFtDdXJs XSBJbXByb3ZlIGN1cmwncyBjb29raWUgY29uZm9ybWFuY2UgaW4gV1BUCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtc2FtZS1v cmlnaW4td2l0aC1hbmNlc3RvcnMuaHR0cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0 cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLXNhbWUtb3JpZ2luLXdpdGgtYW5j ZXN0b3JzLmh0dHBzLWV4cGVjdGVkLnR4dAppbmRleCBjNzAyMWQ4MTgxNzAyNDRkNjI0OGJmMDVl ZDZhOGU5OWNjODcxM2YxLi42NTMwNjQ1YTE5NGI0NWFjZDA5ODNmYzM3M2I1YWI2ZGE5NWYxNTk4 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNy ZWRlbnRpYWwtc2FtZS1vcmlnaW4td2l0aC1hbmNlc3RvcnMuaHR0cHMtZXhwZWN0ZWQudHh0Cisr KyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1z YW1lLW9yaWdpbi13aXRoLWFuY2VzdG9ycy5odHRwcy1leHBlY3RlZC50eHQKQEAgLTIsNyArMiw0 IEBACiAKIFBBU1MgVGVzdHMgdGhhdCBhIGZyYW1lIHRoYXQgZG9lc24ndCBzaGFyZSB0aGUgc2Ft ZSBvcmlnaW4gd2l0aCBhbGwgaXRzIGFuY2VzdG9ycyBjb3VsZCBub3QgYWNjZXNzIHRoZSBBUEku CiBQQVNTIFRlc3RzIHRoYXQgYSBmcmFtZSB0aGF0IGRvZXNuJ3Qgc2hhcmUgdGhlIHNhbWUgb3Jp Z2luIHdpdGggYWxsIGl0cyBhbmNlc3RvcnMgY291bGQgbm90IGFjY2VzcyB0aGUgQVBJLiAyCi1Q QVNTIFRlc3RzIHRoYXQgYSBmcmFtZSB0aGF0IGlzIHNhbWUtc2l0ZSwgY3Jvc3Mtb3JpZ2luIHdp dGhvdXQgcHVibGlja2V5LWNyZWRlbnRpYWxzLWdldCBmZWF0dXJlIHBvbGljeSBjYW5ub3QgdXNl IGdldCgpLgotUEFTUyBUZXN0cyB0aGF0IGEgZnJhbWUgdGhhdCBpcyBzYW1lLXNpdGUsIGNyb3Nz LW9yaWdpbiB3aXRoIHB1YmxpY2tleS1jcmVkZW50aWFscy1nZXQgZmVhdHVyZSBwb2xpY3kgY2Fu IHVzZSBnZXQoKS4KLVBBU1MgVGVzdHMgdGhhdCBhIGZyYW1lIHRoYXQgaXMgY3Jvc3Mtb3JpZ2lu LCBOT1Qgc2FtZS1zaXRlICB3aXRoIHB1YmxpY2tleS1jcmVkZW50aWFscy1nZXQgZmVhdHVyZSBw b2xpY3kgY2Fubm90IHVzZSBnZXQoKS4KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93 cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLXNhbWUtb3JpZ2luLXdpdGgtYW5jZXN0 b3JzLmh0dHBzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5 LWNyZWRlbnRpYWwtc2FtZS1vcmlnaW4td2l0aC1hbmNlc3RvcnMuaHR0cHMuaHRtbAppbmRleCA1 ODE0NzVlNTIwNTA0ZDA4YTljMWZhNmYyNzgyNmM0ZTI1NTI4YjYyLi40ZjFjNDBkOTFmZTc5MWRi ZGUyMDlkMjg1MjY1YWUyMDhiNzNkMjMyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3dw dC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtc2FtZS1vcmlnaW4td2l0aC1hbmNlc3Rv cnMuaHR0cHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMt a2V5LWNyZWRlbnRpYWwtc2FtZS1vcmlnaW4td2l0aC1hbmNlc3RvcnMuaHR0cHMuaHRtbApAQCAt MjIsMjQgKzIyLDYgQEAKICAgICAgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKG1lc3NhZ2UuZGF0 YSwgIlBBU1MuIik7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfSwgIlRlc3RzIHRoYXQgYSBm cmFtZSB0aGF0IGRvZXNuJ3Qgc2hhcmUgdGhlIHNhbWUgb3JpZ2luIHdpdGggYWxsIGl0cyBhbmNl c3RvcnMgY291bGQgbm90IGFjY2VzcyB0aGUgQVBJLiAyIik7Ci0KLSAgICAgICAgcHJvbWlzZV90 ZXN0KHQgPT4gewotICAgICAgICAgICAgcmV0dXJuIHdpdGhTYW1lU2l0ZUlmcmFtZSgic2FtZXNp dGUtaWZyYW1lLmh0bWwiKS50aGVuKChtZXNzYWdlKSA9PiB7Ci0gICAgICAgICAgICAgICAgYXNz ZXJ0X2VxdWFscyhtZXNzYWdlLmRhdGEsICJUaHJvdyBOb3RBbGxvd2VkRXJyb3I6IFRoZSBvcmln aW4gb2YgdGhlIGRvY3VtZW50IGlzIG5vdCB0aGUgc2FtZSBhcyBpdHMgYW5jZXN0b3JzLiIpOwot ICAgICAgICAgICAgfSk7Ci0gICAgICAgIH0sICJUZXN0cyB0aGF0IGEgZnJhbWUgdGhhdCBpcyBz YW1lLXNpdGUsIGNyb3NzLW9yaWdpbiB3aXRob3V0IHB1YmxpY2tleS1jcmVkZW50aWFscy1nZXQg ZmVhdHVyZSBwb2xpY3kgY2Fubm90IHVzZSBnZXQoKS4iKTsKLQotICAgICAgICBwcm9taXNlX3Rl c3QodCA9PiB7Ci0gICAgICAgICAgICByZXR1cm4gd2l0aFNhbWVTaXRlSWZyYW1lKCJzYW1lc2l0 ZS1pZnJhbWUuaHRtbCIsICJwdWJsaWNrZXktY3JlZGVudGlhbHMtZ2V0IikudGhlbigobWVzc2Fn ZSkgPT4gewotICAgICAgICAgICAgICAgIGFzc2VydF9lcXVhbHMobWVzc2FnZS5kYXRhLCAiUEFT UyEiKTsKLSAgICAgICAgICAgIH0pOwotICAgICAgICB9LCAiVGVzdHMgdGhhdCBhIGZyYW1lIHRo YXQgaXMgc2FtZS1zaXRlLCBjcm9zcy1vcmlnaW4gd2l0aCBwdWJsaWNrZXktY3JlZGVudGlhbHMt Z2V0IGZlYXR1cmUgcG9saWN5IGNhbiB1c2UgZ2V0KCkuIik7Ci0KLSAgICAgICAgcHJvbWlzZV90 ZXN0KHQgPT4gewotICAgICAgICAgICAgcmV0dXJuIHdpdGhDcm9zc09yaWdpbklmcmFtZSgic2Ft ZXNpdGUtaWZyYW1lLmh0bWwiLCAicHVibGlja2V5LWNyZWRlbnRpYWxzLWdldCIpLnRoZW4oKG1l c3NhZ2UpID0+IHsKLSAgICAgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKG1lc3NhZ2UuZGF0YSwg IlRocm93IE5vdEFsbG93ZWRFcnJvcjogVGhlIG9yaWdpbiBvZiB0aGUgZG9jdW1lbnQgaXMgbm90 IHRoZSBzYW1lIGFzIGl0cyBhbmNlc3RvcnMuIik7Ci0gICAgICAgICAgICB9KTsKLSAgICAgICAg fSwgIlRlc3RzIHRoYXQgYSBmcmFtZSB0aGF0IGlzIGNyb3NzLW9yaWdpbiwgTk9UIHNhbWUtc2l0 ZSAgd2l0aCBwdWJsaWNrZXktY3JlZGVudGlhbHMtZ2V0IGZlYXR1cmUgcG9saWN5IGNhbm5vdCB1 c2UgZ2V0KCkuIik7CiAgICAgPC9zY3JpcHQ+CiA8L2JvZHk+CiA8L2h0bWw+CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvc2FtZXNpdGUtaWZyYW1l Lmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvc2FtZXNpdGUt aWZyYW1lLmh0bWwKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDc2YjA3NGNmZDQ2Y2My NTM3ZTY5ZTFlNDFlNjAwYmM1NmZkZjA4N2QuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcmVzb3VyY2Vz L3NhbWVzaXRlLWlmcmFtZS5odG1sCisrKyAvZGV2L251bGwKQEAgLTEsMzAgKzAsMCBAQAotPHNj cmlwdCBzcmM9Ii4vdXRpbC5qcyI+PC9zY3JpcHQ+Ci08aW5wdXQgdHlwZT0idGV4dCIgaWQ9Imlu cHV0Ij4KLTxzY3JpcHQ+Ci0gICAgY29uc3QgdXJsID0gbmV3IFVSTCh3aW5kb3cubG9jYXRpb24u aHJlZik7Ci0gICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCi1pbnRlcm5hbHMuc2V0TW9ja1dlYkF1 dGhlbnRpY2F0aW9uQ29uZmlndXJhdGlvbih7IG5mYzogeyBlcnJvcjogInN1Y2Nlc3MiLCBwYXls b2FkQmFzZTY0OiBbdGVzdE5mY0N0YXBWZXJzaW9uQmFzZTY0LCB0ZXN0R2V0SW5mb1Jlc3BvbnNl QXBkdUJhc2U2NCwgdGVzdEFzc2VydGlvbk1lc3NhZ2VBcGR1QmFzZTY0XSB9IH0pOwotCi0gICAg ZnVuY3Rpb24gbWVzc2FnZVRvVG9wKG1lc3NhZ2UpIHsKLSAgICAgICAgdG9wLnBvc3RNZXNzYWdl KG1lc3NhZ2UsICIqIik7Ci0gICAgfQotCi0gICAgY29uc3QgcmVxdWVzdE9wdGlvbnMgPSB7Ci0g ICAgICAgIHB1YmxpY0tleTogewotICAgICAgICAgICAgY2hhbGxlbmdlOiBhc2NpaVRvVWludDhB cnJheSgiMTIzNDU2IiksCi0gICAgICAgICAgICB0aW1lb3V0OiAxMDAKLSAgICAgICAgfQotICAg IH07Ci0KLSAgICBpZiAod2luZG93LmludGVybmFscykKLSAgICAgICAgaW50ZXJuYWxzLndpdGhV c2VyR2VzdHVyZSgoKSA9PiB7IGlucHV0LmZvY3VzKCk7IH0pOwotCi0gICAgbmF2aWdhdG9yLmNy ZWRlbnRpYWxzLmdldChyZXF1ZXN0T3B0aW9ucykudGhlbigKLSAgICAgICAgZnVuY3Rpb24odmFs dWUpIHsKLSAgICAgICAgICAgIG1lc3NhZ2VUb1RvcCgiUEFTUyEiKTsKLSAgICAgICAgfSwKLSAg ICAgICAgZnVuY3Rpb24oZXhjZXB0aW9uKSB7Ci0gICAgICAgICAgICBtZXNzYWdlVG9Ub3AoIlRo cm93ICIgKyBleGNlcHRpb24ubmFtZSArICI6ICIgKyBleGNlcHRpb24ubWVzc2FnZSk7Ci0gICAg ICB9Ci0gICAgKTsKLTwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQv d2ViYXV0aG4vcmVzb3VyY2VzL3V0aWwuanMgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRo bi9yZXNvdXJjZXMvdXRpbC5qcwppbmRleCA4MDJlMTk1YTkwMTQ1OGIxYjU2NzRlYmY3NTc0YWVj NTg0ZTg1OTYyLi44YmY2ZDAyYmEyNzhjZGFmYjc5MDhhZjQ1ZGE1MjVlMjVkMzgxNmYwIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvdXRpbC5qcwor KysgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9yZXNvdXJjZXMvdXRpbC5qcwpAQCAt MzA0LDMzICszMDQsMTggQEAgZnVuY3Rpb24gd2FpdEZvckxvYWQoKQogICAgIH0pOwogfQogCi1m dW5jdGlvbiB3aXRoQ3Jvc3NPcmlnaW5JZnJhbWUocmVzb3VyY2VGaWxlLCBhbGxvdyA9ICIiKQor ZnVuY3Rpb24gd2l0aENyb3NzT3JpZ2luSWZyYW1lKHJlc291cmNlRmlsZSkKIHsKICAgICByZXR1 cm4gbmV3IFByb21pc2UoKHJlc29sdmUpID0+IHsKICAgICAgICAgd2FpdEZvckxvYWQoKS50aGVu KChtZXNzYWdlKSA9PiB7CiAgICAgICAgICAgICByZXNvbHZlKG1lc3NhZ2UpOwogICAgICAgICB9 KTsKICAgICAgICAgY29uc3QgZnJhbWUgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpZnJhbWUi KTsKLSAgICAgICAgZnJhbWUuYWxsb3cgPSBhbGxvdzsKICAgICAgICAgZnJhbWUuc3JjID0gZ2V0 X2hvc3RfaW5mbygpLkhUVFBTX1JFTU9URV9PUklHSU4gKyBSRVNPVVJDRVNfRElSICsgcmVzb3Vy Y2VGaWxlOwogICAgICAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGZyYW1lKTsKICAgICB9 KTsKIH0KIAotZnVuY3Rpb24gd2l0aFNhbWVTaXRlSWZyYW1lKHJlc291cmNlRmlsZSwgYWxsb3cg PSAiIikKLXsKLSAgICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUpID0+IHsKLSAgICAgICAg d2FpdEZvckxvYWQoKS50aGVuKChtZXNzYWdlKSA9PiB7Ci0gICAgICAgICAgICByZXNvbHZlKG1l c3NhZ2UpOwotICAgICAgIH0pOwotICAgICAgIGNvbnN0IGZyYW1lID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiaWZyYW1lIik7Ci0gICAgICAgY29uc3QgaG9zdCA9IGdldF9ob3N0X2luZm8oKTsK LSAgICAgICBmcmFtZS5hbGxvdyA9IGFsbG93OwotICAgICAgIGZyYW1lLnNyYyA9ICJodHRwczov LyIgKyBob3N0Lk9SSUdJTkFMX0hPU1QgKyAiOiIgKyBob3N0LkhUVFBTX1BPUlQyICsgUkVTT1VS Q0VTX0RJUiArIHJlc291cmNlRmlsZTsKLSAgICAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxk KGZyYW1lKTsKLSAgICB9KTsKLX0KLQogZnVuY3Rpb24gcHJvbWlzZVJlamVjdHModGVzdCwgZXhw ZWN0ZWQsIHByb21pc2UsIGRlc2NyaXB0aW9uKQogewogICAgIHJldHVybiBwcm9taXNlLnRoZW4o dGVzdC51bnJlYWNoZWRfZnVuYygiU2hvdWxkIGhhdmUgcmVqZWN0ZWQ6ICIgKyBkZXNjcmlwdGlv bikpLmNhdGNoKGZ1bmN0aW9uKGUpIHsK