127139 2014-01-16 13:39:15 -0800 [Mac] [iOS] Add support for CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain 2014-01-17 13:31:07 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap buildbot dbates rniwa sam oldest_to_newest 968907 0 ap 2014-01-16 13:39:15 -0800 <rdar://problem/15062599> 968916 1 221411 ap 2014-01-16 13:46:52 -0800 Created attachment 221411 proposed patch This depends on WKSI changes, so build will fail. 968967 2 221411 buildbot 2014-01-16 15:19:42 -0800 Comment on attachment 221411 proposed patch Attachment 221411 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/6418068280442880 968975 3 221411 buildbot 2014-01-16 15:49:04 -0800 Comment on attachment 221411 proposed patch Attachment 221411 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/4687781112578048 968987 4 ap 2014-01-16 16:29:44 -0800 Committed <http://trac.webkit.org/r162166>. 969207 5 dbates 2014-01-17 12:27:14 -0800 For completeness, the following build fixes were committed: <http://trac.webkit.org/changeset/162170> <http://trac.webkit.org/changeset/162171> <http://trac.webkit.org/changeset/162208> <http://trac.webkit.org/changeset/162212> (for iOS; __MAC_OS_X_VERSION_MIN_REQUIRED isn't defined for iOS) 969245 6 ap 2014-01-17 13:31:07 -0800 It doesn't stop there: https://trac.webkit.org/r162219 221411 2014-01-16 13:46:52 -0800 2014-01-16 16:16:22 -0800 proposed patch NewCookiePolicy.txt text/plain 18602 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjE0NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDE0LTAxLTE2ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIFtpT1NdIEFkZCBz dXBwb3J0IGZvciBDRkhUVFBDb29raWVTdG9yYWdlQWNjZXB0UG9saWN5RXhjbHVzaXZlbHlGcm9t TWFpbkRvY3VtZW50RG9tYWluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjcxMzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlSU9TLm1tOgor ICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmg6CisgICAgICAg ICogcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UubW06CisgICAgICAgIFBhc3Mg Zmlyc3QgcGFydHkgVVJMIGRvd24sIGJlY2F1c2UgcmVhZGluZyBjb29raWVzIGRlcGVuZHMgb24g aXQgd2hlbiB0aGlzIHBvbGljeQorICAgICAgICBpbiBpbiBhY3Rpb24uCisKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL2NmL0Nvb2tpZUphckNGTmV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OmNvcHlDb29raWVzRm9yVVJMV2l0aEZpcnN0UGFydHlVUkwpOgorICAgICAgICAoV2ViQ29yZTo6 Y29va2llc0ZvckRPTSk6CisgICAgICAgIChXZWJDb3JlOjpjb29raWVSZXF1ZXN0SGVhZGVyRmll bGRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpjb29raWVzRW5hYmxlZCk6CisgICAgICAgIChX ZWJDb3JlOjpnZXRSYXdDb29raWVzKToKKyAgICAgICAgVXNlIGEgbmV3IENGTmV0d29yayBBUEkg dGhhdCB0YWtlcyBmaXJzdCBwYXJ0eSBVUkwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3Jr L21hYy9Db29raWVKYXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpjb29raWVzRm9yRE9NKToK KyAgICAgICAgKFdlYkNvcmU6OmNvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKToKKyAgICAg ICAgKFdlYkNvcmU6OmNvb2tpZXNFbmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6OmdldFJhd0Nv b2tpZXMpOgorICAgICAgICAoV2ViQ29yZTo6ZGVsZXRlQ29va2llKToKKyAgICAgICAgUGFzcyBm aXJzdCBwYXJ0eSBVUkwgKGFuZCBudWxsIGluIGRlbGV0ZUNvb2tpZSwgYXMgdGhlcmUgaXMgbm9u ZSkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5t bToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybUxvYWRSZXNvdXJj ZVN5bmNocm9ub3VzbHkpOgorICAgICAgICBSZW1vdmVkIGEgY2FsbCB0byBzaG91bGRSZWxheFRo aXJkUGFydHlDb29raWVQb2xpY3koKSwgd2hpY2ggbm8gbG9uZ2VyIGV4aXN0cworICAgICAgICBp biB0cnVuay4KKwogMjAxNC0wMS0xNiAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxl LmNvbT4KIAogICAgICAgICBBbGxvdyBNZWRpYVNlc3Npb25NYW5hZ2VyIHRvIHJlc3RyaWN0IGlu bGluZSA8dmlkZW8+IHBsYXliYWNrCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViQ29yZVN5c3RlbUludGVyZmFjZUlPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pb3MvV2ViQ29yZVN5c3RlbUludGVyZmFjZUlPUy5tbQkocmV2aXNpb24gMTYy MDc1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkNvcmVTeXN0ZW1JbnRlcmZh Y2VJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTEwNCw3ICsxMDQsNyBAQCBDRkhUVFBDb29raWVT dG9yYWdlUmVmICgqd2tDb3B5SFRUUENvb2tpCiB1bnNpZ25lZCAoKndrR2V0SFRUUENvb2tpZUFj Y2VwdFBvbGljeSkoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZik7CiB2b2lkICgqd2tTZXRIVFRQQ29v a2llQWNjZXB0UG9saWN5KShDRkhUVFBDb29raWVTdG9yYWdlUmVmLCB1bnNpZ25lZCk7CiBOU0Fy cmF5ICooKndrSFRUUENvb2tpZXMpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYpOwotTlNBcnJheSAq KCp3a0hUVFBDb29raWVzRm9yVVJMKShDRkhUVFBDb29raWVTdG9yYWdlUmVmLCBOU1VSTCAqKTsK K05TQXJyYXkgKigqd2tIVFRQQ29va2llc0ZvclVSTCkoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZiwg TlNVUkwgKiwgTlNVUkwgKik7CiB2b2lkICgqd2tTZXRIVFRQQ29va2llc0ZvclVSTCkoQ0ZIVFRQ Q29va2llU3RvcmFnZVJlZiwgTlNBcnJheSAqLCBOU1VSTCAqLCBOU1VSTCAqKTsKIHZvaWQgKCp3 a0RlbGV0ZUFsbEhUVFBDb29raWVzKShDRkhUVFBDb29raWVTdG9yYWdlUmVmKTsKIHZvaWQgKCp3 a0RlbGV0ZUhUVFBDb29raWUpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYsIE5TSFRUUENvb2tpZSAq KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJm YWNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVT eXN0ZW1JbnRlcmZhY2UuaAkocmV2aXNpb24gMTYyMDc1KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaAkod29ya2luZyBjb3B5KQpAQCAtMzEy LDcgKzMxMiw3IEBAIGV4dGVybiBDRkhUVFBDb29raWVTdG9yYWdlUmVmICgqd2tDb3B5SFQKIGV4 dGVybiB1bnNpZ25lZCAoKndrR2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeSkoQ0ZIVFRQQ29va2ll U3RvcmFnZVJlZik7CiBleHRlcm4gdm9pZCAoKndrU2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeSko Q0ZIVFRQQ29va2llU3RvcmFnZVJlZiwgdW5zaWduZWQpOwogZXh0ZXJuIE5TQXJyYXkgKigqd2tI VFRQQ29va2llcykoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZik7Ci1leHRlcm4gTlNBcnJheSAqKCp3 a0hUVFBDb29raWVzRm9yVVJMKShDRkhUVFBDb29raWVTdG9yYWdlUmVmLCBOU1VSTCAqKTsKK2V4 dGVybiBOU0FycmF5ICooKndrSFRUUENvb2tpZXNGb3JVUkwpKENGSFRUUENvb2tpZVN0b3JhZ2VS ZWYsIE5TVVJMICosIE5TVVJMICopOwogZXh0ZXJuIHZvaWQgKCp3a1NldEhUVFBDb29raWVzRm9y VVJMKShDRkhUVFBDb29raWVTdG9yYWdlUmVmLCBOU0FycmF5ICosIE5TVVJMICosIE5TVVJMICop OwogZXh0ZXJuIHZvaWQgKCp3a0RlbGV0ZUhUVFBDb29raWUpKENGSFRUUENvb2tpZVN0b3JhZ2VS ZWYsIE5TSFRUUENvb2tpZSAqKTsKIGV4dGVybiB2b2lkICgqd2tEZWxldGVBbGxIVFRQQ29va2ll cykoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbQkocmV2aXNpb24gMTYy MDc1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZh Y2UubW0JKHdvcmtpbmcgY29weSkKQEAgLTE3Myw3ICsxNzMsNyBAQCBDRkhUVFBDb29raWVTdG9y YWdlUmVmICgqd2tDb3B5SFRUUENvb2tpCiB1bnNpZ25lZCAoKndrR2V0SFRUUENvb2tpZUFjY2Vw dFBvbGljeSkoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZik7CiB2b2lkICgqd2tTZXRIVFRQQ29va2ll QWNjZXB0UG9saWN5KShDRkhUVFBDb29raWVTdG9yYWdlUmVmLCB1bnNpZ25lZCk7CiBOU0FycmF5 ICooKndrSFRUUENvb2tpZXMpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYpOwotTlNBcnJheSAqKCp3 a0hUVFBDb29raWVzRm9yVVJMKShDRkhUVFBDb29raWVTdG9yYWdlUmVmLCBOU1VSTCAqKTsKK05T QXJyYXkgKigqd2tIVFRQQ29va2llc0ZvclVSTCkoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZiwgTlNV UkwgKiwgTlNVUkwgKik7CiB2b2lkICgqd2tTZXRIVFRQQ29va2llc0ZvclVSTCkoQ0ZIVFRQQ29v a2llU3RvcmFnZVJlZiwgTlNBcnJheSAqLCBOU1VSTCAqLCBOU1VSTCAqKTsKIHZvaWQgKCp3a0Rl bGV0ZUFsbEhUVFBDb29raWVzKShDRkhUVFBDb29raWVTdG9yYWdlUmVmKTsKIHZvaWQgKCp3a0Rl bGV0ZUhUVFBDb29raWUpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYsIE5TSFRUUENvb2tpZSAqKTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvQ29va2llSmFyQ0ZOZXQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvQ29v a2llSmFyQ0ZOZXQuY3BwCShyZXZpc2lvbiAxNjIwNzUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NmL0Nvb2tpZUphckNGTmV0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEs NiArNDEsMTAgQEAKICNpbmNsdWRlIDx3aW5kb3dzLmg+CiAjZW5kaWYKIAorZW51bSB7CisgICAg Q0ZIVFRQQ29va2llU3RvcmFnZUFjY2VwdFBvbGljeUV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1bWVu dERvbWFpbiA9IDM7Cit9OworCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBjb25zdCBD RlN0cmluZ1JlZiBzX3NldENvb2tpZUtleUNGID0gQ0ZTVFIoIlNldC1Db29raWUiKTsKQEAgLTkz LDYgKzk3LDE5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gZmlsdGVyQ29va2kKICAg ICByZXR1cm4gZmlsdGVyZWRDb29raWVzOwogfQogCitzdGF0aWMgUmV0YWluUHRyPENGQXJyYXlS ZWY+IGNvcHlDb29raWVzRm9yVVJMV2l0aEZpcnN0UGFydHlVUkwoY29uc3QgTmV0d29ya1N0b3Jh Z2VTZXNzaW9uJiBzZXNzaW9uLCBjb25zdCBVUkwmIGZpcnN0UGFydHksIGNvbnN0IFVSTCYgdXJs KQoreworICAgIGJvb2wgc2VjdXJlID0gdXJsLnByb3RvY29sSXMoImh0dHBzIik7CisKKyNpZiBQ TEFURk9STShJT1MpIHx8IChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5f UkVRVUlSRUQgPj0gMTAxMDApCisgICAgUmV0YWluUHRyPENGQXJyYXlSZWY+IGNvb2tpZXNDRiA9 IGFkb3B0Q0YoX0NGSFRUUENvb2tpZVN0b3JhZ2VDb3B5Q29va2llc0ZvclVSTFdpdGhNYWluRG9j dW1lbnRVUkwoc2Vzc2lvbi5jb29raWVTdG9yYWdlKCkuZ2V0KCksIHVybC5jcmVhdGVDRlVSTCgp LmdldCgpLCBmaXJzdFBhcnR5LmNyZWF0ZUNGVVJMKCkuZ2V0KCksIHNlY3VyZSkpOworI2Vsc2UK KyAgICAvLyBfQ0ZIVFRQQ29va2llU3RvcmFnZUNvcHlDb29raWVzRm9yVVJMV2l0aE1haW5Eb2N1 bWVudFVSTCBpcyBub3QgYXZhaWxhYmxlIG9uIG90aGVyIHBsYXRmb3Jtcy4KKyAgICBVTlVTRURf UEFSQU0oZmlyc3RQYXJ0eSk7CisgICAgUmV0YWluUHRyPENGQXJyYXlSZWY+IGNvb2tpZXNDRiA9 IGFkb3B0Q0YoQ0ZIVFRQQ29va2llU3RvcmFnZUNvcHlDb29raWVzRm9yVVJMKHNlc3Npb24uY29v a2llU3RvcmFnZSgpLmdldCgpLCB1cmwuY3JlYXRlQ0ZVUkwoKS5nZXQoKSwgc2VjdXJlKSk7Cisj ZW5kaWYKK30KKwogdm9pZCBzZXRDb29raWVzRnJvbURPTShjb25zdCBOZXR3b3JrU3RvcmFnZVNl c3Npb24mIHNlc3Npb24sIGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgVVJMJiB1cmwsIGNv bnN0IFN0cmluZyYgdmFsdWUpCiB7CiAgICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzU2MzI4ODM+IENG SFRUUENvb2tpZVN0b3JhZ2Ugc3RvcmVzIGFuIGVtcHR5IGNvb2tpZSwgd2hpY2ggd291bGQgYmUg c2VudCBhcyAiQ29va2llOiA9Ii4KQEAgLTExNywyMiArMTM0LDE2IEBAIHZvaWQgc2V0Q29va2ll c0Zyb21ET00oY29uc3QgTmV0d29ya1N0b3IKICAgICBDRkhUVFBDb29raWVTdG9yYWdlU2V0Q29v a2llcyhzZXNzaW9uLmNvb2tpZVN0b3JhZ2UoKS5nZXQoKSwgZmlsdGVyQ29va2llcyhjb29raWVz Q0YuZ2V0KCkpLmdldCgpLCB1cmxDRi5nZXQoKSwgZmlyc3RQYXJ0eUZvckNvb2tpZXNDRi5nZXQo KSk7CiB9CiAKLVN0cmluZyBjb29raWVzRm9yRE9NKGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lv biYgc2Vzc2lvbiwgY29uc3QgVVJMJiwgY29uc3QgVVJMJiB1cmwpCitTdHJpbmcgY29va2llc0Zv ckRPTShjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Npb24sIGNvbnN0IFVSTCYgZmly c3RQYXJ0eSwgY29uc3QgVVJMJiB1cmwpCiB7Ci0gICAgUmV0YWluUHRyPENGVVJMUmVmPiB1cmxD RiA9IHVybC5jcmVhdGVDRlVSTCgpOwotCi0gICAgYm9vbCBzZWN1cmUgPSB1cmwucHJvdG9jb2xJ cygiaHR0cHMiKTsKLSAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gY29va2llc0NGID0gYWRvcHRD RihDRkhUVFBDb29raWVTdG9yYWdlQ29weUNvb2tpZXNGb3JVUkwoc2Vzc2lvbi5jb29raWVTdG9y YWdlKCkuZ2V0KCksIHVybENGLmdldCgpLCBzZWN1cmUpKTsKKyAgICBSZXRhaW5QdHI8Q0ZBcnJh eVJlZj4gY29va2llc0NGID0gY29weUNvb2tpZXNGb3JVUkxXaXRoRmlyc3RQYXJ0eVVSTChzZXNz aW9uLCBmaXJzdFBhcnR5LCB1cmwpOwogICAgIFJldGFpblB0cjxDRkRpY3Rpb25hcnlSZWY+IGhl YWRlckNGID0gYWRvcHRDRihDRkhUVFBDb29raWVDb3B5UmVxdWVzdEhlYWRlckZpZWxkcyhrQ0ZB bGxvY2F0b3JEZWZhdWx0LCBmaWx0ZXJDb29raWVzKGNvb2tpZXNDRi5nZXQoKSkuZ2V0KCkpKTsK ICAgICByZXR1cm4gKENGU3RyaW5nUmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKGhlYWRlckNGLmdl dCgpLCBzX2Nvb2tpZUNGKTsKIH0KIAotU3RyaW5nIGNvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFZh bHVlKGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbiwgY29uc3QgVVJMJiAvKmZp cnN0UGFydHkqLywgY29uc3QgVVJMJiB1cmwpCitTdHJpbmcgY29va2llUmVxdWVzdEhlYWRlckZp ZWxkVmFsdWUoY29uc3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBzZXNzaW9uLCBjb25zdCBVUkwm IGZpcnN0UGFydHksIGNvbnN0IFVSTCYgdXJsKQogewotICAgIFJldGFpblB0cjxDRlVSTFJlZj4g dXJsQ0YgPSB1cmwuY3JlYXRlQ0ZVUkwoKTsKLQotICAgIGJvb2wgc2VjdXJlID0gdXJsLnByb3Rv Y29sSXMoImh0dHBzIik7Ci0gICAgUmV0YWluUHRyPENGQXJyYXlSZWY+IGNvb2tpZXNDRiA9IGFk b3B0Q0YoQ0ZIVFRQQ29va2llU3RvcmFnZUNvcHlDb29raWVzRm9yVVJMKHNlc3Npb24uY29va2ll U3RvcmFnZSgpLmdldCgpLCB1cmxDRi5nZXQoKSwgc2VjdXJlKSk7CisgICAgUmV0YWluUHRyPENG QXJyYXlSZWY+IGNvb2tpZXNDRiA9IGNvcHlDb29raWVzRm9yVVJMV2l0aEZpcnN0UGFydHlVUkwo c2Vzc2lvbiwgZmlyc3RQYXJ0eSwgdXJsKTsKICAgICBSZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVm PiBoZWFkZXJDRiA9IGFkb3B0Q0YoQ0ZIVFRQQ29va2llQ29weVJlcXVlc3RIZWFkZXJGaWVsZHMo a0NGQWxsb2NhdG9yRGVmYXVsdCwgY29va2llc0NGLmdldCgpKSk7CiAgICAgcmV0dXJuIChDRlN0 cmluZ1JlZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShoZWFkZXJDRi5nZXQoKSwgc19jb29raWVDRik7 CiB9CkBAIC0xNDAsMTcgKzE1MSwxNCBAQCBTdHJpbmcgY29va2llUmVxdWVzdEhlYWRlckZpZWxk VmFsdWUoY29uCiBib29sIGNvb2tpZXNFbmFibGVkKGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lv biYgc2Vzc2lvbiwgY29uc3QgVVJMJiAvKmZpcnN0UGFydHkqLywgY29uc3QgVVJMJiAvKnVybCov KQogewogICAgIENGSFRUUENvb2tpZVN0b3JhZ2VBY2NlcHRQb2xpY3kgcG9saWN5ID0gQ0ZIVFRQ Q29va2llU3RvcmFnZUdldENvb2tpZUFjY2VwdFBvbGljeShzZXNzaW9uLmNvb2tpZVN0b3JhZ2Uo KS5nZXQoKSk7Ci0gICAgcmV0dXJuIHBvbGljeSA9PSBDRkhUVFBDb29raWVTdG9yYWdlQWNjZXB0 UG9saWN5T25seUZyb21NYWluRG9jdW1lbnREb21haW4gfHwgcG9saWN5ID09IENGSFRUUENvb2tp ZVN0b3JhZ2VBY2NlcHRQb2xpY3lBbHdheXM7CisgICAgcmV0dXJuIHBvbGljeSA9PSBDRkhUVFBD b29raWVTdG9yYWdlQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1lbnREb21haW4gfHwgcG9s aWN5ID09IENGSFRUUENvb2tpZVN0b3JhZ2VBY2NlcHRQb2xpY3lFeGNsdXNpdmVseUZyb21NYWlu RG9jdW1lbnREb21haW4gfHwgcG9saWN5ID09IENGSFRUUENvb2tpZVN0b3JhZ2VBY2NlcHRQb2xp Y3lBbHdheXM7CiB9CiAKLWJvb2wgZ2V0UmF3Q29va2llcyhjb25zdCBOZXR3b3JrU3RvcmFnZVNl c3Npb24mIHNlc3Npb24sIGNvbnN0IFVSTCYgLypmaXJzdFBhcnR5Ki8sIGNvbnN0IFVSTCYgdXJs LCBWZWN0b3I8Q29va2llPiYgcmF3Q29va2llcykKK2Jvb2wgZ2V0UmF3Q29va2llcyhjb25zdCBO ZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Npb24sIGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29u c3QgVVJMJiB1cmwsIFZlY3RvcjxDb29raWU+JiByYXdDb29raWVzKQogewogICAgIHJhd0Nvb2tp ZXMuY2xlYXIoKTsKIAotICAgIFJldGFpblB0cjxDRlVSTFJlZj4gdXJsQ0YgPSB1cmwuY3JlYXRl Q0ZVUkwoKTsKLQotICAgIGJvb2wgc2VuZFNlY3VyZUNvb2tpZXMgPSB1cmwucHJvdG9jb2xJcygi aHR0cHMiKTsKLSAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gY29va2llc0NGID0gYWRvcHRDRihD RkhUVFBDb29raWVTdG9yYWdlQ29weUNvb2tpZXNGb3JVUkwoc2Vzc2lvbi5jb29raWVTdG9yYWdl KCkuZ2V0KCksIHVybENGLmdldCgpLCBzZW5kU2VjdXJlQ29va2llcykpOworICAgIFJldGFpblB0 cjxDRkFycmF5UmVmPiBjb29raWVzQ0YgPSBjb3B5Q29va2llc0ZvclVSTFdpdGhGaXJzdFBhcnR5 VVJMKHNlc3Npb24sIGZpcnN0UGFydHksIHVybCk7CiAKICAgICBDRkluZGV4IGNvdW50ID0gQ0ZB cnJheUdldENvdW50KGNvb2tpZXNDRi5nZXQoKSk7CiAgICAgcmF3Q29va2llcy5yZXNlcnZlQ2Fw YWNpdHkoY291bnQpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMv Q29va2llSmFyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvbWFjL0Nvb2tpZUphck1hYy5tbQkocmV2aXNpb24gMTYyMDc1KQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvQ29va2llSmFyTWFjLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0zNSw2ICszNSwxMCBAQAogI2ltcG9ydCAiTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmgiCiAj aW1wb3J0ICJXZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgiCiAKK2VudW0geworICAgIE5TSFRUUENv b2tpZUFjY2VwdFBvbGljeUV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1bWVudERvbWFpbiA9IDMKK307 CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGljIFJldGFpblB0cjxOU0FycmF5PiBmaWx0 ZXJDb29raWVzKE5TQXJyYXkgKnVuZmlsdGVyZWRDb29raWVzKQpAQCAtNjEsMjIgKzY1LDIyIEBA IHN0YXRpYyBSZXRhaW5QdHI8TlNBcnJheT4gZmlsdGVyQ29va2llcygKICAgICByZXR1cm4gZmls dGVyZWRDb29raWVzOwogfQogCi1TdHJpbmcgY29va2llc0ZvckRPTShjb25zdCBOZXR3b3JrU3Rv cmFnZVNlc3Npb24mIHNlc3Npb24sIGNvbnN0IFVSTCYsIGNvbnN0IFVSTCYgdXJsKQorU3RyaW5n IGNvb2tpZXNGb3JET00oY29uc3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBzZXNzaW9uLCBjb25z dCBVUkwmIGZpcnN0UGFydHksIGNvbnN0IFVSTCYgdXJsKQogewogICAgIEJFR0lOX0JMT0NLX09C SkNfRVhDRVBUSU9OUzsKIAotICAgIE5TQXJyYXkgKmNvb2tpZXMgPSB3a0hUVFBDb29raWVzRm9y VVJMKHNlc3Npb24uY29va2llU3RvcmFnZSgpLmdldCgpLCB1cmwpOworICAgIE5TQXJyYXkgKmNv b2tpZXMgPSB3a0hUVFBDb29raWVzRm9yVVJMKHNlc3Npb24uY29va2llU3RvcmFnZSgpLmdldCgp LCBmaXJzdFBhcnR5LCB1cmwpOwogICAgIHJldHVybiBbW05TSFRUUENvb2tpZSByZXF1ZXN0SGVh ZGVyRmllbGRzV2l0aENvb2tpZXM6ZmlsdGVyQ29va2llcyhjb29raWVzKS5nZXQoKV0gb2JqZWN0 Rm9yS2V5OkAiQ29va2llIl07CiAKICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwogICAg IHJldHVybiBTdHJpbmcoKTsKIH0KIAotU3RyaW5nIGNvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFZh bHVlKGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbiwgY29uc3QgVVJMJiAvKmZp cnN0UGFydHkqLywgY29uc3QgVVJMJiB1cmwpCitTdHJpbmcgY29va2llUmVxdWVzdEhlYWRlckZp ZWxkVmFsdWUoY29uc3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBzZXNzaW9uLCBjb25zdCBVUkwm IGZpcnN0UGFydHksIGNvbnN0IFVSTCYgdXJsKQogewogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhD RVBUSU9OUzsKIAotICAgIE5TQXJyYXkgKmNvb2tpZXMgPSB3a0hUVFBDb29raWVzRm9yVVJMKHNl c3Npb24uY29va2llU3RvcmFnZSgpLmdldCgpLCB1cmwpOworICAgIE5TQXJyYXkgKmNvb2tpZXMg PSB3a0hUVFBDb29raWVzRm9yVVJMKHNlc3Npb24uY29va2llU3RvcmFnZSgpLmdldCgpLCBmaXJz dFBhcnR5LCB1cmwpOwogICAgIHJldHVybiBbW05TSFRUUENvb2tpZSByZXF1ZXN0SGVhZGVyRmll bGRzV2l0aENvb2tpZXM6Y29va2llc10gb2JqZWN0Rm9yS2V5OkAiQ29va2llIl07CiAKICAgICBF TkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwpAQCAtMTEwLDE4ICsxMTQsMTggQEAgYm9vbCBjb29r aWVzRW5hYmxlZChjb25zdCBOZXR3b3JrU3RvcmFnZQogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhD RVBUSU9OUzsKIAogICAgIE5TSFRUUENvb2tpZUFjY2VwdFBvbGljeSBjb29raWVBY2NlcHRQb2xp Y3kgPSBzdGF0aWNfY2FzdDxOU0hUVFBDb29raWVBY2NlcHRQb2xpY3k+KHdrR2V0SFRUUENvb2tp ZUFjY2VwdFBvbGljeShzZXNzaW9uLmNvb2tpZVN0b3JhZ2UoKS5nZXQoKSkpOwotICAgIHJldHVy biBjb29raWVBY2NlcHRQb2xpY3kgPT0gTlNIVFRQQ29va2llQWNjZXB0UG9saWN5QWx3YXlzIHx8 IGNvb2tpZUFjY2VwdFBvbGljeSA9PSBOU0hUVFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1h aW5Eb2N1bWVudERvbWFpbjsKKyAgICByZXR1cm4gY29va2llQWNjZXB0UG9saWN5ID09IE5TSFRU UENvb2tpZUFjY2VwdFBvbGljeUFsd2F5cyB8fCBjb29raWVBY2NlcHRQb2xpY3kgPT0gTlNIVFRQ Q29va2llQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1lbnREb21haW4gfHwgY29va2llQWNj ZXB0UG9saWN5ID09IE5TSFRUUENvb2tpZUFjY2VwdFBvbGljeUV4Y2x1c2l2ZWx5RnJvbU1haW5E b2N1bWVudERvbWFpbjsKIAogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAgICAgcmV0 dXJuIGZhbHNlOwogfQogCi1ib29sIGdldFJhd0Nvb2tpZXMoY29uc3QgTmV0d29ya1N0b3JhZ2VT ZXNzaW9uJiBzZXNzaW9uLCBjb25zdCBVUkwmIC8qZmlyc3RQYXJ0eSovLCBjb25zdCBVUkwmIHVy bCwgVmVjdG9yPENvb2tpZT4mIHJhd0Nvb2tpZXMpCitib29sIGdldFJhd0Nvb2tpZXMoY29uc3Qg TmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBzZXNzaW9uLCBjb25zdCBVUkwmIGZpcnN0UGFydHksIGNv bnN0IFVSTCYgdXJsLCBWZWN0b3I8Q29va2llPiYgcmF3Q29va2llcykKIHsKICAgICByYXdDb29r aWVzLmNsZWFyKCk7CiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOwogCi0gICAgTlNB cnJheSAqY29va2llcyA9IHdrSFRUUENvb2tpZXNGb3JVUkwoc2Vzc2lvbi5jb29raWVTdG9yYWdl KCkuZ2V0KCksIHVybCk7CisgICAgTlNBcnJheSAqY29va2llcyA9IHdrSFRUUENvb2tpZXNGb3JV Ukwoc2Vzc2lvbi5jb29raWVTdG9yYWdlKCkuZ2V0KCksIGZpcnN0UGFydHksIHVybCk7CiAgICAg TlNVSW50ZWdlciBjb3VudCA9IFtjb29raWVzIGNvdW50XTsKICAgICByYXdDb29raWVzLnJlc2Vy dmVDYXBhY2l0eShjb3VudCk7CiAgICAgZm9yIChOU1VJbnRlZ2VyIGkgPSAwOyBpIDwgY291bnQ7 ICsraSkgewpAQCAtMTM5LDkgKzE0Myw4IEBAIHZvaWQgZGVsZXRlQ29va2llKGNvbnN0IE5ldHdv cmtTdG9yYWdlU2UKIHsKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAKLSAgICBO U1VSTCAqY29va2llVVJMID0gdXJsOwogICAgIFJldGFpblB0cjxDRkhUVFBDb29raWVTdG9yYWdl UmVmPiBjb29raWVTdG9yYWdlID0gc2Vzc2lvbi5jb29raWVTdG9yYWdlKCk7Ci0gICAgTlNBcnJh eSAqY29va2llcyA9IHdrSFRUUENvb2tpZXNGb3JVUkwoY29va2llU3RvcmFnZS5nZXQoKSwgY29v a2llVVJMKTsKKyAgICBOU0FycmF5ICpjb29raWVzID0gd2tIVFRQQ29va2llc0ZvclVSTChjb29r aWVTdG9yYWdlLmdldCgpLCAwLCB1cmwpOwogCiAgICAgTlNTdHJpbmcgKmNvb2tpZU5hbWVTdHJp bmcgPSBjb29raWVOYW1lOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQkocmV2aXNpb24gMTYyMDc1 KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVN YWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTM4Niw3ICszODYsNiBAQCB2b2lkIFJlc291cmNlSGFu ZGxlOjpwbGF0Zm9ybUxvYWRSZXNvdXJjCiAgICAgaGFuZGxlLT5jcmVhdGVOU1VSTENvbm5lY3Rp b24oCiAgICAgICAgIGhhbmRsZS0+ZGVsZWdhdGUoKSwgLy8gQSBzeW5jaHJvbm91cyByZXF1ZXN0 IGNhbm5vdCB0dXJuIGludG8gYSBkb3dubG9hZCwgc28gdGhlcmUgaXMgbm8gbmVlZCB0byBwcm94 eSB0aGUgZGVsZWdhdGUuCiAgICAgICAgIHN0b3JlZENyZWRlbnRpYWxzID09IEFsbG93U3RvcmVk Q3JlZGVudGlhbHMsCi0gICAgICAgIHNob3VsZFJlbGF4VGhpcmRQYXJ0eUNvb2tpZVBvbGljeShj b250ZXh0LCByZXF1ZXN0LnVybCgpKSwKICAgICAgICAgaGFuZGxlLT5zaG91bGRDb250ZW50U25p ZmYoKSB8fCAoY29udGV4dCAmJiBjb250ZXh0LT5sb2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFi bGVkKCkpLAogICAgICAgICBTY2hlZHVsaW5nQmVoYXZpb3I6OlN5bmNocm9ub3VzLAogICAgICAg ICAoTlNEaWN0aW9uYXJ5ICopaGFuZGxlLT5jbGllbnQoKS0+Y29ubmVjdGlvblByb3BlcnRpZXMo aGFuZGxlLmdldCgpKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjIxNDcpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAx NC0wMS0xNiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KKworICAgICAgICBb TWFjXSBbaU9TXSBBZGQgc3VwcG9ydCBmb3IgQ0ZIVFRQQ29va2llU3RvcmFnZUFjY2VwdFBvbGlj eUV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1bWVudERvbWFpbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3MTM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvSFRUUENvb2tpZUFjY2VwdFBvbGlj eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaDoKKyAgICAgICAgKFdl YktpdDo6dG9IVFRQQ29va2llQWNjZXB0UG9saWN5KToKKyAgICAgICAgKFdlYktpdDo6dG9BUEkp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0Nvb2tpZU1hbmFnZXIuaDoKKyAgICAgICAg QWRkZWQgdGhlIHBvbGljeSB0byBhcHByb3ByaWF0ZSBzd2l0Y2hlcyBhbmQgZW51bXMuCisKIDIw MTQtMDEtMTYgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFN0b3Ag Y29weWluZyBXS09yaWdpbkRhdGFNYW5hZ2VyLmNwcCBpbnRvIFdlYktpdDIuZnJhbWV3b3JrCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvSFRUUENvb2tpZUFjY2VwdFBvbGljeS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9IVFRQQ29va2llQWNjZXB0UG9saWN5LmgJ KHJldmlzaW9uIDE2MjA3NSkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9IVFRQQ29va2llQWNj ZXB0UG9saWN5LmgJKHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDcgQEAgZW51bSB7CiAgICAg SFRUUENvb2tpZUFjY2VwdFBvbGljeUFsd2F5cyA9IDAsCiAgICAgSFRUUENvb2tpZUFjY2VwdFBv bGljeU5ldmVyID0gMSwKICAgICBIVFRQQ29va2llQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9j dW1lbnREb21haW4gPSAyLAorICAgIEhUVFBDb29raWVBY2NlcHRQb2xpY3lFeGNsdXNpdmVseUZy b21NYWluRG9jdW1lbnREb21haW4gPSAzLAogfTsKIHR5cGVkZWYgdW5zaWduZWQgSFRUUENvb2tp ZUFjY2VwdFBvbGljeTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL QVBJQ2FzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S0FQSUNhc3QuaAkocmV2aXNpb24gMTYyMDc1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLQVBJQ2FzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOTIsNiArMzkyLDggQEAgaW5s aW5lIEhUVFBDb29raWVBY2NlcHRQb2xpY3kgdG9IVFRQQ29vawogICAgICAgICByZXR1cm4gSFRU UENvb2tpZUFjY2VwdFBvbGljeU5ldmVyOwogICAgIGNhc2Uga1dLSFRUUENvb2tpZUFjY2VwdFBv bGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluOgogICAgICAgICByZXR1cm4gSFRUUENvb2tp ZUFjY2VwdFBvbGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluOworICAgIGNhc2Uga1dLSFRU UENvb2tpZUFjY2VwdFBvbGljeUV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1bWVudERvbWFpbjoKKyAg ICAgICAgcmV0dXJuIEhUVFBDb29raWVBY2NlcHRQb2xpY3lFeGNsdXNpdmVseUZyb21NYWluRG9j dW1lbnREb21haW47CiAgICAgfQogCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CkBAIC00MDcs NiArNDA5LDggQEAgaW5saW5lIFdLSFRUUENvb2tpZUFjY2VwdFBvbGljeSB0b0FQSShIVAogICAg ICAgICByZXR1cm4ga1dLSFRUUENvb2tpZUFjY2VwdFBvbGljeU5ldmVyOwogICAgIGNhc2UgSFRU UENvb2tpZUFjY2VwdFBvbGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluOgogICAgICAgICBy ZXR1cm4ga1dLSFRUUENvb2tpZUFjY2VwdFBvbGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWlu OworICAgIGNhc2UgSFRUUENvb2tpZUFjY2VwdFBvbGljeUV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1 bWVudERvbWFpbjoKKyAgICAgICAgcmV0dXJuIGtXS0hUVFBDb29raWVBY2NlcHRQb2xpY3lFeGNs dXNpdmVseUZyb21NYWluRG9jdW1lbnREb21haW47CiAgICAgfQogCiAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb29raWVN YW5hZ2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL Q29va2llTWFuYWdlci5oCShyZXZpc2lvbiAxNjIwNzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tDb29raWVNYW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1 LDggQEAgZXh0ZXJuICJDIiB7CiBlbnVtIHsKICAgICBrV0tIVFRQQ29va2llQWNjZXB0UG9saWN5 QWx3YXlzID0gMCwKICAgICBrV0tIVFRQQ29va2llQWNjZXB0UG9saWN5TmV2ZXIgPSAxLAotICAg IGtXS0hUVFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbiA9IDIK KyAgICBrV0tIVFRQQ29va2llQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1lbnREb21haW4g PSAyLAorICAgIGtXS0hUVFBDb29raWVBY2NlcHRQb2xpY3lFeGNsdXNpdmVseUZyb21NYWluRG9j dW1lbnREb21haW4gPSAzCiB9OwogdHlwZWRlZiB1aW50MzJfdCBXS0hUVFBDb29raWVBY2NlcHRQ b2xpY3k7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjE0NykKKysrIFNvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisy MDE0LTAxLTE2ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAg IFtNYWNdIFtpT1NdIEFkZCBzdXBwb3J0IGZvciBDRkhUVFBDb29raWVTdG9yYWdlQWNjZXB0UG9s aWN5RXhjbHVzaXZlbHlGcm9tTWFpbkRvY3VtZW50RG9tYWluCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjcxMzkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW06 ICgtW1dlYlByZWZlcmVuY2VzIF9zeW5jaHJvbml6ZVdlYlN0b3JhZ2VQb2xpY3lXaXRoQ29va2ll UG9saWN5XSk6CisgICAgICAgIEhhbmRsZSB0aGUgbmV3IGNhc2UuCisKIDIwMTQtMDEtMTYgIFBl dGVyIE1vbG5hciAgPHBtb2xuYXIudS1zemVnZWRAcGFydG5lci5zYW1zdW5nLmNvbT4KIAogICAg ICAgICBSZW1vdmUgd29ya2Fyb3VuZCBmb3IgY29tcGlsZXJzIG5vdCBzdXBwb3J0aW5nIGV4cGxp Y2l0IG92ZXJyaWRlIGNvbnRyb2wKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi UHJlZmVyZW5jZXMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJQcmVmZXJlbmNlcy5tbQkocmV2aXNpb24gMTYyMDc1KQorKysgU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDksNiArNDksMTAg QEAKICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KICNpbXBvcnQgPHd0Zi9SdW5Mb29wLmg+CiAK K2VudW0geworICAgIE5TSFRUUENvb2tpZUFjY2VwdFBvbGljeUV4Y2x1c2l2ZWx5RnJvbU1haW5E b2N1bWVudERvbWFpbiA9IDMKK307CisKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiAjaWYg UExBVEZPUk0oSU9TKQpAQCAtMjI3Niw2ICsyMjgwLDggQEAgLSAodm9pZClfaW52YWxpZGF0ZUNh Y2hlZFByZWZlcmVuY2VzCiAKIC0gKHZvaWQpX3N5bmNocm9uaXplV2ViU3RvcmFnZVBvbGljeVdp dGhDb29raWVQb2xpY3kKIHsKKyAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgZG9uZSBpbiBj bGllbnRzLCBXZWJLaXQgc2hvdWxkbid0IGJlIG1ha2luZyBzdWNoIHBvbGljeSBkZWNpc2lvbnMu CisKICAgICBOU0hUVFBDb29raWVBY2NlcHRQb2xpY3kgY29va2llQWNjZXB0UG9saWN5ID0gW1tO U0hUVFBDb29raWVTdG9yYWdlIHNoYXJlZEhUVFBDb29raWVTdG9yYWdlXSBjb29raWVBY2NlcHRQ b2xpY3ldOwogICAgIFdlYlN0b3JhZ2VCbG9ja2luZ1BvbGljeSBzdG9yYWdlQmxvY2tpbmdQb2xp Y3k7CiAgICAgc3dpdGNoIChjb29raWVBY2NlcHRQb2xpY3kpIHsKQEAgLTIyODMsNiArMjI4OSw3 IEBAIC0gKHZvaWQpX3N5bmNocm9uaXplV2ViU3RvcmFnZVBvbGljeVdpdGgKICAgICAgICAgc3Rv cmFnZUJsb2NraW5nUG9saWN5ID0gV2ViQWxsb3dBbGxTdG9yYWdlOwogICAgICAgICBicmVhazsK ICAgICBjYXNlIE5TSFRUUENvb2tpZUFjY2VwdFBvbGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9t YWluOgorICAgIGNhc2UgTlNIVFRQQ29va2llQWNjZXB0UG9saWN5RXhjbHVzaXZlbHlGcm9tTWFp bkRvY3VtZW50RG9tYWluOgogICAgICAgICBzdG9yYWdlQmxvY2tpbmdQb2xpY3kgPSBXZWJCbG9j a1RoaXJkUGFydHlTdG9yYWdlOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE5TSFRUUENvb2tp ZUFjY2VwdFBvbGljeU5ldmVyOgo=