31386 2009-11-11 16:22:46 -0800 Make Mac AuthenticationChallenge usable from cross-platform code 2009-11-12 09:19:16 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 1 ap ap oldest_to_newest 162722 0 ap 2009-11-11 16:22:46 -0800 Currently, AuthenticationChallenge expects the client to set NSURLAuthenticationChallenge sender, which cannot be done from C++. Patch forthcoming. 162729 1 43019 ap 2009-11-11 16:42:10 -0800 Created attachment 43019 proposed patch 162922 2 ap 2009-11-12 09:19:16 -0800 Committed <http://trac.webkit.org/changeset/50882>. 43019 2009-11-11 16:42:10 -0800 2009-11-11 17:16:25 -0800 proposed patch UseAuthClient.txt text/plain 15056 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDg0NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTUgQEAKKzIwMDktMTEtMTEgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMzg2CisgICAgICAgIE1h a2UgTWFjIEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlIHVzYWJsZSBmcm9tIGNyb3NzLXBsYXRmb3Jt IGNvZGUKKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IsIHNvIG5ldyB0ZXN0cy4KKwor ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OmNsZWFyQXV0aGVudGljYXRpb24pOgorICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbCk6Cisg ICAgICAgIERvbid0IHN0b3JlIG1fY3VycmVudENGQ2hhbGxlbmdlLCB3aGljaCB3YXMgb25seSB1 c2VkIGZvciBhIHNpbmdsZSBhc3NlcnRpb24uIFVubGlrZSB0aGUKKyAgICAgICAgTlNVUkxDb25u ZWN0aW9uIGNhc2UsIENGIGNoYWxsZW5nZSBkb2Vzbid0IGNhcnJ5IGEgc2VuZGVyIHdpdGggaXQs IHNvIHRoZSBjb3B5IGluIHdlYiBjaGFsbGVuZ2UKKyAgICAgICAgaXMgaWRlbnRpY2FsLgorCisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jZi9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZS5oOgor ICAgICAgICAoV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2U6OnNldEF1dGhlbnRpY2F0 aW9uQ2xpZW50KTogQWRkZWQgYSBzZXR0ZXIgdG8gbWF0Y2ggdGhlIG5ldworICAgICAgICBNYWMg aW50ZXJmYWNlLiBQcmV2aW91c2x5LCBvbmUgaGFkIHRvIGNyZWF0ZSBhIG5ldyBBdXRoZW50aWNh dGlvbkNoYWxsZW5nZSB0byByZXBsYWNlIGNsaWVudC4KKworICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvY2YvUmVzb3VyY2VIYW5kbGVDRk5ldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNv dXJjZUhhbmRsZTo6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKTogRml4ZWQgYXNz ZXJ0aW9ucyBhZnRlciByZW1vdmFsCisgICAgICAgIG9mIG1fY3VycmVudENGQ2hhbGxlbmdlLiBB bHNvLCB0aGVyZSBpcyBubyBuZWVkIHRvIHNldCBjbGllbnQgbm93LCBhcyBpdCdzIGd1YXJhbnRl ZWQgdG8KKyAgICAgICAgYmUgYWxyZWFkeSBzZXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL21hYy9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZS5oOgorICAgICAgICAoV2ViQ29yZTo6QXV0 aGVudGljYXRpb25DaGFsbGVuZ2U6Om1fc2VuZGVyKTogRXhwbGFpbmVkIHRoZSBleGlzdGVuY2Ug b2YgdGhpcyBtZW1iZXIgdG8gdGhlCisgICAgICAgIGJlc3Qgb2YgbXkgdW5kZXJzdGFuZGluZy4K KyAgICAgICAgKFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOjptX25zQ2hhbGxlbmdl KTogUmVuYW1lZCBmcm9tIG1fbWFjQ2hhbGxlbmdlIHRvIHByZXZlbnQKKyAgICAgICAgY29uZnVz aW9uIHdpdGggIm1hYyIgYW5kICJ3ZWIiIGNoYWxsZW5nZXMgaW4gUmVzb3VyY2VIYW5kbGVJbnRl cm5hbC4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvbWFjL0F1dGhlbnRpY2F0aW9uTWFj Lm1tOgorICAgICAgICAoV2ViQ29yZUF1dGhlbnRpY2F0aW9uQ2xpZW50QXNDaGFsbGVuZ2VTZW5k ZXIpOiBBZGRlZCBhIE9iai1DIHdyYXBwZXIgZm9yIEF1dGhlbnRpY2F0aW9uQ2xpZW50LAorICAg ICAgICBtYWtpbmcgaXQgcG9zc2libGUgdG8gdXNlIHRoZSBsYXR0ZXIgd2l0aCBOU1VSTEF1dGhl bnRpY2F0aW9uQ2hhbGxlbmdlLgorICAgICAgICAoV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFs bGVuZ2U6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKTogVXBkYXRlZCBmb3IgbV9tYWNDaGFsbGVu Z2UgLT4KKyAgICAgICAgbV9uc0NoYWxsZW5nZSByZW5hbWluZy4KKyAgICAgICAgKFdlYkNvcmU6 OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOjpzZXRBdXRoZW50aWNhdGlvbkNsaWVudCk6IFdyYXAg dGhlIGNsaWVudCBpbiBPYmotQyBhbmQKKyAgICAgICAgc2V0IGl0IGFzIHNlbmRlciAob3IgdW5z ZXQsIGlmIGNsaWVudCBpcyBudWxsKS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvbWFj L1Jlc291cmNlSGFuZGxlTWFjLm1tOgorICAgICAgICAoV2ViQ29yZVJlc291cmNlSGFuZGxlQXNE ZWxlZ2F0ZSkgV2ViQ29yZVJlc291cmNlSGFuZGxlQXNEZWxlZ2F0ZSBubyBsb25nZXIgZG91Ymxl cyBhcworICAgICAgICBhdXRoZW50aWNhdGlvbiBjaGFsbGVuZ2Ugc2VuZGVyLgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6On5SZXNvdXJjZUhhbmRsZSk6IEEgbmF2aWdhdGlvbiBj YW4gaGFwcGVuIHVuZGVybmVhdGggYW4KKyAgICAgICAgYXV0aGVudGljYXRpb24gc2hlZXQuCisg ICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlKTogRm9ybSBtX2N1cnJlbnRXZWJDaGFsbGVuZ2UKKyAgICAgICAgdXNpbmcgdGhl IG5ldyBzZXRBdXRoZW50aWNhdGlvbkNsaWVudCgpIG1ldGhvZC4KKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlSGFuZGxlOjpkaWRDYW5jZWxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSk6IEZpeGVk IGFuIGluY29ycmVjdCBhc3NlcnRpb24uCisgICAgICAgIFNpbmNlIGRpZENhbmNlbEF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlIGlzIGNhbGxlZCBieSBjb25uZWN0aW9uLCB0aGUgcGFzc2VkIGNoYWxs ZW5nZSBpcworICAgICAgICB0aGUgb3JpZ2luYWwgTWFjIG9uZSwgbm90IHRoZSBvbmUgd2UgY3Jl YXRlZCBmb3IgdXNlIHdpdGggYXV0aGVudGljYXRpb24gc2hlZXQuIEkgZG9uJ3QKKyAgICAgICAg a25vdyB3aGVuIGEgY29ubmVjdGlvbiB3b3VsZCBjYW5jZWwgYXV0aGVudGljYXRpb24gaW4gcHJh Y3RpY2UsIHNvIEkgaGF2ZW4ndCB0ZXN0ZWQgdGhpcy4KKwogMjAwOS0xMS0xMSAgSmVucyBBbGZr ZSAgPHNuZWpAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xh emtvdi4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmNw cAkocmV2aXNpb24gNTA4MTApCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VI YW5kbGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTAsOCArMTEwLDYgQEAgdm9pZCBSZXNvdXJj ZUhhbmRsZTo6Y2xlYXJBdXRoZW50aWNhdGlvbgogewogI2lmIFBMQVRGT1JNKE1BQykKICAgICBk LT5tX2N1cnJlbnRNYWNDaGFsbGVuZ2UgPSBuaWw7Ci0jZWxpZiBVU0UoQ0ZORVRXT1JLKQotICAg IGQtPm1fY3VycmVudENGQ2hhbGxlbmdlID0gMDsKICNlbmRpZgogICAgIGQtPm1fY3VycmVudFdl YkNoYWxsZW5nZS5udWxsaWZ5KCk7CiB9CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv UmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgJKHJldmlzaW9uIDUwODEwKQorKysgV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaAkod29ya2luZyBj b3B5KQpAQCAtMTI4LDggKzEyOCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAg ICwgbV9zdGFydFdoZW5TY2hlZHVsZWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1fbmVlZHNTaXRl U3BlY2lmaWNRdWlya3MoZmFsc2UpCiAgICAgICAgICAgICAsIG1fY3VycmVudE1hY0NoYWxsZW5n ZShuaWwpCi0jZWxpZiBVU0UoQ0ZORVRXT1JLKQotICAgICAgICAgICAgLCBtX2N1cnJlbnRDRkNo YWxsZW5nZSgwKQogI2VuZGlmCiAgICAgICAgICAgICAsIG1fZmFpbHVyZVRpbWVyKGxvYWRlciwg JlJlc291cmNlSGFuZGxlOjpmaXJlRmFpbHVyZSkKICAgICAgICAgewpAQCAtMjEyLDEzICsyMTAs MTEgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBRV2ViRnJhbWUqIG1fZnJhbWU7CiAj ZW5kaWYKIAotICAgICAgICAvLyBGSVhNRTogVGhlIHBsYXRmb3JtIGNoYWxsZW5nZSBpcyBhbG1v c3QgaWRlbnRpY2FsIHRvIHRoZSBvbmUgc3RvcmVkIGluIG1fY3VycmVudFdlYkNoYWxsZW5nZSwg YnV0IGl0IGhhcyBhIGRpZmZlcmVudCBzZW5kZXIuIFdlIG9ubHkgbmVlZCB0byBzdG9yZSBhIHNl bmRlciByZWZlcmVuY2UgaGVyZS4KICNpZiBQTEFURk9STShNQUMpCisgICAgICAgIC8vIFdlIG5l ZWQgdG8ga2VlcCBhIHJlZmVyZW5jZSB0byB0aGUgb3JpZ2luYWwgY2hhbGxlbmdlIHRvIGJlIGFi bGUgdG8gY2FuY2VsIGl0LgorICAgICAgICAvLyBJdCBpcyBhbG1vc3QgaWRlbnRpY2FsIHRvIG1f Y3VycmVudFdlYkNoYWxsZW5nZS5uc1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKCksIGJ1dCBo YXMgYSBkaWZmZXJlbnQgc2VuZGVyLgogICAgICAgICBOU1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxl bmdlICptX2N1cnJlbnRNYWNDaGFsbGVuZ2U7CiAjZW5kaWYKLSNpZiBVU0UoQ0ZORVRXT1JLKQot ICAgICAgICBDRlVSTEF1dGhDaGFsbGVuZ2VSZWYgbV9jdXJyZW50Q0ZDaGFsbGVuZ2U7Ci0jZW5k aWYKICAgICAgICAgQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgbV9jdXJyZW50V2ViQ2hhbGxlbmdl OwogCiAgICAgICAgIFJlc291cmNlSGFuZGxlOjpGYWlsdXJlVHlwZSBtX2ZhaWx1cmVUeXBlOwpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL0F1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlLmgJKHJldmlzaW9uIDUwODEwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NmL0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQwLDYg KzQwLDggQEAgcHVibGljOgogICAgIEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKENGVVJMQXV0aENo YWxsZW5nZVJlZiwgQXV0aGVudGljYXRpb25DbGllbnQqKTsKIAogICAgIEF1dGhlbnRpY2F0aW9u Q2xpZW50KiBhdXRoZW50aWNhdGlvbkNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fYXV0aGVudGlj YXRpb25DbGllbnQuZ2V0KCk7IH0KKyAgICB2b2lkIHNldEF1dGhlbnRpY2F0aW9uQ2xpZW50KEF1 dGhlbnRpY2F0aW9uQ2xpZW50KiBjbGllbnQpIHsgbV9hdXRoZW50aWNhdGlvbkNsaWVudCA9IGNs aWVudDsgfQorCiAgICAgQ0ZVUkxBdXRoQ2hhbGxlbmdlUmVmIGNmVVJMQXV0aENoYWxsZW5nZVJl ZigpIGNvbnN0IHsgcmV0dXJuIG1fY2ZDaGFsbGVuZ2UuZ2V0KCk7IH0KIAogcHJpdmF0ZToKSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZUhhbmRsZUNGTmV0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VIYW5kbGVD Rk5ldC5jcHAJKHJldmlzaW9uIDUwODEwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nm L1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NzksMTEgKzQ3OSwx MSBAQCBib29sIFJlc291cmNlSGFuZGxlOjpzaG91bGRVc2VDcmVkZW50aWFsCiB2b2lkIFJlc291 cmNlSGFuZGxlOjpkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoY29uc3QgQXV0aGVu dGljYXRpb25DaGFsbGVuZ2UmIGNoYWxsZW5nZSkKIHsKICAgICBMT0coTmV0d29yaywgIkNGTmV0 IC0gZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKCkiKTsKLSAgICBBU1NFUlQoIWQt Pm1fY3VycmVudENGQ2hhbGxlbmdlKTsKICAgICBBU1NFUlQoZC0+bV9jdXJyZW50V2ViQ2hhbGxl bmdlLmlzTnVsbCgpKTsKICAgICAvLyBTaW5jZSBDRlVSTENvbm5lY3Rpb24gbmV0d29ya2luZyBy ZWxpZXMgb24ga2VlcGluZyBhIHJlZmVyZW5jZSB0byB0aGUgb3JpZ2luYWwgQ0ZVUkxBdXRoQ2hh bGxlbmdlUmVmLAogICAgIC8vIHdlIG1ha2Ugc3VyZSB0aGF0IGlzIGFjdHVhbGx5IHByZXNlbnQK ICAgICBBU1NFUlQoY2hhbGxlbmdlLmNmVVJMQXV0aENoYWxsZW5nZVJlZigpKTsKKyAgICBBU1NF UlQoY2hhbGxlbmdlLmF1dGhlbnRpY2F0aW9uQ2xpZW50KCkgPT0gdGhpcyk7IC8vIFNob3VsZCBi ZSBhbHJlYWR5IHNldC4KIAogICAgIGlmICghZC0+bV91c2VyLmlzTnVsbCgpICYmICFkLT5tX3Bh c3MuaXNOdWxsKCkpIHsKICAgICAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiB1c2VyKEFkb3B0 Q0YsIGQtPm1fdXNlci5jcmVhdGVDRlN0cmluZygpKTsKQEAgLTUxMyw4ICs1MTMsNyBAQCB2b2lk IFJlc291cmNlSGFuZGxlOjpkaWRSZWNlaXZlQXV0aGVudGljCiAgICAgICAgIH0KICAgICB9CiAK LSAgICBkLT5tX2N1cnJlbnRDRkNoYWxsZW5nZSA9IGNoYWxsZW5nZS5jZlVSTEF1dGhDaGFsbGVu Z2VSZWYoKTsKLSAgICBkLT5tX2N1cnJlbnRXZWJDaGFsbGVuZ2UgPSBBdXRoZW50aWNhdGlvbkNo YWxsZW5nZShkLT5tX2N1cnJlbnRDRkNoYWxsZW5nZSwgdGhpcyk7CisgICAgZC0+bV9jdXJyZW50 V2ViQ2hhbGxlbmdlID0gY2hhbGxlbmdlOwogICAgIAogICAgIGlmIChjbGllbnQoKSkKICAgICAg ICAgY2xpZW50KCktPmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSh0aGlzLCBkLT5t X2N1cnJlbnRXZWJDaGFsbGVuZ2UpOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21h Yy9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9tYWMvQXV0aGVudGljYXRpb25DaGFsbGVuZ2UuaAkocmV2aXNpb24gNTA4MTAp CisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl LmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDIxICszNywyNSBAQCBjbGFzcyBOU1VSTEF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIEF1dGhlbnRp Y2F0aW9uQ2xpZW50OworCiBjbGFzcyBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSA6IHB1YmxpYyBB dXRoZW50aWNhdGlvbkNoYWxsZW5nZUJhc2UgewogcHVibGljOgotICAgIEF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlKCkge30KKyAgICBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSgpIHsgfQogICAgIEF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKGNvbnN0IFByb3RlY3Rpb25TcGFjZSYgcHJvdGVjdGlvblNw YWNlLCBjb25zdCBDcmVkZW50aWFsJiBwcm9wb3NlZENyZWRlbnRpYWwsIHVuc2lnbmVkIHByZXZp b3VzRmFpbHVyZUNvdW50LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29uc3Qg UmVzb3VyY2VFcnJvciYgZXJyb3IpOwogICAgIEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKE5TVVJM QXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKik7CiAKICAgICBpZCBzZW5kZXIoKSBjb25zdCB7IHJl dHVybiBtX3NlbmRlci5nZXQoKTsgfQotICAgIE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2Ug Km5zVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoKSBjb25zdCB7IHJldHVybiBtX21hY0NoYWxs ZW5nZS5nZXQoKTsgfQorICAgIE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKm5zVVJMQXV0 aGVudGljYXRpb25DaGFsbGVuZ2UoKSBjb25zdCB7IHJldHVybiBtX25zQ2hhbGxlbmdlLmdldCgp OyB9CisKKyAgICB2b2lkIHNldEF1dGhlbnRpY2F0aW9uQ2xpZW50KEF1dGhlbnRpY2F0aW9uQ2xp ZW50Kik7IC8vIENoYW5nZXMgc2VuZGVyIHRvIG9uZSB0aGF0IGludm9rZXMgY2xpZW50IG1ldGhv ZHMuCiAKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl QmFzZTsKICAgICBzdGF0aWMgYm9vbCBwbGF0Zm9ybUNvbXBhcmUoY29uc3QgQXV0aGVudGljYXRp b25DaGFsbGVuZ2UmIGEsIGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJiBiKTsKIAotICAg IFJldGFpblB0cjxpZD4gbV9zZW5kZXI7Ci0gICAgUmV0YWluUHRyPE5TVVJMQXV0aGVudGljYXRp b25DaGFsbGVuZ2UgKj4gbV9tYWNDaGFsbGVuZ2U7CisgICAgUmV0YWluUHRyPGlkPiBtX3NlbmRl cjsgLy8gQWx3YXlzIHRoZSBzYW1lIGFzIFttX21hY0NoYWxsZW5nZS5nZXQoKSBzZW5kZXJdLCBj YWNoZWQgaGVyZSBmb3IgcGVyZm9ybWFuY2UuCisgICAgUmV0YWluUHRyPE5TVVJMQXV0aGVudGlj YXRpb25DaGFsbGVuZ2UgKj4gbV9uc0NoYWxsZW5nZTsKIH07CiAKIH0KSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9tYWMvQXV0aGVudGljYXRpb25NYWMubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9BdXRoZW50aWNhdGlvbk1hYy5tbQkocmV2aXNp b24gNTA4MTApCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL0F1dGhlbnRpY2F0aW9u TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw3IEBACiAjaW1wb3J0ICJBdXRoZW50 aWNhdGlvbk1hYy5oIgogCiAjaW1wb3J0ICJBdXRoZW50aWNhdGlvbkNoYWxsZW5nZS5oIgorI2lt cG9ydCAiQXV0aGVudGljYXRpb25DbGllbnQuaCIKICNpbXBvcnQgIkNyZWRlbnRpYWwuaCIKICNp bXBvcnQgIlByb3RlY3Rpb25TcGFjZS5oIgogCkBAIC0zMyw2ICszNCw1MSBAQAogI2ltcG9ydCA8 Rm91bmRhdGlvbi9OU1VSTENyZWRlbnRpYWwuaD4KICNpbXBvcnQgPEZvdW5kYXRpb24vTlNVUkxQ cm90ZWN0aW9uU3BhY2UuaD4KIAordXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CisKK0BpbnRlcmZh Y2UgV2ViQ29yZUF1dGhlbnRpY2F0aW9uQ2xpZW50QXNDaGFsbGVuZ2VTZW5kZXIgOiBOU09iamVj dCA8TlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZVNlbmRlcj4KK3sKKyAgICBBdXRoZW50aWNh dGlvbkNsaWVudCogbV9jbGllbnQ7Cit9CistIChpZClpbml0V2l0aENsaWVudDooQXV0aGVudGlj YXRpb25DbGllbnQqKWNsaWVudDsKKy0gKHZvaWQpZGV0YWNoQ2xpZW50OworQGVuZAorCitAaW1w bGVtZW50YXRpb24gV2ViQ29yZUF1dGhlbnRpY2F0aW9uQ2xpZW50QXNDaGFsbGVuZ2VTZW5kZXIK KworLSAoaWQpaW5pdFdpdGhDbGllbnQ6KEF1dGhlbnRpY2F0aW9uQ2xpZW50KiljbGllbnQKK3sK KyAgICBzZWxmID0gW3NlbGYgaW5pdF07CisgICAgaWYgKCFzZWxmKQorICAgICAgICByZXR1cm4g bmlsOworICAgIG1fY2xpZW50ID0gY2xpZW50OworICAgIHJldHVybiBzZWxmOworfQorCistICh2 b2lkKWRldGFjaENsaWVudAoreworICAgIG1fY2xpZW50ID0gMDsKK30KKworLSAodm9pZCl1c2VD cmVkZW50aWFsOihOU1VSTENyZWRlbnRpYWwgKiljcmVkZW50aWFsIGZvckF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlOihOU1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlICopY2hhbGxlbmdlCit7Cisg ICAgaWYgKG1fY2xpZW50KQorICAgICAgICBtX2NsaWVudC0+cmVjZWl2ZWRDcmVkZW50aWFsKGNv cmUoY2hhbGxlbmdlKSwgY29yZShjcmVkZW50aWFsKSk7Cit9CisKKy0gKHZvaWQpY29udGludWVX aXRob3V0Q3JlZGVudGlhbEZvckF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOihOU1VSTEF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlICopY2hhbGxlbmdlCit7CisgICAgaWYgKG1fY2xpZW50KQorICAgICAg ICBtX2NsaWVudC0+cmVjZWl2ZWRSZXF1ZXN0VG9Db250aW51ZVdpdGhvdXRDcmVkZW50aWFsKGNv cmUoY2hhbGxlbmdlKSk7Cit9CisKKy0gKHZvaWQpY2FuY2VsQXV0aGVudGljYXRpb25DaGFsbGVu Z2U6KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKiljaGFsbGVuZ2UKK3sKKyAgICBpZiAo bV9jbGllbnQpCisgICAgICAgIG1fY2xpZW50LT5yZWNlaXZlZENhbmNlbGxhdGlvbihjb3JlKGNo YWxsZW5nZSkpOworfQorCitAZW5kCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNDksMTUg Kzk1LDI2IEBAIEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOjpBdXRoZW50aWNhdGlvbkMKIHsKIH0K IAotQXV0aGVudGljYXRpb25DaGFsbGVuZ2U6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKE5TVVJM QXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKm1hY0NoYWxsZW5nZSkKLSAgICA6IEF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlQmFzZShjb3JlKFttYWNDaGFsbGVuZ2UgcHJvdGVjdGlvblNwYWNlXSksCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29yZShbbWFjQ2hhbGxlbmdlIHByb3Bv c2VkQ3JlZGVudGlhbF0pLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFttYWND aGFsbGVuZ2UgcHJldmlvdXNGYWlsdXJlQ291bnRdLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFttYWNDaGFsbGVuZ2UgZmFpbHVyZVJlc3BvbnNlXSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBbbWFjQ2hhbGxlbmdlIGVycm9yXSkKLSAgICAsIG1fc2VuZGVy KFttYWNDaGFsbGVuZ2Ugc2VuZGVyXSkKLSAgICAsIG1fbWFjQ2hhbGxlbmdlKG1hY0NoYWxsZW5n ZSkKK0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShOU1VS TEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlICpjaGFsbGVuZ2UpCisgICAgOiBBdXRoZW50aWNhdGlv bkNoYWxsZW5nZUJhc2UoY29yZShbY2hhbGxlbmdlIHByb3RlY3Rpb25TcGFjZV0pLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvcmUoW2NoYWxsZW5nZSBwcm9wb3NlZENyZWRl bnRpYWxdKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbY2hhbGxlbmdlIHBy ZXZpb3VzRmFpbHVyZUNvdW50XSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBb Y2hhbGxlbmdlIGZhaWx1cmVSZXNwb25zZV0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgW2NoYWxsZW5nZSBlcnJvcl0pCisgICAgLCBtX3NlbmRlcihbY2hhbGxlbmdlIHNlbmRl cl0pCisgICAgLCBtX25zQ2hhbGxlbmdlKGNoYWxsZW5nZSkKK3sKK30KKwordm9pZCBBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZTo6c2V0QXV0aGVudGljYXRpb25DbGllbnQoQXV0aGVudGljYXRpb25D bGllbnQqIGNsaWVudCkKIHsKKyAgICBpZiAoY2xpZW50KSB7CisgICAgICAgIG1fc2VuZGVyLmFk b3B0TlMoW1tXZWJDb3JlQXV0aGVudGljYXRpb25DbGllbnRBc0NoYWxsZW5nZVNlbmRlciBhbGxv Y10gaW5pdFdpdGhDbGllbnQ6Y2xpZW50XSk7CisgICAgICAgIG1fbnNDaGFsbGVuZ2UuYWRvcHRO UyhbW05TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgYWxsb2NdIGluaXRXaXRoQXV0aGVudGlj YXRpb25DaGFsbGVuZ2U6bV9uc0NoYWxsZW5nZS5nZXQoKSBzZW5kZXI6bV9zZW5kZXIuZ2V0KCld KTsKKyAgICB9IGVsc2UgeworICAgICAgICBpZiAoW21fc2VuZGVyLmdldCgpIGlzTWVtYmVyT2ZD bGFzczpbV2ViQ29yZUF1dGhlbnRpY2F0aW9uQ2xpZW50QXNDaGFsbGVuZ2VTZW5kZXIgY2xhc3Nd XSkKKyAgICAgICAgICAgIFsoV2ViQ29yZUF1dGhlbnRpY2F0aW9uQ2xpZW50QXNDaGFsbGVuZ2VT ZW5kZXIgKiltX3NlbmRlci5nZXQoKSBkZXRhY2hDbGllbnRdOworICAgIH0KIH0KIAogYm9vbCBB dXRoZW50aWNhdGlvbkNoYWxsZW5nZTo6cGxhdGZvcm1Db21wYXJlKGNvbnN0IEF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlJiBhLCBjb25zdCBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYgYikKSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5t bQkocmV2aXNpb24gNTA4MTApCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291 cmNlSGFuZGxlTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC01NSw3ICs1NSw3IEBAIHR5cGVkZWYg aW50IE5TSW50ZWdlcjsKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKLUBpbnRlcmZhY2Ug V2ViQ29yZVJlc291cmNlSGFuZGxlQXNEZWxlZ2F0ZSA6IE5TT2JqZWN0IDxOU1VSTEF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlU2VuZGVyPgorQGludGVyZmFjZSBXZWJDb3JlUmVzb3VyY2VIYW5kbGVB c0RlbGVnYXRlIDogTlNPYmplY3QKIHsKICAgICBSZXNvdXJjZUhhbmRsZSogbV9oYW5kbGU7CiB9 CkBAIC0xMzgsNiArMTM4LDcgQEAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6flJlc291cmNlSGFu ZGxlSQogUmVzb3VyY2VIYW5kbGU6On5SZXNvdXJjZUhhbmRsZSgpCiB7CiAgICAgcmVsZWFzZURl bGVnYXRlKCk7CisgICAgZC0+bV9jdXJyZW50V2ViQ2hhbGxlbmdlLnNldEF1dGhlbnRpY2F0aW9u Q2xpZW50KDApOwogCiAgICAgTE9HKE5ldHdvcmssICJIYW5kbGUgJXAgZGVzdHJveWVkIiwgdGhp cyk7CiB9CkBAIC01MTEsMTAgKzUxMiw4IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OmRpZFJlY2Vp dmVBdXRoZW50aWMKICNlbmRpZgogCiAgICAgZC0+bV9jdXJyZW50TWFjQ2hhbGxlbmdlID0gY2hh bGxlbmdlLm5zVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoKTsKLSAgICBOU1VSTEF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlICp3ZWJDaGFsbGVuZ2UgPSBbW05TVVJMQXV0aGVudGljYXRpb25DaGFs bGVuZ2UgYWxsb2NdIGluaXRXaXRoQXV0aGVudGljYXRpb25DaGFsbGVuZ2U6ZC0+bV9jdXJyZW50 TWFjQ2hhbGxlbmdlIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VuZGVyOihpZDxO U1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlU2VuZGVyPilkZWxlZ2F0ZSgpXTsKLSAgICBkLT5t X2N1cnJlbnRXZWJDaGFsbGVuZ2UgPSBjb3JlKHdlYkNoYWxsZW5nZSk7Ci0gICAgW3dlYkNoYWxs ZW5nZSByZWxlYXNlXTsKKyAgICBkLT5tX2N1cnJlbnRXZWJDaGFsbGVuZ2UgPSBjb3JlKGQtPm1f Y3VycmVudE1hY0NoYWxsZW5nZSk7CisgICAgZC0+bV9jdXJyZW50V2ViQ2hhbGxlbmdlLnNldEF1 dGhlbnRpY2F0aW9uQ2xpZW50KHRoaXMpOwogCiAgICAgaWYgKGNsaWVudCgpKQogICAgICAgICBj bGllbnQoKS0+ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKHRoaXMsIGQtPm1fY3Vy cmVudFdlYkNoYWxsZW5nZSk7CkBAIC01MjMsOCArNTIyLDggQEAgdm9pZCBSZXNvdXJjZUhhbmRs ZTo6ZGlkUmVjZWl2ZUF1dGhlbnRpYwogdm9pZCBSZXNvdXJjZUhhbmRsZTo6ZGlkQ2FuY2VsQXV0 aGVudGljYXRpb25DaGFsbGVuZ2UoY29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVuZ2UmIGNoYWxs ZW5nZSkKIHsKICAgICBBU1NFUlQoZC0+bV9jdXJyZW50TWFjQ2hhbGxlbmdlKTsKKyAgICBBU1NF UlQoZC0+bV9jdXJyZW50TWFjQ2hhbGxlbmdlID09IGNoYWxsZW5nZS5uc1VSTEF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlKCkpOwogICAgIEFTU0VSVCghZC0+bV9jdXJyZW50V2ViQ2hhbGxlbmdlLmlz TnVsbCgpKTsKLSAgICBBU1NFUlQoZC0+bV9jdXJyZW50V2ViQ2hhbGxlbmdlID09IGNoYWxsZW5n ZSk7CiAKICAgICBpZiAoY2xpZW50KCkpCiAgICAgICAgIGNsaWVudCgpLT5kaWRDYW5jZWxBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZSh0aGlzLCBjaGFsbGVuZ2UpOwpAQCAtODY4LDI3ICs4NjcsNiBA QCB2b2lkIFJlc291cmNlSGFuZGxlOjpyZWNlaXZlZENhbmNlbGxhdGlvCiAgICAgcmV0dXJuIG5l d1Jlc3BvbnNlOwogfQogCi0tICh2b2lkKXVzZUNyZWRlbnRpYWw6KE5TVVJMQ3JlZGVudGlhbCAq KWNyZWRlbnRpYWwgZm9yQXV0aGVudGljYXRpb25DaGFsbGVuZ2U6KE5TVVJMQXV0aGVudGljYXRp b25DaGFsbGVuZ2UgKiljaGFsbGVuZ2UKLXsKLSAgICBpZiAoIW1faGFuZGxlKQotICAgICAgICBy ZXR1cm47Ci0gICAgbV9oYW5kbGUtPnJlY2VpdmVkQ3JlZGVudGlhbChjb3JlKGNoYWxsZW5nZSks IGNvcmUoY3JlZGVudGlhbCkpOwotfQotCi0tICh2b2lkKWNvbnRpbnVlV2l0aG91dENyZWRlbnRp YWxGb3JBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTooTlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5n ZSAqKWNoYWxsZW5nZQotewotICAgIGlmICghbV9oYW5kbGUpCi0gICAgICAgIHJldHVybjsKLSAg ICBtX2hhbmRsZS0+cmVjZWl2ZWRSZXF1ZXN0VG9Db250aW51ZVdpdGhvdXRDcmVkZW50aWFsKGNv cmUoY2hhbGxlbmdlKSk7Ci19Ci0KLS0gKHZvaWQpY2FuY2VsQXV0aGVudGljYXRpb25DaGFsbGVu Z2U6KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKiljaGFsbGVuZ2UKLXsKLSAgICBpZiAo IW1faGFuZGxlKQotICAgICAgICByZXR1cm47Ci0gICAgbV9oYW5kbGUtPnJlY2VpdmVkQ2FuY2Vs bGF0aW9uKGNvcmUoY2hhbGxlbmdlKSk7Ci19Ci0KIEBlbmQKIAogI2lmbmRlZiBCVUlMRElOR19P Tl9USUdFUgo=