125612 2013-12-11 18:33:13 -0800 [Cocoa] Navigation action information for policy decisions is missing the original request 2013-12-12 10:42:58 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mitz mitz commit-queue pknight oldest_to_newest 959012 0 mitz 2013-12-11 18:33:13 -0800 [Cocoa] Navigation action information for policy decisions is missing the original request 959013 1 219029 mitz 2013-12-11 18:38:33 -0800 Created attachment 219029 Expose the original request in the action dictionary 959014 2 commit-queue 2013-12-11 18:40:18 -0800 Attachment 219029 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/Platform/CoreIPC/HandleMessage.h', u'Source/WebKit2/UIProcess/API/C/WKPagePolicyClientInternal.h', u'Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm', u'Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h', u'Source/WebKit2/UIProcess/WebPageProxy.cpp', u'Source/WebKit2/UIProcess/WebPageProxy.h', u'Source/WebKit2/UIProcess/WebPageProxy.messages.in', u'Source/WebKit2/UIProcess/WebPolicyClient.cpp', u'Source/WebKit2/UIProcess/WebPolicyClient.h', u'Source/WebKit2/WebKit2.xcodeproj/project.pbxproj', u'Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp', '--commit-queue']" exit_code: 1 ERROR: Source/WebKit2/UIProcess/WebPageProxy.h:901: The parameter name "request" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h:36: One space before end of line comments [whitespace/comments] [5] Total errors found: 2 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 959015 3 mitz 2013-12-11 18:41:18 -0800 Not sure if this internal interface is a good idea. The idea is that we won’t have to create a new versioned interface each time we modify something for the Cocoa API. We’ll only create a new version when the C API requires it (by moving the internal version to the main header). 959047 4 mitz 2013-12-11 21:20:16 -0800 <rdar://problem/15644024> 959238 5 mitz 2013-12-12 10:42:58 -0800 Fixed in <http://trac.webkit.org/r160495>. 219029 2013-12-11 18:38:33 -0800 2013-12-12 10:25:55 -0800 Expose the original request in the action dictionary bug-125612-20131211183854.patch text/plain 25743 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDQ3MSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEzLTEyLTExICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBOYXZpZ2F0aW9uIGFj dGlvbiBpbmZvcm1hdGlvbiBmb3IgcG9saWN5IGRlY2lzaW9ucyBpcyBtaXNzaW5nIHRoZSBvcmln aW5hbCByZXF1ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjU2MTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oOgorICAgICAgICAoQ29yZUlQ Qzo6Y2FsbE1lbWJlckZ1bmN0aW9uKTogQWRkZWQgdGVtcGxhdGUgd2l0aCBhZGRpdGlvbmFsIG1l c3NhZ2UgcGFyYW1ldGVyLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2VQb2xpY3lD bGllbnRJbnRlcm5hbC5oOiBBZGRlZC4gRGVmaW5lcyBhIG5ldyB2ZXJzaW9uIG9mIHRoZSBjbGll bnQKKyAgICAgICAgaW50ZXJmYWNlIHdpdGggYSBuZXcgdmVyc2lvbiBvZiB0aGUgcG9saWN5IGRl Y2lzaW9uIGNhbGxiYWNrLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2lu Z0NvbnRleHRDb250cm9sbGVyLm1tOgorICAgICAgICAoc2V0VXBQYWdlUG9saWN5Q2xpZW50KTog VXNlIHRoZSBuZXcgaW50ZXJuYWwgdmVyc2lvbiBvZiB0aGUgY2xpZW50LiBQYXNzIHRoZSBvcmln aW5hbAorICAgICAgICByZXF1ZXN0IGluIHRoZSBhY3Rpb24gaW5mb3JtYXRpb24gZGljdGlvbmFy eSB1bmRlciBhIG5ldyBrZXkuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dz aW5nQ29udGV4dFBvbGljeURlbGVnYXRlLmg6IERlY2xhcmVkIG5ldyBhY3Rpb24gaW5mb3JtYXRp b24KKyAgICAgICAga2V5LgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb24pOiBBZGRlZCBvcmlnaW5hbFJlcXVlc3QgcGFyYW1ldGVyLAorICAgICAgICB3aGljaCBp cyBwYXNzZWQgdG8gdGhlIHBvbGljeSBjbGllbnQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46 IEFkZGVkIG9yaWdpbmFsUmVxdWVzdCBwYXJhbWV0ZXIgaW4KKyAgICAgICAgRGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbi4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUG9saWN5Q2xpZW50 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUG9saWN5Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uQWN0aW9uKTogUGFzcyB0aGUgb3JpZ2luYWwgcmVxdWVzdCB0bworICAgICAgICB0 aGUgY2xpZW50LgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQb2xpY3lDbGllbnQuaDoKKyAgICAg ICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IEFkZGVkIHJlZmVyZW5jZSB0 byBuZXcgZmlsZS4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6 OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6IFNlbmQgdGhlIG9yaWdp bmFsCisgICAgICAgIHJlcXVlc3QgZnJvbSB0aGUgbmF2aWdhdGlvbiBhY3Rpb24gdG8gdGhlIFVJ IHByb2Nlc3MuCisKIDIwMTMtMTItMTEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KIAogICAgICAgICBNZXNzYWdlUmVjZWl2ZXJNYXAgc2hvdWxkIHRha2UgTWVzc2FnZVJl Y2VpdmVyIG9iamVjdHMgYnkgcmVmZXJlbmNlCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9Q bGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaAkocmV2aXNpb24gMTYwNDUwKQorKysgU291 cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTM2NCw2ICszNjQsMTIgQEAgdm9pZCBjYWxsTWVtYmVyRnVuY3Rpb24oc3RkOjp0dXBs ZTxQMSwgUAogICAgIChvYmplY3QtPipmdW5jdGlvbikoc3RkOjpnZXQ8MD4oYXJncyksIHN0ZDo6 Z2V0PDE+KGFyZ3MpLCBzdGQ6OmdldDwyPihhcmdzKSwgc3RkOjpnZXQ8Mz4oYXJncyksIHN0ZDo6 Z2V0PDQ+KGFyZ3MpLCBzdGQ6OmdldDw1PihhcmdzKSwgc3RkOjpnZXQ8Nj4oYXJncyksIGRlY29k ZXIsIHN0ZDo6Z2V0PDA+KHJlcGx5QXJncyksIHN0ZDo6Z2V0PDE+KHJlcGx5QXJncyksIHN0ZDo6 Z2V0PDI+KHJlcGx5QXJncykpOwogfQogCit0ZW1wbGF0ZTx0eXBlbmFtZSBDLCB0eXBlbmFtZSBN RiwgdHlwZW5hbWUgUDEsIHR5cGVuYW1lIFAyLCB0eXBlbmFtZSBQMywgdHlwZW5hbWUgUDQsIHR5 cGVuYW1lIFA1LCB0eXBlbmFtZSBQNiwgdHlwZW5hbWUgUDcsIHR5cGVuYW1lIFA4LCB0eXBlbmFt ZSBSMSwgdHlwZW5hbWUgUjIsIHR5cGVuYW1lIFIzPgordm9pZCBjYWxsTWVtYmVyRnVuY3Rpb24o c3RkOjp0dXBsZTxQMSwgUDIsIFAzLCBQNCwgUDUsIFA2LCBQNywgUDg+JiYgYXJncywgTWVzc2Fn ZURlY29kZXImIGRlY29kZXIsIHN0ZDo6dHVwbGU8UjEsIFIyLCBSMz4mIHJlcGx5QXJncywgQyog b2JqZWN0LCBNRiBmdW5jdGlvbikKK3sKKyAgICAob2JqZWN0LT4qZnVuY3Rpb24pKHN0ZDo6Z2V0 PDA+KGFyZ3MpLCBzdGQ6OmdldDwxPihhcmdzKSwgc3RkOjpnZXQ8Mj4oYXJncyksIHN0ZDo6Z2V0 PDM+KGFyZ3MpLCBzdGQ6OmdldDw0PihhcmdzKSwgc3RkOjpnZXQ8NT4oYXJncyksIHN0ZDo6Z2V0 PDY+KGFyZ3MpLCBzdGQ6OmdldDw3PihhcmdzKSwgZGVjb2Rlciwgc3RkOjpnZXQ8MD4ocmVwbHlB cmdzKSwgc3RkOjpnZXQ8MT4ocmVwbHlBcmdzKSwgc3RkOjpnZXQ8Mj4ocmVwbHlBcmdzKSk7Cit9 CisKIC8vIE1haW4gZGlzcGF0Y2ggZnVuY3Rpb25zCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBl bmFtZSBDLCB0eXBlbmFtZSBNRj4KIHZvaWQgaGFuZGxlTWVzc2FnZShNZXNzYWdlRGVjb2RlciYg ZGVjb2RlciwgQyogb2JqZWN0LCBNRiBmdW5jdGlvbikKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAxNjA0NTApCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQyNCw3 ICsyNDI0LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmZyYW1lRGlkQmVjb21lRnJhbWVTZQogfQog CiAvLyBQb2xpY3lDbGllbnQKLXZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQzMl90IG9wYXF1ZU5hdmlnYXRpb25U eXBlLCB1aW50MzJfdCBvcGFxdWVNb2RpZmllcnMsIGludDMyX3Qgb3BhcXVlTW91c2VCdXR0b24s IHVpbnQ2NF90IG9yaWdpbmF0aW5nRnJhbWVJRCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCB1aW50NjRfdCBsaXN0ZW5lcklELCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVjb2Rl ciwgYm9vbCYgcmVjZWl2ZWRQb2xpY3lBY3Rpb24sIHVpbnQ2NF90JiBwb2xpY3lBY3Rpb24sIHVp bnQ2NF90JiBkb3dubG9hZElEKQordm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb24odWludDY0X3QgZnJhbWVJRCwgdWludDMyX3Qgb3BhcXVlTmF2aWdhdGlv blR5cGUsIHVpbnQzMl90IG9wYXF1ZU1vZGlmaWVycywgaW50MzJfdCBvcGFxdWVNb3VzZUJ1dHRv biwgdWludDY0X3Qgb3JpZ2luYXRpbmdGcmFtZUlELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCB1 aW50NjRfdCBsaXN0ZW5lcklELCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVjb2RlciwgYm9v bCYgcmVjZWl2ZWRQb2xpY3lBY3Rpb24sIHVpbnQ2NF90JiBwb2xpY3lBY3Rpb24sIHVpbnQ2NF90 JiBkb3dubG9hZElEKQogewogICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4gdXNlckRhdGE7CiAgICAg V2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwgcHJv Y2VzcygpKTsKQEAgLTI0MzksNiArMjQzOSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQ b2xpY3lGb3JOYXZpZ2EKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2Vi RnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAgICAgTUVTU0FHRV9D SEVDS19VUkwocmVxdWVzdC51cmwoKSk7CisgICAgTUVTU0FHRV9DSEVDS19VUkwob3JpZ2luYWxS ZXF1ZXN0LnVybCgpKTsKIAogICAgIE5hdmlnYXRpb25UeXBlIG5hdmlnYXRpb25UeXBlID0gc3Rh dGljX2Nhc3Q8TmF2aWdhdGlvblR5cGU+KG9wYXF1ZU5hdmlnYXRpb25UeXBlKTsKICAgICBXZWJF dmVudDo6TW9kaWZpZXJzIG1vZGlmaWVycyA9IHN0YXRpY19jYXN0PFdlYkV2ZW50OjpNb2RpZmll cnM+KG9wYXF1ZU1vZGlmaWVycyk7CkBAIC0yNDUyLDcgKzI0NTMsNyBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhCiAgICAgbV9pbkRlY2lkZVBvbGljeUZvck5hdmln YXRpb25BY3Rpb24gPSB0cnVlOwogICAgIG1fc3luY05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBY3Rp b25Jc1ZhbGlkID0gZmFsc2U7CiAgICAgCi0gICAgaWYgKCFtX3BvbGljeUNsaWVudC5kZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHRoaXMsIGZyYW1lLCBuYXZpZ2F0aW9uVHlwZSwgbW9k aWZpZXJzLCBtb3VzZUJ1dHRvbiwgb3JpZ2luYXRpbmdGcmFtZSwgcmVxdWVzdCwgbGlzdGVuZXIu Z2V0KCksIHVzZXJEYXRhLmdldCgpKSkKKyAgICBpZiAoIW1fcG9saWN5Q2xpZW50LmRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb24odGhpcywgZnJhbWUsIG5hdmlnYXRpb25UeXBlLCBtb2Rp ZmllcnMsIG1vdXNlQnV0dG9uLCBvcmlnaW5hdGluZ0ZyYW1lLCBvcmlnaW5hbFJlcXVlc3QsIHJl cXVlc3QsIGxpc3RlbmVyLmdldCgpLCB1c2VyRGF0YS5nZXQoKSkpCiAgICAgICAgIGxpc3RlbmVy LT51c2UoKTsKIAogICAgIG1faW5EZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uID0gZmFs c2U7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lv biAxNjA0NTApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdv cmtpbmcgY29weSkKQEAgLTg5OCw3ICs4OTgsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkQ2hh bmdlUHJvZ3Jlc3MoZG91YmxlKTsKICAgICB2b2lkIGRpZEZpbmlzaFByb2dyZXNzKCk7CiAKLSAg ICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24odWludDY0X3QgZnJhbWVJRCwg dWludDMyX3QgbmF2aWdhdGlvblR5cGUsIHVpbnQzMl90IG1vZGlmaWVycywgaW50MzJfdCBtb3Vz ZUJ1dHRvbiwgdWludDY0X3Qgb3JpZ2luYXRpbmdGcmFtZUlELCBjb25zdCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmLCB1aW50NjRfdCBsaXN0ZW5lcklELCBDb3JlSVBDOjpNZXNzYWdlRGVjb2Rl ciYsIGJvb2wmIHJlY2VpdmVkUG9saWN5QWN0aW9uLCB1aW50NjRfdCYgcG9saWN5QWN0aW9uLCB1 aW50NjRfdCYgZG93bmxvYWRJRCk7CisgICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQzMl90IG5hdmlnYXRpb25UeXBlLCB1aW50MzJf dCBtb2RpZmllcnMsIGludDMyX3QgbW91c2VCdXR0b24sIHVpbnQ2NF90IG9yaWdpbmF0aW5nRnJh bWVJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlcXVlc3QsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgdWludDY0X3QgbGlzdGVuZXJJ RCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImLCBib29sJiByZWNlaXZlZFBvbGljeUFjdGlvbiwg dWludDY0X3QmIHBvbGljeUFjdGlvbiwgdWludDY0X3QmIGRvd25sb2FkSUQpOwogICAgIHZvaWQg ZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQzMl90 IG5hdmlnYXRpb25UeXBlLCB1aW50MzJfdCBtb2RpZmllcnMsIGludDMyX3QgbW91c2VCdXR0b24s IGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1l LCB1aW50NjRfdCBsaXN0ZW5lcklELCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYpOwogICAgIHZv aWQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGJv b2wgY2FuU2hvd01JTUVUeXBlLCB1aW50NjRfdCBsaXN0ZW5lcklELCBDb3JlSVBDOjpNZXNzYWdl RGVjb2RlciYpOwogICAgIHZvaWQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VTeW5jKHVpbnQ2NF90 IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmLCBjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmLCBib29sIGNhblNob3dNSU1FVHlwZSwgdWludDY0X3QgbGlzdGVu ZXJJRCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImLCBib29sJiByZWNlaXZlZFBvbGljeUFjdGlv biwgdWludDY0X3QmIHBvbGljeUFjdGlvbiwgdWludDY0X3QmIGRvd25sb2FkSUQpOwpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmlu CShyZXZpc2lvbiAxNjA0NTApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMDMsNyArMTAzLDcgQEAgbWVzc2Fn ZXMgLT4gV2ViUGFnZVByb3h5IHsKIAogICAgICMgUG9saWN5IG1lc3NhZ2VzCiAgICAgRGVjaWRl UG9saWN5Rm9yUmVzcG9uc2VTeW5jKHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6OlJlc291cmNl UmVzcG9uc2UgcmVzcG9uc2UsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0LCBib29s IGNhblNob3dNSU1FVHlwZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgV2ViS2l0OjpJbmplY3RlZEJ1 bmRsZVVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgLT4gKGJvb2wgcmVjZWl2ZWRQb2xpY3lB Y3Rpb24sIHVpbnQ2NF90IHBvbGljeUFjdGlvbiwgdWludDY0X3QgZG93bmxvYWRJRCkgVmFyaWFk aWMKLSAgICBEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHVpbnQ2NF90IGZyYW1lSUQs IHVpbnQzMl90IG5hdmlnYXRpb25UeXBlLCB1aW50MzJfdCBtb2RpZmllcnMsIGludDMyX3QgbW91 c2VCdXR0b24sIHVpbnQ2NF90IG9yaWdpbmF0aW5nRnJhbWVJRCwgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0IHJlcXVlc3QsIHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlYktpdDo6SW5qZWN0ZWRCdW5k bGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIC0+IChib29sIHJlY2VpdmVkUG9saWN5QWN0 aW9uLCB1aW50NjRfdCBwb2xpY3lBY3Rpb24sIHVpbnQ2NF90IGRvd25sb2FkSUQpIFZhcmlhZGlj CisgICAgRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih1aW50NjRfdCBmcmFtZUlELCB1 aW50MzJfdCBuYXZpZ2F0aW9uVHlwZSwgdWludDMyX3QgbW9kaWZpZXJzLCBpbnQzMl90IG1vdXNl QnV0dG9uLCB1aW50NjRfdCBvcmlnaW5hdGluZ0ZyYW1lSUQsIFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCBvcmlnaW5hbFJlcXVlc3QsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0LCB1 aW50NjRfdCBsaXN0ZW5lcklELCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNv ZGVyIHVzZXJEYXRhKSAtPiAoYm9vbCByZWNlaXZlZFBvbGljeUFjdGlvbiwgdWludDY0X3QgcG9s aWN5QWN0aW9uLCB1aW50NjRfdCBkb3dubG9hZElEKSBWYXJpYWRpYwogICAgIERlY2lkZVBvbGlj eUZvck5ld1dpbmRvd0FjdGlvbih1aW50NjRfdCBmcmFtZUlELCB1aW50MzJfdCBuYXZpZ2F0aW9u VHlwZSwgdWludDMyX3QgbW9kaWZpZXJzLCBpbnQzMl90IG1vdXNlQnV0dG9uLCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCwgU3RyaW5nIGZyYW1lTmFtZSwgdWludDY0X3QgbGlzdGVu ZXJJRCwgV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkg VmFyaWFkaWMKICAgICBVbmFibGVUb0ltcGxlbWVudFBvbGljeSh1aW50NjRfdCBmcmFtZUlELCBX ZWJDb3JlOjpSZXNvdXJjZUVycm9yIGVycm9yLCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNlck1l c3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSAgVmFyaWFkaWMKIApJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBvbGljeUNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBvbGljeUNsaWVudC5jcHAJKHJldmlzaW9uIDE2MDQ1MCkKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQb2xpY3lDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zNCwxNyArMzQsMjAgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFj ZSBXZWJLaXQgewogCi1ib29sIFdlYlBvbGljeUNsaWVudDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbihXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZyYW1lUHJveHkqIGZyYW1lLCBOYXZp Z2F0aW9uVHlwZSB0eXBlLCBXZWJFdmVudDo6TW9kaWZpZXJzIG1vZGlmaWVycywgV2ViTW91c2VF dmVudDo6QnV0dG9uIG1vdXNlQnV0dG9uLCBXZWJGcmFtZVByb3h5KiBvcmlnaW5hdGluZ0ZyYW1l LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCwgV2ViRnJhbWVQb2xpY3lM aXN0ZW5lclByb3h5KiBsaXN0ZW5lciwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQorYm9vbCBXZWJQ b2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViUGFnZVByb3h5 KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgTmF2aWdhdGlvblR5cGUgdHlwZSwgV2ViRXZl bnQ6Ok1vZGlmaWVycyBtb2RpZmllcnMsIFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBtb3VzZUJ1dHRv biwgV2ViRnJhbWVQcm94eSogb3JpZ2luYXRpbmdGcmFtZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiBvcmlnaW5hbFJlc291cmNlUmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJj ZVJlcXVlc3QsIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSogbGlzdGVuZXIsIEFQSTo6T2Jq ZWN0KiB1c2VyRGF0YSkKIHsKLSAgICBpZiAoIW1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmln YXRpb25BY3Rpb25fZGVwcmVjYXRlZEZvclVzZVdpdGhWMCAmJiAhbV9jbGllbnQuZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbikKKyAgICBpZiAoIW1fY2xpZW50LmRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb25fZGVwcmVjYXRlZEZvclVzZVdpdGhWMCAmJiAhbV9jbGllbnQuZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbl9kZXByZWNhdGVkRm9yVXNlV2l0aFYxICYmICFt X2NsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKKyAgICBSZWZQdHI8V2ViVVJMUmVxdWVzdD4gb3JpZ2luYWxSZXF1ZXN0ID0gV2Vi VVJMUmVxdWVzdDo6Y3JlYXRlKG9yaWdpbmFsUmVzb3VyY2VSZXF1ZXN0KTsKICAgICBSZWZQdHI8 V2ViVVJMUmVxdWVzdD4gcmVxdWVzdCA9IFdlYlVSTFJlcXVlc3Q6OmNyZWF0ZShyZXNvdXJjZVJl cXVlc3QpOwogCiAgICAgaWYgKG1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b25fZGVwcmVjYXRlZEZvclVzZVdpdGhWMCkKICAgICAgICAgbV9jbGllbnQuZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbl9kZXByZWNhdGVkRm9yVXNlV2l0aFYwKHRvQVBJKHBhZ2UpLCB0 b0FQSShmcmFtZSksIHRvQVBJKHR5cGUpLCB0b0FQSShtb2RpZmllcnMpLCB0b0FQSShtb3VzZUJ1 dHRvbiksIHRvQVBJKHJlcXVlc3QuZ2V0KCkpLCB0b0FQSShsaXN0ZW5lciksIHRvQVBJKHVzZXJE YXRhKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKKyAgICBlbHNlIGlmIChtX2NsaWVudC5k ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjEpCisg ICAgICAgIG1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25fZGVwcmVjYXRl ZEZvclVzZVdpdGhWMSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSSh0eXBlKSwgdG9B UEkobW9kaWZpZXJzKSwgdG9BUEkobW91c2VCdXR0b24pLCB0b0FQSShvcmlnaW5hdGluZ0ZyYW1l KSwgdG9BUEkocmVxdWVzdC5nZXQoKSksIHRvQVBJKGxpc3RlbmVyKSwgdG9BUEkodXNlckRhdGEp LCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogICAgIGVsc2UKLSAgICAgICAgbV9jbGllbnQu ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUp LCB0b0FQSSh0eXBlKSwgdG9BUEkobW9kaWZpZXJzKSwgdG9BUEkobW91c2VCdXR0b24pLCB0b0FQ SShvcmlnaW5hdGluZ0ZyYW1lKSwgdG9BUEkocmVxdWVzdC5nZXQoKSksIHRvQVBJKGxpc3RlbmVy KSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOworICAgICAgICBt X2NsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHRvQVBJKHBhZ2UpLCB0b0FQ SShmcmFtZSksIHRvQVBJKHR5cGUpLCB0b0FQSShtb2RpZmllcnMpLCB0b0FQSShtb3VzZUJ1dHRv biksIHRvQVBJKG9yaWdpbmF0aW5nRnJhbWUpLCB0b0FQSShvcmlnaW5hbFJlcXVlc3QuZ2V0KCkp LCB0b0FQSShyZXF1ZXN0LmdldCgpKSwgdG9BUEkobGlzdGVuZXIpLCB0b0FQSSh1c2VyRGF0YSks IG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQb2xpY3lDbGllbnQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUG9saWN5Q2xpZW50LmgJKHJldmlzaW9uIDE2 MDQ1MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQb2xpY3lDbGllbnQuaAkod29y a2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaW5jbHVkZSAiQVBJQ2xpZW50LmgiCiAj aW5jbHVkZSAiV0tQYWdlLmgiCisjaW5jbHVkZSAiV0tQYWdlUG9saWN5Q2xpZW50SW50ZXJuYWwu aCIKICNpbmNsdWRlICJXZWJFdmVudC5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVMb2FkZXJU eXBlcy5oPgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CkBAIC0zNiw3ICszNyw3IEBAIG5hbWVz cGFjZSBBUEkgewogY2xhc3MgT2JqZWN0OwogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBDbGllbnRUcmFp dHM8V0tQYWdlUG9saWN5Q2xpZW50QmFzZT4gewotICAgIHR5cGVkZWYgc3RkOjp0dXBsZTxXS1Bh Z2VQb2xpY3lDbGllbnRWMCwgV0tQYWdlUG9saWN5Q2xpZW50VjE+IFZlcnNpb25zOworICAgIHR5 cGVkZWYgc3RkOjp0dXBsZTxXS1BhZ2VQb2xpY3lDbGllbnRWMCwgV0tQYWdlUG9saWN5Q2xpZW50 VjEsIFdLUGFnZVBvbGljeUNsaWVudEludGVybmFsPiBWZXJzaW9uczsKIH07CiB9CiAKQEAgLTU0 LDcgKzU1LDcgQEAgY2xhc3MgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5OwogCiBjbGFzcyBX ZWJQb2xpY3lDbGllbnQgOiBwdWJsaWMgQVBJOjpDbGllbnQ8V0tQYWdlUG9saWN5Q2xpZW50QmFz ZT4gewogcHVibGljOgotICAgIGJvb2wgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihX ZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5KiwgV2ViQ29yZTo6TmF2aWdhdGlvblR5cGUsIFdl YkV2ZW50OjpNb2RpZmllcnMsIFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiwgV2ViRnJhbWVQcm94eSog b3JpZ2luYXRpbmdGcmFtZSwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgV2ViRnJh bWVQb2xpY3lMaXN0ZW5lclByb3h5KiwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKTsKKyAgICBib29s IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQ cm94eSosIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlLCBXZWJFdmVudDo6TW9kaWZpZXJzLCBXZWJN b3VzZUV2ZW50OjpCdXR0b24sIFdlYkZyYW1lUHJveHkqIG9yaWdpbmF0aW5nRnJhbWUsIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmLCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkqLCBBUEk6Ok9i amVjdCogdXNlckRhdGEpOwogICAgIGJvb2wgZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9u KFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZSwg V2ViRXZlbnQ6Ok1vZGlmaWVycywgV2ViTW91c2VFdmVudDo6QnV0dG9uLCBjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgV2ViRnJhbWVQb2xp Y3lMaXN0ZW5lclByb3h5KiwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKTsKICAgICBib29sIGRlY2lk ZVBvbGljeUZvclJlc3BvbnNlKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiwgYm9vbCBjYW5TaG93TUlNRVR5cGUsIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSosIEFQ STo6T2JqZWN0KiB1c2VyRGF0YSk7CiAgICAgdm9pZCB1bmFibGVUb0ltcGxlbWVudFBvbGljeShX ZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJv ciYsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQYWdlUG9saWN5Q2xpZW50SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlUG9saWN5Q2xpZW50SW50ZXJuYWwuaAko cmV2aXNpb24gMCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2VQb2xp Y3lDbGllbnRJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNTggQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoK KyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmli dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVu dGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0 aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQg SVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVE IFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJ RUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElD VUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUg SU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElO RElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5U SUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9S IFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFO RCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNU UklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K KyAqLworCisjaWZuZGVmIFdLUGFnZVBvbGljeUNsaWVudEludGVybmFsX2gKKyNkZWZpbmUgV0tQ YWdlUG9saWN5Q2xpZW50SW50ZXJuYWxfaAorCisjaW5jbHVkZSAiV0tQYWdlUG9saWN5Q2xpZW50 LmgiCisKKyNpZmRlZiBfX2NwbHVzcGx1cworZXh0ZXJuICJDIiB7CisjZW5kaWYKKwordHlwZWRl ZiB2b2lkICgqV0tQYWdlRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkNhbGxiYWNrX2lu dGVybmFsKShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tGcmFtZU5hdmlnYXRp b25UeXBlIG5hdmlnYXRpb25UeXBlLCBXS0V2ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgV0tFdmVu dE1vdXNlQnV0dG9uIG1vdXNlQnV0dG9uLCBXS0ZyYW1lUmVmIG9yaWdpbmF0aW5nRnJhbWUsIFdL VVJMUmVxdWVzdFJlZiBvcmlnaW5hbFJlcXVlc3QsIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBX S0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYgbGlzdGVuZXIsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29u c3Qgdm9pZCogY2xpZW50SW5mbyk7CisKK3R5cGVkZWYgc3RydWN0IFdLUGFnZVBvbGljeUNsaWVu dEludGVybmFsIHsKKyAgICBXS1BhZ2VQb2xpY3lDbGllbnRCYXNlICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYXNlOworCisgICAgLy8gVmVyc2lvbiAwLgor ICAgIFdLUGFnZURlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25DYWxsYmFja19kZXByZWNh dGVkRm9yVXNlV2l0aFYwIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25fZGVwcmVjYXRl ZEZvclVzZVdpdGhWMDsKKyAgICBXS1BhZ2VEZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb25D YWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICBkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dB Y3Rpb247CisgICAgV0tQYWdlRGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VDYWxsYmFja19kZXByZWNh dGVkRm9yVXNlV2l0aFYwICAgICAgICAgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VfZGVwcmVjYXRl ZEZvclVzZVdpdGhWMDsKKyAgICBXS1BhZ2VVbmFibGVUb0ltcGxlbWVudFBvbGljeUNhbGxiYWNr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bmFibGVUb0ltcGxlbWVudFBvbGljeTsK KworICAgIC8vIFZlcnNpb24gMS4KKyAgICBXS1BhZ2VEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICBkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjE7CisgICAgV0tQYWdlRGVjaWRlUG9s aWN5Rm9yUmVzcG9uc2VDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGVj aWRlUG9saWN5Rm9yUmVzcG9uc2U7CisKKyAgICAvLyBJbnRlcm5hbC4KKyAgICBXS1BhZ2VEZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQ2FsbGJhY2tfaW50ZXJuYWwgICAgICAgICAgICAg ICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOworfSBXS1BhZ2VQb2xpY3lDbGllbnRJ bnRlcm5hbDsKKworI2lmZGVmIF9fY3BsdXNwbHVzCit9CisjZW5kaWYKKworI2VuZGlmIC8vIFdL UGFnZVBvbGljeUNsaWVudEludGVybmFsX2gKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250 cm9sbGVyLm1tCShyZXZpc2lvbiAxNjA0NTApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpA QCAtMTExLDYgKzExMSw3IEBAIE5TU3RyaW5nICogY29uc3QgV0tBY3Rpb25Jc01haW5GcmFtZUtl eSAKIE5TU3RyaW5nICogY29uc3QgV0tBY3Rpb25OYXZpZ2F0aW9uVHlwZUtleSA9IEAiV0tBY3Rp b25OYXZpZ2F0aW9uVHlwZUtleSI7CiBOU1N0cmluZyAqIGNvbnN0IFdLQWN0aW9uTW91c2VCdXR0 b25LZXkgPSBAIldLQWN0aW9uTW91c2VCdXR0b25LZXkiOwogTlNTdHJpbmcgKiBjb25zdCBXS0Fj dGlvbk1vZGlmaWVyRmxhZ3NLZXkgPSBAIldLQWN0aW9uTW9kaWZpZXJGbGFnc0tleSI7CitOU1N0 cmluZyAqIGNvbnN0IFdLQWN0aW9uT3JpZ2luYWxVUkxSZXF1ZXN0S2V5ID0gQCJXS0FjdGlvbk9y aWdpbmFsVVJMUmVxdWVzdEtleSI7CiBOU1N0cmluZyAqIGNvbnN0IFdLQWN0aW9uVVJMUmVxdWVz dEtleSA9IEAiV0tBY3Rpb25VUkxSZXF1ZXN0S2V5IjsKIE5TU3RyaW5nICogY29uc3QgV0tBY3Rp b25VUkxSZXNwb25zZUtleSA9IEAiV0tBY3Rpb25VUkxSZXNwb25zZUtleSI7CiBOU1N0cmluZyAq IGNvbnN0IFdLQWN0aW9uRnJhbWVOYW1lS2V5ID0gQCJXS0FjdGlvbkZyYW1lTmFtZUtleSI7CkBA IC01NjEsMTMgKzU2MiwxMyBAQCBzdGF0aWMgV0tQb2xpY3lEZWNpc2lvbkhhbmRsZXIgbWFrZVBv bGljCiAKIHN0YXRpYyB2b2lkIHNldFVwUGFnZVBvbGljeUNsaWVudChXS0Jyb3dzaW5nQ29udGV4 dENvbnRyb2xsZXIgKmJyb3dzaW5nQ29udGV4dCwgV2ViUGFnZVByb3h5JiBwYWdlKQogewotICAg IFdLUGFnZVBvbGljeUNsaWVudFYxIHBvbGljeUNsaWVudDsKKyAgICBXS1BhZ2VQb2xpY3lDbGll bnRJbnRlcm5hbCBwb2xpY3lDbGllbnQ7CiAgICAgbWVtc2V0KCZwb2xpY3lDbGllbnQsIDAsIHNp emVvZihwb2xpY3lDbGllbnQpKTsKIAotICAgIHBvbGljeUNsaWVudC5iYXNlLnZlcnNpb24gPSAx OworICAgIHBvbGljeUNsaWVudC5iYXNlLnZlcnNpb24gPSAyOwogICAgIHBvbGljeUNsaWVudC5i YXNlLmNsaWVudEluZm8gPSBicm93c2luZ0NvbnRleHQ7CiAKLSAgICBwb2xpY3lDbGllbnQuZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiA9IFtdKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1l UmVmIGZyYW1lLCBXS0ZyYW1lTmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cGUsIFdLRXZlbnRN b2RpZmllcnMgbW9kaWZpZXJzLCBXS0V2ZW50TW91c2VCdXR0b24gbW91c2VCdXR0b24sIFdLRnJh bWVSZWYgb3JpZ2luYXRpbmdGcmFtZSwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIFdLRnJhbWVQ b2xpY3lMaXN0ZW5lclJlZiBsaXN0ZW5lciwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lk KiBjbGllbnRJbmZvKQorICAgIHBvbGljeUNsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uID0gW10oV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLRnJhbWVOYXZp Z2F0aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZSwgV0tFdmVudE1vZGlmaWVycyBtb2RpZmllcnMsIFdL RXZlbnRNb3VzZUJ1dHRvbiBtb3VzZUJ1dHRvbiwgV0tGcmFtZVJlZiBvcmlnaW5hdGluZ0ZyYW1l LCBXS1VSTFJlcXVlc3RSZWYgb3JpZ2luYWxSZXF1ZXN0LCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVz dCwgV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIGxpc3RlbmVyLCBXS1R5cGVSZWYgdXNlckRhdGEs IGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiAgICAgewogICAgICAgICBXS0Jyb3dzaW5nQ29udGV4 dENvbnRyb2xsZXIgKmJyb3dzaW5nQ29udGV4dCA9IChXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xs ZXIgKiljbGllbnRJbmZvOwogICAgICAgICBhdXRvIHBvbGljeURlbGVnYXRlID0gYnJvd3NpbmdD b250ZXh0LT5fcG9saWN5RGVsZWdhdGUuZ2V0KCk7CkBAIC01NzgsNiArNTc5LDcgQEAgc3RhdGlj IHZvaWQgc2V0VXBQYWdlUG9saWN5Q2xpZW50KFdLQnJvdwogICAgICAgICAgICAgICAgIFdLQWN0 aW9uTmF2aWdhdGlvblR5cGVLZXk6IEAobmF2aWdhdGlvblR5cGUpLAogICAgICAgICAgICAgICAg IFdLQWN0aW9uTW9kaWZpZXJGbGFnc0tleTogQChtb2RpZmllcnMpLAogICAgICAgICAgICAgICAg IFdLQWN0aW9uTW91c2VCdXR0b25LZXk6IEAobW91c2VCdXR0b24pLAorICAgICAgICAgICAgICAg IFdLQWN0aW9uT3JpZ2luYWxVUkxSZXF1ZXN0S2V5OiBhZG9wdE5TKFdLVVJMUmVxdWVzdENvcHlO U1VSTFJlcXVlc3Qob3JpZ2luYWxSZXF1ZXN0KSkuZ2V0KCksCiAgICAgICAgICAgICAgICAgV0tB Y3Rpb25VUkxSZXF1ZXN0S2V5OiBhZG9wdE5TKFdLVVJMUmVxdWVzdENvcHlOU1VSTFJlcXVlc3Qo cmVxdWVzdCkpLmdldCgpCiAgICAgICAgICAgICB9OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0UG9saWN5RGVsZWdhdGUuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdD b250ZXh0UG9saWN5RGVsZWdhdGUuaAkocmV2aXNpb24gMTYwNDUwKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dFBvbGljeURlbGVnYXRlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDcgQEAgV0tfRVhQT1JUIGV4dGVybiBOU1N0cmlu ZyAqIGNvbnN0IFdLQWN0aQogV0tfRVhQT1JUIGV4dGVybiBOU1N0cmluZyAqIGNvbnN0IFdLQWN0 aW9uTmF2aWdhdGlvblR5cGVLZXk7ICAgICAgLy8gTlNOdW1iZXIgKFdLTmF2aWdhdGlvblR5cGUp CiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICogY29uc3QgV0tBY3Rpb25Nb3VzZUJ1dHRvbktl eTsgICAgICAgICAvLyBOU051bWJlciAoMCBmb3IgbGVmdCBidXR0b24sIDEgZm9yIG1pZGRsZSBi dXR0b24sIDIgZm9yIHJpZ2h0IGJ1dHRvbikKIFdLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBj b25zdCBXS0FjdGlvbk1vZGlmaWVyRmxhZ3NLZXk7ICAgICAgIC8vIE5TTnVtYmVyICh1bnNpZ25l ZCkKK1dLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBXS0FjdGlvbk9yaWdpbmFsVVJM UmVxdWVzdEtleTsgIC8vIE5TVVJMUmVxdWVzdAogV0tfRVhQT1JUIGV4dGVybiBOU1N0cmluZyAq IGNvbnN0IFdLQWN0aW9uVVJMUmVxdWVzdEtleTsgICAgICAgICAgLy8gTlNVUkxSZXF1ZXN0CiBX S19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICogY29uc3QgV0tBY3Rpb25VUkxSZXNwb25zZUtleTsg ICAgICAgICAvLyBOU1VSTFJlc3BvbnNlCiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICogY29u c3QgV0tBY3Rpb25GcmFtZU5hbWVLZXk7ICAgICAgICAgICAvLyBOU1N0cmluZwpJbmRleDogU291 cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2 aXNpb24gMTYwNDUwKQorKysgU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC00NTAsNiArNDUwLDcgQEAKIAkJMzcyQ0FGMEMx ODMzRkQ5MTAwNDBBQzI3IC8qIFdLTlNFcnJvci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDM3MkNBRjBBMTgzM0ZEOTEwMDQwQUMyNyAvKiBXS05TRXJy b3IubW0gKi87IH07CiAJCTM3M0NFQUQ1MTg1NDE3QUUwMDhDMzYzRCAvKiBXS05TRGF0YS5tbSBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDM3M0NFQUQzMTg1 NDE3QUUwMDhDMzYzRCAvKiBXS05TRGF0YS5tbSAqLzsgfTsKIAkJMzczQ0VBRDYxODU0MTdBRTAw OEMzNjNEIC8qIFdLTlNEYXRhLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSAzNzNDRUFENDE4NTQxN0FFMDA4QzM2M0QgLyogV0tOU0RhdGEuaCAqLzsgfTsK KwkJMzczQ0VBRDgxODU5NTUzRjAwOEMzNjNEIC8qIFdLUGFnZVBvbGljeUNsaWVudEludGVybmFs LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAzNzNDRUFE NzE4NTk1NTNGMDA4QzM2M0QgLyogV0tQYWdlUG9saWN5Q2xpZW50SW50ZXJuYWwuaCAqLzsgfTsK IAkJMzc0NDM2ODgxODIwRTcyNDAwNDk1NzlGIC8qIFdLT2JqZWN0Lm1tIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMzc0NDM2ODcxODIwRTcyNDAwNDk1NzlG IC8qIFdLT2JqZWN0Lm1tICovOyB9OwogCQkzNzYwODgxRTE1MDQxM0U5MDBGQzgyQzcgLyogV2Vi UmVuZGVyT2JqZWN0LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDM3NjA4ODFDMTUwNDEzRTkwMEZDODJDNyAvKiBXZWJSZW5kZXJPYmplY3QuY3BwICov OyB9OwogCQkzNzYwODgxRjE1MDQxM0U5MDBGQzgyQzcgLyogV2ViUmVuZGVyT2JqZWN0LmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAzNzYwODgxRDE1MDQx M0U5MDBGQzgyQzcgLyogV2ViUmVuZGVyT2JqZWN0LmggKi87IH07CkBAIC0yMDA0LDYgKzIwMDUs NyBAQAogCQkzNzJDQUYwQTE4MzNGRDkxMDA0MEFDMjcgLyogV0tOU0Vycm9yLm1tICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gV0tOU0Vycm9yLm1tOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQkzNzNDRUFEMzE4NTQxN0FFMDA4QzM2M0QgLyogV0tOU0RhdGEu bW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBXS05TRGF0YS5tbTsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMzczQ0VBRDQxODU0MTdBRTAwOEMzNjNEIC8q IFdLTlNEYXRhLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLTlNEYXRhLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTM3M0NFQUQ3MTg1OTU1M0YwMDhDMzYzRCAv KiBXS1BhZ2VQb2xpY3lDbGllbnRJbnRlcm5hbC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7 IHBhdGggPSBXS1BhZ2VQb2xpY3lDbGllbnRJbnRlcm5hbC5oOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQkzNzQ0MzY4NzE4MjBFNzI0MDA0OTU3OUYgLyogV0tPYmplY3QubW0gKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBXS09iamVjdC5tbTsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMzc2MDg4MUMxNTA0MTNFOTAwRkM4MkM3IC8qIFdlYlJlbmRl ck9iamVjdC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXZWJSZW5k ZXJPYmplY3QuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkzNzYwODgxRDE1MDQx M0U5MDBGQzgyQzcgLyogV2ViUmVuZGVyT2JqZWN0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IFdlYlJlbmRlck9iamVjdC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpA QCAtNDY2NSw2ICs0NjY3LDcgQEAKIAkJCQlCQzdCNjMzNTEyQTQ1QUJBMDBEMTc0QTQgLyogV0tQ YWdlR3JvdXAuaCAqLywKIAkJCQkxQUI4QTFFQjE4NDAwODA5MDBFOUFFNjkgLyogV0tQYWdlTG9h ZGVyQ2xpZW50LmggKi8sCiAJCQkJMUFCOEExRUQxODQwMEFDQjAwRTlBRTY5IC8qIFdLUGFnZVBv bGljeUNsaWVudC5oICovLAorCQkJCTM3M0NFQUQ3MTg1OTU1M0YwMDhDMzYzRCAvKiBXS1BhZ2VQ b2xpY3lDbGllbnRJbnRlcm5hbC5oICovLAogCQkJCUJDMTc3NDY0MTE4QjlGRjQwMDdEOUU5QSAv KiBXS1BhZ2VQcml2YXRlLmggKi8sCiAJCQkJMUFCOEExRjExODQwMEI2MjAwRTlBRTY5IC8qIFdL UGFnZVVJQ2xpZW50LmggKi8sCiAJCQkJMUFDODZGRjExMzBCNDZEMzAwMkMxMjU3IC8qIFdLUGx1 Z2luU2l0ZURhdGFNYW5hZ2VyLmNwcCAqLywKQEAgLTYxOTEsNiArNjE5NCw3IEBACiAJCQkJQkNE REIzMkIxMjRFQzJBQjAwNDhEMTNDIC8qIFdLU2hhcmVkQVBJQ2FzdC5oIGluIEhlYWRlcnMgKi8s CiAJCQkJQkM0MDc2MDYxMjRGRjAyNzAwNjhGMjBBIC8qIFdLU3RyaW5nLmggaW4gSGVhZGVycyAq LywKIAkJCQk3QzlEMTUzNzE4NDU4NERBMDA5RDM5MTggLyogV0tCcm93c2luZ0NvbnRleHRHcm91 cEludGVybmFsLmggaW4gSGVhZGVycyAqLywKKwkJCQkzNzNDRUFEODE4NTk1NTNGMDA4QzM2M0Qg LyogV0tQYWdlUG9saWN5Q2xpZW50SW50ZXJuYWwuaCBpbiBIZWFkZXJzICovLAogCQkJCUJDNDA3 NjFBMTI0RkYwMzcwMDY4RjIwQSAvKiBXS1N0cmluZ0NGLmggaW4gSGVhZGVycyAqLywKIAkJCQk3 NTlDQ0Q1OTE4MDhGMTY5MDA3OEU4QTggLyogV2ViT3JpZ2luRGF0YU1hbmFnZXJQcm94eUNoYW5n ZUNsaWVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQkM5MDk5ODAxMjU2QTk4MjAwMDgzNzU2IC8q IFdLU3RyaW5nUHJpdmF0ZS5oIGluIEhlYWRlcnMgKi8sCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50LmNwcAkocmV2aXNpb24gMTYwNDUwKQorKysgU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTcyOCw3ICs3MjgsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNw YXRjaERlY2lkCiAgICAgfQogCiAgICAgLy8gTm90aWZ5IHRoZSBVSVByb2Nlc3MuCi0gICAgaWYg KCF3ZWJQYWdlLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uQWN0aW9uKG1fZnJhbWUtPmZyYW1lSUQoKSwgYWN0aW9uLT5uYXZpZ2F0aW9u VHlwZSgpLCBhY3Rpb24tPm1vZGlmaWVycygpLCBhY3Rpb24tPm1vdXNlQnV0dG9uKCksIG9yaWdp bmF0aW5nRnJhbWUgPyBvcmlnaW5hdGluZ0ZyYW1lLT5mcmFtZUlEKCkgOiAwLCByZXF1ZXN0LCBs aXN0ZW5lcklELCBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0YS5nZXQo KSkpLCBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uOjpSZXBseShyZWNlaXZlZFBvbGljeUFjdGlvbiwgcG9saWN5QWN0aW9uLCBkb3dubG9hZElE KSkpCisgICAgaWYgKCF3ZWJQYWdlLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpE ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKG1fZnJhbWUtPmZyYW1lSUQoKSwgYWN0aW9u LT5uYXZpZ2F0aW9uVHlwZSgpLCBhY3Rpb24tPm1vZGlmaWVycygpLCBhY3Rpb24tPm1vdXNlQnV0 dG9uKCksIG9yaWdpbmF0aW5nRnJhbWUgPyBvcmlnaW5hdGluZ0ZyYW1lLT5mcmFtZUlEKCkgOiAw LCBuYXZpZ2F0aW9uQWN0aW9uLnJlc291cmNlUmVxdWVzdCgpLCByZXF1ZXN0LCBsaXN0ZW5lcklE LCBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0YS5nZXQoKSkpLCBNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOjpSZXBs eShyZWNlaXZlZFBvbGljeUFjdGlvbiwgcG9saWN5QWN0aW9uLCBkb3dubG9hZElEKSkpCiAgICAg ICAgIHJldHVybjsKIAogICAgIC8vIFdlIGNhbGwgdGhpcyBzeW5jaHJvbm91c2x5IGJlY2F1c2Ug V2ViQ29yZSBjYW5ub3QgZ3JhY2VmdWxseSBoYW5kbGUgYSBmcmFtZSBsb2FkIHdpdGhvdXQgYSBz eW5jaHJvbm91cyBuYXZpZ2F0aW9uIHBvbGljeSByZXBseS4K