95651 2012-09-01 19:48:19 -0700 Use dynamic sandbox extension rather than sandbox parameters for paths provided by the UIProcess 2012-09-01 20:07:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 710304 0 sam 2012-09-01 19:48:19 -0700 Use dynamic sandbox extension rather than sandbox parameters for paths provided by the UIProcess 710305 1 161836 sam 2012-09-01 19:58:01 -0700 Created attachment 161836 Patch 710306 2 161836 mitz 2012-09-01 20:04:53 -0700 Comment on attachment 161836 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161836&action=review > Source/WebKit2/ChangeLog:24 > + Add SandboxExtension::Handle's for path's we need access to, and remove Too many 's > Source/WebKit2/ChangeLog:31 > + Create SandboxExtension::Handle's for path's we need access to, and move Again > Source/WebKit2/ChangeLog:42 > + Replace the use of sandbox parameters for opening access for necessary path's … 710307 3 sam 2012-09-01 20:07:30 -0700 Committed r127384: <http://trac.webkit.org/changeset/127384> 161836 2012-09-01 19:58:01 -0700 2012-09-01 20:04:52 -0700 Patch bug-95651-20120901195752.patch text/plain 18140 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNzM4MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUwIEBACisyMDEyLTA5LTAxICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIGR5bmFtaWMgc2FuZGJveCBleHRl bnNpb24gcmF0aGVyIHRoYW4gc2FuZGJveCBwYXJhbWV0ZXJzIGZvciBwYXRocyBwcm92aWRlZCBi eSB0aGUgVUlQcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05NTY1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgaXMgdGhlIGZpcnN0IHN0ZXAgdG8gbm90IHJlbHlpbmcgb24gdGhlIGluaXRp YWxpemF0aW9uIG1lc3NhZ2UgdG8gaW5pdGlhbGl6ZQorICAgICAgICB0aGUgc2FuZGJveC4KKwor ICAgICAgICAqIFNoYXJlZC9TYW5kYm94RXh0ZW5zaW9uLmg6CisgICAgICAgIChTYW5kYm94RXh0 ZW5zaW9uKToKKyAgICAgICAgKiBTaGFyZWQvbWFjL1NhbmRib3hFeHRlbnNpb25NYWMubW06Cisg ICAgICAgIChXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseSk6Cisg ICAgICAgIEFkZCBzdGF0aWMgdmVyc2lvbiBvZiBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVy bWFuZW50bHkgd2hpY2ggdGFrZXMgYQorICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUu IFRoZXJlIGlzIG5vIHJlYXNvbiB0byBjcmVhdGUgYSBTYW5kYm94RXh0ZW5zaW9uCisgICAgICAg IGp1c3QgdG8gY29uc3VtZSBpdCBmb3JldmVyLgorCisgICAgICAgICogU2hhcmVkL1dlYlByb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3Jl YXRpb25QYXJhbWV0ZXJzOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3Jl YXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3Jl YXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgIChXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz KToKKyAgICAgICAgQWRkIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSdzIGZvciBwYXRoJ3Mgd2Ug bmVlZCBhY2Nlc3MgdG8sIGFuZCByZW1vdmUKKyAgICAgICAgd2ViSW5zcGVjdG9yQmFzZURpcmVj dG9yeSwgd2hpY2ggaXMgdW51c2VkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpjcmVhdGVOZXdXZWJQcm9jZXNzKToK KyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW06CisgICAgICAgIChXZWJL aXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICBD cmVhdGUgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJ3MgZm9yIHBhdGgncyB3ZSBuZWVkIGFjY2Vz cyB0bywgYW5kIG1vdmUKKyAgICAgICAgZ2V0dGluZyB0aGUgcHJlc2VudGVyQXBwbGljYXRpb25Q aWQgdG8gcGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcywgc2luY2UKKyAgICAgICAgaXQgaXMg TWFjIG9ubHkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIE1v dmUgc2V0dGluZyB0aGUgcHJlc2VudGVyQXBwbGljYXRpb25QaWQgdG8gcGxhdGZvcm1Jbml0aWFs aXplV2ViUHJvY2Vzcy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWMu bW06CisgICAgICAgIChXZWJLaXQ6OmluaXRpYWxpemVTYW5kYm94KToKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIFJl cGxhY2UgdGhlIHVzZSBvZiBzYW5kYm94IHBhcmFtZXRlcnMgZm9yIG9wZW5pbmcgYWNjZXNzIGZv ciBuZWNlc3NhcnkgcGF0aCdzCisgICAgICAgIHdpdGggcGVybWFuZW50IGNvbnN1bXB0aW9uIG9m IHNhbmRib3ggZXh0ZW5zaW9ucy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvY29tLmFwcGxlLldl YlByb2Nlc3Muc2IuaW46CisgICAgICAgIFJlbW92ZSBzYW5kYm94IHJ1bGVzIHRoYXQgYXJlIG5v dyBoYW5kbGVkIHZpYSBleHRlbnNpb25zLgorCiAyMDEyLTA4LTMxICBCeXVuZ3dvbyBMZWUgIDxi dzgwLmxlZUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBCdWlsZCB3YXJuaW5nIDogLVdmb3JtYXQg b24gV2ViTWVtb3J5U2FtcGxlci5jcHAuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2Fu ZGJveEV4dGVuc2lvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9TYW5k Ym94RXh0ZW5zaW9uLmgJKHJldmlzaW9uIDEyNzM4MykKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJl ZC9TYW5kYm94RXh0ZW5zaW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTk5LDYgKzk5LDggQEAgcHVi bGljOgogICAgIGJvb2wgY29uc3VtZSgpOwogICAgIGJvb2wgY29uc3VtZVBlcm1hbmVudGx5KCk7 CiAKKyAgICBzdGF0aWMgYm9vbCBjb25zdW1lUGVybWFuZW50bHkoY29uc3QgSGFuZGxlJik7CisK IHByaXZhdGU6CiAgICAgZXhwbGljaXQgU2FuZGJveEV4dGVuc2lvbihjb25zdCBIYW5kbGUmKTsK ICAgICAgICAgICAgICAgICAgICAgIApJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMTI3Mzgz KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Miw4ICs1MiwxMSBAQCB2b2lkIFdlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnM6OmVuY29kCiAgICAgZW5jb2Rlci0+ZW5jb2RlKGluamVjdGVkQnVuZGxl UGF0aCk7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKGluamVjdGVkQnVuZGxlUGF0aEV4dGVuc2lvbkhh bmRsZSk7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkpOwor ICAgIGVuY29kZXItPmVuY29kZShhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFu ZGxlKTsKICAgICBlbmNvZGVyLT5lbmNvZGUoZGF0YWJhc2VEaXJlY3RvcnkpOworICAgIGVuY29k ZXItPmVuY29kZShkYXRhYmFzZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAgICAgZW5jb2Rl ci0+ZW5jb2RlKGxvY2FsU3RvcmFnZURpcmVjdG9yeSk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKGxv Y2FsU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAgICAgZW5jb2Rlci0+ZW5jb2Rl KHVybFNjaGVtZXNSZWdpc3RlcmVyZEFzRW1wdHlEb2N1bWVudCk7CiAgICAgZW5jb2Rlci0+ZW5j b2RlKHVybFNjaGVtZXNSZWdpc3RlcmVkQXNTZWN1cmUpOwogICAgIGVuY29kZXItPmVuY29kZSh1 cmxTY2hlbWVzRm9yV2hpY2hEb21haW5SZWxheGF0aW9uSXNGb3JiaWRkZW4pOwpAQCAtNzgsMTEg KzgxLDEyIEBAIHZvaWQgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2QKICAgICBl bmNvZGVyLT5lbmNvZGUocGFyZW50UHJvY2Vzc05hbWUpOwogICAgIGVuY29kZXItPmVuY29kZShw cmVzZW50ZXJBcHBsaWNhdGlvblBpZCk7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKG5zVVJMQ2FjaGVQ YXRoKTsKKyAgICBlbmNvZGVyLT5lbmNvZGUobnNVUkxDYWNoZVBhdGhFeHRlbnNpb25IYW5kbGUp OwogICAgIGVuY29kZXItPmVuY29kZShuc1VSTENhY2hlTWVtb3J5Q2FwYWNpdHkpOwogICAgIGVu Y29kZXItPmVuY29kZShuc1VSTENhY2hlRGlza0NhcGFjaXR5KTsKICAgICBlbmNvZGVyLT5lbmNv ZGUoYWNjZWxlcmF0ZWRDb21wb3NpdGluZ1BvcnQpOwogICAgIGVuY29kZXItPmVuY29kZSh1aVBy b2Nlc3NCdW5kbGVSZXNvdXJjZVBhdGgpOwotICAgIGVuY29kZXItPmVuY29kZSh3ZWJJbnNwZWN0 b3JCYXNlRGlyZWN0b3J5KTsKKyAgICBlbmNvZGVyLT5lbmNvZGUodWlQcm9jZXNzQnVuZGxlUmVz b3VyY2VQYXRoRXh0ZW5zaW9uSGFuZGxlKTsKICNlbGlmIFBMQVRGT1JNKFdJTikKICAgICBlbmNv ZGVyLT5lbmNvZGUoc2hvdWxkUGFpbnROYXRpdmVDb250cm9scyk7CiAgICAgZW5jb2Rlci0+ZW5j b2RlKGNmVVJMQ2FjaGVQYXRoKTsKQEAgLTExNCwxMCArMTE4LDE2IEBAIGJvb2wgV2ViUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2QKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlm ICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZShwYXJhbWV0 ZXJzLmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocGFyYW1ldGVycy5kYXRhYmFz ZURpcmVjdG9yeSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRl Y29kZShwYXJhbWV0ZXJzLmRhdGFiYXNlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMubG9j YWxTdG9yYWdlRGlyZWN0b3J5KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVj b2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMubG9jYWxTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFu ZGxlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBh cmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVyZXJkQXNFbXB0eURvY3VtZW50KSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMudXJsU2No ZW1lc1JlZ2lzdGVyZWRBc1NlY3VyZSkpCkBAIC0xNjIsNiArMTcyLDggQEAgYm9vbCBXZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZAogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg aWYgKCFkZWNvZGVyLT5kZWNvZGUocGFyYW1ldGVycy5uc1VSTENhY2hlUGF0aCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZShwYXJhbWV0ZXJzLm5zVVJM Q2FjaGVQYXRoRXh0ZW5zaW9uSGFuZGxlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlm ICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMubnNVUkxDYWNoZU1lbW9yeUNhcGFjaXR5KSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRl cnMubnNVUkxDYWNoZURpc2tDYXBhY2l0eSkpCkBAIC0xNzAsNyArMTgyLDcgQEAgYm9vbCBXZWJQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZAogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocGFyYW1ldGVycy51aVByb2Nlc3NCdW5kbGVSZXNvdXJj ZVBhdGgpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUo cGFyYW1ldGVycy53ZWJJbnNwZWN0b3JCYXNlRGlyZWN0b3J5KSkKKyAgICBpZiAoIWRlY29kZXIt PmRlY29kZShwYXJhbWV0ZXJzLnVpUHJvY2Vzc0J1bmRsZVJlc291cmNlUGF0aEV4dGVuc2lvbkhh bmRsZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICNlbGlmIFBMQVRGT1JNKFdJTikKICAgICBp ZiAoIWRlY29kZXItPmRlY29kZShwYXJhbWV0ZXJzLnNob3VsZFBhaW50TmF0aXZlQ29udHJvbHMp KQpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiAxMjczODMpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSw4 ICs1NSwxMSBAQCBzdHJ1Y3QgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyB7CiAgICAgU2Fu ZGJveEV4dGVuc2lvbjo6SGFuZGxlIGluamVjdGVkQnVuZGxlUGF0aEV4dGVuc2lvbkhhbmRsZTsK IAogICAgIFN0cmluZyBhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5OyAgICAKKyAgICBTYW5kYm94 RXh0ZW5zaW9uOjpIYW5kbGUgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRs ZTsKICAgICBTdHJpbmcgZGF0YWJhc2VEaXJlY3Rvcnk7CisgICAgU2FuZGJveEV4dGVuc2lvbjo6 SGFuZGxlIGRhdGFiYXNlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwogICAgIFN0cmluZyBsb2Nh bFN0b3JhZ2VEaXJlY3Rvcnk7CisgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIGxvY2FsU3Rv cmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsKIAogICAgIFZlY3RvcjxTdHJpbmc+IHVybFNj aGVtZXNSZWdpc3RlcmVyZEFzRW1wdHlEb2N1bWVudDsKICAgICBWZWN0b3I8U3RyaW5nPiB1cmxT Y2hlbWVzUmVnaXN0ZXJlZEFzU2VjdXJlOwpAQCAtOTgsMTQgKzEwMSwxNSBAQCBzdHJ1Y3QgV2Vi UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyB7CiAKICAgICAvLyBGSVhNRTogVGhlc2Ugc2hvdWxk IGJlIG1lcmdlZCB3aXRoIENGVVJMQ2FjaGUgY291bnRlcnBhcnRzIGJlbG93LgogICAgIFN0cmlu ZyBuc1VSTENhY2hlUGF0aDsKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgbnNVUkxDYWNo ZVBhdGhFeHRlbnNpb25IYW5kbGU7CisKICAgICB1aW50NjRfdCBuc1VSTENhY2hlTWVtb3J5Q2Fw YWNpdHk7CiAgICAgdWludDY0X3QgbnNVUkxDYWNoZURpc2tDYXBhY2l0eTsKIAogICAgIENvcmVJ UEM6Ok1hY2hQb3J0IGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdQb3J0OwogCiAgICAgU3RyaW5nIHVp UHJvY2Vzc0J1bmRsZVJlc291cmNlUGF0aDsKLQotICAgIFN0cmluZyB3ZWJJbnNwZWN0b3JCYXNl RGlyZWN0b3J5OworICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSB1aVByb2Nlc3NCdW5kbGVS ZXNvdXJjZVBhdGhFeHRlbnNpb25IYW5kbGU7CiAKICNlbGlmIFBMQVRGT1JNKFdJTikKICAgICBT dHJpbmcgY2ZVUkxDYWNoZVBhdGg7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1Nh bmRib3hFeHRlbnNpb25NYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVk L21hYy9TYW5kYm94RXh0ZW5zaW9uTWFjLm1tCShyZXZpc2lvbiAxMjczODMpCisrKyBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvbWFjL1NhbmRib3hFeHRlbnNpb25NYWMubW0JKHdvcmtpbmcgY29weSkK QEAgLTI5MCw2ICsyOTAsMTkgQEAgYm9vbCBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFu ZW50bAogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK2Jvb2wgU2FuZGJveEV4dGVuc2lvbjo6Y29u c3VtZVBlcm1hbmVudGx5KGNvbnN0IEhhbmRsZSYgaGFuZGxlKQoreworICAgIEFTU0VSVChoYW5k bGUubV9zYW5kYm94RXh0ZW5zaW9uKTsKKworICAgIGJvb2wgcmVzdWx0ID0gV0tTYW5kYm94RXh0 ZW5zaW9uQ29uc3VtZShoYW5kbGUubV9zYW5kYm94RXh0ZW5zaW9uKTsKKyAgICAKKyAgICAvLyBE ZXN0cm95IHRoZSBleHRlbnNpb24gd2l0aG91dCBpbnZhbGlkYXRpbmcgaXQuCisgICAgV0tTYW5k Ym94RXh0ZW5zaW9uRGVzdHJveShoYW5kbGUubV9zYW5kYm94RXh0ZW5zaW9uKTsKKyAgICBoYW5k bGUubV9zYW5kYm94RXh0ZW5zaW9uID0gMDsKKworICAgIHJldHVybiByZXN1bHQ7Cit9CisKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gRU5BQkxFKFdFQl9QUk9DRVNTX1NBTkRC T1gpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCShyZXZpc2lv biAxMjczODMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTMwNywyMSArMzA3LDI1IEBAIFBhc3NSZWZQdHI8V2ViUHJvY2Vzc1By b3h5PiBXZWJDb250ZXh0OjoKIAogICAgIFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgcGFy YW1ldGVyczsKIAotICAgIGlmICghaW5qZWN0ZWRCdW5kbGVQYXRoKCkuaXNFbXB0eSgpKSB7Ci0g ICAgICAgIHBhcmFtZXRlcnMuaW5qZWN0ZWRCdW5kbGVQYXRoID0gaW5qZWN0ZWRCdW5kbGVQYXRo KCk7CisgICAgcGFyYW1ldGVycy5pbmplY3RlZEJ1bmRsZVBhdGggPSBpbmplY3RlZEJ1bmRsZVBh dGgoKTsKKyAgICBpZiAoIXBhcmFtZXRlcnMuaW5qZWN0ZWRCdW5kbGVQYXRoLmlzRW1wdHkoKSkK ICAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlKHBhcmFtZXRlcnMuaW5qZWN0 ZWRCdW5kbGVQYXRoLCBTYW5kYm94RXh0ZW5zaW9uOjpSZWFkT25seSwgcGFyYW1ldGVycy5pbmpl Y3RlZEJ1bmRsZVBhdGhFeHRlbnNpb25IYW5kbGUpOwotICAgIH0KIAotICAgIHBhcmFtZXRlcnMu c2hvdWxkVHJhY2tWaXNpdGVkTGlua3MgPSBtX2hpc3RvcnlDbGllbnQuc2hvdWxkVHJhY2tWaXNp dGVkTGlua3MoKTsKLSAgICBwYXJhbWV0ZXJzLmNhY2hlTW9kZWwgPSBtX2NhY2hlTW9kZWw7Ci0g ICAgcGFyYW1ldGVycy5sYW5ndWFnZXMgPSB1c2VyUHJlZmVycmVkTGFuZ3VhZ2VzKCk7CiAgICAg cGFyYW1ldGVycy5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5ID0gYXBwbGljYXRpb25DYWNoZURp cmVjdG9yeSgpOworICAgIGlmICghcGFyYW1ldGVycy5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5 LmlzRW1wdHkoKSkKKyAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlKHBhcmFt ZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSwgU2FuZGJveEV4dGVuc2lvbjo6UmVhZFdy aXRlLCBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUp OworCiAgICAgcGFyYW1ldGVycy5kYXRhYmFzZURpcmVjdG9yeSA9IGRhdGFiYXNlRGlyZWN0b3J5 KCk7CisgICAgaWYgKCFwYXJhbWV0ZXJzLmRhdGFiYXNlRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAg ICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlKHBhcmFtZXRlcnMuZGF0YWJhc2VE aXJlY3RvcnksIFNhbmRib3hFeHRlbnNpb246OlJlYWRXcml0ZSwgcGFyYW1ldGVycy5kYXRhYmFz ZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CisKICAgICBwYXJhbWV0ZXJzLmxvY2FsU3RvcmFn ZURpcmVjdG9yeSA9IGxvY2FsU3RvcmFnZURpcmVjdG9yeSgpOworICAgIGlmICghcGFyYW1ldGVy cy5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkuaXNFbXB0eSgpKQorICAgICAgICBTYW5kYm94RXh0ZW5z aW9uOjpjcmVhdGVIYW5kbGUocGFyYW1ldGVycy5sb2NhbFN0b3JhZ2VEaXJlY3RvcnksIFNhbmRi b3hFeHRlbnNpb246OlJlYWRXcml0ZSwgcGFyYW1ldGVycy5sb2NhbFN0b3JhZ2VEaXJlY3RvcnlF eHRlbnNpb25IYW5kbGUpOwogCi0jaWYgUExBVEZPUk0oTUFDKQotICAgIHBhcmFtZXRlcnMucHJl c2VudGVyQXBwbGljYXRpb25QaWQgPSBnZXRwaWQoKTsKLSNlbmRpZgorICAgIHBhcmFtZXRlcnMu c2hvdWxkVHJhY2tWaXNpdGVkTGlua3MgPSBtX2hpc3RvcnlDbGllbnQuc2hvdWxkVHJhY2tWaXNp dGVkTGlua3MoKTsKKyAgICBwYXJhbWV0ZXJzLmNhY2hlTW9kZWwgPSBtX2NhY2hlTW9kZWw7Cisg ICAgcGFyYW1ldGVycy5sYW5ndWFnZXMgPSB1c2VyUHJlZmVycmVkTGFuZ3VhZ2VzKCk7CiAKICAg ICBjb3B5VG9WZWN0b3IobV9zY2hlbWVzVG9SZWdpc3RlckFzRW1wdHlEb2N1bWVudCwgcGFyYW1l dGVycy51cmxTY2hlbWVzUmVnaXN0ZXJlcmRBc0VtcHR5RG9jdW1lbnQpOwogICAgIGNvcHlUb1Zl Y3RvcihtX3NjaGVtZXNUb1JlZ2lzdGVyQXNTZWN1cmUsIHBhcmFtZXRlcnMudXJsU2NoZW1lc1Jl Z2lzdGVyZWRBc1NlY3VyZSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dl YkNvbnRleHRNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9XZWJDb250ZXh0TWFjLm1tCShyZXZpc2lvbiAxMjczODMpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTc1LDI0ICs3 NSwyOCBAQCBTdHJpbmcgV2ViQ29udGV4dDo6YXBwbGljYXRpb25DYWNoZURpcmVjCiAKIHZvaWQg V2ViQ29udGV4dDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogeworICAgIHBhcmFtZXRlcnMucHJlc2VudGVyQXBw bGljYXRpb25QaWQgPSBnZXRwaWQoKTsKKwogICAgIGlmICghb21pdFBERlN1cHBvcnQoKSkgewog ICAgICAgICAvLyBXZSB3YW50IHRvIHVzZSBhIFBERiB2aWV3IGluIHRoZSBVSSBwcm9jZXNzIGZv ciBQREYgTUlNRSB0eXBlcy4KICAgICAgICAgSGFzaFNldDxTdHJpbmcsIENhc2VGb2xkaW5nSGFz aD4gbWltZVR5cGUgPSBwZGZBbmRQb3N0U2NyaXB0TUlNRVR5cGVzKCk7CiAgICAgICAgIHBhcmFt ZXRlcnMubWltZVR5cGVzV2l0aEN1c3RvbVJlcHJlc2VudGF0aW9uLmFwcGVuZFJhbmdlKG1pbWVU eXBlLmJlZ2luKCksIG1pbWVUeXBlLmVuZCgpKTsKICAgICB9CiAKKyAgICBwYXJhbWV0ZXJzLnBh cmVudFByb2Nlc3NOYW1lID0gW1tOU1Byb2Nlc3NJbmZvIHByb2Nlc3NJbmZvXSBwcm9jZXNzTmFt ZV07ICAgIAorCiAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBjYWNoZVBhdGgoQWRvcHRDRiwg V0tDb3B5Rm91bmRhdGlvbkNhY2hlRGlyZWN0b3J5KCkpOwogICAgIGlmICghY2FjaGVQYXRoKQog ICAgICAgICBjYWNoZVBhdGggPSByZWludGVycHJldF9jYXN0PENGU3RyaW5nUmVmPihOU0hvbWVE aXJlY3RvcnkoKSk7CiAKLSAgICBOU1VSTENhY2hlICp1cmxDYWNoZSA9IFtOU1VSTENhY2hlIHNo YXJlZFVSTENhY2hlXTsKLQotICAgIHBhcmFtZXRlcnMucGFyZW50UHJvY2Vzc05hbWUgPSBbW05T UHJvY2Vzc0luZm8gcHJvY2Vzc0luZm9dIHByb2Nlc3NOYW1lXTsgICAgCiAgICAgcGFyYW1ldGVy cy5uc1VSTENhY2hlUGF0aCA9IFsoTlNTdHJpbmcgKiljYWNoZVBhdGguZ2V0KCkgc3RyaW5nQnlT dGFuZGFyZGl6aW5nUGF0aF07CisgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlKHBh cmFtZXRlcnMubnNVUkxDYWNoZVBhdGgsIFNhbmRib3hFeHRlbnNpb246OlJlYWRXcml0ZSwgcGFy YW1ldGVycy5uc1VSTENhY2hlUGF0aEV4dGVuc2lvbkhhbmRsZSk7CisgICAgQVNTRVJUKCFwYXJh bWV0ZXJzLm5zVVJMQ2FjaGVQYXRoLmlzRW1wdHkoKSk7CisKKyAgICBOU1VSTENhY2hlICp1cmxD YWNoZSA9IFtOU1VSTENhY2hlIHNoYXJlZFVSTENhY2hlXTsKICAgICBwYXJhbWV0ZXJzLm5zVVJM Q2FjaGVNZW1vcnlDYXBhY2l0eSA9IFt1cmxDYWNoZSBtZW1vcnlDYXBhY2l0eV07CiAgICAgcGFy YW1ldGVycy5uc1VSTENhY2hlRGlza0NhcGFjaXR5ID0gW3VybENhY2hlIGRpc2tDYXBhY2l0eV07 CiAKLSAgICBBU1NFUlQoIXBhcmFtZXRlcnMubnNVUkxDYWNoZVBhdGguaXNFbXB0eSgpKTsKIAog I2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKICAgICBwYXJhbWV0ZXJzLmRpc2FibGVQbHVnaW5Q cm9jZXNzTWVzc2FnZVRpbWVvdXQgPSBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1 bHRzXSBib29sRm9yS2V5OkAiV2ViS2l0RGlzYWJsZVBsdWdpblByb2Nlc3NNZXNzYWdlVGltZW91 dCJdOwpAQCAtMTEwLDYgKzExNCw3IEBAIHZvaWQgV2ViQ29udGV4dDo6cGxhdGZvcm1Jbml0aWFs aXplV2ViUHIKIAogICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCByZWFsbHkgYmUgY29uZmlndXJh YmxlOyB3ZSBzaG91bGRuJ3QganVzdCBibGluZGx5IGFsbG93IHJlYWQgYWNjZXNzIHRvIHRoZSBV SSBwcm9jZXNzIGJ1bmRsZS4KICAgICBwYXJhbWV0ZXJzLnVpUHJvY2Vzc0J1bmRsZVJlc291cmNl UGF0aCA9IFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gcmVzb3VyY2VQYXRoXTsKKyAgICBTYW5kYm94 RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGUocGFyYW1ldGVycy51aVByb2Nlc3NCdW5kbGVSZXNvdXJj ZVBhdGgsIFNhbmRib3hFeHRlbnNpb246OlJlYWRPbmx5LCBwYXJhbWV0ZXJzLnVpUHJvY2Vzc0J1 bmRsZVJlc291cmNlUGF0aEV4dGVuc2lvbkhhbmRsZSk7CiAKICAgICBwYXJhbWV0ZXJzLnVpUHJv Y2Vzc0J1bmRsZUlkZW50aWZpZXIgPSBTdHJpbmcoW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBidW5k bGVJZGVudGlmaWVyXSk7CiAgICAgCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlByb2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UHJvY2Vzcy5jcHAJKHJldmlzaW9uIDEyNzM4MykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MywxMCArMjUzLDYgQEAgdm9p ZCBXZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJvY2VzcyhjbwogCiAgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBwYXJhbWV0ZXJzLm1pbWVUeXBlc1dpdGhDdXN0b21SZXByZXNlbnRhdGlvbi5z aXplKCk7ICsraSkKICAgICAgICAgbV9taW1lVHlwZXNXaXRoQ3VzdG9tUmVwcmVzZW50YXRpb25z LmFkZChwYXJhbWV0ZXJzLm1pbWVUeXBlc1dpdGhDdXN0b21SZXByZXNlbnRhdGlvbltpXSk7Ci0g ICAgCi0jaWYgUExBVEZPUk0oTUFDKQotICAgIG1fcHJlc2VudGVyQXBwbGljYXRpb25QaWQgPSBw YXJhbWV0ZXJzLnByZXNlbnRlckFwcGxpY2F0aW9uUGlkOwotI2VuZGlmCiAKICAgICBpZiAocGFy YW1ldGVycy5zaG91bGRBbHdheXNVc2VDb21wbGV4VGV4dENvZGVQYXRoKQogICAgICAgICBzZXRB bHdheXNVc2VzQ29tcGxleFRleHRDb2RlUGF0aCh0cnVlKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5zYi5pbgkocmV2aXNp b24gMTI3MzgzKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJv Y2Vzcy5zYi5pbgkod29ya2luZyBjb3B5KQpAQCAtMTA3LDMwICsxMDcsNiBAQAogKGlmIChwb3Np dGl2ZT8gKHN0cmluZy1sZW5ndGggKHBhcmFtICJEQVJXSU5fVVNFUl9URU1QX0RJUiIpKSkKICAg ICAoYWxsb3cgZmlsZSogKHN1YnBhdGggKHBhcmFtICJEQVJXSU5fVVNFUl9URU1QX0RJUiIpKSkp CiAKLTs7IERhdGFiYXNlIGRpcmVjdG9yeS4KLShpZiAocG9zaXRpdmU/IChzdHJpbmctbGVuZ3Ro IChwYXJhbSAiV0VCS0lUX0RBVEFCQVNFX0RJUiIpKSkKLSAgICAoYWxsb3cgZmlsZSogKHN1YnBh dGggKHBhcmFtICJXRUJLSVRfREFUQUJBU0VfRElSIikpKSkKLQotOzsgTG9jYWxTdG9yYWdlIGRp cmVjdG9yeS4KLShpZiAocG9zaXRpdmU/IChzdHJpbmctbGVuZ3RoIChwYXJhbSAiV0VCS0lUX0xP Q0FMU1RPUkFHRV9ESVIiKSkpCi0gICAgKGFsbG93IGZpbGUqIChzdWJwYXRoIChwYXJhbSAiV0VC S0lUX0xPQ0FMU1RPUkFHRV9ESVIiKSkpKQotCi07OyBBcHBsaWNhdGlvbkNhY2hlIGRpcmVjdG9y eS4KLShpZiAocG9zaXRpdmU/IChzdHJpbmctbGVuZ3RoIChwYXJhbSAiV0VCS0lUX0FQUExJQ0FU SU9OX0NBQ0hFX0RJUiIpKSkKLSAgICAoYWxsb3cgZmlsZSogKHN1YnBhdGggKHBhcmFtICJXRUJL SVRfQVBQTElDQVRJT05fQ0FDSEVfRElSIikpKSkKLQotOzsgVGhlIFdlYiBJbnNwZWN0b3IgZGly ZWN0b3J5LgotKGlmIChwb3NpdGl2ZT8gKHN0cmluZy1sZW5ndGggKHBhcmFtICJXRUJLSVRfV0VC X0lOU1BFQ1RPUl9ESVIiKSkpCi0gICAgKGFsbG93IGZpbGUtcmVhZCogKHN1YnBhdGggKHBhcmFt ICJXRUJLSVRfV0VCX0lOU1BFQ1RPUl9ESVIiKSkpKQotCi07OyBUaGUgTlNVUkxDYWNoZSBkaXJl Y3RvcnkuCi0oaWYgKHBvc2l0aXZlPyAoc3RyaW5nLWxlbmd0aCAocGFyYW0gIk5TVVJMX0NBQ0hF X0RJUiIpKSkKLSAgICAoYWxsb3cgZmlsZSogKHN1YnBhdGggKHBhcmFtICJOU1VSTF9DQUNIRV9E SVIiKSkpKQotCi07OyBUaGUgYnVuZGxlIHJlc291cmNlIHBhdGggb2YgdGhlIFVJIHByb2Nlc3Mu Ci0oaWYgKHBvc2l0aXZlPyAoc3RyaW5nLWxlbmd0aCAocGFyYW0gIlVJX1BST0NFU1NfQlVORExF X1JFU09VUkNFX0RJUiIpKSkKLSAgICAoYWxsb3cgZmlsZS1yZWFkKiAoc3VicGF0aCAocGFyYW0g IlVJX1BST0NFU1NfQlVORExFX1JFU09VUkNFX0RJUiIpKSkpCi0KIDs7IElPS2l0IHVzZXIgY2xp ZW50cwogKGFsbG93IGlva2l0LW9wZW4KICAgICAgICAoaW9raXQtY29ubmVjdGlvbiAiSU9BY2Nl bGVyYXRvciIpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNz TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvbWFjL1dlYlBy b2Nlc3NNYWMubW0JKHJldmlzaW9uIDEyNzM4MykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvbWFjL1dlYlByb2Nlc3NNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTIwNSw4ICsyMDUsNiBA QCBzdGF0aWMgdm9pZCBpbml0aWFsaXplU2FuZGJveChjb25zdCBXZWJQCiAKICAgICAvLyBUaGVz ZSBhcmUgcmVhZC1vbmx5LgogICAgIGFwcGVuZFJlYWRvbmx5U2FuZGJveERpcmVjdG9yeShzYW5k Ym94UGFyYW1ldGVycywgIldFQktJVDJfRlJBTUVXT1JLX0RJUiIsIFtbW05TQnVuZGxlIGJ1bmRs ZUZvckNsYXNzOk5TQ2xhc3NGcm9tU3RyaW5nKEAiV0tWaWV3IildIGJ1bmRsZVBhdGhdIHN0cmlu Z0J5RGVsZXRpbmdMYXN0UGF0aENvbXBvbmVudF0pOwotICAgIGFwcGVuZFJlYWRvbmx5U2FuZGJv eERpcmVjdG9yeShzYW5kYm94UGFyYW1ldGVycywgIlVJX1BST0NFU1NfQlVORExFX1JFU09VUkNF X0RJUiIsIHBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxlUmVzb3VyY2VQYXRoKTsKLSAgICBhcHBl bmRSZWFkb25seVNhbmRib3hEaXJlY3Rvcnkoc2FuZGJveFBhcmFtZXRlcnMsICJXRUJLSVRfV0VC X0lOU1BFQ1RPUl9ESVIiLCBwYXJhbWV0ZXJzLndlYkluc3BlY3RvckJhc2VEaXJlY3RvcnkpOwog CiAgICAgLy8gVGhlc2UgYXJlIHJlYWQtd3JpdGUgZ2V0Y29uZiBwYXRocy4KICAgICBhcHBlbmRS ZWFkd3JpdGVDb25mRGlyZWN0b3J5KHNhbmRib3hQYXJhbWV0ZXJzLCAiREFSV0lOX1VTRVJfVEVN UF9ESVIiLCBfQ1NfREFSV0lOX1VTRVJfVEVNUF9ESVIpOwpAQCAtMjE0LDEwICsyMTIsNiBAQCBz dGF0aWMgdm9pZCBpbml0aWFsaXplU2FuZGJveChjb25zdCBXZWJQCiAKICAgICAvLyBUaGVzZSBh cmUgcmVhZC13cml0ZSBwYXRocy4KICAgICBhcHBlbmRSZWFkd3JpdGVTYW5kYm94RGlyZWN0b3J5 KHNhbmRib3hQYXJhbWV0ZXJzLCAiSE9NRV9ESVIiLCBOU0hvbWVEaXJlY3RvcnkoKSk7Ci0gICAg YXBwZW5kUmVhZHdyaXRlU2FuZGJveERpcmVjdG9yeShzYW5kYm94UGFyYW1ldGVycywgIldFQktJ VF9EQVRBQkFTRV9ESVIiLCBwYXJhbWV0ZXJzLmRhdGFiYXNlRGlyZWN0b3J5KTsKLSAgICBhcHBl bmRSZWFkd3JpdGVTYW5kYm94RGlyZWN0b3J5KHNhbmRib3hQYXJhbWV0ZXJzLCAiV0VCS0lUX0xP Q0FMU1RPUkFHRV9ESVIiLCBwYXJhbWV0ZXJzLmxvY2FsU3RvcmFnZURpcmVjdG9yeSk7Ci0gICAg YXBwZW5kUmVhZHdyaXRlU2FuZGJveERpcmVjdG9yeShzYW5kYm94UGFyYW1ldGVycywgIldFQktJ VF9BUFBMSUNBVElPTl9DQUNIRV9ESVIiLCBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uQ2FjaGVEaXJl Y3RvcnkpOwotICAgIGFwcGVuZFJlYWR3cml0ZVNhbmRib3hEaXJlY3Rvcnkoc2FuZGJveFBhcmFt ZXRlcnMsICJOU1VSTF9DQUNIRV9ESVIiLCBwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVQYXRoKTsKIAog ICAgIHNhbmRib3hQYXJhbWV0ZXJzLmFwcGVuZChzdGF0aWNfY2FzdDxjb25zdCBjaGFyKj4oMCkp OwogCkBAIC0yNTgsNiArMjUyLDEyIEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFs aXplV2ViUHIKIAogICAgIGluaXRpYWxpemVTYW5kYm94KHBhcmFtZXRlcnMpOwogCisgICAgU2Fu ZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMudWlQcm9jZXNzQnVu ZGxlUmVzb3VyY2VQYXRoRXh0ZW5zaW9uSGFuZGxlKTsKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpj b25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5sb2NhbFN0b3JhZ2VEaXJlY3RvcnlFeHRlbnNp b25IYW5kbGUpOworICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJh bWV0ZXJzLmRhdGFiYXNlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKKyAgICBTYW5kYm94RXh0 ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5hcHBsaWNhdGlvbkNhY2hlRGly ZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVy bWFuZW50bHkocGFyYW1ldGVycy5uc1VSTENhY2hlUGF0aEV4dGVuc2lvbkhhbmRsZSk7CisKICAg ICBpZiAoIXBhcmFtZXRlcnMucGFyZW50UHJvY2Vzc05hbWUuaXNOdWxsKCkpIHsKICAgICAgICAg TlNTdHJpbmcgKmFwcGxpY2F0aW9uTmFtZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OldF Ql9VSV9TVFJJTkcoIiVAIFdlYiBDb250ZW50IiwgIlZpc2libGUgbmFtZSBvZiB0aGUgd2ViIHBy b2Nlc3MuIFRoZSBhcmd1bWVudCBpcyB0aGUgYXBwbGljYXRpb24gbmFtZS4iKSwgKE5TU3RyaW5n ICopcGFyYW1ldGVycy5wYXJlbnRQcm9jZXNzTmFtZV07CiAgICAgICAgIFdLU2V0VmlzaWJsZUFw cGxpY2F0aW9uTmFtZSgoQ0ZTdHJpbmdSZWYpYXBwbGljYXRpb25OYW1lKTsKQEAgLTI3Nyw2ICsy NzcsOCBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByCiAgICAgbV9u b3RpZmljYXRpb25NYW5hZ2VyLmluaXRpYWxpemUocGFyYW1ldGVycy5ub3RpZmljYXRpb25QZXJt aXNzaW9ucyk7CiAjZW5kaWYKIAorICAgIG1fcHJlc2VudGVyQXBwbGljYXRpb25QaWQgPSBwYXJh bWV0ZXJzLnByZXNlbnRlckFwcGxpY2F0aW9uUGlkOworCiAgICAgLy8gcmRhcjovLzkxMTg2Mzkg YWNjZXNzaWJpbGl0eUZvY3VzZWRVSUVsZW1lbnQgaW4gTlNBcHBsaWNhdGlvbiBkZWZhdWx0cyB0 byB1c2UgdGhlIGtleVdpbmRvdy4gU2luY2UgdGhlcmUncwogICAgIC8vIG5vIHdpbmRvdyBpbiBX SzIsIE5TQXBwbGljYXRpb24gbmVlZHMgdG8gdXNlIHRoZSBmb2N1c2VkIHBhZ2UncyBmb2N1c2Vk IGVsZW1lbnQuCiAgICAgTWV0aG9kIG1ldGhvZFRvUGF0Y2ggPSBjbGFzc19nZXRJbnN0YW5jZU1l dGhvZChbTlNBcHBsaWNhdGlvbiBjbGFzc10sIEBzZWxlY3RvcihhY2Nlc3NpYmlsaXR5Rm9jdXNl ZFVJRWxlbWVudCkpOwo=