123436 2013-10-29 00:31:05 -0700 [Mac] Rationalize user defaults override code 2013-10-29 10:46:02 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap commit-queue mitz oldest_to_newest 944339 0 ap 2013-10-29 00:31:05 -0700 DumpRenderTree and WebKitTestRunner use a variety of techniques to change user defaults, from registering a default to setting application preferences to overriding via argument domain. There is no reason for this variety as far as I can tell. 944341 1 215368 ap 2013-10-29 00:40:32 -0700 Created attachment 215368 proposed patch Let's see if EWS agrees that this doesn't change behavior... 944418 2 215368 mitz 2013-10-29 07:19:18 -0700 Comment on attachment 215368 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=215368&action=review > Tools/DumpRenderTree/mac/DumpRenderTree.mm:694 > + @"AppleLanguages": @[@"en"], Spaces around @"en", please. 944461 3 215394 ap 2013-10-29 10:16:05 -0700 Created attachment 215394 patch for landing 944474 4 215394 commit-queue 2013-10-29 10:46:01 -0700 Comment on attachment 215394 patch for landing Clearing flags on attachment: 215394 Committed r158199: <http://trac.webkit.org/changeset/158199> 944475 5 commit-queue 2013-10-29 10:46:02 -0700 All reviewed patches have been landed. Closing bug. 215368 2013-10-29 00:40:32 -0700 2013-10-29 10:16:05 -0700 proposed patch RationalizePreferences.txt text/plain 13627 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1ODE4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDEzLTEwLTI5ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFtNYWNdIFJhdGlvbmFsaXplIHVzZXIgZGVmYXVsdHMgb3ZlcnJpZGUgY29k ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNDM2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEdW1w UmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW06CisgICAgICAgIChyZXNldFdlYlByZWZl cmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKTogUmVuYW1lZCBmcm9tIHJlc2V0RGVmYXVsdHNUb0Nv bnNpc3RlbnRWYWx1ZXMsCisgICAgICAgIGJlY2F1c2UgdGhpcyBmdW5jdGlvbiBvbmx5IHJlc2V0 cyBXZWJQcmVmZXJlbmNlcyBub3cuCisgICAgICAgIChzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZh bHVlc0ZvclRlc3RpbmcpOiBNb3ZlZCBjb2RlIGZvciBzZXR0aW5nIHRoZSBkZWZhdWx0cworICAg ICAgICBoZXJlLCBiZWNhdXNlIHRlc3RzIG5ldmVyIGNoYW5nZSB0aGVtLCBhbmQgdGhleSBvbmx5 IG5lZWQgdG8gYmUgc2V0IG9uY2UsIG5vdAorICAgICAgICBiZWZvcmUgZWFjaCB0ZXN0LiBSZW1v dmVkIGxvbmcgb2Jzb2xldGUgd29ya2Fyb3VuZCBmb3IgSElUb29sYm94IHByZWZlcmVuY2VzLgor ICAgICAgICBEb24ndCBjYWxsIHJlc2V0V2ViUHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMs IGJlY2F1c2UgaXQgd2lsbCBiZSBjYWxsZWQgYmVmb3JlCisgICAgICAgIHRoZSBmaXJzdCB0ZXN0 IGFueXdheS4KKyAgICAgICAgKG1haW4pOiBEb24ndCBzZXQgQXBwbGVNYWduaWZpZWRNb2RlIGhl cmUsIG1vdmVkIHRoYXQgdG8gc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXNGb3JUZXN0aW5n LgorICAgICAgICAocmVzZXRXZWJWaWV3VG9Db25zaXN0ZW50U3RhdGVCZWZvcmVUZXN0aW5nKTog TW92ZWQgVGVzdFJ1bm5lcjo6c2V0U2VyaWFsaXplSFRUUExvYWRzCisgICAgICAgIGFuZCBzZXRs b2NhbGUgY2FsbHMgb3V0IG9mIHJlc2V0V2ViUHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMo KS4KKyAgICAgICAgQWRkZWQgQXBwbGVBcXVhQW50aUFsaWFzaW5nQ2hhbmdlZCBub3RpZmljYXRp b24gdGhhdCB3ZSBoYWQgaW4gV0syLCBiZWNhdXNlIGl0J3MKKyAgICAgICAgYWxzbyBuZWVkZWQg aW4gV0sxLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMv SW5qZWN0ZWRCdW5kbGVNYWMubW06CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlOjpwbGF0 Zm9ybUluaXRpYWxpemUpOiBVc2UgbGl0ZXJhbCBzeW50YXggZm9yIGRlZmF1bHRzCisgICAgICAg IGRpY3Rpb25hcnkuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL21hYy9tYWluLm1tOgor ICAgICAgICAoc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXNGb3JUZXN0aW5nKTogRmFjdG9y ZWQgb3V0IG9mIG1haW4oKSwgYW5kIGNoYW5nZWQgdG8KKyAgICAgICAgdXNlIE5TQXJndW1lbnRE b21haW4gZm9yIGV2ZXJ5dGhpbmcuCisKIDIwMTMtMTAtMjggIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRmxvYXRpbmcgbGVmdCB0aGUgaGVhZGVyIGJy b2tlIG90aGVyIHBhZ2VzLCBhbmQgdGhpcyBDU1MgaGFzIG5vIHdheSB0byBjdXN0b21pemUKSW5k ZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0JKHJldmlzaW9u IDE1ODE4MSkKKysrIFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQko d29ya2luZyBjb3B5KQpAQCAtNTk3LDYwICs1OTcsOCBAQCBzdGF0aWMgTlNTdHJpbmcgKmxpYnJh cnlQYXRoRm9yRHVtcFJlbmRlCiB9CiAKIC8vIENhbGxlZCBiZWZvcmUgZWFjaCB0ZXN0Lgotc3Rh dGljIHZvaWQgcmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlcygpCitzdGF0aWMgdm9pZCBy ZXNldFdlYlByZWZlcmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKCkKIHsKLSAgICBzdGF0aWMgY29u c3QgaW50IE5vRm9udFNtb290aGluZyA9IDA7Ci0gICAgc3RhdGljIGNvbnN0IGludCBCbHVlVGlu dGVkQXBwZWFyYW5jZSA9IDE7Ci0KLSAgICBOU1VzZXJEZWZhdWx0cyAqZGVmYXVsdHMgPSBbTlNV c2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdOwotICAgIFtkZWZhdWx0cyBzZXRJbnRl Z2VyOjQgZm9yS2V5OkAiQXBwbGVBbnRpQWxpYXNpbmdUaHJlc2hvbGQiXTsgLy8gc21hbGxlc3Qg Zm9udCBzaXplIHRvIENHIHNob3VsZCBwZXJmb3JtIGFudGlhbGlhc2luZyBvbgotICAgIFtkZWZh dWx0cyBzZXRJbnRlZ2VyOk5vRm9udFNtb290aGluZyBmb3JLZXk6QCJBcHBsZUZvbnRTbW9vdGhp bmciXTsKLSAgICBbZGVmYXVsdHMgc2V0SW50ZWdlcjpCbHVlVGludGVkQXBwZWFyYW5jZSBmb3JL ZXk6QCJBcHBsZUFxdWFDb2xvclZhcmlhbnQiXTsKLSAgICBbZGVmYXVsdHMgc2V0T2JqZWN0OkAi MC43MDk4MDAgMC44MzUzMDAgMS4wMDAwMDAiIGZvcktleTpAIkFwcGxlSGlnaGxpZ2h0Q29sb3Ii XTsKLSAgICBbZGVmYXVsdHMgc2V0T2JqZWN0OkAiMC41MDAwMDAgMC41MDAwMDAgMC41MDAwMDAi IGZvcktleTpAIkFwcGxlT3RoZXJIaWdobGlnaHRDb2xvciJdOwotICAgIFtkZWZhdWx0cyBzZXRP YmplY3Q6W05TQXJyYXkgYXJyYXlXaXRoT2JqZWN0OkAiZW4iXSBmb3JLZXk6QCJBcHBsZUxhbmd1 YWdlcyJdOwotICAgIFtkZWZhdWx0cyBzZXRCb29sOllFUyBmb3JLZXk6V2ViS2l0RW5hYmxlRnVs bERvY3VtZW50VGVhcmRvd25QcmVmZXJlbmNlS2V5XTsKLSAgICBbZGVmYXVsdHMgc2V0Qm9vbDpZ RVMgZm9yS2V5OldlYktpdEZ1bGxTY3JlZW5FbmFibGVkUHJlZmVyZW5jZUtleV07Ci0gICAgW2Rl ZmF1bHRzIHNldEJvb2w6WUVTIGZvcktleTpAIlVzZVdlYktpdFdlYkluc3BlY3RvciJdOwotCi0g ICAgW2RlZmF1bHRzIHNldE9iamVjdDpbTlNEaWN0aW9uYXJ5IGRpY3Rpb25hcnlXaXRoT2JqZWN0 c0FuZEtleXM6Ci0gICAgICAgIEAibm90YXRpb25hbCIsIEAibm90YXRpb25sIiwKLSAgICAgICAg QCJtZXNzYWdlIiwgQCJtZXNhZ2UiLAotICAgICAgICBAIndvdWxkIiwgQCJ3b3VsZG4iLAotICAg ICAgICBAIndlbGNvbWUiLCBAIndlbGxjb21lIiwKLSAgICAgICAgQCJoZWxsb1xud29ybGQiLCBA ImhlbGxvbGZ3b3JsZCIsCi0gICAgICAgIG5pbF0gZm9yS2V5OkAiTlNUZXN0Q29ycmVjdGlvbkRp Y3Rpb25hcnkiXTsKLQotICAgIC8vIFNjcm9sbGJhcnMgYXJlIGRyYXduIGVpdGhlciB1c2luZyBB cHBLaXQgKHdoaWNoIHVzZXMgTlNVc2VyRGVmYXVsdHMpIG9yIHVzaW5nIEhJVG9vbGJveCAod2hp Y2ggdXNlcyBDRlByZWZlcmVuY2VzIC8ga0NGUHJlZmVyZW5jZXNBbnlBcHBsaWNhdGlvbiAvIGtD RlByZWZlcmVuY2VzQ3VycmVudFVzZXIgLyBrQ0ZQcmVmZXJlbmNlc0FueUhvc3QpCi0gICAgW2Rl ZmF1bHRzIHNldE9iamVjdDpAIkRvdWJsZU1heCIgZm9yS2V5OkAiQXBwbGVTY3JvbGxCYXJWYXJp YW50Il07Ci0gICAgUmV0YWluUHRyPENGVHlwZVJlZj4gaW5pdGlhbFZhbHVlID0gQ0ZQcmVmZXJl bmNlc0NvcHlWYWx1ZShDRlNUUigiQXBwbGVTY3JvbGxCYXJWYXJpYW50IiksIGtDRlByZWZlcmVu Y2VzQW55QXBwbGljYXRpb24sIGtDRlByZWZlcmVuY2VzQ3VycmVudFVzZXIsIGtDRlByZWZlcmVu Y2VzQW55SG9zdCk7Ci0gICAgQ0ZQcmVmZXJlbmNlc1NldFZhbHVlKENGU1RSKCJBcHBsZVNjcm9s bEJhclZhcmlhbnQiKSwgQ0ZTVFIoIkRvdWJsZU1heCIpLCBrQ0ZQcmVmZXJlbmNlc0FueUFwcGxp Y2F0aW9uLCBrQ0ZQcmVmZXJlbmNlc0N1cnJlbnRVc2VyLCBrQ0ZQcmVmZXJlbmNlc0FueUhvc3Qp OwotI2lmbmRlZiBfX0xQNjRfXwotICAgIC8vIFNlZSA8cmRhcjovL3Byb2JsZW0vNjM0NzM4OD4u Ci0gICAgVGhlbWVTY3JvbGxCYXJBcnJvd1N0eWxlIHN0eWxlOwotICAgIEdldFRoZW1lU2Nyb2xs QmFyQXJyb3dTdHlsZSgmc3R5bGUpOyAvLyBGb3JjZSBISVRvb2xib3ggdG8gcmVhZCBmcm9tIENG UHJlZmVyZW5jZXMKLSNlbmRpZgotCi0KLSNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJ UkVEID49IDEwODAKLSAgICBbZGVmYXVsdHMgc2V0Qm9vbDpOTyBmb3JLZXk6QCJOU1Njcm9sbEFu aW1hdGlvbkVuYWJsZWQiXTsKLSNlbHNlCi0gICAgW2RlZmF1bHRzIHNldEJvb2w6Tk8gZm9yS2V5 OkAiQXBwbGVTY3JvbGxBbmltYXRpb25FbmFibGVkIl07Ci0jZW5kaWYKLQotICAgIFtkZWZhdWx0 cyBzZXRCb29sOk5PIGZvcktleTpAIk5TT3ZlcmxheVNjcm9sbGVyc0VuYWJsZWQiXTsKLSAgICBb ZGVmYXVsdHMgc2V0T2JqZWN0OkAiQWx3YXlzIiBmb3JLZXk6QCJBcHBsZVNob3dTY3JvbGxCYXJz Il07Ci0KLSAgICBpZiAoaW5pdGlhbFZhbHVlKQotICAgICAgICBDRlByZWZlcmVuY2VzU2V0VmFs dWUoQ0ZTVFIoIkFwcGxlU2Nyb2xsQmFyVmFyaWFudCIpLCBpbml0aWFsVmFsdWUuZ2V0KCksIGtD RlByZWZlcmVuY2VzQW55QXBwbGljYXRpb24sIGtDRlByZWZlcmVuY2VzQ3VycmVudFVzZXIsIGtD RlByZWZlcmVuY2VzQW55SG9zdCk7Ci0KLSAgICBOU1N0cmluZyAqcGF0aCA9IGxpYnJhcnlQYXRo Rm9yRHVtcFJlbmRlclRyZWUoKTsKLSAgICBbZGVmYXVsdHMgc2V0T2JqZWN0OltwYXRoIHN0cmlu Z0J5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIkRhdGFiYXNlcyJdIGZvcktleTpXZWJEYXRhYmFz ZURpcmVjdG9yeURlZmF1bHRzS2V5XTsKLSAgICBbZGVmYXVsdHMgc2V0T2JqZWN0OltwYXRoIHN0 cmluZ0J5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIkxvY2FsU3RvcmFnZSJdIGZvcktleTpXZWJT dG9yYWdlRGlyZWN0b3J5RGVmYXVsdHNLZXldOwotICAgIFtkZWZhdWx0cyBzZXRPYmplY3Q6W3Bh dGggc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiTG9jYWxDYWNoZSJdIGZvcktleTpX ZWJLaXRMb2NhbENhY2hlRGVmYXVsdHNLZXldOwotCi0gICAgW2RlZmF1bHRzIHNldEJvb2w6Tk8g Zm9yS2V5OkAiV2ViS2l0S2VybmluZ0FuZExpZ2F0dXJlc0VuYWJsZWRCeURlZmF1bHQiXTsKLQog ICAgIFdlYlByZWZlcmVuY2VzICpwcmVmZXJlbmNlcyA9IFtXZWJQcmVmZXJlbmNlcyBzdGFuZGFy ZFByZWZlcmVuY2VzXTsKIAogICAgIFtwcmVmZXJlbmNlcyBzZXRBbGxvd1VuaXZlcnNhbEFjY2Vz c0Zyb21GaWxlVVJMczpZRVNdOwpAQCAtNzIzLDEwICs2NzEsNiBAQCBzdGF0aWMgdm9pZCByZXNl dERlZmF1bHRzVG9Db25zaXN0ZW50VmFsCiAgICAgW3ByZWZlcmVuY2VzIHNldFNjcmVlbkZvbnRT dWJzdGl0dXRpb25FbmFibGVkOllFU107CiAKICAgICBbV2ViUHJlZmVyZW5jZXMgX3NldEN1cnJl bnROZXR3b3JrTG9hZGVyU2Vzc2lvbkNvb2tpZUFjY2VwdFBvbGljeTpOU0hUVFBDb29raWVBY2Nl cHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbl07Ci0gICAgCi0gICAgVGVzdFJ1bm5l cjo6c2V0U2VyaWFsaXplSFRUUExvYWRzKGZhbHNlKTsKLQotICAgIHNldGxvY2FsZShMQ19BTEws ICIiKTsKIH0KIAogLy8gQ2FsbGVkIG9uY2Ugb24gRHVtcFJlbmRlclRyZWUgc3RhcnR1cC4KQEAg LTczNSwxMyArNjc5LDQ5IEBAIHN0YXRpYyB2b2lkIHNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFs dWUKICAgICAvLyBGSVhNRTogV2UnZCBsaWtlIHRvIHN0YXJ0IHdpdGggYSBjbGVhbiBzdGF0ZSBm b3IgZXZlcnkgdGVzdCwgYnV0IHRoaXMgZnVuY3Rpb24gY2FuJ3QgYmUgdXNlZCBtb3JlIHRoYW4g b25jZSB5ZXQuCiAgICAgW1dlYlByZWZlcmVuY2VzIF9zd2l0Y2hOZXR3b3JrTG9hZGVyVG9OZXdU ZXN0aW5nU2Vzc2lvbl07CiAKLSAgICByZXNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzKCk7 CisgICAgc3RhdGljIGNvbnN0IGludCBOb0ZvbnRTbW9vdGhpbmcgPSAwOworICAgIHN0YXRpYyBj b25zdCBpbnQgQmx1ZVRpbnRlZEFwcGVhcmFuY2UgPSAxOworCisgICAgTlNTdHJpbmcgKmxpYnJh cnlQYXRoID0gbGlicmFyeVBhdGhGb3JEdW1wUmVuZGVyVHJlZSgpOworCisgICAgTlNEaWN0aW9u YXJ5ICpkaWN0ID0gQHsKKyAgICAgICAgQCJBcHBsZU1hZ25pZmllZE1vZGUiOiBAWUVTLAorICAg ICAgICBAIkFwcGxlQW50aUFsaWFzaW5nVGhyZXNob2xkIjogQDQsCisgICAgICAgIEAiQXBwbGVG b250U21vb3RoaW5nIjogQChOb0ZvbnRTbW9vdGhpbmcpLAorICAgICAgICBAIkFwcGxlQXF1YUNv bG9yVmFyaWFudCI6IEAoQmx1ZVRpbnRlZEFwcGVhcmFuY2UpLAorICAgICAgICBAIkFwcGxlSGln aGxpZ2h0Q29sb3IiOiBAIjAuNzA5ODAwIDAuODM1MzAwIDEuMDAwMDAwIiwKKyAgICAgICAgQCJB cHBsZU90aGVySGlnaGxpZ2h0Q29sb3IiOkAiMC41MDAwMDAgMC41MDAwMDAgMC41MDAwMDAiLAor ICAgICAgICBAIkFwcGxlTGFuZ3VhZ2VzIjogQFtAImVuIl0sCisgICAgICAgIFdlYktpdEVuYWJs ZUZ1bGxEb2N1bWVudFRlYXJkb3duUHJlZmVyZW5jZUtleTogQFlFUywKKyAgICAgICAgV2ViS2l0 RnVsbFNjcmVlbkVuYWJsZWRQcmVmZXJlbmNlS2V5OiBAWUVTLAorICAgICAgICBAIlVzZVdlYktp dFdlYkluc3BlY3RvciI6IEBZRVMsCisgICAgICAgIEAiTlNUZXN0Q29ycmVjdGlvbkRpY3Rpb25h cnkiOiBAeworICAgICAgICAgICAgQCJub3RhdGlvbmwiOiBAIm5vdGF0aW9uYWwiLAorICAgICAg ICAgICAgQCJtZXNhZ2UiOiBAIm1lc3NhZ2UiLAorICAgICAgICAgICAgQCJ3b3VsZG4iOiBAIndv dWxkIiwKKyAgICAgICAgICAgIEAid2VsbGNvbWUiOiBAIndlbGNvbWUiLAorICAgICAgICAgICAg QCJoZWxsb2xmd29ybGQiOiBAImhlbGxvXG53b3JsZCIKKyAgICAgICAgfSwKKyAgICAgICAgQCJX ZWJLaXRLZXJuaW5nQW5kTGlnYXR1cmVzRW5hYmxlZEJ5RGVmYXVsdCI6IEBOTywKKyAgICAgICAg QCJBcHBsZVNjcm9sbEJhclZhcmlhbnQiOiBAIkRvdWJsZU1heCIsCisgICAgICAgIEAiTlNTY3Jv bGxBbmltYXRpb25FbmFibGVkIjogQE5PLAorICAgICAgICBAIk5TT3ZlcmxheVNjcm9sbGVyc0Vu YWJsZWQiOiBATk8sCisgICAgICAgIEAiQXBwbGVTaG93U2Nyb2xsQmFycyI6IEAiQWx3YXlzIiwK KyAgICAgICAgV2ViRGF0YWJhc2VEaXJlY3RvcnlEZWZhdWx0c0tleTogW2xpYnJhcnlQYXRoIHN0 cmluZ0J5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIkRhdGFiYXNlcyJdLAorICAgICAgICBXZWJT dG9yYWdlRGlyZWN0b3J5RGVmYXVsdHNLZXk6IFtsaWJyYXJ5UGF0aCBzdHJpbmdCeUFwcGVuZGlu Z1BhdGhDb21wb25lbnQ6QCJMb2NhbFN0b3JhZ2UiXSwKKyAgICAgICAgV2ViS2l0TG9jYWxDYWNo ZURlZmF1bHRzS2V5OiBbbGlicmFyeVBhdGggc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50 OkAiTG9jYWxDYWNoZSJdCisgICAgfTsKKworICAgIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRV c2VyRGVmYXVsdHNdIHNldFZvbGF0aWxlRG9tYWluOmRpY3QgZm9yTmFtZTpOU0FyZ3VtZW50RG9t YWluXTsKKworICAgIC8vIFVuZGVybHlpbmcgZnJhbWV3b3JrcyBoYXZlIGFscmVhZHkgcmVhZCBB cHBsZUFudGlBbGlhc2luZ1RocmVzaG9sZCBkZWZhdWx0IGJlZm9yZSB3ZSBjaGFuZ2VkIGl0Lgor ICAgIC8vIEEgZGlzdHJpYnV0ZWQgbm90aWZpY2F0aW9uIGlzIGRlbGl2ZXJlZCB0byBhbGwgYXBw bGljYXRpb25zLCBidXQgaXQgc2hvdWxkIGJlIGhhcm1sZXNzLCBhbmQgaXQncyB0aGUgb25seSB3 YXkgdG8gdXBkYXRlIGFsbCB1bmRlcmx5aW5nIGZyYW1ld29ya3MgYW55d2F5LgorICAgIFtbTlNE aXN0cmlidXRlZE5vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBwb3N0Tm90aWZpY2F0 aW9uTmFtZTpAIkFwcGxlQXF1YUFudGlBbGlhc2luZ0NoYW5nZWQiIG9iamVjdDpuaWwgdXNlcklu Zm86bmlsIGRlbGl2ZXJJbW1lZGlhdGVseTpZRVNdOwogCi0gICAgTlNTdHJpbmcgKnBhdGggPSBs aWJyYXJ5UGF0aEZvckR1bXBSZW5kZXJUcmVlKCk7CiAgICAgTlNVUkxDYWNoZSAqc2hhcmVkQ2Fj aGUgPQogICAgICAgICBbW05TVVJMQ2FjaGUgYWxsb2NdIGluaXRXaXRoTWVtb3J5Q2FwYWNpdHk6 MTAyNCAqIDEwMjQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlza0Nh cGFjaXR5OjAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpc2tQ YXRoOltwYXRoIHN0cmluZ0J5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIlVSTENhY2hlIl1dOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlza1BhdGg6W2xpYnJh cnlQYXRoIHN0cmluZ0J5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIlVSTENhY2hlIl1dOwogICAg IFtOU1VSTENhY2hlIHNldFNoYXJlZFVSTENhY2hlOnNoYXJlZENhY2hlXTsKICAgICBbc2hhcmVk Q2FjaGUgcmVsZWFzZV07CiB9CkBAIC05NTAsMTEgKzkzMCw3IEBAIGludCBtYWluKGludCBhcmdj LCBjb25zdCBjaGFyICphcmd2W10pCiB7CiAgICAgTlNBdXRvcmVsZWFzZVBvb2wgKnBvb2wgPSBb W05TQXV0b3JlbGVhc2VQb29sIGFsbG9jXSBpbml0XTsKICAgICBbRHVtcFJlbmRlclRyZWVBcHBs aWNhdGlvbiBzaGFyZWRBcHBsaWNhdGlvbl07IC8vIEZvcmNlIEFwcEtpdCB0byBpbml0IGl0c2Vs ZgotICAgIAotICAgIE5TRGljdGlvbmFyeSAqZGVmYXVsdHMgPSBbW05TRGljdGlvbmFyeSBhbGxv Y10gaW5pdFdpdGhPYmplY3RzQW5kS2V5czpbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwg QCJBcHBsZU1hZ25pZmllZE1vZGUiLCBuaWxdOwotICAgIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRh cmRVc2VyRGVmYXVsdHNdIHJlZ2lzdGVyRGVmYXVsdHM6ZGVmYXVsdHNdOwotICAgIFtkZWZhdWx0 cyByZWxlYXNlXTsKLSAgICAKKwogICAgIGR1bXBSZW5kZXJUcmVlKGFyZ2MsIGFyZ3YpOwogICAg IFtXZWJDb3JlU3RhdGlzdGljcyBnYXJiYWdlQ29sbGVjdEphdmFTY3JpcHRPYmplY3RzXTsKICAg ICBbV2ViQ29yZVN0YXRpc3RpY3MgZW1wdHlDYWNoZV07IC8vIE90aGVyd2lzZSBTVkdJbWFnZXMg dHJpZ2dlciBmYWxzZSBwb3NpdGl2ZXMgZm9yIEZyYW1lL05vZGUgY291bnRzCkBAIC0xMzA1LDcg KzEyODEsMTEgQEAgc3RhdGljIHZvaWQgcmVzZXRXZWJWaWV3VG9Db25zaXN0ZW50U3RhdAogICAg IFtbd2ViVmlldyB3aW5kb3ddIHNldEF1dG9kaXNwbGF5Ok5PXTsKICAgICBbd2ViVmlldyBzZXRU cmFja3NSZXBhaW50czpOT107CiAgICAgCi0gICAgcmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZh bHVlcygpOworICAgIHJlc2V0V2ViUHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMoKTsKKwor ICAgIFRlc3RSdW5uZXI6OnNldFNlcmlhbGl6ZUhUVFBMb2FkcyhmYWxzZSk7CisKKyAgICBzZXRs b2NhbGUoTENfQUxMLCAiIik7CiAKICAgICBpZiAoZ1Rlc3RSdW5uZXIpIHsKICAgICAgICAgV2Vi Q29yZVRlc3RTdXBwb3J0OjpyZXNldEludGVybmFsc09iamVjdChbbWFpbkZyYW1lIGdsb2JhbENv bnRleHRdKTsKSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFj L0luamVjdGVkQnVuZGxlTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0luamVjdGVkQnVuZGxlTWFjLm1tCShyZXZpc2lvbiAxNTgx ODEpCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL21hYy9JbmplY3Rl ZEJ1bmRsZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDIsMjIgKzQyLDIxIEBAIHZvaWQgSW5q ZWN0ZWRCdW5kbGU6OnBsYXRmb3JtSW5pdGlhbGl6ZSgKICAgICBzdGF0aWMgY29uc3QgaW50IE5v Rm9udFNtb290aGluZyA9IDA7CiAgICAgc3RhdGljIGNvbnN0IGludCBCbHVlVGludGVkQXBwZWFy YW5jZSA9IDE7CiAKLSAgICBOU0RpY3Rpb25hcnkgKmRpY3QgPSBbTlNEaWN0aW9uYXJ5IGRpY3Rp b25hcnlXaXRoT2JqZWN0c0FuZEtleXM6Ci0gICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoSW50 ZWdlcjo0XSwgQCJBcHBsZUFudGlBbGlhc2luZ1RocmVzaG9sZCIsCi0gICAgICAgIFtOU051bWJl ciBudW1iZXJXaXRoSW50ZWdlcjpOb0ZvbnRTbW9vdGhpbmddLCBAIkFwcGxlRm9udFNtb290aGlu ZyIsCi0gICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoSW50ZWdlcjpCbHVlVGludGVkQXBwZWFy YW5jZV0sIEAiQXBwbGVBcXVhQ29sb3JWYXJpYW50IiwKLSAgICAgICAgQCIwLjcwOTgwMCAwLjgz NTMwMCAxLjAwMDAwMCIsIEAiQXBwbGVIaWdobGlnaHRDb2xvciIsCi0gICAgICAgIEAiMC41MDAw MDAgMC41MDAwMDAgMC41MDAwMDAiLCBAIkFwcGxlT3RoZXJIaWdobGlnaHRDb2xvciIsCi0jaWYg X19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDgwCi0gICAgICAgIFtOU051bWJl ciBudW1iZXJXaXRoQm9vbDpOT10sIEAiTlNTY3JvbGxBbmltYXRpb25FbmFibGVkIiwKLSNlbHNl Ci0gICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpOT10sIEAiQXBwbGVTY3JvbGxBbmlt YXRpb25FbmFibGVkIiwKLSNlbmRpZgotICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6 Tk9dLCBAIk5TT3ZlcmxheVNjcm9sbGVyc0VuYWJsZWQiLAotICAgICAgICBAIkFsd2F5cyIsIEAi QXBwbGVTaG93U2Nyb2xsQmFycyIsCi0gICAgICAgIFtOU0FycmF5IGFycmF5V2l0aE9iamVjdDpA ImVuIl0sIEAiQXBwbGVMYW5ndWFnZXMiLAotICAgICAgICBbTlNEaWN0aW9uYXJ5IGRpY3Rpb25h cnlXaXRoT2JqZWN0c0FuZEtleXM6QCJub3RhdGlvbmFsIiwgQCJub3RhdGlvbmwiLCBuaWxdLCBA Ik5TVGVzdENvcnJlY3Rpb25EaWN0aW9uYXJ5IiwKLSAgICAgICAgbmlsXTsKKyAgICBOU0RpY3Rp b25hcnkgKmRpY3QgPSBAeworICAgICAgICBAIkFwcGxlQW50aUFsaWFzaW5nVGhyZXNob2xkIjog QDQsCisgICAgICAgIEAiQXBwbGVGb250U21vb3RoaW5nIjogQChOb0ZvbnRTbW9vdGhpbmcpLAor ICAgICAgICBAIkFwcGxlQXF1YUNvbG9yVmFyaWFudCI6IEAoQmx1ZVRpbnRlZEFwcGVhcmFuY2Up LAorICAgICAgICBAIkFwcGxlSGlnaGxpZ2h0Q29sb3IiOiBAIjAuNzA5ODAwIDAuODM1MzAwIDEu MDAwMDAwIiwKKyAgICAgICAgQCJBcHBsZU90aGVySGlnaGxpZ2h0Q29sb3IiOiBAIjAuNTAwMDAw IDAuNTAwMDAwIDAuNTAwMDAwIiwKKyAgICAgICAgQCJOU1Njcm9sbEFuaW1hdGlvbkVuYWJsZWQi OiBATk8sCisgICAgICAgIEAiTlNPdmVybGF5U2Nyb2xsZXJzRW5hYmxlZCI6IEBOTywKKyAgICAg ICAgQCJBcHBsZVNob3dTY3JvbGxCYXJzIjogQCJBbHdheXMiLAorICAgICAgICBAIkFwcGxlTGFu Z3VhZ2VzIjogQFtAImVuIl0sCisgICAgICAgIC8vIEZJWE1FOiBXaHkgZG9lcyB0aGlzIGRpY3Rp b25hcnkgbm90IG1hdGNoIHRoZSBvbmUgaW4gRHVtcFJlbmRlclRyZWU/CisgICAgICAgIEAiTlNU ZXN0Q29ycmVjdGlvbkRpY3Rpb25hcnkiOiBAeworICAgICAgICAgICAgQCJub3RhdGlvbmwiOiBA Im5vdGF0aW9uYWwiCisgICAgICAgIH0KKyAgICB9OwogCiAgICAgW1tOU1VzZXJEZWZhdWx0cyBz dGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0Vm9sYXRpbGVEb21haW46ZGljdCBmb3JOYW1lOk5TQXJn dW1lbnREb21haW5dOwogCkluZGV4OiBUb29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9tYWluLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL21haW4ubW0JKHJldmlz aW9uIDE1ODE4MSkKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL21haW4ubW0JKHdvcmtp bmcgY29weSkKQEAgLTI3LDE4ICsyNywyNCBAQAogCiAjaW1wb3J0ICJUZXN0Q29udHJvbGxlci5o IgogCitzdGF0aWMgdm9pZCBzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlc0ZvclRlc3Rpbmco KQoreworICAgIE5TRGljdGlvbmFyeSAqZGljdCA9IEB7CisgICAgICAgIEAiQXBwbGVNYWduaWZp ZWRNb2RlIjogQFlFUywKKyAgICAgICAgQCJXZWJLaXRLZXJuaW5nQW5kTGlnYXR1cmVzRW5hYmxl ZEJ5RGVmYXVsdCI6IEBOTywKKyAgICAgICAgLy8gRklYTUU6IFRoaXMgaXMgbGlrZWx5IGluc3Vm ZmljaWVudCwgYXMgdGVzdHMgY2hhbmdlIChhbmQgZG9uJ3QgcmVzZXQpIHRoZXNlIHNldHRpbmdz IHZpYSBJbnRlcm5hbHMuCisgICAgICAgIEAiV2ViQXV0b21hdGljUXVvdGVTdWJzdGl0dXRpb25F bmFibGVkIjogQE5PLAorICAgICAgICBAIldlYkF1dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb25FbmFi bGVkIjogQE5PCisgICAgfTsKKworICAgIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVm YXVsdHNdIHNldFZvbGF0aWxlRG9tYWluOmRpY3QgZm9yTmFtZTpOU0FyZ3VtZW50RG9tYWluXTsK K30KKwogaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKIHsKICAgICBOU0F1 dG9yZWxlYXNlUG9vbCAqcG9vbCA9IFtbTlNBdXRvcmVsZWFzZVBvb2wgYWxsb2NdIGluaXRdOwog ICAgIFtOU0FwcGxpY2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9uXTsKLSAgICBbW05TVXNlckRlZmF1 bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRWb2xhdGlsZURvbWFpbjpbTlNEaWN0aW9uYXJ5 IGRpY3Rpb25hcnlXaXRoT2JqZWN0OltOU051bWJlciBudW1iZXJXaXRoQm9vbDpOT10gZm9yS2V5 OkAiV2ViS2l0S2VybmluZ0FuZExpZ2F0dXJlc0VuYWJsZWRCeURlZmF1bHQiXSBmb3JOYW1lOk5T QXJndW1lbnREb21haW5dOwotICAgIAotICAgIE5TRGljdGlvbmFyeSAqZGVmYXVsdHMgPSBbW05T RGljdGlvbmFyeSBhbGxvY10gaW5pdFdpdGhPYmplY3RzQW5kS2V5czpbTlNOdW1iZXIgbnVtYmVy V2l0aEJvb2w6WUVTXSwgQCJBcHBsZU1hZ25pZmllZE1vZGUiLCBuaWxdOwotICAgIFtbTlNVc2Vy RGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHJlZ2lzdGVyRGVmYXVsdHM6ZGVmYXVsdHNd OwotICAgIFtkZWZhdWx0cyByZWxlYXNlXTsKLQotICAgIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRh cmRVc2VyRGVmYXVsdHNdIHNldEJvb2w6Tk8gZm9yS2V5OkAiV2ViQXV0b21hdGljUXVvdGVTdWJz dGl0dXRpb25FbmFibGVkIl07Ci0gICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZh dWx0c10gc2V0Qm9vbDpOTyBmb3JLZXk6QCJXZWJBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5h YmxlZCJdOworICAgIHNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzRm9yVGVzdGluZygpOwog CiAgICAgewogICAgICAgICBXVFI6OlRlc3RDb250cm9sbGVyIGNvbnRyb2xsZXIoYXJnYywgYXJn dik7Cg== 215394 2013-10-29 10:16:05 -0700 2013-10-29 10:46:01 -0700 patch for landing RationalizePreferences.txt text/plain 13630 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1ODE4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDEzLTEwLTI5ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFtNYWNdIFJhdGlvbmFsaXplIHVzZXIgZGVmYXVsdHMgb3ZlcnJpZGUgY29k ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNDM2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KKworICAgICAgICAqIER1bXBS ZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbToKKyAgICAgICAgKHJlc2V0V2ViUHJlZmVy ZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMpOiBSZW5hbWVkIGZyb20gcmVzZXREZWZhdWx0c1RvQ29u c2lzdGVudFZhbHVlcywKKyAgICAgICAgYmVjYXVzZSB0aGlzIGZ1bmN0aW9uIG9ubHkgcmVzZXRz IFdlYlByZWZlcmVuY2VzIG5vdy4KKyAgICAgICAgKHNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFs dWVzRm9yVGVzdGluZyk6IE1vdmVkIGNvZGUgZm9yIHNldHRpbmcgdGhlIGRlZmF1bHRzCisgICAg ICAgIGhlcmUsIGJlY2F1c2UgdGVzdHMgbmV2ZXIgY2hhbmdlIHRoZW0sIGFuZCB0aGV5IG9ubHkg bmVlZCB0byBiZSBzZXQgb25jZSwgbm90CisgICAgICAgIGJlZm9yZSBlYWNoIHRlc3QuIFJlbW92 ZWQgbG9uZyBvYnNvbGV0ZSB3b3JrYXJvdW5kIGZvciBISVRvb2xib3ggcHJlZmVyZW5jZXMuCisg ICAgICAgIERvbid0IGNhbGwgcmVzZXRXZWJQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcywg YmVjYXVzZSBpdCB3aWxsIGJlIGNhbGxlZCBiZWZvcmUKKyAgICAgICAgdGhlIGZpcnN0IHRlc3Qg YW55d2F5LgorICAgICAgICAobWFpbik6IERvbid0IHNldCBBcHBsZU1hZ25pZmllZE1vZGUgaGVy ZSwgbW92ZWQgdGhhdCB0byBzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlc0ZvclRlc3Rpbmcu CisgICAgICAgIChyZXNldFdlYlZpZXdUb0NvbnNpc3RlbnRTdGF0ZUJlZm9yZVRlc3RpbmcpOiBN b3ZlZCBUZXN0UnVubmVyOjpzZXRTZXJpYWxpemVIVFRQTG9hZHMKKyAgICAgICAgYW5kIHNldGxv Y2FsZSBjYWxscyBvdXQgb2YgcmVzZXRXZWJQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcygp LgorICAgICAgICBBZGRlZCBBcHBsZUFxdWFBbnRpQWxpYXNpbmdDaGFuZ2VkIG5vdGlmaWNhdGlv biB0aGF0IHdlIGhhZCBpbiBXSzIsIGJlY2F1c2UgaXQncworICAgICAgICBhbHNvIG5lZWRlZCBp biBXSzEuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL21hYy9J bmplY3RlZEJ1bmRsZU1hYy5tbToKKyAgICAgICAgKFdUUjo6SW5qZWN0ZWRCdW5kbGU6OnBsYXRm b3JtSW5pdGlhbGl6ZSk6IFVzZSBsaXRlcmFsIHN5bnRheCBmb3IgZGVmYXVsdHMKKyAgICAgICAg ZGljdGlvbmFyeS4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvbWFjL21haW4ubW06Cisg ICAgICAgIChzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlc0ZvclRlc3RpbmcpOiBGYWN0b3Jl ZCBvdXQgb2YgbWFpbigpLCBhbmQgY2hhbmdlZCB0bworICAgICAgICB1c2UgTlNBcmd1bWVudERv bWFpbiBmb3IgZXZlcnl0aGluZy4KKwogMjAxMy0xMC0yOCAgU2ltb24gRnJhc2VyICA8c2ltb24u ZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBGbG9hdGluZyBsZWZ0IHRoZSBoZWFkZXIgYnJv a2Ugb3RoZXIgcGFnZXMsIGFuZCB0aGlzIENTUyBoYXMgbm8gd2F5IHRvIGN1c3RvbWl6ZQpJbmRl eDogVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQkocmV2aXNpb24g MTU4MTgxKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC01OTcsNjAgKzU5Nyw4IEBAIHN0YXRpYyBOU1N0cmluZyAqbGlicmFy eVBhdGhGb3JEdW1wUmVuZGUKIH0KIAogLy8gQ2FsbGVkIGJlZm9yZSBlYWNoIHRlc3QuCi1zdGF0 aWMgdm9pZCByZXNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzKCkKK3N0YXRpYyB2b2lkIHJl c2V0V2ViUHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMoKQogewotICAgIHN0YXRpYyBjb25z dCBpbnQgTm9Gb250U21vb3RoaW5nID0gMDsKLSAgICBzdGF0aWMgY29uc3QgaW50IEJsdWVUaW50 ZWRBcHBlYXJhbmNlID0gMTsKLQotICAgIE5TVXNlckRlZmF1bHRzICpkZWZhdWx0cyA9IFtOU1Vz ZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c107Ci0gICAgW2RlZmF1bHRzIHNldEludGVn ZXI6NCBmb3JLZXk6QCJBcHBsZUFudGlBbGlhc2luZ1RocmVzaG9sZCJdOyAvLyBzbWFsbGVzdCBm b250IHNpemUgdG8gQ0cgc2hvdWxkIHBlcmZvcm0gYW50aWFsaWFzaW5nIG9uCi0gICAgW2RlZmF1 bHRzIHNldEludGVnZXI6Tm9Gb250U21vb3RoaW5nIGZvcktleTpAIkFwcGxlRm9udFNtb290aGlu ZyJdOwotICAgIFtkZWZhdWx0cyBzZXRJbnRlZ2VyOkJsdWVUaW50ZWRBcHBlYXJhbmNlIGZvcktl eTpAIkFwcGxlQXF1YUNvbG9yVmFyaWFudCJdOwotICAgIFtkZWZhdWx0cyBzZXRPYmplY3Q6QCIw LjcwOTgwMCAwLjgzNTMwMCAxLjAwMDAwMCIgZm9yS2V5OkAiQXBwbGVIaWdobGlnaHRDb2xvciJd OwotICAgIFtkZWZhdWx0cyBzZXRPYmplY3Q6QCIwLjUwMDAwMCAwLjUwMDAwMCAwLjUwMDAwMCIg Zm9yS2V5OkAiQXBwbGVPdGhlckhpZ2hsaWdodENvbG9yIl07Ci0gICAgW2RlZmF1bHRzIHNldE9i amVjdDpbTlNBcnJheSBhcnJheVdpdGhPYmplY3Q6QCJlbiJdIGZvcktleTpAIkFwcGxlTGFuZ3Vh Z2VzIl07Ci0gICAgW2RlZmF1bHRzIHNldEJvb2w6WUVTIGZvcktleTpXZWJLaXRFbmFibGVGdWxs RG9jdW1lbnRUZWFyZG93blByZWZlcmVuY2VLZXldOwotICAgIFtkZWZhdWx0cyBzZXRCb29sOllF UyBmb3JLZXk6V2ViS2l0RnVsbFNjcmVlbkVuYWJsZWRQcmVmZXJlbmNlS2V5XTsKLSAgICBbZGVm YXVsdHMgc2V0Qm9vbDpZRVMgZm9yS2V5OkAiVXNlV2ViS2l0V2ViSW5zcGVjdG9yIl07Ci0KLSAg ICBbZGVmYXVsdHMgc2V0T2JqZWN0OltOU0RpY3Rpb25hcnkgZGljdGlvbmFyeVdpdGhPYmplY3Rz QW5kS2V5czoKLSAgICAgICAgQCJub3RhdGlvbmFsIiwgQCJub3RhdGlvbmwiLAotICAgICAgICBA Im1lc3NhZ2UiLCBAIm1lc2FnZSIsCi0gICAgICAgIEAid291bGQiLCBAIndvdWxkbiIsCi0gICAg ICAgIEAid2VsY29tZSIsIEAid2VsbGNvbWUiLAotICAgICAgICBAImhlbGxvXG53b3JsZCIsIEAi aGVsbG9sZndvcmxkIiwKLSAgICAgICAgbmlsXSBmb3JLZXk6QCJOU1Rlc3RDb3JyZWN0aW9uRGlj dGlvbmFyeSJdOwotCi0gICAgLy8gU2Nyb2xsYmFycyBhcmUgZHJhd24gZWl0aGVyIHVzaW5nIEFw cEtpdCAod2hpY2ggdXNlcyBOU1VzZXJEZWZhdWx0cykgb3IgdXNpbmcgSElUb29sYm94ICh3aGlj aCB1c2VzIENGUHJlZmVyZW5jZXMgLyBrQ0ZQcmVmZXJlbmNlc0FueUFwcGxpY2F0aW9uIC8ga0NG UHJlZmVyZW5jZXNDdXJyZW50VXNlciAvIGtDRlByZWZlcmVuY2VzQW55SG9zdCkKLSAgICBbZGVm YXVsdHMgc2V0T2JqZWN0OkAiRG91YmxlTWF4IiBmb3JLZXk6QCJBcHBsZVNjcm9sbEJhclZhcmlh bnQiXTsKLSAgICBSZXRhaW5QdHI8Q0ZUeXBlUmVmPiBpbml0aWFsVmFsdWUgPSBDRlByZWZlcmVu Y2VzQ29weVZhbHVlKENGU1RSKCJBcHBsZVNjcm9sbEJhclZhcmlhbnQiKSwga0NGUHJlZmVyZW5j ZXNBbnlBcHBsaWNhdGlvbiwga0NGUHJlZmVyZW5jZXNDdXJyZW50VXNlciwga0NGUHJlZmVyZW5j ZXNBbnlIb3N0KTsKLSAgICBDRlByZWZlcmVuY2VzU2V0VmFsdWUoQ0ZTVFIoIkFwcGxlU2Nyb2xs QmFyVmFyaWFudCIpLCBDRlNUUigiRG91YmxlTWF4IiksIGtDRlByZWZlcmVuY2VzQW55QXBwbGlj YXRpb24sIGtDRlByZWZlcmVuY2VzQ3VycmVudFVzZXIsIGtDRlByZWZlcmVuY2VzQW55SG9zdCk7 Ci0jaWZuZGVmIF9fTFA2NF9fCi0gICAgLy8gU2VlIDxyZGFyOi8vcHJvYmxlbS82MzQ3Mzg4Pi4K LSAgICBUaGVtZVNjcm9sbEJhckFycm93U3R5bGUgc3R5bGU7Ci0gICAgR2V0VGhlbWVTY3JvbGxC YXJBcnJvd1N0eWxlKCZzdHlsZSk7IC8vIEZvcmNlIEhJVG9vbGJveCB0byByZWFkIGZyb20gQ0ZQ cmVmZXJlbmNlcwotI2VuZGlmCi0KLQotI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTA4MAotICAgIFtkZWZhdWx0cyBzZXRCb29sOk5PIGZvcktleTpAIk5TU2Nyb2xsQW5p bWF0aW9uRW5hYmxlZCJdOwotI2Vsc2UKLSAgICBbZGVmYXVsdHMgc2V0Qm9vbDpOTyBmb3JLZXk6 QCJBcHBsZVNjcm9sbEFuaW1hdGlvbkVuYWJsZWQiXTsKLSNlbmRpZgotCi0gICAgW2RlZmF1bHRz IHNldEJvb2w6Tk8gZm9yS2V5OkAiTlNPdmVybGF5U2Nyb2xsZXJzRW5hYmxlZCJdOwotICAgIFtk ZWZhdWx0cyBzZXRPYmplY3Q6QCJBbHdheXMiIGZvcktleTpAIkFwcGxlU2hvd1Njcm9sbEJhcnMi XTsKLQotICAgIGlmIChpbml0aWFsVmFsdWUpCi0gICAgICAgIENGUHJlZmVyZW5jZXNTZXRWYWx1 ZShDRlNUUigiQXBwbGVTY3JvbGxCYXJWYXJpYW50IiksIGluaXRpYWxWYWx1ZS5nZXQoKSwga0NG UHJlZmVyZW5jZXNBbnlBcHBsaWNhdGlvbiwga0NGUHJlZmVyZW5jZXNDdXJyZW50VXNlciwga0NG UHJlZmVyZW5jZXNBbnlIb3N0KTsKLQotICAgIE5TU3RyaW5nICpwYXRoID0gbGlicmFyeVBhdGhG b3JEdW1wUmVuZGVyVHJlZSgpOwotICAgIFtkZWZhdWx0cyBzZXRPYmplY3Q6W3BhdGggc3RyaW5n QnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiRGF0YWJhc2VzIl0gZm9yS2V5OldlYkRhdGFiYXNl RGlyZWN0b3J5RGVmYXVsdHNLZXldOwotICAgIFtkZWZhdWx0cyBzZXRPYmplY3Q6W3BhdGggc3Ry aW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiTG9jYWxTdG9yYWdlIl0gZm9yS2V5OldlYlN0 b3JhZ2VEaXJlY3RvcnlEZWZhdWx0c0tleV07Ci0gICAgW2RlZmF1bHRzIHNldE9iamVjdDpbcGF0 aCBzdHJpbmdCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJMb2NhbENhY2hlIl0gZm9yS2V5Oldl YktpdExvY2FsQ2FjaGVEZWZhdWx0c0tleV07Ci0KLSAgICBbZGVmYXVsdHMgc2V0Qm9vbDpOTyBm b3JLZXk6QCJXZWJLaXRLZXJuaW5nQW5kTGlnYXR1cmVzRW5hYmxlZEJ5RGVmYXVsdCJdOwotCiAg ICAgV2ViUHJlZmVyZW5jZXMgKnByZWZlcmVuY2VzID0gW1dlYlByZWZlcmVuY2VzIHN0YW5kYXJk UHJlZmVyZW5jZXNdOwogCiAgICAgW3ByZWZlcmVuY2VzIHNldEFsbG93VW5pdmVyc2FsQWNjZXNz RnJvbUZpbGVVUkxzOllFU107CkBAIC03MjMsMTAgKzY3MSw2IEBAIHN0YXRpYyB2b2lkIHJlc2V0 RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWwKICAgICBbcHJlZmVyZW5jZXMgc2V0U2NyZWVuRm9udFN1 YnN0aXR1dGlvbkVuYWJsZWQ6WUVTXTsKIAogICAgIFtXZWJQcmVmZXJlbmNlcyBfc2V0Q3VycmVu dE5ldHdvcmtMb2FkZXJTZXNzaW9uQ29va2llQWNjZXB0UG9saWN5Ok5TSFRUUENvb2tpZUFjY2Vw dFBvbGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluXTsKLSAgICAKLSAgICBUZXN0UnVubmVy OjpzZXRTZXJpYWxpemVIVFRQTG9hZHMoZmFsc2UpOwotCi0gICAgc2V0bG9jYWxlKExDX0FMTCwg IiIpOwogfQogCiAvLyBDYWxsZWQgb25jZSBvbiBEdW1wUmVuZGVyVHJlZSBzdGFydHVwLgpAQCAt NzM1LDEzICs2NzksNDkgQEAgc3RhdGljIHZvaWQgc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1 ZQogICAgIC8vIEZJWE1FOiBXZSdkIGxpa2UgdG8gc3RhcnQgd2l0aCBhIGNsZWFuIHN0YXRlIGZv ciBldmVyeSB0ZXN0LCBidXQgdGhpcyBmdW5jdGlvbiBjYW4ndCBiZSB1c2VkIG1vcmUgdGhhbiBv bmNlIHlldC4KICAgICBbV2ViUHJlZmVyZW5jZXMgX3N3aXRjaE5ldHdvcmtMb2FkZXJUb05ld1Rl c3RpbmdTZXNzaW9uXTsKIAotICAgIHJlc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMoKTsK KyAgICBzdGF0aWMgY29uc3QgaW50IE5vRm9udFNtb290aGluZyA9IDA7CisgICAgc3RhdGljIGNv bnN0IGludCBCbHVlVGludGVkQXBwZWFyYW5jZSA9IDE7CisKKyAgICBOU1N0cmluZyAqbGlicmFy eVBhdGggPSBsaWJyYXJ5UGF0aEZvckR1bXBSZW5kZXJUcmVlKCk7CisKKyAgICBOU0RpY3Rpb25h cnkgKmRpY3QgPSBAeworICAgICAgICBAIkFwcGxlTWFnbmlmaWVkTW9kZSI6IEBZRVMsCisgICAg ICAgIEAiQXBwbGVBbnRpQWxpYXNpbmdUaHJlc2hvbGQiOiBANCwKKyAgICAgICAgQCJBcHBsZUZv bnRTbW9vdGhpbmciOiBAKE5vRm9udFNtb290aGluZyksCisgICAgICAgIEAiQXBwbGVBcXVhQ29s b3JWYXJpYW50IjogQChCbHVlVGludGVkQXBwZWFyYW5jZSksCisgICAgICAgIEAiQXBwbGVIaWdo bGlnaHRDb2xvciI6IEAiMC43MDk4MDAgMC44MzUzMDAgMS4wMDAwMDAiLAorICAgICAgICBAIkFw cGxlT3RoZXJIaWdobGlnaHRDb2xvciI6QCIwLjUwMDAwMCAwLjUwMDAwMCAwLjUwMDAwMCIsCisg ICAgICAgIEAiQXBwbGVMYW5ndWFnZXMiOiBAWyBAImVuIiBdLAorICAgICAgICBXZWJLaXRFbmFi bGVGdWxsRG9jdW1lbnRUZWFyZG93blByZWZlcmVuY2VLZXk6IEBZRVMsCisgICAgICAgIFdlYktp dEZ1bGxTY3JlZW5FbmFibGVkUHJlZmVyZW5jZUtleTogQFlFUywKKyAgICAgICAgQCJVc2VXZWJL aXRXZWJJbnNwZWN0b3IiOiBAWUVTLAorICAgICAgICBAIk5TVGVzdENvcnJlY3Rpb25EaWN0aW9u YXJ5IjogQHsKKyAgICAgICAgICAgIEAibm90YXRpb25sIjogQCJub3RhdGlvbmFsIiwKKyAgICAg ICAgICAgIEAibWVzYWdlIjogQCJtZXNzYWdlIiwKKyAgICAgICAgICAgIEAid291bGRuIjogQCJ3 b3VsZCIsCisgICAgICAgICAgICBAIndlbGxjb21lIjogQCJ3ZWxjb21lIiwKKyAgICAgICAgICAg IEAiaGVsbG9sZndvcmxkIjogQCJoZWxsb1xud29ybGQiCisgICAgICAgIH0sCisgICAgICAgIEAi V2ViS2l0S2VybmluZ0FuZExpZ2F0dXJlc0VuYWJsZWRCeURlZmF1bHQiOiBATk8sCisgICAgICAg IEAiQXBwbGVTY3JvbGxCYXJWYXJpYW50IjogQCJEb3VibGVNYXgiLAorICAgICAgICBAIk5TU2Ny b2xsQW5pbWF0aW9uRW5hYmxlZCI6IEBOTywKKyAgICAgICAgQCJOU092ZXJsYXlTY3JvbGxlcnNF bmFibGVkIjogQE5PLAorICAgICAgICBAIkFwcGxlU2hvd1Njcm9sbEJhcnMiOiBAIkFsd2F5cyIs CisgICAgICAgIFdlYkRhdGFiYXNlRGlyZWN0b3J5RGVmYXVsdHNLZXk6IFtsaWJyYXJ5UGF0aCBz dHJpbmdCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJEYXRhYmFzZXMiXSwKKyAgICAgICAgV2Vi U3RvcmFnZURpcmVjdG9yeURlZmF1bHRzS2V5OiBbbGlicmFyeVBhdGggc3RyaW5nQnlBcHBlbmRp bmdQYXRoQ29tcG9uZW50OkAiTG9jYWxTdG9yYWdlIl0sCisgICAgICAgIFdlYktpdExvY2FsQ2Fj aGVEZWZhdWx0c0tleTogW2xpYnJhcnlQYXRoIHN0cmluZ0J5QXBwZW5kaW5nUGF0aENvbXBvbmVu dDpAIkxvY2FsQ2FjaGUiXQorICAgIH07CisKKyAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJk VXNlckRlZmF1bHRzXSBzZXRWb2xhdGlsZURvbWFpbjpkaWN0IGZvck5hbWU6TlNBcmd1bWVudERv bWFpbl07CisKKyAgICAvLyBVbmRlcmx5aW5nIGZyYW1ld29ya3MgaGF2ZSBhbHJlYWR5IHJlYWQg QXBwbGVBbnRpQWxpYXNpbmdUaHJlc2hvbGQgZGVmYXVsdCBiZWZvcmUgd2UgY2hhbmdlZCBpdC4K KyAgICAvLyBBIGRpc3RyaWJ1dGVkIG5vdGlmaWNhdGlvbiBpcyBkZWxpdmVyZWQgdG8gYWxsIGFw cGxpY2F0aW9ucywgYnV0IGl0IHNob3VsZCBiZSBoYXJtbGVzcywgYW5kIGl0J3MgdGhlIG9ubHkg d2F5IHRvIHVwZGF0ZSBhbGwgdW5kZXJseWluZyBmcmFtZXdvcmtzIGFueXdheS4KKyAgICBbW05T RGlzdHJpYnV0ZWROb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcG9zdE5vdGlmaWNh dGlvbk5hbWU6QCJBcHBsZUFxdWFBbnRpQWxpYXNpbmdDaGFuZ2VkIiBvYmplY3Q6bmlsIHVzZXJJ bmZvOm5pbCBkZWxpdmVySW1tZWRpYXRlbHk6WUVTXTsKIAotICAgIE5TU3RyaW5nICpwYXRoID0g bGlicmFyeVBhdGhGb3JEdW1wUmVuZGVyVHJlZSgpOwogICAgIE5TVVJMQ2FjaGUgKnNoYXJlZENh Y2hlID0KICAgICAgICAgW1tOU1VSTENhY2hlIGFsbG9jXSBpbml0V2l0aE1lbW9yeUNhcGFjaXR5 OjEwMjQgKiAxMDI0CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpc2tD YXBhY2l0eTowCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXNr UGF0aDpbcGF0aCBzdHJpbmdCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJVUkxDYWNoZSJdXTsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpc2tQYXRoOltsaWJy YXJ5UGF0aCBzdHJpbmdCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJVUkxDYWNoZSJdXTsKICAg ICBbTlNVUkxDYWNoZSBzZXRTaGFyZWRVUkxDYWNoZTpzaGFyZWRDYWNoZV07CiAgICAgW3NoYXJl ZENhY2hlIHJlbGVhc2VdOwogfQpAQCAtOTUwLDExICs5MzAsNyBAQCBpbnQgbWFpbihpbnQgYXJn YywgY29uc3QgY2hhciAqYXJndltdKQogewogICAgIE5TQXV0b3JlbGVhc2VQb29sICpwb29sID0g W1tOU0F1dG9yZWxlYXNlUG9vbCBhbGxvY10gaW5pdF07CiAgICAgW0R1bXBSZW5kZXJUcmVlQXBw bGljYXRpb24gc2hhcmVkQXBwbGljYXRpb25dOyAvLyBGb3JjZSBBcHBLaXQgdG8gaW5pdCBpdHNl bGYKLSAgICAKLSAgICBOU0RpY3Rpb25hcnkgKmRlZmF1bHRzID0gW1tOU0RpY3Rpb25hcnkgYWxs b2NdIGluaXRXaXRoT2JqZWN0c0FuZEtleXM6W05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10s IEAiQXBwbGVNYWduaWZpZWRNb2RlIiwgbmlsXTsKLSAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5k YXJkVXNlckRlZmF1bHRzXSByZWdpc3RlckRlZmF1bHRzOmRlZmF1bHRzXTsKLSAgICBbZGVmYXVs dHMgcmVsZWFzZV07Ci0gICAgCisKICAgICBkdW1wUmVuZGVyVHJlZShhcmdjLCBhcmd2KTsKICAg ICBbV2ViQ29yZVN0YXRpc3RpY3MgZ2FyYmFnZUNvbGxlY3RKYXZhU2NyaXB0T2JqZWN0c107CiAg ICAgW1dlYkNvcmVTdGF0aXN0aWNzIGVtcHR5Q2FjaGVdOyAvLyBPdGhlcndpc2UgU1ZHSW1hZ2Vz IHRyaWdnZXIgZmFsc2UgcG9zaXRpdmVzIGZvciBGcmFtZS9Ob2RlIGNvdW50cwpAQCAtMTMwNSw3 ICsxMjgxLDExIEBAIHN0YXRpYyB2b2lkIHJlc2V0V2ViVmlld1RvQ29uc2lzdGVudFN0YXQKICAg ICBbW3dlYlZpZXcgd2luZG93XSBzZXRBdXRvZGlzcGxheTpOT107CiAgICAgW3dlYlZpZXcgc2V0 VHJhY2tzUmVwYWludHM6Tk9dOwogICAgIAotICAgIHJlc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRW YWx1ZXMoKTsKKyAgICByZXNldFdlYlByZWZlcmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKCk7CisK KyAgICBUZXN0UnVubmVyOjpzZXRTZXJpYWxpemVIVFRQTG9hZHMoZmFsc2UpOworCisgICAgc2V0 bG9jYWxlKExDX0FMTCwgIiIpOwogCiAgICAgaWYgKGdUZXN0UnVubmVyKSB7CiAgICAgICAgIFdl YkNvcmVUZXN0U3VwcG9ydDo6cmVzZXRJbnRlcm5hbHNPYmplY3QoW21haW5GcmFtZSBnbG9iYWxD b250ZXh0XSk7CkluZGV4OiBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL21h Yy9JbmplY3RlZEJ1bmRsZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL21hYy9JbmplY3RlZEJ1bmRsZU1hYy5tbQkocmV2aXNpb24gMTU4 MTgxKQorKysgVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMvSW5qZWN0 ZWRCdW5kbGVNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTQyLDIyICs0MiwyMSBAQCB2b2lkIElu amVjdGVkQnVuZGxlOjpwbGF0Zm9ybUluaXRpYWxpemUoCiAgICAgc3RhdGljIGNvbnN0IGludCBO b0ZvbnRTbW9vdGhpbmcgPSAwOwogICAgIHN0YXRpYyBjb25zdCBpbnQgQmx1ZVRpbnRlZEFwcGVh cmFuY2UgPSAxOwogCi0gICAgTlNEaWN0aW9uYXJ5ICpkaWN0ID0gW05TRGljdGlvbmFyeSBkaWN0 aW9uYXJ5V2l0aE9iamVjdHNBbmRLZXlzOgotICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aElu dGVnZXI6NF0sIEAiQXBwbGVBbnRpQWxpYXNpbmdUaHJlc2hvbGQiLAotICAgICAgICBbTlNOdW1i ZXIgbnVtYmVyV2l0aEludGVnZXI6Tm9Gb250U21vb3RoaW5nXSwgQCJBcHBsZUZvbnRTbW9vdGhp bmciLAotICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEludGVnZXI6Qmx1ZVRpbnRlZEFwcGVh cmFuY2VdLCBAIkFwcGxlQXF1YUNvbG9yVmFyaWFudCIsCi0gICAgICAgIEAiMC43MDk4MDAgMC44 MzUzMDAgMS4wMDAwMDAiLCBAIkFwcGxlSGlnaGxpZ2h0Q29sb3IiLAotICAgICAgICBAIjAuNTAw MDAwIDAuNTAwMDAwIDAuNTAwMDAwIiwgQCJBcHBsZU90aGVySGlnaGxpZ2h0Q29sb3IiLAotI2lm IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA4MAotICAgICAgICBbTlNOdW1i ZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCBAIk5TU2Nyb2xsQW5pbWF0aW9uRW5hYmxlZCIsCi0jZWxz ZQotICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCBAIkFwcGxlU2Nyb2xsQW5p bWF0aW9uRW5hYmxlZCIsCi0jZW5kaWYKLSAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29s Ok5PXSwgQCJOU092ZXJsYXlTY3JvbGxlcnNFbmFibGVkIiwKLSAgICAgICAgQCJBbHdheXMiLCBA IkFwcGxlU2hvd1Njcm9sbEJhcnMiLAotICAgICAgICBbTlNBcnJheSBhcnJheVdpdGhPYmplY3Q6 QCJlbiJdLCBAIkFwcGxlTGFuZ3VhZ2VzIiwKLSAgICAgICAgW05TRGljdGlvbmFyeSBkaWN0aW9u YXJ5V2l0aE9iamVjdHNBbmRLZXlzOkAibm90YXRpb25hbCIsIEAibm90YXRpb25sIiwgbmlsXSwg QCJOU1Rlc3RDb3JyZWN0aW9uRGljdGlvbmFyeSIsCi0gICAgICAgIG5pbF07CisgICAgTlNEaWN0 aW9uYXJ5ICpkaWN0ID0gQHsKKyAgICAgICAgQCJBcHBsZUFudGlBbGlhc2luZ1RocmVzaG9sZCI6 IEA0LAorICAgICAgICBAIkFwcGxlRm9udFNtb290aGluZyI6IEAoTm9Gb250U21vb3RoaW5nKSwK KyAgICAgICAgQCJBcHBsZUFxdWFDb2xvclZhcmlhbnQiOiBAKEJsdWVUaW50ZWRBcHBlYXJhbmNl KSwKKyAgICAgICAgQCJBcHBsZUhpZ2hsaWdodENvbG9yIjogQCIwLjcwOTgwMCAwLjgzNTMwMCAx LjAwMDAwMCIsCisgICAgICAgIEAiQXBwbGVPdGhlckhpZ2hsaWdodENvbG9yIjogQCIwLjUwMDAw MCAwLjUwMDAwMCAwLjUwMDAwMCIsCisgICAgICAgIEAiTlNTY3JvbGxBbmltYXRpb25FbmFibGVk IjogQE5PLAorICAgICAgICBAIk5TT3ZlcmxheVNjcm9sbGVyc0VuYWJsZWQiOiBATk8sCisgICAg ICAgIEAiQXBwbGVTaG93U2Nyb2xsQmFycyI6IEAiQWx3YXlzIiwKKyAgICAgICAgQCJBcHBsZUxh bmd1YWdlcyI6IEBbIEAiZW4iIF0sCisgICAgICAgIC8vIEZJWE1FOiBXaHkgZG9lcyB0aGlzIGRp Y3Rpb25hcnkgbm90IG1hdGNoIHRoZSBvbmUgaW4gRHVtcFJlbmRlclRyZWU/CisgICAgICAgIEAi TlNUZXN0Q29ycmVjdGlvbkRpY3Rpb25hcnkiOiBAeworICAgICAgICAgICAgQCJub3RhdGlvbmwi OiBAIm5vdGF0aW9uYWwiCisgICAgICAgIH0KKyAgICB9OwogCiAgICAgW1tOU1VzZXJEZWZhdWx0 cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0Vm9sYXRpbGVEb21haW46ZGljdCBmb3JOYW1lOk5T QXJndW1lbnREb21haW5dOwogCkluZGV4OiBUb29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9tYWlu Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL21haW4ubW0JKHJl dmlzaW9uIDE1ODE4MSkKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL21haW4ubW0JKHdv cmtpbmcgY29weSkKQEAgLTI3LDE4ICsyNywyNCBAQAogCiAjaW1wb3J0ICJUZXN0Q29udHJvbGxl ci5oIgogCitzdGF0aWMgdm9pZCBzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlc0ZvclRlc3Rp bmcoKQoreworICAgIE5TRGljdGlvbmFyeSAqZGljdCA9IEB7CisgICAgICAgIEAiQXBwbGVNYWdu aWZpZWRNb2RlIjogQFlFUywKKyAgICAgICAgQCJXZWJLaXRLZXJuaW5nQW5kTGlnYXR1cmVzRW5h YmxlZEJ5RGVmYXVsdCI6IEBOTywKKyAgICAgICAgLy8gRklYTUU6IFRoaXMgaXMgbGlrZWx5IGlu c3VmZmljaWVudCwgYXMgdGVzdHMgY2hhbmdlIChhbmQgZG9uJ3QgcmVzZXQpIHRoZXNlIHNldHRp bmdzIHZpYSBJbnRlcm5hbHMuCisgICAgICAgIEAiV2ViQXV0b21hdGljUXVvdGVTdWJzdGl0dXRp b25FbmFibGVkIjogQE5PLAorICAgICAgICBAIldlYkF1dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb25F bmFibGVkIjogQE5PCisgICAgfTsKKworICAgIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2Vy RGVmYXVsdHNdIHNldFZvbGF0aWxlRG9tYWluOmRpY3QgZm9yTmFtZTpOU0FyZ3VtZW50RG9tYWlu XTsKK30KKwogaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKIHsKICAgICBO U0F1dG9yZWxlYXNlUG9vbCAqcG9vbCA9IFtbTlNBdXRvcmVsZWFzZVBvb2wgYWxsb2NdIGluaXRd OwogICAgIFtOU0FwcGxpY2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9uXTsKLSAgICBbW05TVXNlckRl ZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRWb2xhdGlsZURvbWFpbjpbTlNEaWN0aW9u YXJ5IGRpY3Rpb25hcnlXaXRoT2JqZWN0OltOU051bWJlciBudW1iZXJXaXRoQm9vbDpOT10gZm9y S2V5OkAiV2ViS2l0S2VybmluZ0FuZExpZ2F0dXJlc0VuYWJsZWRCeURlZmF1bHQiXSBmb3JOYW1l Ok5TQXJndW1lbnREb21haW5dOwotICAgIAotICAgIE5TRGljdGlvbmFyeSAqZGVmYXVsdHMgPSBb W05TRGljdGlvbmFyeSBhbGxvY10gaW5pdFdpdGhPYmplY3RzQW5kS2V5czpbTlNOdW1iZXIgbnVt YmVyV2l0aEJvb2w6WUVTXSwgQCJBcHBsZU1hZ25pZmllZE1vZGUiLCBuaWxdOwotICAgIFtbTlNV c2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHJlZ2lzdGVyRGVmYXVsdHM6ZGVmYXVs dHNdOwotICAgIFtkZWZhdWx0cyByZWxlYXNlXTsKLQotICAgIFtbTlNVc2VyRGVmYXVsdHMgc3Rh bmRhcmRVc2VyRGVmYXVsdHNdIHNldEJvb2w6Tk8gZm9yS2V5OkAiV2ViQXV0b21hdGljUXVvdGVT dWJzdGl0dXRpb25FbmFibGVkIl07Ci0gICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJE ZWZhdWx0c10gc2V0Qm9vbDpOTyBmb3JLZXk6QCJXZWJBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9u RW5hYmxlZCJdOworICAgIHNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzRm9yVGVzdGluZygp OwogCiAgICAgewogICAgICAgICBXVFI6OlRlc3RDb250cm9sbGVyIGNvbnRyb2xsZXIoYXJnYywg YXJndik7Cg==