27560 2009-07-22 13:40:25 -0700 [Gtk] Password is saved into gnome-keyring even if auth. fails 2009-07-24 07:36:19 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 plaes webkit-unassigned xan.lopez oldest_to_newest 133885 0 plaes 2009-07-22 13:40:25 -0700 When choosing to save http authentication into gnome-keyring, it is always saved even if authentication fails. This also means that it can overwrite previously saved password with wrong pass. 134492 1 33422 plaes 2009-07-24 03:31:04 -0700 Created attachment 33422 webkit-bug-27560-fix-authentication.patch 134497 2 33422 xan.lopez 2009-07-24 03:45:41 -0700 Comment on attachment 33422 webkit-bug-27560-fix-authentication.patch > 2009-07-23 Jan Michael Alonzo <jmalonzo@webkit.org> > > Reviewed by Eric Seidel. > diff --git a/WebKit/gtk/webkit/webkitsoupauthdialog.c b/WebKit/gtk/webkit/webkitsoupauthdialog.c > index d5ca79c..eeaaa63 100644 > --- a/WebKit/gtk/webkit/webkitsoupauthdialog.c > +++ b/WebKit/gtk/webkit/webkitsoupauthdialog.c > @@ -90,12 +90,16 @@ typedef struct _WebKitAuthData { > GtkWidget* passwordEntry; > #if USE(GNOMEKEYRING) > GtkWidget* checkButton; > + char *username; > + char *password; > #endif > } WebKitAuthData; > > static void free_authData(WebKitAuthData* authData) > { > g_object_unref(authData->msg); > + g_free(authData->username); > + g_free(authData->password); Should be protected by #if USE(GNOMEKEYRING) > g_slice_free(WebKitAuthData, authData); > } > > @@ -104,47 +108,52 @@ static void set_password_callback(GnomeKeyringResult result, guint32 val, gpoint > { > /* Dummy callback, gnome_keyring_set_network_password does not accept a NULL one */ > } > -#endif > > -static void response_callback(GtkDialog* dialog, gint response_id, WebKitAuthData* authData) > +static void save_password_callback(SoupMessage* msg, WebKitAuthData* authData) > { > - const char* login; > - const char* password; > -#if USE(GNOMEKEYRING) > SoupURI* uri; > - gboolean storePassword; > + > + if (msg->status_code >= 400) > + return; > + Mmm, are you sure anything < 400 means we should save the password? > > @@ -278,7 +287,7 @@ static void show_auth_dialog(WebKitAuthData* authData, const char* login, const > gtk_box_pack_start (GTK_BOX (vbox), rememberBox, > FALSE, FALSE, 0); > > - checkButton = gtk_check_button_new_with_label(_("_Remember password")); > + checkButton = gtk_check_button_new_with_mnemonic(_("_Remember password")); > if (login && password) > gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkButton), TRUE); > gtk_label_set_line_wrap(GTK_LABEL(gtk_bin_get_child(GTK_BIN(checkButton))), TRUE); This seems unrelated to this bug (although it looks OK, please open a new bug with it). Marking r- for now, waiting for the updated patch :) 134506 3 33426 plaes 2009-07-24 04:34:41 -0700 Created attachment 33426 webkit-bug-27560-fix-authentication-v2.patch 134508 4 33426 xan.lopez 2009-07-24 04:38:52 -0700 Comment on attachment 33426 webkit-bug-27560-fix-authentication-v2.patch authData is leaked when the authentication fails, but other than that looks good to me. 134517 5 33428 plaes 2009-07-24 05:15:36 -0700 Created attachment 33428 webkit-bug-27560-fix-authentication-v3.patch 134519 6 33428 xan.lopez 2009-07-24 05:26:56 -0700 Comment on attachment 33428 webkit-bug-27560-fix-authentication-v3.patch OK. 134550 7 xan.lopez 2009-07-24 07:36:19 -0700 Landed in r46350, closing. 33422 2009-07-24 03:31:04 -0700 2009-07-24 04:34:41 -0700 webkit-bug-27560-fix-authentication.patch webkit-bug-27560-fix-authentication.patch text/plain 6268 plaes RnJvbSBhMDljZTVlYmUwYTc0ODVjMWM1MjM0ZTE3ZWExODViOTAxZDU0OTg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQcmlpdCBMYWVzIDxwbGFlc0BwbGFlcy5vcmc+CkRhdGU6IEZy aSwgMjQgSnVsIDIwMDkgMTM6Mjg6NTYgKzAzMDAKU3ViamVjdDogW1BBVENIXSAyMDA5LTA3LTI0 ICBQcmlpdCBMYWVzICA8cGxhZXNAcGxhZXMub3JnPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCiAgICAgICAgW0d0a10gUGFzc3dvcmQgaXMgc2F2ZWQgaW50byBnbm9tZS1r ZXlyaW5nIGV2ZW4gaWYgYXV0aC4gZmFpbHMKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1NjAKCiAgICAgICAgQ2hlY2sgYXV0aGVudGljYXRpb24gcmVz dWx0IGFuZCBzYXZlIHBhc3N3b3JkIG9ubHkgd2hlbiBhdXRoZW50aWNhdGlvbgogICAgICAgIHN1 Y2NlZWRzLgoKICAgICAgICAqIHdlYmtpdC93ZWJraXRzb3VwYXV0aGRpYWxvZy5jOgogICAgICAg IChmcmVlX2F1dGhEYXRhKToKICAgICAgICAocmVzcG9uc2VfY2FsbGJhY2spOgogICAgICAgIChz YXZlX3Bhc3N3b3JkX2NhbGxiYWNrKTogTmV3IGZ1bmN0aW9uLgogICAgICAgIChzaG93X2F1dGhf ZGlhbG9nKTogRml4IHNob3dpbmcgb2YgbW5lbW9uaWMuCi0tLQogV2ViS2l0L2d0ay9DaGFuZ2VM b2cgICAgICAgICAgICAgICAgICAgICB8ICAgMTYgKysrKysrKysKIFdlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHNvdXBhdXRoZGlhbG9nLmMgfCAgIDYxICsrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9n CmluZGV4IDJiNzEwNTguLmNiOGZkOGQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMDctMjQg IFByaWl0IExhZXMgIDxwbGFlc0BwbGFlcy5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW0d0a10gUGFzc3dvcmQgaXMgc2F2ZWQgaW50byBnbm9t ZS1rZXlyaW5nIGV2ZW4gaWYgYXV0aC4gZmFpbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTI3NTYwCisKKyAgICAgICAgQ2hlY2sgYXV0aGVudGljYXRp b24gcmVzdWx0IGFuZCBzYXZlIHBhc3N3b3JkIG9ubHkgd2hlbiBhdXRoZW50aWNhdGlvbgorICAg ICAgICBzdWNjZWVkcy4KKworICAgICAgICAqIHdlYmtpdC93ZWJraXRzb3VwYXV0aGRpYWxvZy5j OgorICAgICAgICAoZnJlZV9hdXRoRGF0YSk6CisgICAgICAgIChyZXNwb25zZV9jYWxsYmFjayk6 CisgICAgICAgIChzYXZlX3Bhc3N3b3JkX2NhbGxiYWNrKTogTmV3IGZ1bmN0aW9uLgorICAgICAg ICAoc2hvd19hdXRoX2RpYWxvZyk6IEZpeCBzaG93aW5nIG9mIG1uZW1vbmljLgorCiAyMDA5LTA3 LTIzICBKYW4gTWljaGFlbCBBbG9uem8gIDxqbWFsb256b0B3ZWJraXQub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQv d2Via2l0c291cGF1dGhkaWFsb2cuYyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHNvdXBhdXRo ZGlhbG9nLmMKaW5kZXggZDVjYTc5Yy4uZWVhYWE2MyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0c291cGF1dGhkaWFsb2cuYworKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXRzb3VwYXV0aGRpYWxvZy5jCkBAIC05MCwxMiArOTAsMTYgQEAgdHlwZWRlZiBzdHJ1Y3QgX1dl YktpdEF1dGhEYXRhIHsKICAgICBHdGtXaWRnZXQqIHBhc3N3b3JkRW50cnk7CiAjaWYgVVNFKEdO T01FS0VZUklORykKICAgICBHdGtXaWRnZXQqIGNoZWNrQnV0dG9uOworICAgIGNoYXIgKnVzZXJu YW1lOworICAgIGNoYXIgKnBhc3N3b3JkOwogI2VuZGlmCiB9IFdlYktpdEF1dGhEYXRhOwogCiBz dGF0aWMgdm9pZCBmcmVlX2F1dGhEYXRhKFdlYktpdEF1dGhEYXRhKiBhdXRoRGF0YSkKIHsKICAg ICBnX29iamVjdF91bnJlZihhdXRoRGF0YS0+bXNnKTsKKyAgICBnX2ZyZWUoYXV0aERhdGEtPnVz ZXJuYW1lKTsKKyAgICBnX2ZyZWUoYXV0aERhdGEtPnBhc3N3b3JkKTsKICAgICBnX3NsaWNlX2Zy ZWUoV2ViS2l0QXV0aERhdGEsIGF1dGhEYXRhKTsKIH0KIApAQCAtMTA0LDQ3ICsxMDgsNTIgQEAg c3RhdGljIHZvaWQgc2V0X3Bhc3N3b3JkX2NhbGxiYWNrKEdub21lS2V5cmluZ1Jlc3VsdCByZXN1 bHQsIGd1aW50MzIgdmFsLCBncG9pbnQKIHsKICAgICAvKiBEdW1teSBjYWxsYmFjaywgZ25vbWVf a2V5cmluZ19zZXRfbmV0d29ya19wYXNzd29yZCBkb2VzIG5vdCBhY2NlcHQgYSBOVUxMIG9uZSAq LwogfQotI2VuZGlmCiAKLXN0YXRpYyB2b2lkIHJlc3BvbnNlX2NhbGxiYWNrKEd0a0RpYWxvZyog ZGlhbG9nLCBnaW50IHJlc3BvbnNlX2lkLCBXZWJLaXRBdXRoRGF0YSogYXV0aERhdGEpCitzdGF0 aWMgdm9pZCBzYXZlX3Bhc3N3b3JkX2NhbGxiYWNrKFNvdXBNZXNzYWdlKiBtc2csIFdlYktpdEF1 dGhEYXRhKiBhdXRoRGF0YSkKIHsKLSAgICBjb25zdCBjaGFyKiBsb2dpbjsKLSAgICBjb25zdCBj aGFyKiBwYXNzd29yZDsKLSNpZiBVU0UoR05PTUVLRVlSSU5HKQogICAgIFNvdXBVUkkqIHVyaTsK LSAgICBnYm9vbGVhbiBzdG9yZVBhc3N3b3JkOworCisgICAgaWYgKG1zZy0+c3RhdHVzX2NvZGUg Pj0gNDAwKQorICAgICAgICByZXR1cm47CisKKyAgICB1cmkgPSBzb3VwX21lc3NhZ2VfZ2V0X3Vy aShhdXRoRGF0YS0+bXNnKTsKKworICAgIGdub21lX2tleXJpbmdfc2V0X25ldHdvcmtfcGFzc3dv cmQoTlVMTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF1dGhEYXRh LT51c2VybmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNvdXBf YXV0aF9nZXRfcmVhbG0oYXV0aERhdGEtPmF1dGgpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdXJpLT5ob3N0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgTlVMTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVy aS0+c2NoZW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc291cF9h dXRoX2dldF9zY2hlbWVfbmFtZShhdXRoRGF0YS0+YXV0aCksCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1cmktPnBvcnQsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBhdXRoRGF0YS0+cGFzc3dvcmQsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoR25vbWVLZXlyaW5nT3BlcmF0aW9uR2V0SW50Q2FsbGJhY2spc2V0 X3Bhc3N3b3JkX2NhbGxiYWNrLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgTlVMTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwpOwor ICAgIGZyZWVfYXV0aERhdGEoYXV0aERhdGEpOworfQogI2VuZGlmCiAKK3N0YXRpYyB2b2lkIHJl c3BvbnNlX2NhbGxiYWNrKEd0a0RpYWxvZyogZGlhbG9nLCBnaW50IHJlc3BvbnNlX2lkLCBXZWJL aXRBdXRoRGF0YSogYXV0aERhdGEpCit7CiAgICAgc3dpdGNoKHJlc3BvbnNlX2lkKSB7CiAgICAg Y2FzZSBHVEtfUkVTUE9OU0VfT0s6Ci0gICAgICAgIGxvZ2luID0gZ3RrX2VudHJ5X2dldF90ZXh0 KEdUS19FTlRSWShhdXRoRGF0YS0+bG9naW5FbnRyeSkpOwotICAgICAgICBwYXNzd29yZCA9IGd0 a19lbnRyeV9nZXRfdGV4dChHVEtfRU5UUlkoYXV0aERhdGEtPnBhc3N3b3JkRW50cnkpKTsKLSAg ICAgICAgc291cF9hdXRoX2F1dGhlbnRpY2F0ZShhdXRoRGF0YS0+YXV0aCwgbG9naW4sIHBhc3N3 b3JkKTsKKyAgICAgICAgYXV0aERhdGEtPnVzZXJuYW1lID0gZ19zdHJkdXAoZ3RrX2VudHJ5X2dl dF90ZXh0KEdUS19FTlRSWShhdXRoRGF0YS0+bG9naW5FbnRyeSkpKTsKKyAgICAgICAgYXV0aERh dGEtPnBhc3N3b3JkID0gZ19zdHJkdXAoZ3RrX2VudHJ5X2dldF90ZXh0KEdUS19FTlRSWShhdXRo RGF0YS0+cGFzc3dvcmRFbnRyeSkpKTsKKyAgICAgICAgc291cF9hdXRoX2F1dGhlbnRpY2F0ZShh dXRoRGF0YS0+YXV0aCwgYXV0aERhdGEtPnVzZXJuYW1lLCBhdXRoRGF0YS0+cGFzc3dvcmQpOwog CiAjaWYgVVNFKEdOT01FS0VZUklORykKLSAgICAgICAgc3RvcmVQYXNzd29yZCA9IGd0a190b2dn bGVfYnV0dG9uX2dldF9hY3RpdmUoR1RLX1RPR0dMRV9CVVRUT04oYXV0aERhdGEtPmNoZWNrQnV0 dG9uKSk7Ci0gICAgICAgIGlmIChzdG9yZVBhc3N3b3JkKSB7Ci0gICAgICAgICAgICB1cmkgPSBz b3VwX21lc3NhZ2VfZ2V0X3VyaShhdXRoRGF0YS0+bXNnKTsKLSAgICAgICAgICAgIGdub21lX2tl eXJpbmdfc2V0X25ldHdvcmtfcGFzc3dvcmQoTlVMTCwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbG9naW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHNvdXBfYXV0aF9nZXRfcmVhbG0oYXV0aERhdGEtPmF1dGgp LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1cmktPmhv c3QsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEws Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVyaS0+c2No ZW1lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzb3Vw X2F1dGhfZ2V0X3NjaGVtZV9uYW1lKGF1dGhEYXRhLT5hdXRoKSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXJpLT5wb3J0LAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXNzd29yZCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKEdub21lS2V5cmluZ09wZXJhdGlvbkdl dEludENhbGxiYWNrKXNldF9wYXNzd29yZF9jYWxsYmFjaywKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKGd0 a190b2dnbGVfYnV0dG9uX2dldF9hY3RpdmUoR1RLX1RPR0dMRV9CVVRUT04oYXV0aERhdGEtPmNo ZWNrQnV0dG9uKSkpCisgICAgICAgICAgICBnX3NpZ25hbF9jb25uZWN0KGF1dGhEYXRhLT5tc2cs ICJnb3QtaGVhZGVycyIsIEdfQ0FMTEJBQ0soc2F2ZV9wYXNzd29yZF9jYWxsYmFjayksIGF1dGhE YXRhKTsKICNlbmRpZgogICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwogICAgIH0KIAogICAg IHNvdXBfc2Vzc2lvbl91bnBhdXNlX21lc3NhZ2UoYXV0aERhdGEtPnNlc3Npb24sIGF1dGhEYXRh LT5tc2cpOworI2lmICFVU0UoR05PTUVLRVlSSU5HKQogICAgIGZyZWVfYXV0aERhdGEoYXV0aERh dGEpOworI2VuZGlmCiAgICAgZ3RrX3dpZGdldF9kZXN0cm95KEdUS19XSURHRVQoZGlhbG9nKSk7 CiB9CiAKQEAgLTI3OCw3ICsyODcsNyBAQCBzdGF0aWMgdm9pZCBzaG93X2F1dGhfZGlhbG9nKFdl YktpdEF1dGhEYXRhKiBhdXRoRGF0YSwgY29uc3QgY2hhciogbG9naW4sIGNvbnN0CiAgICAgZ3Rr X2JveF9wYWNrX3N0YXJ0IChHVEtfQk9YICh2Ym94KSwgcmVtZW1iZXJCb3gsCiAgICAgICAgICAg ICAgICAgICAgICAgICBGQUxTRSwgRkFMU0UsIDApOwogCi0gICAgY2hlY2tCdXR0b24gPSBndGtf Y2hlY2tfYnV0dG9uX25ld193aXRoX2xhYmVsKF8oIl9SZW1lbWJlciBwYXNzd29yZCIpKTsKKyAg ICBjaGVja0J1dHRvbiA9IGd0a19jaGVja19idXR0b25fbmV3X3dpdGhfbW5lbW9uaWMoXygiX1Jl bWVtYmVyIHBhc3N3b3JkIikpOwogICAgIGlmIChsb2dpbiAmJiBwYXNzd29yZCkKICAgICAgICAg Z3RrX3RvZ2dsZV9idXR0b25fc2V0X2FjdGl2ZShHVEtfVE9HR0xFX0JVVFRPTihjaGVja0J1dHRv biksIFRSVUUpOwogICAgIGd0a19sYWJlbF9zZXRfbGluZV93cmFwKEdUS19MQUJFTChndGtfYmlu X2dldF9jaGlsZChHVEtfQklOKGNoZWNrQnV0dG9uKSkpLCBUUlVFKTsKLS0gCjEuNi4zLjMKCg== 33426 2009-07-24 04:34:41 -0700 2009-07-24 05:15:36 -0700 webkit-bug-27560-fix-authentication-v2.patch webkit-bug-27560-fix-authentication.patch text/plain 5634 plaes RnJvbSA1MDFhZjY0MDlkNjY1OGU0MjI5M2RhMTIxODY1MmY5MTY4ZGE0MmJkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQcmlpdCBMYWVzIDxwbGFlc0BwbGFlcy5vcmc+CkRhdGU6IEZy aSwgMjQgSnVsIDIwMDkgMTM6Mjg6NTYgKzAzMDAKU3ViamVjdDogW1BBVENIXSAyMDA5LTA3LTI0 ICBQcmlpdCBMYWVzICA8cGxhZXNAcGxhZXMub3JnPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCiAgICAgICAgW0d0a10gUGFzc3dvcmQgaXMgc2F2ZWQgaW50byBnbm9tZS1r ZXlyaW5nIGV2ZW4gaWYgYXV0aC4gZmFpbHMKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1NjAKCiAgICAgICAgQ2hlY2sgYXV0aGVudGljYXRpb24gcmVz dWx0IGFuZCBzYXZlIHBhc3N3b3JkIG9ubHkgd2hlbiBhdXRoZW50aWNhdGlvbgogICAgICAgIHN1 Y2NlZWRzLgoKICAgICAgICAqIHdlYmtpdC93ZWJraXRzb3VwYXV0aGRpYWxvZy5jOgogICAgICAg IChmcmVlX2F1dGhEYXRhKToKICAgICAgICAocmVzcG9uc2VfY2FsbGJhY2spOgogICAgICAgIChz YXZlX3Bhc3N3b3JkX2NhbGxiYWNrKToKLS0tCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgIHwgICAxNSArKysrKysrCiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRzb3Vw YXV0aGRpYWxvZy5jIHwgICA2MCArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogMiBmaWxl cyBjaGFuZ2VkLCA1MCBpbnNlcnRpb25zKCspLCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IDJiNzEw NTguLjU5MzIxMTUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktp dC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDctMjQgIFByaWl0IExhZXMg IDxwbGFlc0BwbGFlcy5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW0d0a10gUGFzc3dvcmQgaXMgc2F2ZWQgaW50byBnbm9tZS1rZXlyaW5nIGV2 ZW4gaWYgYXV0aC4gZmFpbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI3NTYwCisKKyAgICAgICAgQ2hlY2sgYXV0aGVudGljYXRpb24gcmVzdWx0IGFu ZCBzYXZlIHBhc3N3b3JkIG9ubHkgd2hlbiBhdXRoZW50aWNhdGlvbgorICAgICAgICBzdWNjZWVk cy4KKworICAgICAgICAqIHdlYmtpdC93ZWJraXRzb3VwYXV0aGRpYWxvZy5jOgorICAgICAgICAo ZnJlZV9hdXRoRGF0YSk6CisgICAgICAgIChyZXNwb25zZV9jYWxsYmFjayk6CisgICAgICAgIChz YXZlX3Bhc3N3b3JkX2NhbGxiYWNrKToKKwogMjAwOS0wNy0yMyAgSmFuIE1pY2hhZWwgQWxvbnpv ICA8am1hbG9uem9Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRl bC4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHNvdXBhdXRoZGlhbG9nLmMg Yi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRzb3VwYXV0aGRpYWxvZy5jCmluZGV4IGQ1Y2E3OWMu LmZmODRkOWUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHNvdXBhdXRoZGlh bG9nLmMKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0c291cGF1dGhkaWFsb2cuYwpAQCAt OTEsMTEgKzkxLDE1IEBAIHR5cGVkZWYgc3RydWN0IF9XZWJLaXRBdXRoRGF0YSB7CiAjaWYgVVNF KEdOT01FS0VZUklORykKICAgICBHdGtXaWRnZXQqIGNoZWNrQnV0dG9uOwogI2VuZGlmCisgICAg Y2hhciAqdXNlcm5hbWU7CisgICAgY2hhciAqcGFzc3dvcmQ7CiB9IFdlYktpdEF1dGhEYXRhOwog CiBzdGF0aWMgdm9pZCBmcmVlX2F1dGhEYXRhKFdlYktpdEF1dGhEYXRhKiBhdXRoRGF0YSkKIHsK ICAgICBnX29iamVjdF91bnJlZihhdXRoRGF0YS0+bXNnKTsKKyAgICBnX2ZyZWUoYXV0aERhdGEt PnVzZXJuYW1lKTsKKyAgICBnX2ZyZWUoYXV0aERhdGEtPnBhc3N3b3JkKTsKICAgICBnX3NsaWNl X2ZyZWUoV2ViS2l0QXV0aERhdGEsIGF1dGhEYXRhKTsKIH0KIApAQCAtMTA0LDQ3ICsxMDgsNTMg QEAgc3RhdGljIHZvaWQgc2V0X3Bhc3N3b3JkX2NhbGxiYWNrKEdub21lS2V5cmluZ1Jlc3VsdCBy ZXN1bHQsIGd1aW50MzIgdmFsLCBncG9pbnQKIHsKICAgICAvKiBEdW1teSBjYWxsYmFjaywgZ25v bWVfa2V5cmluZ19zZXRfbmV0d29ya19wYXNzd29yZCBkb2VzIG5vdCBhY2NlcHQgYSBOVUxMIG9u ZSAqLwogfQotI2VuZGlmCiAKLXN0YXRpYyB2b2lkIHJlc3BvbnNlX2NhbGxiYWNrKEd0a0RpYWxv ZyogZGlhbG9nLCBnaW50IHJlc3BvbnNlX2lkLCBXZWJLaXRBdXRoRGF0YSogYXV0aERhdGEpCitz dGF0aWMgdm9pZCBzYXZlX3Bhc3N3b3JkX2NhbGxiYWNrKFNvdXBNZXNzYWdlKiBtc2csIFdlYktp dEF1dGhEYXRhKiBhdXRoRGF0YSkKIHsKLSAgICBjb25zdCBjaGFyKiBsb2dpbjsKLSAgICBjb25z dCBjaGFyKiBwYXNzd29yZDsKLSNpZiBVU0UoR05PTUVLRVlSSU5HKQogICAgIFNvdXBVUkkqIHVy aTsKLSAgICBnYm9vbGVhbiBzdG9yZVBhc3N3b3JkOworCisgICAgLyogQ2hlY2sgb25seSBmb3Ig U3VjY2VzcyBzdGF0dXMgY29kZXMgKDJ4eCkgKi8KKyAgICBpZiAoKG1zZy0+c3RhdHVzX2NvZGUg PCAyMDApIHx8IChtc2ctPnN0YXR1c19jb2RlID49IDMwMCkpCisgICAgICAgIHJldHVybjsKKwor ICAgIHVyaSA9IHNvdXBfbWVzc2FnZV9nZXRfdXJpKGF1dGhEYXRhLT5tc2cpOworCisgICAgZ25v bWVfa2V5cmluZ19zZXRfbmV0d29ya19wYXNzd29yZChOVUxMLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYXV0aERhdGEtPnVzZXJuYW1lLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc291cF9hdXRoX2dldF9yZWFsbShhdXRoRGF0YS0+YXV0 aCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1cmktPmhvc3QsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdXJpLT5zY2hlbWUsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzb3VwX2F1dGhfZ2V0X3NjaGVtZV9uYW1lKGF1dGhEYXRh LT5hdXRoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVyaS0+cG9y dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF1dGhEYXRhLT5wYXNz d29yZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChHbm9tZUtleXJp bmdPcGVyYXRpb25HZXRJbnRDYWxsYmFjaylzZXRfcGFzc3dvcmRfY2FsbGJhY2ssCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgTlVMTCk7CisgICAgZnJlZV9hdXRoRGF0YShhdXRoRGF0YSk7 Cit9CiAjZW5kaWYKIAorc3RhdGljIHZvaWQgcmVzcG9uc2VfY2FsbGJhY2soR3RrRGlhbG9nKiBk aWFsb2csIGdpbnQgcmVzcG9uc2VfaWQsIFdlYktpdEF1dGhEYXRhKiBhdXRoRGF0YSkKK3sKICAg ICBzd2l0Y2gocmVzcG9uc2VfaWQpIHsKICAgICBjYXNlIEdUS19SRVNQT05TRV9PSzoKLSAgICAg ICAgbG9naW4gPSBndGtfZW50cnlfZ2V0X3RleHQoR1RLX0VOVFJZKGF1dGhEYXRhLT5sb2dpbkVu dHJ5KSk7Ci0gICAgICAgIHBhc3N3b3JkID0gZ3RrX2VudHJ5X2dldF90ZXh0KEdUS19FTlRSWShh dXRoRGF0YS0+cGFzc3dvcmRFbnRyeSkpOwotICAgICAgICBzb3VwX2F1dGhfYXV0aGVudGljYXRl KGF1dGhEYXRhLT5hdXRoLCBsb2dpbiwgcGFzc3dvcmQpOworICAgICAgICBhdXRoRGF0YS0+dXNl cm5hbWUgPSBnX3N0cmR1cChndGtfZW50cnlfZ2V0X3RleHQoR1RLX0VOVFJZKGF1dGhEYXRhLT5s b2dpbkVudHJ5KSkpOworICAgICAgICBhdXRoRGF0YS0+cGFzc3dvcmQgPSBnX3N0cmR1cChndGtf ZW50cnlfZ2V0X3RleHQoR1RLX0VOVFJZKGF1dGhEYXRhLT5wYXNzd29yZEVudHJ5KSkpOworICAg ICAgICBzb3VwX2F1dGhfYXV0aGVudGljYXRlKGF1dGhEYXRhLT5hdXRoLCBhdXRoRGF0YS0+dXNl cm5hbWUsIGF1dGhEYXRhLT5wYXNzd29yZCk7CiAKICNpZiBVU0UoR05PTUVLRVlSSU5HKQotICAg ICAgICBzdG9yZVBhc3N3b3JkID0gZ3RrX3RvZ2dsZV9idXR0b25fZ2V0X2FjdGl2ZShHVEtfVE9H R0xFX0JVVFRPTihhdXRoRGF0YS0+Y2hlY2tCdXR0b24pKTsKLSAgICAgICAgaWYgKHN0b3JlUGFz c3dvcmQpIHsKLSAgICAgICAgICAgIHVyaSA9IHNvdXBfbWVzc2FnZV9nZXRfdXJpKGF1dGhEYXRh LT5tc2cpOwotICAgICAgICAgICAgZ25vbWVfa2V5cmluZ19zZXRfbmV0d29ya19wYXNzd29yZChO VUxMLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsb2dp biwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc291cF9h dXRoX2dldF9yZWFsbShhdXRoRGF0YS0+YXV0aCksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHVyaS0+aG9zdCwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdXJpLT5zY2hlbWUsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHNvdXBfYXV0aF9nZXRfc2NoZW1lX25hbWUoYXV0aERh dGEtPmF1dGgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB1cmktPnBvcnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHBhc3N3b3JkLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAoR25vbWVLZXlyaW5nT3BlcmF0aW9uR2V0SW50Q2FsbGJhY2spc2V0X3Bhc3N3b3JkX2Nh bGxiYWNrLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBO VUxMLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxM KTsKLSAgICAgICAgfQorICAgICAgICBpZiAoZ3RrX3RvZ2dsZV9idXR0b25fZ2V0X2FjdGl2ZShH VEtfVE9HR0xFX0JVVFRPTihhdXRoRGF0YS0+Y2hlY2tCdXR0b24pKSkKKyAgICAgICAgICAgIGdf c2lnbmFsX2Nvbm5lY3QoYXV0aERhdGEtPm1zZywgImdvdC1oZWFkZXJzIiwgR19DQUxMQkFDSyhz YXZlX3Bhc3N3b3JkX2NhbGxiYWNrKSwgYXV0aERhdGEpOwogI2VuZGlmCiAgICAgZGVmYXVsdDoK ICAgICAgICAgYnJlYWs7CiAgICAgfQogCiAgICAgc291cF9zZXNzaW9uX3VucGF1c2VfbWVzc2Fn ZShhdXRoRGF0YS0+c2Vzc2lvbiwgYXV0aERhdGEtPm1zZyk7CisjaWYgIVVTRShHTk9NRUtFWVJJ TkcpCiAgICAgZnJlZV9hdXRoRGF0YShhdXRoRGF0YSk7CisjZW5kaWYKICAgICBndGtfd2lkZ2V0 X2Rlc3Ryb3koR1RLX1dJREdFVChkaWFsb2cpKTsKIH0KIAotLSAKMS42LjMuMwoK 33428 2009-07-24 05:15:36 -0700 2009-07-24 05:26:56 -0700 webkit-bug-27560-fix-authentication-v3.patch webkit-bug-27560-fix-authentication.patch text/plain 5682 plaes RnJvbSAxZGYyMDcwYjdkMzAwODk1OWNkMjliZDkyNTA5N2VlYjc0MDgyMWU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQcmlpdCBMYWVzIDxwbGFlc0BwbGFlcy5vcmc+CkRhdGU6IEZy aSwgMjQgSnVsIDIwMDkgMTM6Mjg6NTYgKzAzMDAKU3ViamVjdDogW1BBVENIXSAyMDA5LTA3LTI0 ICBQcmlpdCBMYWVzICA8cGxhZXNAcGxhZXMub3JnPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCiAgICAgICAgW0d0a10gUGFzc3dvcmQgaXMgc2F2ZWQgaW50byBnbm9tZS1r ZXlyaW5nIGV2ZW4gaWYgYXV0aC4gZmFpbHMKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1NjAKCiAgICAgICAgQ2hlY2sgYXV0aGVudGljYXRpb24gcmVz dWx0IGFuZCBzYXZlIHBhc3N3b3JkIG9ubHkgd2hlbiBhdXRoZW50aWNhdGlvbgogICAgICAgIHN1 Y2NlZWRzLgoKICAgICAgICAqIHdlYmtpdC93ZWJraXRzb3VwYXV0aGRpYWxvZy5jOgogICAgICAg IChmcmVlX2F1dGhEYXRhKToKICAgICAgICAocmVzcG9uc2VfY2FsbGJhY2spOgogICAgICAgIChz YXZlX3Bhc3N3b3JkX2NhbGxiYWNrKToKLS0tCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgIHwgICAxNSArKysrKysrKwogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0c291 cGF1dGhkaWFsb2cuYyB8ICAgNTggKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDIgZmls ZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCAyYjcx MDU4Li41OTMyMTE1IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJL aXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDA5LTA3LTI0ICBQcmlpdCBMYWVz ICA8cGxhZXNAcGxhZXMub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtHdGtdIFBhc3N3b3JkIGlzIHNhdmVkIGludG8gZ25vbWUta2V5cmluZyBl dmVuIGlmIGF1dGguIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yNzU2MAorCisgICAgICAgIENoZWNrIGF1dGhlbnRpY2F0aW9uIHJlc3VsdCBh bmQgc2F2ZSBwYXNzd29yZCBvbmx5IHdoZW4gYXV0aGVudGljYXRpb24KKyAgICAgICAgc3VjY2Vl ZHMuCisKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0c291cGF1dGhkaWFsb2cuYzoKKyAgICAgICAg KGZyZWVfYXV0aERhdGEpOgorICAgICAgICAocmVzcG9uc2VfY2FsbGJhY2spOgorICAgICAgICAo c2F2ZV9wYXNzd29yZF9jYWxsYmFjayk6CisKIDIwMDktMDctMjMgIEphbiBNaWNoYWVsIEFsb256 byAgPGptYWxvbnpvQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlk ZWwuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRzb3VwYXV0aGRpYWxvZy5j IGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0c291cGF1dGhkaWFsb2cuYwppbmRleCBkNWNhNzlj Li41ZTIwODkxIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRzb3VwYXV0aGRp YWxvZy5jCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHNvdXBhdXRoZGlhbG9nLmMKQEAg LTkxLDExICs5MSwxNSBAQCB0eXBlZGVmIHN0cnVjdCBfV2ViS2l0QXV0aERhdGEgewogI2lmIFVT RShHTk9NRUtFWVJJTkcpCiAgICAgR3RrV2lkZ2V0KiBjaGVja0J1dHRvbjsKICNlbmRpZgorICAg IGNoYXIgKnVzZXJuYW1lOworICAgIGNoYXIgKnBhc3N3b3JkOwogfSBXZWJLaXRBdXRoRGF0YTsK IAogc3RhdGljIHZvaWQgZnJlZV9hdXRoRGF0YShXZWJLaXRBdXRoRGF0YSogYXV0aERhdGEpCiB7 CiAgICAgZ19vYmplY3RfdW5yZWYoYXV0aERhdGEtPm1zZyk7CisgICAgZ19mcmVlKGF1dGhEYXRh LT51c2VybmFtZSk7CisgICAgZ19mcmVlKGF1dGhEYXRhLT5wYXNzd29yZCk7CiAgICAgZ19zbGlj ZV9mcmVlKFdlYktpdEF1dGhEYXRhLCBhdXRoRGF0YSk7CiB9CiAKQEAgLTEwNCw0NyArMTA4LDQ5 IEBAIHN0YXRpYyB2b2lkIHNldF9wYXNzd29yZF9jYWxsYmFjayhHbm9tZUtleXJpbmdSZXN1bHQg cmVzdWx0LCBndWludDMyIHZhbCwgZ3BvaW50CiB7CiAgICAgLyogRHVtbXkgY2FsbGJhY2ssIGdu b21lX2tleXJpbmdfc2V0X25ldHdvcmtfcGFzc3dvcmQgZG9lcyBub3QgYWNjZXB0IGEgTlVMTCBv bmUgKi8KIH0KLSNlbmRpZgogCi1zdGF0aWMgdm9pZCByZXNwb25zZV9jYWxsYmFjayhHdGtEaWFs b2cqIGRpYWxvZywgZ2ludCByZXNwb25zZV9pZCwgV2ViS2l0QXV0aERhdGEqIGF1dGhEYXRhKQor c3RhdGljIHZvaWQgc2F2ZV9wYXNzd29yZF9jYWxsYmFjayhTb3VwTWVzc2FnZSogbXNnLCBXZWJL aXRBdXRoRGF0YSogYXV0aERhdGEpCiB7Ci0gICAgY29uc3QgY2hhciogbG9naW47Ci0gICAgY29u c3QgY2hhciogcGFzc3dvcmQ7Ci0jaWYgVVNFKEdOT01FS0VZUklORykKLSAgICBTb3VwVVJJKiB1 cmk7Ci0gICAgZ2Jvb2xlYW4gc3RvcmVQYXNzd29yZDsKKyAgICAvKiBDaGVjayBvbmx5IGZvciBT dWNjZXNzIHN0YXR1cyBjb2RlcyAoMnh4KSAqLworICAgIGlmICgobXNnLT5zdGF0dXNfY29kZSA+ PSAyMDApICYmIChtc2ctPnN0YXR1c19jb2RlIDwgMzAwKSkgeworICAgICAgICBTb3VwVVJJKiB1 cmkgPSBzb3VwX21lc3NhZ2VfZ2V0X3VyaShhdXRoRGF0YS0+bXNnKTsKKyAgICAgICAgZ25vbWVf a2V5cmluZ19zZXRfbmV0d29ya19wYXNzd29yZChOVUxMLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGF1dGhEYXRhLT51c2VybmFtZSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzb3VwX2F1dGhfZ2V0X3JlYWxtKGF1dGhEYXRh LT5hdXRoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1cmkt Pmhvc3QsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1cmktPnNjaGVtZSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzb3VwX2F1dGhfZ2V0 X3NjaGVtZV9uYW1lKGF1dGhEYXRhLT5hdXRoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1cmktPnBvcnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYXV0aERhdGEtPnBhc3N3b3JkLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChHbm9tZUtleXJpbmdPcGVyYXRpb25HZXRJbnRDYWxsYmFj aylzZXRfcGFzc3dvcmRfY2FsbGJhY2ssCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgTlVMTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBOVUxMKTsKKyAgICB9CisgICAgZnJlZV9hdXRoRGF0YShhdXRoRGF0YSk7Cit9CiAjZW5k aWYKIAorc3RhdGljIHZvaWQgcmVzcG9uc2VfY2FsbGJhY2soR3RrRGlhbG9nKiBkaWFsb2csIGdp bnQgcmVzcG9uc2VfaWQsIFdlYktpdEF1dGhEYXRhKiBhdXRoRGF0YSkKK3sKICAgICBzd2l0Y2go cmVzcG9uc2VfaWQpIHsKICAgICBjYXNlIEdUS19SRVNQT05TRV9PSzoKLSAgICAgICAgbG9naW4g PSBndGtfZW50cnlfZ2V0X3RleHQoR1RLX0VOVFJZKGF1dGhEYXRhLT5sb2dpbkVudHJ5KSk7Ci0g ICAgICAgIHBhc3N3b3JkID0gZ3RrX2VudHJ5X2dldF90ZXh0KEdUS19FTlRSWShhdXRoRGF0YS0+ cGFzc3dvcmRFbnRyeSkpOwotICAgICAgICBzb3VwX2F1dGhfYXV0aGVudGljYXRlKGF1dGhEYXRh LT5hdXRoLCBsb2dpbiwgcGFzc3dvcmQpOworICAgICAgICBhdXRoRGF0YS0+dXNlcm5hbWUgPSBn X3N0cmR1cChndGtfZW50cnlfZ2V0X3RleHQoR1RLX0VOVFJZKGF1dGhEYXRhLT5sb2dpbkVudHJ5 KSkpOworICAgICAgICBhdXRoRGF0YS0+cGFzc3dvcmQgPSBnX3N0cmR1cChndGtfZW50cnlfZ2V0 X3RleHQoR1RLX0VOVFJZKGF1dGhEYXRhLT5wYXNzd29yZEVudHJ5KSkpOworICAgICAgICBzb3Vw X2F1dGhfYXV0aGVudGljYXRlKGF1dGhEYXRhLT5hdXRoLCBhdXRoRGF0YS0+dXNlcm5hbWUsIGF1 dGhEYXRhLT5wYXNzd29yZCk7CiAKICNpZiBVU0UoR05PTUVLRVlSSU5HKQotICAgICAgICBzdG9y ZVBhc3N3b3JkID0gZ3RrX3RvZ2dsZV9idXR0b25fZ2V0X2FjdGl2ZShHVEtfVE9HR0xFX0JVVFRP TihhdXRoRGF0YS0+Y2hlY2tCdXR0b24pKTsKLSAgICAgICAgaWYgKHN0b3JlUGFzc3dvcmQpIHsK LSAgICAgICAgICAgIHVyaSA9IHNvdXBfbWVzc2FnZV9nZXRfdXJpKGF1dGhEYXRhLT5tc2cpOwot ICAgICAgICAgICAgZ25vbWVfa2V5cmluZ19zZXRfbmV0d29ya19wYXNzd29yZChOVUxMLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsb2dpbiwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc291cF9hdXRoX2dldF9y ZWFsbShhdXRoRGF0YS0+YXV0aCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVyaS0+aG9zdCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgTlVMTCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdXJpLT5zY2hlbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHNvdXBfYXV0aF9nZXRfc2NoZW1lX25hbWUoYXV0aERhdGEtPmF1dGgp LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1cmktPnBv cnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhc3N3 b3JkLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoR25v bWVLZXlyaW5nT3BlcmF0aW9uR2V0SW50Q2FsbGJhY2spc2V0X3Bhc3N3b3JkX2NhbGxiYWNrLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMKTsKLSAgICAg ICAgfQorICAgICAgICBpZiAoZ3RrX3RvZ2dsZV9idXR0b25fZ2V0X2FjdGl2ZShHVEtfVE9HR0xF X0JVVFRPTihhdXRoRGF0YS0+Y2hlY2tCdXR0b24pKSkKKyAgICAgICAgICAgIGdfc2lnbmFsX2Nv bm5lY3QoYXV0aERhdGEtPm1zZywgImdvdC1oZWFkZXJzIiwgR19DQUxMQkFDSyhzYXZlX3Bhc3N3 b3JkX2NhbGxiYWNrKSwgYXV0aERhdGEpOwogI2VuZGlmCiAgICAgZGVmYXVsdDoKICAgICAgICAg YnJlYWs7CiAgICAgfQogCiAgICAgc291cF9zZXNzaW9uX3VucGF1c2VfbWVzc2FnZShhdXRoRGF0 YS0+c2Vzc2lvbiwgYXV0aERhdGEtPm1zZyk7CisjaWYgIVVTRShHTk9NRUtFWVJJTkcpCiAgICAg ZnJlZV9hdXRoRGF0YShhdXRoRGF0YSk7CisjZW5kaWYKICAgICBndGtfd2lkZ2V0X2Rlc3Ryb3ko R1RLX1dJREdFVChkaWFsb2cpKTsKIH0KIAotLSAKMS42LjMuMwoK