194797 2019-02-18 15:38:21 -0800 REGRESSION (PSON): Can't access optumbank.com from myuhc.com 2019-02-18 18:29:09 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez beidson commit-queue ggaren koivisto webkit-bug-importer oldest_to_newest 1507495 0 cdumez 2019-02-18 15:38:21 -0800 Can't access optumbank.com from myuhc.com when PSON is enabled. 1507496 1 cdumez 2019-02-18 15:38:36 -0800 <rdar://problem/48055151> 1507523 2 362355 cdumez 2019-02-18 16:17:22 -0800 Created attachment 362355 Patch 1507538 3 362355 ggaren 2019-02-18 16:52:58 -0800 Comment on attachment 362355 Patch r=me 1507568 4 362355 commit-queue 2019-02-18 18:29:07 -0800 Comment on attachment 362355 Patch Clearing flags on attachment: 362355 Committed r241752: <https://trac.webkit.org/changeset/241752> 1507569 5 commit-queue 2019-02-18 18:29:09 -0800 All reviewed patches have been landed. Closing bug. 362355 2019-02-18 16:17:22 -0800 2019-02-18 18:29:07 -0800 Patch bug-194797-20190218161721.patch text/plain 30352 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxNjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg1MjJjYTQ1ZWE4MTcwN2Uy ZmM4NTNiZWU3YTA5YjMwYzliNjAxNWUuLjk0Y2RiNzNmZmFiODA4ZDVhM2I1MjI1Yzg3YjFkNjY0 ZTc5NzY1N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTktMDItMTggIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChQU09OKTogQ2Fu J3QgYWNjZXNzIG9wdHVtYmFuay5jb20gZnJvbSBteXVoYy5jb20KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDc5NworICAgICAgICA8cmRhcjovL3By b2JsZW0vNDgwNTUxNTE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIGlzc3VlIHdhcyBjYXVzZWQgYnkgdXMgbWlzdGFrZW5seSBwcm9jZXNzLXN3 YXBwaW5nIGZvciBhIHNhbWUtc2l0ZSBzZXJ2ZXIgc2lkZSByZWRpcmVjdC4KKyAgICAgICAgVGhl IHJlYXNvbiB3ZSB3ZXJlIGdldHRpbmcgaXQgd3JvbmcgaXMgYmVjYXVzZSB0aGUgbG9naWMgaW4K KyAgICAgICAgV2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uSW50ZXJuYWwoKSB3 YXMgZXhwZWN0aW5nIHBhZ2UucHJvY2VzcygpIHRvIGJlIHRoZSBzb3VyY2UKKyAgICAgICAgcHJv Y2VzcyBhbmQgcGFnZS5wYWdlTG9hZFN0YXRlKCkudXJsKCkgdG8gYmUgdGhlIHNvdXJjZSBVUkwu IFRob3NlIGFzc3VtcHRpb25zIGFyZSBpbmNvcnJlY3QKKyAgICAgICAgd2hlbiBhIHNlcnZlci1z aWRlIHJlZGlyZWN0IG9jY3VycyBpbiBhIHByb3Zpc2lvbmFsIHByb2Nlc3MuIEluIHN1Y2ggY2Fz ZSwgdGhlIHNvdXJjZSBwcm9jZXNzCisgICAgICAgIGlzIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94 eSdzIHByb2Nlc3MgYW5kIHRoZSBzb3VyY2UgVVJMIGlzIHRoZSBwcm92aXNpb25hbCBVUkwsIG5v dCB0aGUKKyAgICAgICAgY29tbWl0dGVkIG9uZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92 aXNpb25hbFBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVBy b3h5OjpkaWRQZXJmb3JtU2VydmVyUmVkaXJlY3QpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUmVj ZWl2ZU1lc3NhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5o OgorICAgICAgICBNYWtlIHN1cmUgdGhlIHByb3Zpc2lvbmFsIHBhZ2UgZm9yd2FyZHMgSVBDIHJl bGF0ZWQgdG8gc2VydmVyLXNpZGUgcmVkaXJlY3RzIHRvIHRoZSBwYWdlIHNvCisgICAgICAgIHRo YXQgdGhlIGNsaWVudCBnZXRzIGluZm9ybWVkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZp Z2F0aW9uUG9saWN5RGVjaXNpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRp ZFBlcmZvcm1TZXJ2ZXJSZWRpcmVjdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0U2hhcmVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uSW50ZXJu YWwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorCiAyMDE5LTAyLTE1 ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBOZXR3b3JrRGF0 YVRhc2sgc2hvdWxkIGNoZWNrIGl0cyBjbGllbnQgYmVmb3JlIGNhbGxpbmcgc2hvdWxkQ2FwdHVy ZUV4dHJhTmV0d29ya0xvYWRNZXRyaWNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Q cm92aXNpb25hbFBhZ2VQcm94eS5jcHAKaW5kZXggYjY2ZmY5YjRkZDFkMDdmNjZhYWFhNGExMTk2 ZjlhODM0ZGY5N2M4My4uMWY4ZDRhMzVmY2EwZDc0ZTZiYjg2NjI1YjJiMDgyYWEyNmEyMTdhZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNw cApAQCAtMjg0LDYgKzI4NCwxNiBAQCB2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkZWNpZGVQ b2xpY3lGb3JSZXNwb25zZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDbwogICAgIG1fcGFn ZS5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZVNoYXJlZChtX3Byb2Nlc3MuY29weVJlZigpLCBmcmFt ZUlELCBmcmFtZVNlY3VyaXR5T3JpZ2luLCBpZGVudGlmaWVyLCBuYXZpZ2F0aW9uSUQsIHJlc3Bv bnNlLCByZXF1ZXN0LCBjYW5TaG93TUlNRVR5cGUsIGxpc3RlbmVySUQsIHVzZXJEYXRhKTsKIH0K IAordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KGNv bnN0IFN0cmluZyYgc291cmNlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIGRlc3RpbmF0aW9uVVJM U3RyaW5nLCB1aW50NjRfdCBmcmFtZUlEKQoreworICAgIG1fcGFnZS5kaWRQZXJmb3JtU2VydmVy UmVkaXJlY3RTaGFyZWQobV9wcm9jZXNzLmNvcHlSZWYoKSwgc291cmNlVVJMU3RyaW5nLCBkZXN0 aW5hdGlvblVSTFN0cmluZywgZnJhbWVJRCk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJv eHk6OmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiYgcmVxdWVzdCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIG1fcGFn ZS5kaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZVNoYXJl ZChtX3Byb2Nlc3MuY29weVJlZigpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUocmVx dWVzdCksIHVzZXJEYXRhKTsKK30KKwogdm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6c3RhcnRV UkxTY2hlbWVUYXNrKFVSTFNjaGVtZVRhc2tQYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKIHsKICAg ICBtX3BhZ2Uuc3RhcnRVUkxTY2hlbWVUYXNrU2hhcmVkKG1fcHJvY2Vzcy5jb3B5UmVmKCksIFdU Rk1vdmUocGFyYW1ldGVycykpOwpAQCAtMzc0LDYgKzM4NCwxNiBAQCB2b2lkIFByb3Zpc2lvbmFs UGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24s IElQQzo6RAogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgaWYgKGRlY29kZXIubWVzc2Fn ZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFu ZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFs UGFnZVByb3h5OjpkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JG cmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdl TmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFBlcmZvcm1TZXJ2ZXJSZWRpcmVj dDo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpEaWRQZXJmb3JtU2VydmVyUmVkaXJlY3Q+KGRlY29kZXIsIHRoaXMsICZQcm92aXNp b25hbFBhZ2VQcm94eTo6ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKwogICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgbWVzc2FnZSAl czo6JXMgZnJvbSBwcm92aXNpb25hbCBwcm9jZXNzIiwgZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJO YW1lKCkudG9TdHJpbmcoKS5kYXRhKCksIGRlY29kZXIubWVzc2FnZU5hbWUoKS50b1N0cmluZygp LmRhdGEoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zp c2lvbmFsUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBh Z2VQcm94eS5oCmluZGV4IGZjMDAxNjkxOWM3MTc2Y2FlZjI4ZjVmZjg4YjU5ODgyYzk4MTY3YjAu LjYwZDM5MTA4M2JmZmM2NzhiZjk5NDVkMmJhYjk0NDNlOGRlNGFhOGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmgKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaApAQCAtNjQsNiArNjQsNyBA QCBwdWJsaWM6CiAgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKCkgeyByZXR1cm4gbV9wcm9j ZXNzLmdldCgpOyB9CiAgICAgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50OyB9CiAgICAgdWludDY0X3QgbmF2aWdhdGlvbklEKCkgY29uc3QgeyByZXR1cm4g bV9uYXZpZ2F0aW9uSUQ7IH0KKyAgICBjb25zdCBVUkwmIHByb3Zpc2lvbmFsVVJMKCkgY29uc3Qg eyByZXR1cm4gbV9wcm92aXNpb25hbExvYWRVUkw7IH0KIAogICAgIERyYXdpbmdBcmVhUHJveHkq IGRyYXdpbmdBcmVhKCkgY29uc3QgeyByZXR1cm4gbV9kcmF3aW5nQXJlYS5nZXQoKTsgfQogICAg IHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiB0YWtlRHJhd2luZ0FyZWEoKTsKQEAg LTkxLDYgKzkyLDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGRlY2lkZVBvbGljeUZvclJlc3BvbnNl KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYsIFdl YkNvcmU6OlBvbGljeUNoZWNrSWRlbnRpZmllciwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25z dCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiwKICAgICAgICAgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiwgYm9vbCBjYW5TaG93TUlNRVR5cGUsIHVpbnQ2NF90IGxpc3RlbmVySUQs IGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYpOworICAg IHZvaWQgZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KGNvbnN0IFN0cmluZyYgc291cmNlVVJMU3Ry aW5nLCBjb25zdCBTdHJpbmcmIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCB1aW50NjRfdCBmcmFtZUlE KTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2ViQ29yZTo6 UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWROYXZpZ2F0 ZVdpdGhOYXZpZ2F0aW9uRGF0YShjb25zdCBXZWJOYXZpZ2F0aW9uRGF0YVN0b3JlJiwgdWludDY0 X3QgZnJhbWVJRCk7CiAgICAgdm9pZCBkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QoY29uc3QgU3Ry aW5nJiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25VUkxTdHJpbmcs IHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIHZvaWQgZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXgg ZjBhM2Q0YzhmYWZhYTExMTMzN2Y4N2UyZGQwNThjODEyNjBiYWFkZS4uMTczNTg1YzdlN2ZiM2Rl OWU2MTMwMjc2ZGM2MWEzOTNkZDgzODg3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCkBAIC0yNzQ4LDcgKzI3NDgsMTcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJl Y2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKFBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24s IEEKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgp LnByb2Nlc3NGb3JOYXZpZ2F0aW9uKCp0aGlzLCAqbmF2aWdhdGlvbiwgcHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcG9s aWN5QWN0aW9uLCBuYXZpZ2F0aW9uID0gbWFrZVJlZigqbmF2aWdhdGlvbiksCisgICAgUmVmPFdl YlByb2Nlc3NQcm94eT4gc291cmNlUHJvY2VzcyA9IHByb2Nlc3MoKTsKKyAgICBVUkwgc291cmNl VVJMID0gVVJMIHsgVVJMKCksIHBhZ2VMb2FkU3RhdGUoKS51cmwoKSB9OworICAgIGlmIChhdXRv KiBwcm92aXNpb25hbFBhZ2UgPSBwcm92aXNpb25hbFBhZ2VQcm94eSgpKSB7CisgICAgICAgIGlm IChwcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpID09IG5hdmlnYXRpb24tPm5hdmlnYXRp b25JRCgpKSB7CisgICAgICAgICAgICBBU1NFUlQobmF2aWdhdGlvbi0+Y3VycmVudFJlcXVlc3RJ c1JlZGlyZWN0KCkpOworICAgICAgICAgICAgc291cmNlUHJvY2VzcyA9IHByb3Zpc2lvbmFsUGFn ZS0+cHJvY2VzcygpOworICAgICAgICAgICAgc291cmNlVVJMID0gcHJvdmlzaW9uYWxQYWdlLT5w cm92aXNpb25hbFVSTCgpOworICAgICAgICB9CisgICAgfQorCisgICAgcHJvY2VzcygpLnByb2Nl c3NQb29sKCkucHJvY2Vzc0Zvck5hdmlnYXRpb24oKnRoaXMsICpuYXZpZ2F0aW9uLCBzb3VyY2VQ cm9jZXNzLmNvcHlSZWYoKSwgc291cmNlVVJMLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 LCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBwb2xpY3lBY3Rpb24sIG5h dmlnYXRpb24gPSBtYWtlUmVmKCpuYXZpZ2F0aW9uKSwgc291cmNlUHJvY2VzcyA9IHNvdXJjZVBy b2Nlc3MuY29weVJlZigpLAogICAgICAgICBkYXRhID0gV1RGTW92ZShkYXRhKSwgc2VuZGVyID0g V1RGTW92ZShzZW5kZXIpLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50XSAoUmVmPFdlYlBy b2Nlc3NQcm94eT4mJiBwcm9jZXNzRm9yTmF2aWdhdGlvbiwgU3VzcGVuZGVkUGFnZVByb3h5KiBk ZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UsIGNvbnN0IFN0cmluZyYgcmVhc29uKSBtdXRhYmxlIHsK ICAgICAgICAgLy8gSWYgdGhlIG5hdmlnYXRpb24gaGFzIGJlZW4gZGVzdHJveWVkLCB0aGVuIG5v IG5lZWQgdG8gcHJvY2VlZC4KICAgICAgICAgaWYgKGlzQ2xvc2VkKCkgfHwgIW5hdmlnYXRpb25T dGF0ZSgpLmhhc05hdmlnYXRpb24obmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCkpKSB7CkBAIC0y NzU2LDE0ICsyNzY2LDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Q b2xpY3lEZWNpc2lvbihQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBCiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBpZiAocHJvY2Vzc0Zvck5hdmlnYXRpb24ucHRy KCkgIT0gJnByb2Nlc3MoKSkgeworICAgICAgICBib29sIHNob3VsZFByb2Nlc3NTd2FwID0gcHJv Y2Vzc0Zvck5hdmlnYXRpb24ucHRyKCkgIT0gc291cmNlUHJvY2Vzcy5wdHIoKTsKKyAgICAgICAg aWYgKHNob3VsZFByb2Nlc3NTd2FwKSB7CiAgICAgICAgICAgICBwb2xpY3lBY3Rpb24gPSBQb2xp Y3lBY3Rpb246OlN0b3BBbGxMb2FkczsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9X RUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiwgc3dh cHBpbmcgcHJvY2VzcyAlaSB3aXRoIHByb2Nlc3MgJWkgZm9yIG5hdmlnYXRpb24sIHJlYXNvbjog JXtwdWJsaWN9cyIsIHByb2Nlc3NJZGVudGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5w cm9jZXNzSWRlbnRpZmllcigpLCByZWFzb24udXRmOCgpLmRhdGEoKSk7CiAgICAgICAgICAgICBM T0coUHJvY2Vzc1N3YXBwaW5nLCAiKFByb2Nlc3NTd2FwcGluZykgU3dpdGNoaW5nIGZyb20gcHJv Y2VzcyAlaSB0byBuZXcgcHJvY2VzcyAoJWkpIGZvciBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICcl cyciLCBwcm9jZXNzSWRlbnRpZmllcigpLCBwcm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lk ZW50aWZpZXIoKSwgbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24tPmxvZ2dp bmdTdHJpbmcoKSk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZf QUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u OiBrZWVwIHVzaW5nIHByb2Nlc3MgJWkgZm9yIG5hdmlnYXRpb24sIHJlYXNvbjogJXtwdWJsaWN9 cyIsIHByb2Nlc3NJZGVudGlmaWVyKCksIHJlYXNvbi51dGY4KCkuZGF0YSgpKTsKIAotICAgICAg ICBib29sIHNob3VsZFByb2Nlc3NTd2FwID0gcHJvY2Vzc0Zvck5hdmlnYXRpb24ucHRyKCkgIT0g JnByb2Nlc3MoKTsKICAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24s IG5hdmlnYXRpb24ucHRyKCksIHNob3VsZFByb2Nlc3NTd2FwID8gV1RGOjpudWxsb3B0IDogV1RG TW92ZShkYXRhKSwgV1RGTW92ZShzZW5kZXIpLCBzaG91bGRQcm9jZXNzU3dhcCA/IFdpbGxDb250 aW51ZUxvYWRJbk5ld1Byb2Nlc3M6OlllcyA6IFdpbGxDb250aW51ZUxvYWRJbk5ld1Byb2Nlc3M6 Ok5vKTsKIAogICAgICAgICBpZiAoIXNob3VsZFByb2Nlc3NTd2FwKQpAQCAtNDc5NiwyMyArNDgw NiwyOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVk KFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcwogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlk UGVyZm9ybVNlcnZlclJlZGlyZWN0KGNvbnN0IFN0cmluZyYgc291cmNlVVJMU3RyaW5nLCBjb25z dCBTdHJpbmcmIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCB1aW50NjRfdCBmcmFtZUlEKQogewotICAg IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImRpZFBlcmZvcm1TZXJ2ZXJSZWRpcmVj dDogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRl bnRpZmllcigpLCBtX3BhZ2VJRCk7CisgICAgZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0U2hhcmVk KG1fcHJvY2Vzcy5jb3B5UmVmKCksIHNvdXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJp bmcsIGZyYW1lSUQpOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybVNlcnZlclJl ZGlyZWN0U2hhcmVkKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywgY29uc3QgU3RyaW5n JiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25VUkxTdHJpbmcsIHVp bnQ2NF90IGZyYW1lSUQpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAi ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0OiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0 LCBwcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CiAKICAgICBQYWdlQ2xp ZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgaWYgKHNvdXJjZVVS TFN0cmluZy5pc0VtcHR5KCkgfHwgZGVzdGluYXRpb25VUkxTdHJpbmcuaXNFbXB0eSgpKQogICAg ICAgICByZXR1cm47CiAgICAgCi0gICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3Mt PndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLCBmcmFtZSk7 Ci0gICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MsIGZyYW1lLT5wYWdlKCkgPT0gdGhpcyk7Cisg ICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBwcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKKyAg ICBNRVNTQUdFX0NIRUNLKHByb2Nlc3MsIGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLKHByb2Nl c3MsIGZyYW1lLT5wYWdlKCkgPT0gdGhpcyk7CiAKLSAgICBNRVNTQUdFX0NIRUNLX1VSTChtX3By b2Nlc3MsIHNvdXJjZVVSTFN0cmluZyk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwobV9wcm9jZXNz LCBkZXN0aW5hdGlvblVSTFN0cmluZyk7CisgICAgTUVTU0FHRV9DSEVDS19VUkwocHJvY2Vzcywg c291cmNlVVJMU3RyaW5nKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCBkZXN0aW5h dGlvblVSTFN0cmluZyk7CiAKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAg IG1faGlzdG9yeUNsaWVudC0+ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KCp0aGlzLCBzb3VyY2VV UkxTdHJpbmcsIGRlc3RpbmF0aW9uVVJMU3RyaW5nKTsKLSAgICBwcm9jZXNzKCkucHJvY2Vzc1Bv b2woKS5oaXN0b3J5Q2xpZW50KCkuZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KHByb2Nlc3MoKS5w cm9jZXNzUG9vbCgpLCAqdGhpcywgc291cmNlVVJMU3RyaW5nLCBkZXN0aW5hdGlvblVSTFN0cmlu ZywgKmZyYW1lKTsKKyAgICBwcm9jZXNzLT5wcm9jZXNzUG9vbCgpLmhpc3RvcnlDbGllbnQoKS5k aWRQZXJmb3JtU2VydmVyUmVkaXJlY3QocHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKSwgKnRoaXMsIHNv dXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcsICpmcmFtZSk7CiB9CiAKIHZvaWQg V2ViUGFnZVByb3h5OjpkaWRVcGRhdGVIaXN0b3J5VGl0bGUoY29uc3QgU3RyaW5nJiB0aXRsZSwg Y29uc3QgU3RyaW5nJiB1cmwsIHVpbnQ2NF90IGZyYW1lSUQpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCmluZGV4IGI0ZDhhZjNjZDJlMzk3NDQxZTYzODBjYzRjNmQxZTBhODM5 ZDY0OWIuLmIyYjBlODVkMmUwZDE1OWIwOGQwOWIzMzgxN2M4ZmMxMjZjMGQ4NGYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xNDQyLDYgKzE0NDIsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKFJlZjxX ZWJQcm9jZXNzUHJveHk+JiYsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgVVJMJiYsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZv aWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKFJlZjxXZWJQcm9jZXNzUHJv eHk+JiYsIHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0 YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJp bmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3Qg VXNlckRhdGEmKTsKICAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lv bmFsTG9hZEZvckZyYW1lU2hhcmVkKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHVpbnQ2NF90IGZy YW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYs IGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRQZXJmb3JtU2VydmVyUmVkaXJlY3RTaGFy ZWQoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkxTdHJpbmcs IGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25VUkxTdHJpbmcsIHVpbnQ2NF90IGZyYW1lSUQpOwog ICAgIHZvaWQgZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVkKFJlZjxXZWJQcm9jZXNzUHJv eHk+JiYsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIGRlc3Rp bmF0aW9uVVJMU3RyaW5nLCB1aW50NjRfdCBmcmFtZUlEKTsKICAgICB2b2lkIGRpZE5hdmlnYXRl V2l0aE5hdmlnYXRpb25EYXRhU2hhcmVkKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIGNvbnN0IFdl Yk5hdmlnYXRpb25EYXRhU3RvcmUmLCB1aW50NjRfdCBmcmFtZUlEKTsKICAgICB2b2lkIGRpZENo YW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWVTaGFyZWQoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwg dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKaW5kZXggN2U4Nzg4YTFmYzViM2Q0 YzFmYjU2YWJlZWQ2MTNiMGZiOWU0OTFiMC4uMTNlM2UwYzc1ZmYyY2QzM2M1NTA0NjdmNzEzMjg4 MGE5ODBkNzAyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNw cApAQCAtMjExNSwxNCArMjExNSwxNCBAQCBTZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5KiBXZWJQ cm9jZXNzUG9vbDo6c2VydmljZVdvcmtlclByb2Nlc3NQcm94eUZyb21QYWdlSUQodQogfQogI2Vu ZGlmCiAKLXZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmFkZFByb2Nlc3NUb09yaWdpbkNhY2hlU2V0KFdl YlBhZ2VQcm94eSYgcGFnZSkKK3ZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmFkZFByb2Nlc3NUb09yaWdp bkNhY2hlU2V0KFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgY29uc3QgVVJMJiB1cmwpCiB7Ci0g ICAgYXV0byByZWdpc3RyYWJsZURvbWFpbiA9IHRvUmVnaXN0cmFibGVEb21haW4oeyB7IH0sIHBh Z2UucGFnZUxvYWRTdGF0ZSgpLnVybCgpIH0pOwotICAgIGF1dG8gcmVzdWx0ID0gbV9zd2FwcGVk UHJvY2Vzc2VzUGVyUmVnaXN0cmFibGVEb21haW4uYWRkKHJlZ2lzdHJhYmxlRG9tYWluLCAmcGFn ZS5wcm9jZXNzKCkpOworICAgIGF1dG8gcmVnaXN0cmFibGVEb21haW4gPSB0b1JlZ2lzdHJhYmxl RG9tYWluKHVybCk7CisgICAgYXV0byByZXN1bHQgPSBtX3N3YXBwZWRQcm9jZXNzZXNQZXJSZWdp c3RyYWJsZURvbWFpbi5hZGQocmVnaXN0cmFibGVEb21haW4sICZwcm9jZXNzKTsKICAgICBpZiAo IXJlc3VsdC5pc05ld0VudHJ5KQotICAgICAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gJnBh Z2UucHJvY2VzcygpOworICAgICAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gJnByb2Nlc3M7 CiAKLSAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAiKFByb2Nlc3NTd2FwcGluZykgUmVnaXN0cmFi bGUgZG9tYWluICVzIGp1c3Qgc2F2ZWQgYSBjYWNoZWQgcHJvY2VzcyB3aXRoIHBpZCAlaSIsIHJl Z2lzdHJhYmxlRG9tYWluLnV0ZjgoKS5kYXRhKCksIHBhZ2UucHJvY2VzcygpLnByb2Nlc3NJZGVu dGlmaWVyKCkpOworICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICIoUHJvY2Vzc1N3YXBwaW5nKSBS ZWdpc3RyYWJsZSBkb21haW4gJXMganVzdCBzYXZlZCBhIGNhY2hlZCBwcm9jZXNzIHdpdGggcGlk ICVpIiwgcmVnaXN0cmFibGVEb21haW4udXRmOCgpLmRhdGEoKSwgcHJvY2Vzcy5wcm9jZXNzSWRl bnRpZmllcigpKTsKICAgICBpZiAoIXJlc3VsdC5pc05ld0VudHJ5KQogICAgICAgICBMT0coUHJv Y2Vzc1N3YXBwaW5nLCAiKFByb2Nlc3NTd2FwcGluZykgTm90ZTogSXQgYWxyZWFkeSBoYWQgb25l IHNhdmVkIik7CiB9CkBAIC0yMTQyLDMyICsyMTQyLDMyIEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6 OnJlbW92ZVByb2Nlc3NGcm9tT3JpZ2luQ2FjaGVTZXQoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNz KQogICAgICAgICBtX3N3YXBwZWRQcm9jZXNzZXNQZXJSZWdpc3RyYWJsZURvbWFpbi5yZW1vdmUo cmVnaXN0cmFibGVEb21haW4pOwogfQogCi12b2lkIFdlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9y TmF2aWdhdGlvbihXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IEFQSTo6TmF2aWdhdGlvbiYgbmF2 aWdhdGlvbiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYs IFN1c3BlbmRlZFBhZ2VQcm94eSosIGNvbnN0IFN0cmluZyYpPiYmIGNvbXBsZXRpb25IYW5kbGVy KQordm9pZCBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb24oV2ViUGFnZVByb3h5 JiBwYWdlLCBjb25zdCBBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFJlZjxXZWJQcm9jZXNz UHJveHk+JiYgc291cmNlUHJvY2VzcywgY29uc3QgVVJMJiBzb3VyY2VVUkwsIFByb2Nlc3NTd2Fw UmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZChSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmLCBTdXNwZW5kZWRQYWdlUHJveHkq LCBjb25zdCBTdHJpbmcmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBwcm9jZXNzRm9y TmF2aWdhdGlvbkludGVybmFsKHBhZ2UsIG5hdmlnYXRpb24sIHByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQsIFt0aGlzLCBwYWdlID0gbWFrZVJlZlB0cihwYWdlKSwgbmF2aWdhdGlvbiA9IG1h a2VSZWYobmF2aWdhdGlvbiksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIGNvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKFJlZjxXZWJQcm9jZXNzUHJv eHk+JiYgcHJvY2VzcywgU3VzcGVuZGVkUGFnZVByb3h5KiBzdXNwZW5kZWRQYWdlLCBjb25zdCBT dHJpbmcmIHJlYXNvbikgbXV0YWJsZSB7CisgICAgcHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5h bChwYWdlLCBuYXZpZ2F0aW9uLCBzb3VyY2VQcm9jZXNzLmNvcHlSZWYoKSwgc291cmNlVVJMLCBw cm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBbdGhpcywgcGFnZSA9IG1ha2VSZWZQdHIocGFn ZSksIG5hdmlnYXRpb24gPSBtYWtlUmVmKG5hdmlnYXRpb24pLCBzb3VyY2VQcm9jZXNzID0gc291 cmNlUHJvY2Vzcy5jb3B5UmVmKCksIHNvdXJjZVVSTCwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNs aWVudCwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oUmVm PFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBTdXNwZW5kZWRQYWdlUHJveHkqIHN1c3BlbmRl ZFBhZ2UsIGNvbnN0IFN0cmluZyYgcmVhc29uKSBtdXRhYmxlIHsKICAgICAgICAgLy8gV2UgYXJl IHByb2Nlc3Mtc3dhcHBpbmcgc28gYXV0b21hdGljIHByb2Nlc3MgcHJld2FybWluZyB3b3VsZCBi ZSBiZW5lZmljaWFsIGlmIHRoZSBjbGllbnQgaGFzIG5vdCBleHBsaWNpdGx5IGVuYWJsZWQgLyBk aXNhYmxlZCBpdC4KLSAgICAgICAgYm9vbCBkb2luZ0FuQXV0b21hdGljUHJvY2Vzc1N3YXAgPSBw cm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50ID09IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQ6Ok5vICYmIHByb2Nlc3MucHRyKCkgIT0gJnBhZ2UtPnByb2Nlc3MoKTsKKyAgICAgICAgYm9v bCBkb2luZ0FuQXV0b21hdGljUHJvY2Vzc1N3YXAgPSBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xp ZW50ID09IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQ6Ok5vICYmIHByb2Nlc3MucHRyKCkg IT0gc291cmNlUHJvY2Vzcy5wdHIoKTsKICAgICAgICAgaWYgKGRvaW5nQW5BdXRvbWF0aWNQcm9j ZXNzU3dhcCAmJiAhY29uZmlndXJhdGlvbigpLndhc0F1dG9tYXRpY1Byb2Nlc3NXYXJtaW5nU2V0 QnlDbGllbnQoKSAmJiAhY29uZmlndXJhdGlvbigpLmNsaWVudFdvdWxkQmVuZWZpdEZyb21BdXRv bWF0aWNQcm9jZXNzUHJld2FybWluZygpKSB7CiAgICAgICAgICAgICBSRUxFQVNFX0xPRyhQZXJm b3JtYW5jZUxvZ2dpbmcsICJBdXRvbWF0aWNhbGx5IHR1cm5pbmcgb24gcHJvY2VzcyBwcmV3YXJt aW5nIGJlY2F1c2UgdGhlIGNsaWVudCB3b3VsZCBiZW5lZml0IGZyb20gaXQiKTsKICAgICAgICAg ICAgIGNvbmZpZ3VyYXRpb24oKS5zZXRDbGllbnRXb3VsZEJlbmVmaXRGcm9tQXV0b21hdGljUHJv Y2Vzc1ByZXdhcm1pbmcodHJ1ZSk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAobV9jb25maWd1 cmF0aW9uLT5hbHdheXNLZWVwQW5kUmV1c2VTd2FwcGVkUHJvY2Vzc2VzKCkgJiYgcHJvY2Vzcy5w dHIoKSAhPSAmcGFnZS0+cHJvY2VzcygpKSB7CisgICAgICAgIGlmIChtX2NvbmZpZ3VyYXRpb24t PmFsd2F5c0tlZXBBbmRSZXVzZVN3YXBwZWRQcm9jZXNzZXMoKSAmJiBwcm9jZXNzLnB0cigpICE9 IHNvdXJjZVByb2Nlc3MucHRyKCkpIHsKICAgICAgICAgICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxh ZyBvbmNlRmxhZzsKICAgICAgICAgICAgIHN0ZDo6Y2FsbF9vbmNlKG9uY2VGbGFnLCBbXSB7CiAg ICAgICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJXQVJOSU5HOiBUaGUgb3B0aW9uIHRvIGFsd2F5 cyBrZWVwIHN3YXBwZWQgd2ViIHByb2Nlc3NlcyBhbGl2ZSBpcyBhY3RpdmUuIFRoaXMgaXMgbWVh bnQgZm9yIGRlYnVnZ2luZyBhbmQgdGVzdGluZyBvbmx5LiIpOwogICAgICAgICAgICAgfSk7CiAK LSAgICAgICAgICAgIGFkZFByb2Nlc3NUb09yaWdpbkNhY2hlU2V0KCpwYWdlKTsKKyAgICAgICAg ICAgIGFkZFByb2Nlc3NUb09yaWdpbkNhY2hlU2V0KHNvdXJjZVByb2Nlc3MsIHNvdXJjZVVSTCk7 CiAKLSAgICAgICAgICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICIoUHJvY2Vzc1N3YXBwaW5nKSBO YXZpZ2F0aW5nIGZyb20gJXMgdG8gJXMsIGtlZXBpbmcgYXJvdW5kIG9sZCBwcm9jZXNzLiBOb3cg aG9sZGluZyBvbiB0byBvbGQgcHJvY2Vzc2VzIGZvciAldSBvcmlnaW5zLiIsIHBhZ2UtPmN1cnJl bnRVUkwoKS51dGY4KCkuZGF0YSgpLCBuYXZpZ2F0aW9uLT5jdXJyZW50UmVxdWVzdCgpLnVybCgp LnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIG1fc3dhcHBlZFByb2Nlc3Nlc1BlclJlZ2lzdHJhYmxl RG9tYWluLnNpemUoKSk7CisgICAgICAgICAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAiKFByb2Nl c3NTd2FwcGluZykgTmF2aWdhdGluZyBmcm9tICVzIHRvICVzLCBrZWVwaW5nIGFyb3VuZCBvbGQg cHJvY2Vzcy4gTm93IGhvbGRpbmcgb24gdG8gb2xkIHByb2Nlc3NlcyBmb3IgJXUgb3JpZ2lucy4i LCBzb3VyY2VVUkwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgbmF2aWdhdGlvbi0+Y3VycmVudFJl cXVlc3QoKS51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBtX3N3YXBwZWRQcm9jZXNzZXNQ ZXJSZWdpc3RyYWJsZURvbWFpbi5zaXplKCkpOwogICAgICAgICB9CiAKICAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoV1RGTW92ZShwcm9jZXNzKSwgc3VzcGVuZGVkUGFnZSwgcmVhc29uKTsKICAg ICB9KTsKIH0KIAotdm9pZCBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRl cm5hbChXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlv biwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xp ZW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIFN1c3Bl bmRlZFBhZ2VQcm94eSosIGNvbnN0IFN0cmluZyYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9p ZCBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbChXZWJQYWdlUHJv eHkmIHBhZ2UsIGNvbnN0IEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgUmVmPFdlYlByb2Nl c3NQcm94eT4mJiBzb3VyY2VQcm9jZXNzLCBjb25zdCBVUkwmIHBhZ2VTb3VyY2VVUkwsIFByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgQ29t cGxldGlvbkhhbmRsZXI8dm9pZChSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmLCBTdXNwZW5kZWRQYWdl UHJveHkqLCBjb25zdCBTdHJpbmcmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBhdXRv JiB0YXJnZXRVUkwgPSBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkudXJsKCk7CiAgICAgYXV0 byByZWdpc3RyYWJsZURvbWFpbiA9IHRvUmVnaXN0cmFibGVEb21haW4odGFyZ2V0VVJMKTsKQEAg LTIxOTMsMzAgKzIxOTMsMzAgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmln YXRpb25JbnRlcm5hbChXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IEFQSToKICAgICB9OwogCiAg ICAgaWYgKHVzZXNTaW5nbGVXZWJQcm9jZXNzKCkpCi0gICAgICAgIHJldHVybiBjb21wbGV0aW9u SGFuZGxlcihwYWdlLnByb2Nlc3MoKSwgbnVsbHB0ciwgIlNpbmdsZSBXZWJQcm9jZXNzIG1vZGUg aXMgZW5hYmxlZCJfcyk7CisgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3Zl KHNvdXJjZVByb2Nlc3MpLCBudWxscHRyLCAiU2luZ2xlIFdlYlByb2Nlc3MgbW9kZSBpcyBlbmFi bGVkIl9zKTsKIAogICAgIGlmIChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50ID09IFByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQ6OlllcykKICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25I YW5kbGVyKGNyZWF0ZU5ld1Byb2Nlc3MoKSwgbnVsbHB0ciwgIlByb2Nlc3Mgc3dhcCB3YXMgcmVx dWVzdGVkIGJ5IHRoZSBjbGllbnQiX3MpOwogCiAgICAgaWYgKCFtX2NvbmZpZ3VyYXRpb24tPnBy b2Nlc3NTd2Fwc09uTmF2aWdhdGlvbigpKQotICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRs ZXIocGFnZS5wcm9jZXNzKCksIG51bGxwdHIsICJGZWF0dXJlIGlzIGRpc2FibGVkIl9zKTsKKyAg ICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoc291cmNlUHJvY2VzcyksIG51 bGxwdHIsICJGZWF0dXJlIGlzIGRpc2FibGVkIl9zKTsKIAogICAgIGlmIChtX2F1dG9tYXRpb25T ZXNzaW9uKQotICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIocGFnZS5wcm9jZXNzKCks IG51bGxwdHIsICJBbiBhdXRvbWF0aW9uIHNlc3Npb24gaXMgYWN0aXZlIl9zKTsKKyAgICAgICAg cmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoc291cmNlUHJvY2VzcyksIG51bGxwdHIs ICJBbiBhdXRvbWF0aW9uIHNlc3Npb24gaXMgYWN0aXZlIl9zKTsKIAotICAgIGlmICghcGFnZS5w cm9jZXNzKCkuaGFzQ29tbWl0dGVkQW55UHJvdmlzaW9uYWxMb2FkcygpKSB7Ci0gICAgICAgIHRy eVByZXdhcm1XaXRoRG9tYWluSW5mb3JtYXRpb24ocGFnZS5wcm9jZXNzKCksIHRhcmdldFVSTCk7 Ci0gICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcihwYWdlLnByb2Nlc3MoKSwgbnVsbHB0 ciwgIlByb2Nlc3MgaGFzIG5vdCB5ZXQgY29tbWl0dGVkIGFueSBwcm92aXNpb25hbCBsb2FkcyJf cyk7CisgICAgaWYgKCFzb3VyY2VQcm9jZXNzLT5oYXNDb21taXR0ZWRBbnlQcm92aXNpb25hbExv YWRzKCkpIHsKKyAgICAgICAgdHJ5UHJld2FybVdpdGhEb21haW5JbmZvcm1hdGlvbihzb3VyY2VQ cm9jZXNzLCB0YXJnZXRVUkwpOworICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoV1RG TW92ZShzb3VyY2VQcm9jZXNzKSwgbnVsbHB0ciwgIlByb2Nlc3MgaGFzIG5vdCB5ZXQgY29tbWl0 dGVkIGFueSBwcm92aXNpb25hbCBsb2FkcyJfcyk7CiAgICAgfQogCiAgICAgLy8gRklYTUU6IFdl IHNob3VsZCBzdXBwb3J0IHByb2Nlc3Mgc3dhcCB3aGVuIGEgd2luZG93IGhhcyBiZWVuIG9wZW5l ZCB2aWEgd2luZG93Lm9wZW4oKSB3aXRob3V0ICdub29wZW5lcicuCiAgICAgLy8gVGhlIGlzc3Vl IGlzIHRoYXQgdGhlIG9wZW5lciBoYXMgYSBoYW5kbGUgdG8gdGhlIFdpbmRvd1Byb3h5LgogICAg IGlmIChuYXZpZ2F0aW9uLm9wZW5lZEJ5RE9NV2l0aE9wZW5lcigpICYmICFtX2NvbmZpZ3VyYXRp b24tPnByb2Nlc3NTd2Fwc09uV2luZG93T3BlbldpdGhPcGVuZXIoKSkKLSAgICAgICAgcmV0dXJu IGNvbXBsZXRpb25IYW5kbGVyKHBhZ2UucHJvY2VzcygpLCBudWxscHRyLCAiQnJvd3NpbmcgY29u dGV4dCBiZWVuIG9wZW5lZCBieSBET00gd2l0aG91dCAnbm9vcGVuZXInIl9zKTsKKyAgICAgICAg cmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoc291cmNlUHJvY2VzcyksIG51bGxwdHIs ICJCcm93c2luZyBjb250ZXh0IGJlZW4gb3BlbmVkIGJ5IERPTSB3aXRob3V0ICdub29wZW5lcici X3MpOwogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBzdXBwb3J0IHByb2Nlc3Mgc3dhcCB3aGVu IGEgd2luZG93IGhhcyBvcGVuZWQgb3RoZXIgd2luZG93cyB2aWEgd2luZG93Lm9wZW4uCiAgICAg aWYgKG5hdmlnYXRpb24uaGFzT3BlbmVkRnJhbWVzKCkpCi0gICAgICAgIHJldHVybiBjb21wbGV0 aW9uSGFuZGxlcihwYWdlLnByb2Nlc3MoKSwgbnVsbHB0ciwgIkJyb3dzaW5nIGNvbnRleHQgaGFz IG9wZW5lZCBvdGhlciB3aW5kb3dzIl9zKTsKKyAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5k bGVyKFdURk1vdmUoc291cmNlUHJvY2VzcyksIG51bGxwdHIsICJCcm93c2luZyBjb250ZXh0IGhh cyBvcGVuZWQgb3RoZXIgd2luZG93cyJfcyk7CiAKICAgICBpZiAoYXV0byogdGFyZ2V0SXRlbSA9 IG5hdmlnYXRpb24udGFyZ2V0SXRlbSgpKSB7CiAgICAgICAgIGlmIChhdXRvKiBzdXNwZW5kZWRQ YWdlID0gdGFyZ2V0SXRlbS0+c3VzcGVuZGVkUGFnZSgpKSB7CkBAIC0yMjQ1LDEzICsyMjQ1LDEz IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uSW50ZXJuYWwoV2Vi UGFnZVByb3h5JiBwYWdlLCBjb25zdCBBUEk6CiAgICAgfQogCiAgICAgaWYgKG5hdmlnYXRpb24u dHJlYXRBc1NhbWVPcmlnaW5OYXZpZ2F0aW9uKCkpCi0gICAgICAgIHJldHVybiBjb21wbGV0aW9u SGFuZGxlcihwYWdlLnByb2Nlc3MoKSwgbnVsbHB0ciwgIlRoZSB0cmVhdEFzU2FtZU9yaWdpbk5h dmlnYXRpb24gZmxhZyBpcyBzZXQiX3MpOworICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRs ZXIoV1RGTW92ZShzb3VyY2VQcm9jZXNzKSwgbnVsbHB0ciwgIlRoZSB0cmVhdEFzU2FtZU9yaWdp bk5hdmlnYXRpb24gZmxhZyBpcyBzZXQiX3MpOwogCiAgICAgVVJMIHNvdXJjZVVSTDsKICAgICBp ZiAocGFnZS5pc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpICYm ICFuYXZpZ2F0aW9uLnJlcXVlc3Rlck9yaWdpbigpLmlzRW1wdHkoKSkKICAgICAgICAgc291cmNl VVJMID0gVVJMIHsgVVJMKCksIG5hdmlnYXRpb24ucmVxdWVzdGVyT3JpZ2luKCkudG9TdHJpbmco KSB9OwogICAgIGVsc2UKLSAgICAgICAgc291cmNlVVJMID0gVVJMIHsgeyB9LCBwYWdlLnBhZ2VM b2FkU3RhdGUoKS51cmwoKSB9OworICAgICAgICBzb3VyY2VVUkwgPSBwYWdlU291cmNlVVJMOwog CiAgICAgaWYgKHNvdXJjZVVSTC5pc0VtcHR5KCkgJiYgcGFnZS5jb25maWd1cmF0aW9uKCkucmVs YXRlZFBhZ2UoKSkgewogICAgICAgICBzb3VyY2VVUkwgPSBVUkwgeyB7IH0sIHBhZ2UuY29uZmln dXJhdGlvbigpLnJlbGF0ZWRQYWdlKCktPnBhZ2VMb2FkU3RhdGUoKS51cmwoKSB9OwpAQCAtMjI1 OSw3ICsyMjU5LDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25J bnRlcm5hbChXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IEFQSToKICAgICB9CiAKICAgICBpZiAo IXNvdXJjZVVSTC5pc1ZhbGlkKCkgfHwgIXRhcmdldFVSTC5pc1ZhbGlkKCkgfHwgc291cmNlVVJM LmlzRW1wdHkoKSB8fCBzb3VyY2VVUkwucHJvdG9jb2xJc0Fib3V0KCkgfHwgcmVnaXN0cmFibGVE b21haW5zQXJlRXF1YWwoc291cmNlVVJMLCB0YXJnZXRVUkwpKQotICAgICAgICByZXR1cm4gY29t cGxldGlvbkhhbmRsZXIocGFnZS5wcm9jZXNzKCksIG51bGxwdHIsICJOYXZpZ2F0aW9uIGlzIHNh bWUtc2l0ZSJfcyk7CisgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKHNv dXJjZVByb2Nlc3MpLCBudWxscHRyLCAiTmF2aWdhdGlvbiBpcyBzYW1lLXNpdGUiX3MpOwogCiAg ICAgU3RyaW5nIHJlYXNvbiA9ICJOYXZpZ2F0aW9uIGlzIGNyb3NzLXNpdGUiX3M7CiAgICAgCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAppbmRleCBlYmZmOWJmOTdmYTk2 OTZkMzI3MTY0YWI2Y2FlZTQ1NGJhYTJiMmViLi4zNWQwOTBmNGZmY2IyMGRiYmNiZjExOTNjMTBi MDgwMWEwMmU0ZTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgK QEAgLTQ1Nyw3ICs0NTcsNyBAQCBwdWJsaWM6CiAgICAgQmFja2dyb3VuZFdlYlByb2Nlc3NUb2tl biBiYWNrZ3JvdW5kV2ViUHJvY2Vzc1Rva2VuKCkgY29uc3QgeyByZXR1cm4gQmFja2dyb3VuZFdl YlByb2Nlc3NUb2tlbihtX2JhY2tncm91bmRXZWJQcm9jZXNzQ291bnRlci5jb3VudCgpKTsgfQog I2VuZGlmCiAKLSAgICB2b2lkIHByb2Nlc3NGb3JOYXZpZ2F0aW9uKFdlYlBhZ2VQcm94eSYsIGNv bnN0IEFQSTo6TmF2aWdhdGlvbiYsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgU3VzcGVuZGVkUGFnZVBy b3h5KiwgY29uc3QgU3RyaW5nJik+JiYpOworICAgIHZvaWQgcHJvY2Vzc0Zvck5hdmlnYXRpb24o V2ViUGFnZVByb3h5JiwgY29uc3QgQVBJOjpOYXZpZ2F0aW9uJiwgUmVmPFdlYlByb2Nlc3NQcm94 eT4mJiBzb3VyY2VQcm9jZXNzLCBjb25zdCBVUkwmIHNvdXJjZVVSTCwgUHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChSZWY8V2ViUHJvY2Vzc1Byb3h5 PiYmLCBTdXNwZW5kZWRQYWdlUHJveHkqLCBjb25zdCBTdHJpbmcmKT4mJik7CiAKICAgICAvLyBT dXNwZW5kZWRQYWdlUHJveHkgbWFuYWdlbWVudC4KICAgICB2b2lkIGFkZFN1c3BlbmRlZFBhZ2Uo c3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJik7CkBAIC00OTksNyArNDk5LDcg QEAgcHJpdmF0ZToKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYpOwogICAgIHZvaWQgcGxhdGZvcm1JbnZhbGlkYXRlQ29u dGV4dCgpOwogCi0gICAgdm9pZCBwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVybmFsKFdlYlBhZ2VQ cm94eSYsIGNvbnN0IEFQSTo6TmF2aWdhdGlvbiYsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgU3VzcGVu ZGVkUGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJik+JiYpOworICAgIHZvaWQgcHJvY2Vzc0Zvck5h dmlnYXRpb25JbnRlcm5hbChXZWJQYWdlUHJveHkmLCBjb25zdCBBUEk6Ok5hdmlnYXRpb24mLCBS ZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHNvdXJjZVByb2Nlc3MsIGNvbnN0IFVSTCYgc291cmNlVVJM LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFJl ZjxXZWJQcm9jZXNzUHJveHk+JiYsIFN1c3BlbmRlZFBhZ2VQcm94eSosIGNvbnN0IFN0cmluZyYp PiYmKTsKIAogICAgIFJlZlB0cjxXZWJQcm9jZXNzUHJveHk+IHRyeVRha2VQcmV3YXJtZWRQcm9j ZXNzKFdlYnNpdGVEYXRhU3RvcmUmKTsKIApAQCAtNTYyLDcgKzU2Miw3IEBAIHByaXZhdGU6CiAg ICAgdm9pZCByZXNvbHZlUGF0aHNGb3JTYW5kYm94RXh0ZW5zaW9ucygpOwogICAgIHZvaWQgcGxh dGZvcm1SZXNvbHZlUGF0aHNGb3JTYW5kYm94RXh0ZW5zaW9ucygpOwogCi0gICAgdm9pZCBhZGRQ cm9jZXNzVG9PcmlnaW5DYWNoZVNldChXZWJQYWdlUHJveHkmKTsKKyAgICB2b2lkIGFkZFByb2Nl c3NUb09yaWdpbkNhY2hlU2V0KFdlYlByb2Nlc3NQcm94eSYsIGNvbnN0IFVSTCYpOwogICAgIHZv aWQgcmVtb3ZlUHJvY2Vzc0Zyb21PcmlnaW5DYWNoZVNldChXZWJQcm9jZXNzUHJveHkmKTsKIAog ICAgIHZvaWQgdHJ5UHJld2FybVdpdGhEb21haW5JbmZvcm1hdGlvbihXZWJQcm9jZXNzUHJveHkm LCBjb25zdCBVUkwmKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCA1NDcwMjk2YTYxYTIyYTBhOGVlMzU4ZGNlZTAwMGFhNTk4ZmM3NDExLi5lMWIy MTFkZTlhNWZiZThmZGI2NmU1YzZjZTY0MzA5NGU2ZGNmMTQ1IDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDIt MTggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9O IChQU09OKTogQ2FuJ3QgYWNjZXNzIG9wdHVtYmFuay5jb20gZnJvbSBteXVoYy5jb20KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDc5NworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDgwNTUxNTE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkIEFQSSB0ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5t bToKKwogMjAxOS0wMi0xNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtMRkNdIFJlbmRlckltYWdlJ3MgZGVmYXVsdCBpbnRyaW5zaWMgc2l6ZSBpcyAwLgpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dh cE9uTmF2aWdhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev UHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KaW5kZXggNTEwZmZiYTViM2U1NGM4ZTlmOGZkNTJm OTAxMWM2NGZiOTQ0ZDNmZS4uYjIwZTMyODI1N2ZlZGMwNjkyMTA5OTc1ODBlMmMxMjA2ZGI1ZWYy NiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9j ZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCkBAIC0xNDA2LDExICsxNDA2LDE1 IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0KQogICAgIHNlcnZlclJlZGlyZWN0 ZWQgPSBmYWxzZTsKIAogICAgIHNlZW5QSURzLmFkZChbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50 aWZpZXJdKTsKKyAgICBpZiAoYXV0byBwcm92aXNpb25hbFBJRCA9IFt3ZWJWaWV3IF9wcm92aXNp b25hbFdlYlByb2Nlc3NJZGVudGlmaWVyXSkKKyAgICAgICAgc2VlblBJRHMuYWRkKHByb3Zpc2lv bmFsUElEKTsKIAogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CiAgICAgZG9u ZSA9IGZhbHNlOwogCiAgICAgc2VlblBJRHMuYWRkKFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRp Zmllcl0pOworICAgIGlmIChhdXRvIHByb3Zpc2lvbmFsUElEID0gW3dlYlZpZXcgX3Byb3Zpc2lv bmFsV2ViUHJvY2Vzc0lkZW50aWZpZXJdKQorICAgICAgICBzZWVuUElEcy5hZGQocHJvdmlzaW9u YWxQSUQpOwogCiAgICAgRVhQRUNUX0ZBTFNFKHNlcnZlclJlZGlyZWN0ZWQpOwogICAgIEVYUEVD VF9FUSgzLCBudW1iZXJPZkRlY2lkZVBvbGljeUNhbGxzKTsKQEAgLTE0NTUsMTEgKzE0NTksMTUg QEAgVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QyKQogICAgIHNlcnZlclJlZGlyZWN0 ZWQgPSBmYWxzZTsKIAogICAgIHNlZW5QSURzLmFkZChbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50 aWZpZXJdKTsKKyAgICBpZiAoYXV0byBwcm92aXNpb25hbFBJRCA9IFt3ZWJWaWV3IF9wcm92aXNp b25hbFdlYlByb2Nlc3NJZGVudGlmaWVyXSkKKyAgICAgICAgc2VlblBJRHMuYWRkKHByb3Zpc2lv bmFsUElEKTsKIAogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CiAgICAgZG9u ZSA9IGZhbHNlOwogCiAgICAgc2VlblBJRHMuYWRkKFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRp Zmllcl0pOworICAgIGlmIChhdXRvIHByb3Zpc2lvbmFsUElEID0gW3dlYlZpZXcgX3Byb3Zpc2lv bmFsV2ViUHJvY2Vzc0lkZW50aWZpZXJdKQorICAgICAgICBzZWVuUElEcy5hZGQocHJvdmlzaW9u YWxQSUQpOwogCiAgICAgRVhQRUNUX0ZBTFNFKHNlcnZlclJlZGlyZWN0ZWQpOwogICAgIEVYUEVD VF9FUSgzLCBudW1iZXJPZkRlY2lkZVBvbGljeUNhbGxzKTsKQEAgLTE0NzUsNiArMTQ4Myw4NyBA QCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRpcmVjdDIpCiAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4xLmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNv bHV0ZVN0cmluZ10pOwogfQogCitlbnVtIGNsYXNzIFNob3VsZENhY2hlUHJvY2Vzc0ZpcnN0IHsg Tm8sIFllcyB9Oworc3RhdGljIHZvaWQgcnVuU2FtZU9yaWdpblNlcnZlclJlZGlyZWN0VGVzdChT aG91bGRDYWNoZVByb2Nlc3NGaXJzdCBzaG91bGRDYWNoZVByb2Nlc3NGaXJzdCkKK3sKKyAgICBh dXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IHBzb25Qcm9jZXNzUG9vbENvbmZpZ3VyYXRp b24oKTsKKyAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBzT25O YXZpZ2F0aW9uID0gWUVTOworICAgIGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9j ZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3Vy YXRpb24uZ2V0KCldKTsKKworICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5T KFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29u ZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBo YW5kbGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbaGFuZGxl ciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0 bWwiIHRvRGF0YTpjcm9zc1NpdGVDbGllbnRTaWRlUmVkaXJlY3RCeXRlc107CisgICAgW2hhbmRs ZXIgYWRkUmVkaXJlY3RGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5o dG1sIiB0b1VSTFN0cmluZzpAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4yLmh0bWwiXTsKKyAg ICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgp IGZvclVSTFNjaGVtZTpAInBzb24iXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tX S1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkg Y29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gZGVs ZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwor ICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAg ICBOU1VSTFJlcXVlc3QgKnJlcXVlc3Q7CisKKyAgICBpZiAoc2hvdWxkQ2FjaGVQcm9jZXNzRmly c3QgPT0gU2hvdWxkQ2FjaGVQcm9jZXNzRmlyc3Q6OlllcykgeworICAgICAgICByZXF1ZXN0ID0g W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246 Ly93d3cuYXBwbGUuY29tL21haW4zLmh0bWwiXV07CisgICAgICAgIFt3ZWJWaWV3IGxvYWRSZXF1 ZXN0OnJlcXVlc3RdOworCisgICAgICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7 CisgICAgICAgIGRvbmUgPSBmYWxzZTsKKyAgICB9CisKKyAgICBkZWxlZ2F0ZS0+ZGlkU3RhcnRQ cm92aXNpb25hbE5hdmlnYXRpb25IYW5kbGVyID0gXnsKKyAgICAgICAgc2VlblBJRHMuYWRkKFt3 ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOworICAgICAgICBpZiAoYXV0byBwcm92aXNp b25hbFBJRCA9IFt3ZWJWaWV3IF9wcm92aXNpb25hbFdlYlByb2Nlc3NJZGVudGlmaWVyXSkKKyAg ICAgICAgICAgIHNlZW5QSURzLmFkZChwcm92aXNpb25hbFBJRCk7CisgICAgfTsKKworICAgIHdp bGxQZXJmb3JtQ2xpZW50UmVkaXJlY3QgPSBmYWxzZTsKKyAgICBkaWRQZXJmb3JtQ2xpZW50UmVk aXJlY3QgPSBmYWxzZTsKKyAgICBzZXJ2ZXJSZWRpcmVjdGVkID0gZmFsc2U7CisgICAgcmVxdWVz dCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJw c29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1 ZXN0OnJlcXVlc3RdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZ3aWxsUGVyZm9y bUNsaWVudFJlZGlyZWN0KTsKKworICAgIHNlZW5QSURzLmFkZChbd2ViVmlldyBfd2ViUHJvY2Vz c0lkZW50aWZpZXJdKTsKKyAgICBpZiAoYXV0byBwcm92aXNpb25hbFBJRCA9IFt3ZWJWaWV3IF9w cm92aXNpb25hbFdlYlByb2Nlc3NJZGVudGlmaWVyXSkKKyAgICAgICAgc2VlblBJRHMuYWRkKHBy b3Zpc2lvbmFsUElEKTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZGlkUGVyZm9y bUNsaWVudFJlZGlyZWN0KTsKKyAgICBkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QgPSBmYWxzZTsK KyAgICB3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0ID0gZmFsc2U7CisKKyAgICBzZWVuUElEcy5h ZGQoW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CisgICAgaWYgKGF1dG8gcHJvdmlz aW9uYWxQSUQgPSBbd2ViVmlldyBfcHJvdmlzaW9uYWxXZWJQcm9jZXNzSWRlbnRpZmllcl0pCisg ICAgICAgIHNlZW5QSURzLmFkZChwcm92aXNpb25hbFBJRCk7CisKKyAgICBUZXN0V2ViS2l0QVBJ OjpVdGlsOjpydW4oJnNlcnZlclJlZGlyZWN0ZWQpOworICAgIHNlcnZlclJlZGlyZWN0ZWQgPSBm YWxzZTsKKworICAgIHNlZW5QSURzLmFkZChbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJd KTsKKyAgICBpZiAoYXV0byBwcm92aXNpb25hbFBJRCA9IFt3ZWJWaWV3IF9wcm92aXNpb25hbFdl YlByb2Nlc3NJZGVudGlmaWVyXSkKKyAgICAgICAgc2VlblBJRHMuYWRkKHByb3Zpc2lvbmFsUElE KTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZh bHNlOworCisgICAgc2VlblBJRHMuYWRkKFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0p OworICAgIGlmIChhdXRvIHByb3Zpc2lvbmFsUElEID0gW3dlYlZpZXcgX3Byb3Zpc2lvbmFsV2Vi UHJvY2Vzc0lkZW50aWZpZXJdKQorICAgICAgICBzZWVuUElEcy5hZGQocHJvdmlzaW9uYWxQSUQp OworCisgICAgRVhQRUNUX0VRKDJ1LCBzZWVuUElEcy5zaXplKCkpOworfQorCitURVNUKFByb2Nl c3NTd2FwLCBTYW1lT3JpZ2luU2VydmVyUmVkaXJlY3QpCit7CisgICAgcnVuU2FtZU9yaWdpblNl cnZlclJlZGlyZWN0VGVzdChTaG91bGRDYWNoZVByb2Nlc3NGaXJzdDo6Tm8pOworfQorCitURVNU KFByb2Nlc3NTd2FwLCBTYW1lT3JpZ2luU2VydmVyUmVkaXJlY3RGcm9tQ2FjaGVkUHJvY2VzcykK K3sKKyAgICBydW5TYW1lT3JpZ2luU2VydmVyUmVkaXJlY3RUZXN0KFNob3VsZENhY2hlUHJvY2Vz c0ZpcnN0OjpZZXMpOworfQorCiBURVNUKFByb2Nlc3NTd2FwLCBUZXJtaW5hdGVQcm9jZXNzUmln aHRBZnRlclN3YXApCiB7CiAgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBwc29u UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKCk7Cg==