87706 2012-05-29 01:06:33 -0700 [BlackBerry] Refactoring http/proxy authentication to use authcallback mechanism introduced with libcurl 2012-05-29 10:14:39 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 jonathan.dong.webkit webkit-unassigned charles.wei joenotcharles leo.yang rwlbuis staikos tonikitoo webkit.review.bot oldest_to_newest 635692 0 jonathan.dong.webkit 2012-05-29 01:06:33 -0700 RIM PR: 152357 We are trying to use libcurl's new feature: authentication callback mechanism to refactor our current implementation of http/proxy authentication process. This feature in libcurl is contributed by Joe Mason and will be an important new feature in libcurl's next release. For now we have a work around solution in platform repository to simulate the same logic. With this mechanism we don't need to handle all the intermediate authentication headers for some of the http authentication scheme, what we only need to do is to provide libcurl with the credentials when it calls the authentication callback. 635783 1 144492 jonathan.dong.webkit 2012-05-29 02:34:37 -0700 Created attachment 144492 Patch 636170 2 144492 webkit.review.bot 2012-05-29 10:14:34 -0700 Comment on attachment 144492 Patch Clearing flags on attachment: 144492 Committed r118801: <http://trac.webkit.org/changeset/118801> 636171 3 webkit.review.bot 2012-05-29 10:14:39 -0700 All reviewed patches have been landed. Closing bug. 144492 2012-05-29 02:34:37 -0700 2012-05-29 10:14:34 -0700 Patch bug-87706-20120529173434.patch text/plain 9016 jonathan.dong.webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ5ZGZjNzNiNzMxZDZh NzI4Yjg5MWU0MWNlNTQ5MWViYjg4NDE3OC4uZGY3Nzc2MjM4MzQ1MTViOWY0YTg4NjM4N2YxYmI1 MmZkOWQxYmU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTA1LTI5ICBKb25h dGhhbiBEb25nICA8am9uYXRoYW4uZG9uZ0B0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAg W0JsYWNrQmVycnldIFJlZmFjdG9yaW5nIGh0dHAvcHJveHkgYXV0aGVudGljYXRpb24gdG8gdXNl IGF1dGhjYWxsYmFjayBtZWNoYW5pc20gaW50cm9kdWNlZCB3aXRoIGxpYmN1cmwKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3NzA2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmVjYXVzZSB3ZSB1c2UgYXV0 aGVudGljYXRpb24gY2FsbGJhY2sgbWVjaGFuaXNtIG9mIGxpYmN1cmwsCisgICAgICAgIHdoaWNo IHdpbGwgdGFrZSBjYXJlIG9mIGFsbCB0aGUgYXV0aGVudGljYXRpb24gY29tbXVuaWNhdGlvbgor ICAgICAgICBiZXR3ZWVuIFVBIGFuZCBzZXJ2ZXIsIHNvIHRoZSBvbmx5IHRoaW5nIHdlIG5lZWQg dG8gZG8gaXMgdG8KKyAgICAgICAgcHJvdmlkZSBjcmVkZW50aWFsIGluZm9ybWF0aW9uIHdoZW4g YXV0aGVudGljYXRpb24gY2FsbGJhY2sKKyAgICAgICAgaXMgdHJpZ2dlcmVkLiBCeSB1c2luZyB0 aGlzIHdlIGRvbid0IG5lZWQgdG8gcHJvY2VzcworICAgICAgICBpbnRlcm1lZGlhdGUgaGVhZGVy cyBmb3IgZWFjaCBodHRwIGF1dGhlbnRpY2F0aW9uIHNjaGVtZS4KKworICAgICAgICBJbXBsZW1l bnRlZCBpbnRlcmZhY2UgZnVuY3Rpb24gbm90aWZ5QXV0aFJlY2VpdmVkKCkgaW4KKyAgICAgICAg TmV0d29ya0pvYiB0byBoYW5kbGUgdGhlIGF1dGhlbnRpY2F0aW9uIG5vdGlmaWNhdGlvbiBmcm9t CisgICAgICAgIG5ldHdvcmtpbmcgdGhyZWFkLgorICAgICAgICBXaGVuIHRoZSBhdXRoZW50aWNh dGlvbiBjYWxsYmFjayBpcyB0cmlnZ2VyZWQsIHdlIHNob3VsZAorICAgICAgICBjYW5jZWwgdGhl IGN1cnJlbnQgbG9hZGluZyByZXF1ZXN0IGFuZCByZXN0YXJ0IGEgbmV3IG9uZSB3aXRoCisgICAg ICAgIGNyZWRlbnRpYWwgaW5mb3JtYXRpb24gYXR0YWNoZWQgd2hpY2ggY29tZXMgZnJvbQorICAg ICAgICBjcmVkZW50aWFsU3RvcmFnZSBvciB1c2VyIGlucHV0LgorCisgICAgICAgIEludGVybmFs bHkgcmV2aWV3ZWQgYnkgSm9lIE1hc29uIDxqbWFzb25AcmltLmNvbT4uCisKKyAgICAgICAgTm8g bmV3IHRlc3RzIHNpbmNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Ok5ldHdvcmtKb2I6Om5vdGlmeUF1dGhSZWNlaXZlZCk6CisgICAgICAgIChXZWJDb3Jl KToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OmhhbmRsZU5vdGlmeUhlYWRlclJlY2Vp dmVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRl bnRpYWxzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pv Yi5oOgorICAgICAgICAoTmV0d29ya0pvYik6CisKIDIwMTItMDUtMjkgIElseWEgVGlraG9ub3Zz a3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JF U1NJT046IGxvYWQgaGVhcCBzbmFwc2hvdCBkb2Vzbid0IHdvcmsuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAK aW5kZXggMDA1MzUyZWJlOWE5YzFkOTllN2FlMmViMjcxMTUzZTc5NTgxMTg3MS4uNTQ2NmVmMmY4 NGQyNzBlOTY3NDc5ZDAwNGYzZGFkMDdlZDQ5NjMyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcApAQCAt MjQ3LDYgKzI0NywzNiBAQCB2b2lkIE5ldHdvcmtKb2I6Om5vdGlmeU11bHRpcGFydEhlYWRlclJl Y2VpdmVkKGNvbnN0IGNoYXIqIGtleSwgY29uc3QgY2hhciogdmFsdQogICAgICAgICBoYW5kbGVO b3RpZnlNdWx0aXBhcnRIZWFkZXJSZWNlaXZlZChrZXksIHZhbHVlKTsKIH0KIAordm9pZCBOZXR3 b3JrSm9iOjpub3RpZnlBdXRoUmVjZWl2ZWQoQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtS ZXF1ZXN0OjpBdXRoVHlwZSBhdXRoVHlwZSwgY29uc3QgY2hhciogcmVhbG0pCit7CisgICAgdXNp bmcgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OworCisgICAgUHJvdGVjdGlv blNwYWNlU2VydmVyVHlwZSBzZXJ2ZXJUeXBlID0gUHJvdGVjdGlvblNwYWNlU2VydmVySFRUUDsK KyAgICBQcm90ZWN0aW9uU3BhY2VBdXRoZW50aWNhdGlvblNjaGVtZSBzY2hlbWUgPSBQcm90ZWN0 aW9uU3BhY2VBdXRoZW50aWNhdGlvblNjaGVtZURlZmF1bHQ7CisgICAgc3dpdGNoIChhdXRoVHlw ZSkgeworICAgIGNhc2UgTmV0d29ya1JlcXVlc3Q6OkF1dGhIVFRQQmFzaWM6CisgICAgICAgIHNj aGVtZSA9IFByb3RlY3Rpb25TcGFjZUF1dGhlbnRpY2F0aW9uU2NoZW1lSFRUUEJhc2ljOworICAg ICAgICBicmVhazsKKyAgICBjYXNlIE5ldHdvcmtSZXF1ZXN0OjpBdXRoSFRUUERpZ2VzdDoKKyAg ICAgICAgc2NoZW1lID0gUHJvdGVjdGlvblNwYWNlQXV0aGVudGljYXRpb25TY2hlbWVIVFRQRGln ZXN0OworICAgICAgICBicmVhazsKKyAgICBjYXNlIE5ldHdvcmtSZXF1ZXN0OjpBdXRoSFRUUE5U TE06CisgICAgICAgIHNjaGVtZSA9IFByb3RlY3Rpb25TcGFjZUF1dGhlbnRpY2F0aW9uU2NoZW1l TlRMTTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBOZXR3b3JrUmVxdWVzdDo6QXV0aEZUUDoK KyAgICAgICAgc2VydmVyVHlwZSA9IFByb3RlY3Rpb25TcGFjZVNlcnZlckZUUDsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBOZXR3b3JrUmVxdWVzdDo6QXV0aFByb3h5OgorICAgICAgICBzZXJ2 ZXJUeXBlID0gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQOworICAgICAgICBicmVhazsKKyAgICBj YXNlIE5ldHdvcmtSZXF1ZXN0OjpBdXRoTm9uZToKKyAgICBkZWZhdWx0OgorICAgICAgICByZXR1 cm47CisgICAgfQorCisgICAgc2VuZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMoc2VydmVyVHlwZSwg c2NoZW1lLCByZWFsbSk7Cit9CisKIHZvaWQgTmV0d29ya0pvYjo6bm90aWZ5U3RyaW5nSGVhZGVy UmVjZWl2ZWQoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUpCiB7CiAgICAg aWYgKHNob3VsZERlZmVyTG9hZGluZygpKQpAQCAtMjc5LDExICszMDksNyBAQCB2b2lkIE5ldHdv cmtKb2I6OmhhbmRsZU5vdGlmeUhlYWRlclJlY2VpdmVkKGNvbnN0IFN0cmluZyYga2V5LCBjb25z dCBTdHJpbmcmIHZhbAogICAgICAgICAgICAgbV9yZXNwb25zZS5zZXRIVFRQSGVhZGVyRmllbGQo a2V5LCBtX3Jlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZChrZXkpICsgIlxyXG4iICsgdmFsdWUpOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgfSBlbHNlIGlmIChtX2V4dGVuZGVk U3RhdHVzQ29kZSA9PSA0MDEgJiYgbG93ZXJLZXkgPT0gInd3dy1hdXRoZW50aWNhdGUiKQotICAg ICAgICBoYW5kbGVBdXRoSGVhZGVyKFByb3RlY3Rpb25TcGFjZVNlcnZlckhUVFAsIHZhbHVlKTsK LSAgICBlbHNlIGlmIChtX2V4dGVuZGVkU3RhdHVzQ29kZSA9PSA0MDcgJiYgbG93ZXJLZXkgPT0g InByb3h5LWF1dGhlbnRpY2F0ZSIgJiYgIUJsYWNrQmVycnk6OlBsYXRmb3JtOjpDbGllbnQ6Omdl dCgpLT5nZXRQcm94eUFkZHJlc3MoKS5lbXB0eSgpKQotICAgICAgICBoYW5kbGVBdXRoSGVhZGVy KFByb3RlY3Rpb25TcGFjZVByb3h5SFRUUCwgdmFsdWUpOwotICAgIGVsc2UgaWYgKGVxdWFsSWdu b3JpbmdDYXNlKGtleSwgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpIRUFE RVJfQkxBQ0tCRVJSWV9GVFApKQorICAgIH0gZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uoa2V5 LCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkhFQURFUl9CTEFDS0JFUlJZ X0ZUUCkpCiAgICAgICAgIGhhbmRsZUZUUEhlYWRlcih2YWx1ZSk7CiAKICAgICBtX3Jlc3BvbnNl LnNldEhUVFBIZWFkZXJGaWVsZChrZXksIHZhbHVlKTsKQEAgLTY0OCw2MiArNjc0LDYgQEAgdm9p ZCBOZXR3b3JrSm9iOjpzZW5kTXVsdGlwYXJ0UmVzcG9uc2VJZk5lZWRlZCgpCiAgICAgfQogfQog Ci1ib29sIE5ldHdvcmtKb2I6OmhhbmRsZUF1dGhIZWFkZXIoY29uc3QgUHJvdGVjdGlvblNwYWNl U2VydmVyVHlwZSBzcGFjZSwgY29uc3QgU3RyaW5nJiBoZWFkZXIpCi17Ci0gICAgaWYgKCFtX2hh bmRsZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYgKCFtX2hhbmRsZS0+Z2V0SW50 ZXJuYWwoKS0+bV9jdXJyZW50V2ViQ2hhbGxlbmdlLmlzTnVsbCgpKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0KLSAgICBpZiAoaGVhZGVyLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNl OwotCi0gICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGhlYWRlciwgIm50bG0iKSkKLSAgICAgICAg c2VuZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMoc3BhY2UsIFByb3RlY3Rpb25TcGFjZUF1dGhlbnRp Y2F0aW9uU2NoZW1lTlRMTSwgIk5UTE0iKTsKLQotICAgIC8vIEV4dHJhY3QgdGhlIGF1dGggc2No ZW1lIGFuZCByZWFsbSBmcm9tIHRoZSBoZWFkZXIuCi0gICAgc2l6ZV90IHNwYWNlUG9zID0gaGVh ZGVyLmZpbmQoJyAnKTsKLSAgICBpZiAoc3BhY2VQb3MgPT0gbm90Rm91bmQpIHsKLSAgICAgICAg TE9HKE5ldHdvcmssICIlcy1BdXRoZW50aWNhdGUgZmllbGQgJyVzJyBiYWRseSBmb3JtYXR0ZWQ6 IG1pc3Npbmcgc2NoZW1lLiIsIHNwYWNlID09IFByb3RlY3Rpb25TcGFjZVNlcnZlckhUVFAgPyAi V1dXIiA6ICJQcm94eSIsIGhlYWRlci51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgIH0KLQotICAgIFN0cmluZyBzY2hlbWUgPSBoZWFkZXIubGVmdChzcGFjZVBvcyk7 Ci0KLSAgICBQcm90ZWN0aW9uU3BhY2VBdXRoZW50aWNhdGlvblNjaGVtZSBwcm90ZWN0aW9uU3Bh Y2VTY2hlbWUgPSBQcm90ZWN0aW9uU3BhY2VBdXRoZW50aWNhdGlvblNjaGVtZURlZmF1bHQ7Ci0g ICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHNjaGVtZSwgImJhc2ljIikpCi0gICAgICAgIHByb3Rl Y3Rpb25TcGFjZVNjaGVtZSA9IFByb3RlY3Rpb25TcGFjZUF1dGhlbnRpY2F0aW9uU2NoZW1lSFRU UEJhc2ljOwotICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHNjaGVtZSwgImRpZ2VzdCIp KQotICAgICAgICBwcm90ZWN0aW9uU3BhY2VTY2hlbWUgPSBQcm90ZWN0aW9uU3BhY2VBdXRoZW50 aWNhdGlvblNjaGVtZUhUVFBEaWdlc3Q7Ci0gICAgZWxzZSB7Ci0gICAgICAgIG5vdEltcGxlbWVu dGVkKCk7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0KLSAgICBzaXplX3QgcmVhbG1Q b3MgPSBoZWFkZXIuZmluZElnbm9yaW5nQ2FzZSgicmVhbG09Iiwgc3BhY2VQb3MpOwotICAgIGlm IChyZWFsbVBvcyA9PSBub3RGb3VuZCkgewotICAgICAgICBMT0coTmV0d29yaywgIiVzLUF1dGhl bnRpY2F0ZSBmaWVsZCAnJXMnIGJhZGx5IGZvcm1hdHRlZDogbWlzc2luZyByZWFsbS4iLCBzcGFj ZSA9PSBQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJIVFRQID8gIldXVyIgOiAiUHJveHkiLCBoZWFkZXIu dXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0gICAgc2l6ZV90 IGJlZ2luUG9zID0gcmVhbG1Qb3MgKyA2OwotICAgIFN0cmluZyByZWFsbSAgPSBoZWFkZXIucmln aHQoaGVhZGVyLmxlbmd0aCgpIC0gYmVnaW5Qb3MpOwotICAgIGlmIChyZWFsbS5zdGFydHNXaXRo KCJcIiIpKSB7Ci0gICAgICAgIGJlZ2luUG9zICs9IDE7Ci0gICAgICAgIHNpemVfdCBlbmRQb3Mg PSBoZWFkZXIuZmluZCgiXCIiLCBiZWdpblBvcyk7Ci0gICAgICAgIGlmIChlbmRQb3MgPT0gbm90 Rm91bmQpIHsKLSAgICAgICAgICAgIExPRyhOZXR3b3JrLCAiJXMtQXV0aGVudGljYXRlIGZpZWxk ICclcycgYmFkbHkgZm9ybWF0dGVkOiBpbnZhbGlkIHJlYWxtLiIsIHNwYWNlID09IFByb3RlY3Rp b25TcGFjZVNlcnZlckhUVFAgPyAiV1dXIiA6ICJQcm94eSIsIGhlYWRlci51dGY4KCkuZGF0YSgp KTsKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfQotICAgICAgICByZWFsbSA9 IGhlYWRlci5zdWJzdHJpbmcoYmVnaW5Qb3MsIGVuZFBvcyAtIGJlZ2luUG9zKTsKLSAgICB9Ci0K LSAgICAvLyBHZXQgdGhlIHVzZXIncyBjcmVkZW50aWFscyBhbmQgcmVzZW5kIHRoZSByZXF1ZXN0 LgotICAgIHNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKHNwYWNlLCBwcm90ZWN0aW9uU3BhY2VT Y2hlbWUsIHJlYWxtKTsKLQotICAgIHJldHVybiB0cnVlOwotfQotCiBib29sIE5ldHdvcmtKb2I6 OmhhbmRsZUZUUEhlYWRlcihjb25zdCBTdHJpbmcmIGhlYWRlcikKIHsKICAgICBzaXplX3Qgc3Bh Y2VQb3MgPSBoZWFkZXIuZmluZCgnICcpOwpAQCAtODAxLDggKzc3MSw2IEBAIGJvb2wgTmV0d29y a0pvYjo6c2VuZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMoUHJvdGVjdGlvblNwYWNlU2VydmVyVHlw ZSB0eXBlLCBQcm90CiAgICAgICAgIG1faGFuZGxlLT5nZXRJbnRlcm5hbCgpLT5tX2N1cnJlbnRX ZWJDaGFsbGVuZ2UgPSBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShwcm90ZWN0aW9uU3BhY2UsIGNy ZWRlbnRpYWwsIDAsIG1fcmVzcG9uc2UsIFJlc291cmNlRXJyb3IoKSk7CiAgICAgfQogCi0gICAg Ly8gRklYTUU6IFJlc2VuZCB0aGUgcmVzb3VyY2UgcmVxdWVzdC4gQ2xvbmVkIGZyb20gaGFuZGxl UmVkaXJlY3QoKS4gTm90IHN1cmUKLSAgICAvLyBpZiB3ZSBuZWVkIGV2ZXJ5dGhpbmcgdGhhdCBm b2xsb3dzLi4uCiAgICAgUmVzb3VyY2VSZXF1ZXN0IG5ld1JlcXVlc3QgPSBtX2hhbmRsZS0+Zmly c3RSZXF1ZXN0KCk7CiAgICAgbmV3UmVxdWVzdC5zZXRVUkwobmV3VVJMKTsKICAgICBuZXdSZXF1 ZXN0LnNldE11c3RIYW5kbGVJbnRlcm5hbGx5KHRydWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmgKaW5kZXggMTFi ZDJhYTU5MDhmMWE5MjFkNGNjMTA3NmJjN2U1ZGNlOTViM2Q1ZC4uYTlhN2I4ODFiZjQ0NzVlZTcw ZWFjYWM2MWJiZWQ1NDQxODg3OWQ5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oCkBAIC02OSw2ICs2OSw3IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5SGVhZGVyc1JlY2VpdmVkKEJsYWNrQmVy cnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6SGVhZGVyTGlzdCYgaGVhZGVycyk7CiAgICAg dmlydHVhbCB2b2lkIG5vdGlmeU11bHRpcGFydEhlYWRlclJlY2VpdmVkKGNvbnN0IGNoYXIqIGtl eSwgY29uc3QgY2hhciogdmFsdWUpOwogICAgIC8vIEV4aXN0cyBvbmx5IHRvIHJlc29sdmUgYW1i aWd1aXR5IGJldHdlZW4gY2hhciogYW5kIFN0cmluZyBwYXJhbWV0ZXJzCisgICAgdmlydHVhbCB2 b2lkIG5vdGlmeUF1dGhSZWNlaXZlZChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVl c3Q6OkF1dGhUeXBlLCBjb25zdCBjaGFyKiByZWFsbSk7CiAgICAgdm9pZCBub3RpZnlTdHJpbmdI ZWFkZXJSZWNlaXZlZChjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAg ICAgdm9pZCBoYW5kbGVOb3RpZnlIZWFkZXJSZWNlaXZlZChjb25zdCBTdHJpbmcmIGtleSwgY29u c3QgU3RyaW5nJiB2YWx1ZSk7CiAgICAgdm9pZCBoYW5kbGVOb3RpZnlNdWx0aXBhcnRIZWFkZXJS ZWNlaXZlZChjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CkBAIC0xMjIs MTIgKzEyMywxMCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBoYW5kbGVBYm91dCgpOwogCi0gICAg Ly8gVGhlIHNlcnZlciBuZWVkcyBhdXRoZW50aWNhdGlvbiBjcmVkZW50aWFscy4gU2VhcmNoIGlu IHRoZQotICAgIC8vIENyZWRlbnRpYWxTdG9yYWdlIG9yIHByb21wdCB0aGUgdXNlciB2aWEgZGlh bG9nLgotICAgIGJvb2wgaGFuZGxlQXV0aEhlYWRlcihjb25zdCBQcm90ZWN0aW9uU3BhY2VTZXJ2 ZXJUeXBlLCBjb25zdCBTdHJpbmcmIGhlYWRlcik7Ci0KICAgICBib29sIGhhbmRsZUZUUEhlYWRl cihjb25zdCBTdHJpbmcmIGhlYWRlcik7CiAKKyAgICAvLyBUaGUgc2VydmVyIG5lZWRzIGF1dGhl bnRpY2F0aW9uIGNyZWRlbnRpYWxzLiBTZWFyY2ggaW4gdGhlIENyZWRlbnRpYWxTdG9yYWdlCisg ICAgLy8gb3IgcHJvbXB0IHRoZSB1c2VyIHZpYSBkaWFsb2csIHRoZW4gcmVzZW5kIHRoZSByZXF1 ZXN0IHdpdGggdGhlIGNyZWRlbnRpYWxzLgogICAgIGJvb2wgc2VuZFJlcXVlc3RXaXRoQ3JlZGVu dGlhbHMoUHJvdGVjdGlvblNwYWNlU2VydmVyVHlwZSwgUHJvdGVjdGlvblNwYWNlQXV0aGVudGlj YXRpb25TY2hlbWUsIGNvbnN0IFN0cmluZyYgcmVhbG0pOwogCiAgICAgdm9pZCBzdG9yZUNyZWRl bnRpYWxzKCk7Cg==