107945 2005-06-22 23:17:09 +0000 wrong/strange autocomplete in composer addressfield 2007-09-14 12:17:01 +0000 1 1 10 Unmaintained kmail general unspecified unspecified Linux RESOLVED FIXED NOR normal --- 0 schaarsc pim-bugs-null psychonaut 0 oldest_to_newest 352641 0 schaarsc 2005-06-22 23:17:09 +0000 Version: Unbekannt (using KDE 3.4.0, Debian Package 4:3.4.0-0pre4 (3.1)) Compiler: gcc version 3.3.5 (Debian 1:3.3.5-12) OS: Linux (i686) release 2.4.22 Example: addressbook entry Firstname: FIRST Lastname: LAST e-mail: FIRST.LAST@foo.com when I start typing e.g. FIR autocomplete will list in the drop down box: FIRST.LAST@foo.com (LAST, FIRST) using this list-entry results in an error because kmail sends out mails to three recipients FIRST.LAST@foo.com , LAST@mydomain.com , FIRST@mydomain.com It is good that the lookup works on e-mail address as well as name, but IMHO autocomplete should in both cases stick to the "normal" format "FIRST, LAST" <FIRST.LAST@foo.com> 444067 1 16455 schaarsc 2006-06-03 22:34:58 +0000 Created attachment 16455 introduce KMailCompletion this patch requires deactivating autocompletion, because lookup is done on givenName, familyName, nickName, email but fullEmail is returned from s_completion.allMatches, which is (most likely) not what has been typed. Basic idea: store some keywords for each addressee (fullEmail); let KCompletion find the keyword and then lookup corresponding addressee. Advantage: - no more "first.name@org (First Name)"; Bug 107945 - lookup any part; Bug 77342 - email-addr will only be listed once; Bug 109798 484982 2 schaarsc 2006-11-07 19:50:03 +0000 SVN commit 603074 by schaarsc: address completion redesign - lookup: nickname, first/lastname, email, domain - disable unsupported completion modes - select first item in popup, pick with return CCBUG: 98691, 76739, 77342, 109798, 107945, 82699 M +1 -1 branches/work/kdepim-3.5.5+/libkdepim/Makefile.am M +174 -70 branches/work/kdepim-3.5.5+/libkdepim/addresseelineedit.cpp M +21 -3 branches/work/kdepim-3.5.5+/libkdepim/addresseelineedit.h A branches/work/kdepim-3.5.5+/libkdepim/kmailcompletion.cpp [License: LGPL (v2+)] A branches/work/kdepim-3.5.5+/libkdepim/kmailcompletion.h [License: LGPL (v2+)] 489672 3 schaarsc 2006-11-25 22:56:00 +0000 SVN commit 607833 by schaarsc: port of revsion 603074, 605966 address completion redesign - lookup: nickname, first/lastname, email, domain - disable unsupported completion modes - select first item in popup, pick with return BUG: 98691, 76739, 77342, 109798, 107945, 82699 M +6 -1 kdelibs/kabc/scripts/addressee.src.cpp M +1 -1 kdepim/libkdepim/Makefile.am M +174 -70 kdepim/libkdepim/addresseelineedit.cpp M +21 -3 kdepim/libkdepim/addresseelineedit.h A kdepim/libkdepim/kmailcompletion.cpp branches/work/kdepim-3.5.5+/libkdepim/kmailcompletion.cpp#603074 [License: LGPL (v2+)] A kdepim/libkdepim/kmailcompletion.h branches/work/kdepim-3.5.5+/libkdepim/kmailcompletion.h#603074 [License: LGPL (v2+)] 494940 4 schaarsc 2006-12-19 18:44:32 +0000 *** Bug 104436 has been marked as a duplicate of this bug. *** 16455 2006-06-03 22:34:58 +0000 2006-06-03 22:34:58 +0000 introduce KMailCompletion addresseelineedit.patch text/plain 10146 schaarsc SW5kZXg6IGxpYmtkZXBpbS9hZGRyZXNzZWVsaW5lZWRpdC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxpYmtk ZXBpbS9hZGRyZXNzZWVsaW5lZWRpdC5oCShyZXZpc2lvbiA1NDYzMzkpCisrKyBsaWJrZGVwaW0v YWRkcmVzc2VlbGluZWVkaXQuaAkod29ya2luZyBjb3B5KQpAQCAtNTAsNiArNTAsMTkgQEAKIAog bmFtZXNwYWNlIEtQSU0gewogCitjbGFzcyBLTWFpbENvbXBsZXRpb24gOiBwdWJsaWMgS0NvbXBs ZXRpb24KK3sKKyAgUV9PQkpFQ1QKKworICBwdWJsaWM6CisgICAgdmlydHVhbCB2b2lkIGNsZWFy KCk7CisgICAgdm9pZCBhZGRJdGVtV2l0aEtleXMoIGNvbnN0IFFTdHJpbmcmIGl0ZW0sIGludCB3 ZWlnaHQsIGNvbnN0IFFTdHJpbmdMaXN0ICoga2V5V29yZHMpOworICAgIHZpcnR1YWwgdm9pZCBw b3N0UHJvY2Vzc01hdGNoZXMoIFFTdHJpbmdMaXN0ICogcE1hdGNoZXMgKWNvbnN0OworICAKKyAg cHJpdmF0ZToKKyAgICBRTWFwPCBRU3RyaW5nLCBRU3RyaW5nTGlzdCA+IG1fa2V5TWFwOworfTsK KwogY2xhc3MgS0RFX0VYUE9SVCBBZGRyZXNzZWVMaW5lRWRpdCA6IHB1YmxpYyBDbGlja0xpbmVF ZGl0LCBwdWJsaWMgRENPUE9iamVjdAogewogICBLX0RDT1AKQEAgLTEyMCw3ICsxMzMsNyBAQAog ICAgIHZvaWQgc3RvcExEQVBMb29rdXAoKTsKIAogICAgIHZvaWQgc2V0Q29tcGxldGVkSXRlbXMo IGNvbnN0IFFTdHJpbmdMaXN0JiBpdGVtcywgYm9vbCBhdXRvU3VnZ2VzdCApOwotICAgIHZvaWQg YWRkQ29tcGxldGlvbkl0ZW0oIGNvbnN0IFFTdHJpbmcmIHN0cmluZywgaW50IHdlaWdodCwgaW50 IHNvdXJjZSApOworICAgIHZvaWQgYWRkQ29tcGxldGlvbkl0ZW0oIGNvbnN0IFFTdHJpbmcmIHN0 cmluZywgaW50IHdlaWdodCwgaW50IHNvdXJjZSwgY29uc3QgUVN0cmluZ0xpc3QgKiBrZXlXb3Jk cyApOwogICAgIFFTdHJpbmcgY29tcGxldGlvblNlYXJjaFRleHQoIFFTdHJpbmcmICk7CiAgICAg Y29uc3QgUVN0cmluZ0xpc3QgZ2V0QWRqdXN0ZWRDb21wbGV0aW9uSXRlbXMoIGJvb2wgZnVsbFNl YXJjaCApOwogCkBAIC0xMzQsNyArMTQ3LDcgQEAKICAgICAvL1FNYXA8UVN0cmluZywgS0FCQzo6 QWRkcmVzc2VlPiBtX2NvbnRhY3RNYXA7CiAKICAgICBzdGF0aWMgYm9vbCBzX2FkZHJlc3Nlc0Rp cnR5OwotICAgIHN0YXRpYyBLQ29tcGxldGlvbiAqc19jb21wbGV0aW9uOworICAgIHN0YXRpYyBL TWFpbENvbXBsZXRpb24gKnNfY29tcGxldGlvbjsKICAgICBzdGF0aWMgQ29tcGxldGlvbkl0ZW1z TWFwKiBzX2NvbXBsZXRpb25JdGVtTWFwOwogICAgIHN0YXRpYyBRVGltZXIgKnNfTERBUFRpbWVy OwogICAgIHN0YXRpYyBLUElNOjpMZGFwU2VhcmNoICpzX0xEQVBTZWFyY2g7CkluZGV4OiBsaWJr ZGVwaW0vYWRkcmVzc2VlbGluZWVkaXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxpYmtkZXBpbS9hZGRy ZXNzZWVsaW5lZWRpdC5jcHAJKHJldmlzaW9uIDU0NjMzOSkKKysrIGxpYmtkZXBpbS9hZGRyZXNz ZWVsaW5lZWRpdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYxLDcgKzYxLDcgQEAKIAogdXNpbmcg bmFtZXNwYWNlIEtQSU07CiAKLUtDb21wbGV0aW9uICogQWRkcmVzc2VlTGluZUVkaXQ6OnNfY29t cGxldGlvbiA9IDBMOworS01haWxDb21wbGV0aW9uICogQWRkcmVzc2VlTGluZUVkaXQ6OnNfY29t cGxldGlvbiA9IDBMOwogS1BJTTo6Q29tcGxldGlvbkl0ZW1zTWFwKiBBZGRyZXNzZWVMaW5lRWRp dDo6c19jb21wbGV0aW9uSXRlbU1hcCA9IDBMOwogUVN0cmluZ0xpc3QqIEFkZHJlc3NlZUxpbmVF ZGl0OjpzX2NvbXBsZXRpb25Tb3VyY2VzID0gMEw7CiBib29sIEFkZHJlc3NlZUxpbmVFZGl0Ojpz X2FkZHJlc3Nlc0RpcnR5ID0gZmFsc2U7CkBAIC03MSw2ICs3MSw3IEBACiBBZGRyZXNzZWVMaW5l RWRpdCogQWRkcmVzc2VlTGluZUVkaXQ6OnNfTERBUExpbmVFZGl0ID0gMEw7CiAKIHN0YXRpYyBL U3RhdGljRGVsZXRlcjxLQ29tcGxldGlvbj4gY29tcGxldGlvbkRlbGV0ZXI7CitzdGF0aWMgS1N0 YXRpY0RlbGV0ZXI8S01haWxDb21wbGV0aW9uPiBjb21wbGV0aW9uTWFpbERlbGV0ZXI7CiBzdGF0 aWMgS1N0YXRpY0RlbGV0ZXI8S1BJTTo6Q29tcGxldGlvbkl0ZW1zTWFwPiBjb21wbGV0aW9uSXRl bXNEZWxldGVyOwogc3RhdGljIEtTdGF0aWNEZWxldGVyPFFUaW1lcj4gbGRhcFRpbWVyRGVsZXRl cjsKIHN0YXRpYyBLU3RhdGljRGVsZXRlcjxLUElNOjpMZGFwU2VhcmNoPiBsZGFwU2VhcmNoRGVs ZXRlcjsKQEAgLTExMCw3ICsxMTEsNyBAQAogdm9pZCBBZGRyZXNzZWVMaW5lRWRpdDo6aW5pdCgp CiB7CiAgIGlmICggIXNfY29tcGxldGlvbiApIHsKLSAgICBjb21wbGV0aW9uRGVsZXRlci5zZXRP YmplY3QoIHNfY29tcGxldGlvbiwgbmV3IEtDb21wbGV0aW9uKCkgKTsKKyAgICBjb21wbGV0aW9u TWFpbERlbGV0ZXIuc2V0T2JqZWN0KCBzX2NvbXBsZXRpb24sIG5ldyBLTWFpbENvbXBsZXRpb24o KSApOwogICAgIHNfY29tcGxldGlvbi0+c2V0T3JkZXIoIGNvbXBsZXRpb25PcmRlcigpICk7CiAg ICAgc19jb21wbGV0aW9uLT5zZXRJZ25vcmVDYXNlKCB0cnVlICk7CiAKQEAgLTM3Niw1NCArMzc3 LDEyIEBACiAgIEtHbG9iYWxTZXR0aW5nczo6Q29tcGxldGlvbiAgbW9kZSA9IGNvbXBsZXRpb25N b2RlKCk7CiAKICAgc3dpdGNoICggbW9kZSApIHsKLSAgICBjYXNlIEtHbG9iYWxTZXR0aW5nczo6 Q29tcGxldGlvblBvcHVwQXV0bzoKLSAgICB7Ci0gICAgICBpZiAoIG1fc2VhcmNoU3RyaW5nLmlz RW1wdHkoKSApCi0gICAgICAgIGJyZWFrOwotICAgIH0KLQotICAgIGNhc2UgS0dsb2JhbFNldHRp bmdzOjpDb21wbGV0aW9uUG9wdXA6Ci0gICAgewotICAgICAgY29uc3QgUVN0cmluZ0xpc3QgaXRl bXMgPSBnZXRBZGp1c3RlZENvbXBsZXRpb25JdGVtcyggdHJ1ZSApOwotICAgICAgYm9vbCBhdXRv U3VnZ2VzdCA9ICFpdGVtcy5pc0VtcHR5KCkgJiYgKG1vZGUgIT0gS0dsb2JhbFNldHRpbmdzOjpD b21wbGV0aW9uUG9wdXBBdXRvKTsKLSAgICAgIHNldENvbXBsZXRlZEl0ZW1zKCBpdGVtcywgYXV0 b1N1Z2dlc3QgKTsKLQotICAgICAgaWYgKCAhYXV0b1N1Z2dlc3QgKSB7Ci0gICAgICAgIGludCBp bmRleCA9IGl0ZW1zLmZpcnN0KCkuZmluZCggbV9zZWFyY2hTdHJpbmcgKTsKLSAgICAgICAgUVN0 cmluZyBuZXdUZXh0ID0gbV9wcmV2aW91c0FkZHJlc3NlcyArIGl0ZW1zLmZpcnN0KCkubWlkKCBp bmRleCApLnN0cmlwV2hpdGVTcGFjZSgpOwotICAgICAgICBzZXRVc2VyU2VsZWN0aW9uKCBmYWxz ZSApOwotICAgICAgICBzZXRDb21wbGV0ZWRUZXh0KCBuZXdUZXh0LCB0cnVlICk7Ci0gICAgICB9 Ci0gICAgICBicmVhazsKLSAgICB9Ci0KLSAgICBjYXNlIEtHbG9iYWxTZXR0aW5nczo6Q29tcGxl dGlvblNoZWxsOgotICAgIHsKLSAgICAgIFFTdHJpbmcgbWF0Y2ggPSBzX2NvbXBsZXRpb24tPm1h a2VDb21wbGV0aW9uKCBtX3NlYXJjaFN0cmluZyApOwotICAgICAgaWYgKCAhbWF0Y2guaXNOdWxs KCkgJiYgbWF0Y2ggIT0gbV9zZWFyY2hTdHJpbmcgKSB7Ci0gICAgICAgIHNldFRleHQoIG1fcHJl dmlvdXNBZGRyZXNzZXMgKyBtYXRjaCApOwotICAgICAgICBzZXRFZGl0ZWQoIHRydWUgKTsKLSAg ICAgICAgY3Vyc29yQXRFbmQoKTsKLSAgICAgIH0KLSAgICAgIGJyZWFrOwotICAgIH0KLQotICAg IGNhc2UgS0dsb2JhbFNldHRpbmdzOjpDb21wbGV0aW9uTWFuOiAvLyBTaG9ydC1BdXRvIGluIGZh Y3QKLSAgICBjYXNlIEtHbG9iYWxTZXR0aW5nczo6Q29tcGxldGlvbkF1dG86Ci0gICAgewotICAg ICAgaWYgKCAhbV9zZWFyY2hTdHJpbmcuaXNFbXB0eSgpICkgewotICAgICAgICBRU3RyaW5nIG1h dGNoID0gc19jb21wbGV0aW9uLT5tYWtlQ29tcGxldGlvbiggbV9zZWFyY2hTdHJpbmcgKTsKLSAg ICAgICAgaWYgKCAhbWF0Y2guaXNOdWxsKCkgJiYgbWF0Y2ggIT0gbV9zZWFyY2hTdHJpbmcgKSB7 Ci0gICAgICAgICAgUVN0cmluZyBhZGRzID0gbV9wcmV2aW91c0FkZHJlc3NlcyArIG1hdGNoOwot ICAgICAgICAgIHNldENvbXBsZXRlZFRleHQoIGFkZHMgKTsKLSAgICAgICAgfQotICAgICAgICBi cmVhazsKLSAgICAgIH0KLSAgICB9Ci0KICAgICBjYXNlIEtHbG9iYWxTZXR0aW5nczo6Q29tcGxl dGlvbk5vbmU6Ci0gICAgZGVmYXVsdDogLy8gZmFsbCB0aHJvdWdoCiAgICAgICBicmVhazsKKyAg ICBkZWZhdWx0OiAvLyBkbyBDb21wbGV0aW9uUG9wdXAKKyAgICAgIGNvbnN0IFFTdHJpbmdMaXN0 IGl0ZW1zID0gZ2V0QWRqdXN0ZWRDb21wbGV0aW9uSXRlbXMoIHRydWUgKTsKKyAgICAgIHNldENv bXBsZXRlZEl0ZW1zKCBpdGVtcywgZmFsc2UgKTsKKyAgICAgIGJyZWFrOwogICB9CiB9CiAKQEAg LTQ4Niw3ICs0NDUsOCBAQAogICBRU3RyaW5nTGlzdDo6Y29uc3RfaXRlcmF0b3IgbGlzdEl0Owog ICBpbnQgaWR4ID0gYWRkQ29tcGxldGlvblNvdXJjZSggaTE4biggIkRpc3RyaWJ1dGlvbiBMaXN0 cyIgKSApOwogICBmb3IgKCBsaXN0SXQgPSBkaXN0TGlzdHMuYmVnaW4oKTsgbGlzdEl0ICE9IGRp c3RMaXN0cy5lbmQoKTsgKytsaXN0SXQgKSB7Ci0gICAgYWRkQ29tcGxldGlvbkl0ZW0oICgqbGlz dEl0KS5zaW1wbGlmeVdoaXRlU3BhY2UoKSwgd2VpZ2h0LCBpZHggKTsKKyAgICBRU3RyaW5nTGlz dCBzbCA9IFFTdHJpbmdMaXN0KCgqbGlzdEl0KS5zaW1wbGlmeVdoaXRlU3BhY2UoKSk7CisgICAg YWRkQ29tcGxldGlvbkl0ZW0oICgqbGlzdEl0KS5zaW1wbGlmeVdoaXRlU3BhY2UoKSwgd2VpZ2h0 LCBpZHgsICZzbCApOwogICB9CiAjZW5kaWYKIApAQCAtNTAzLDI1ICs0NjMsMzQgQEAKICNpZmRl ZiBLREVQSU1fTkVXX0RJU1RSTElTVFMKICAgaWYgKCBLUElNOjpEaXN0cmlidXRpb25MaXN0Ojpp c0Rpc3RyaWJ1dGlvbkxpc3QoIGFkZHIgKSApIHsKICAgICAvL2tkRGVidWcoNTMwMCkgPDwgIkFk ZHJlc3NlZUxpbmVFZGl0OjphZGRDb250YWN0KCkgZGlzdHJpYnV0aW9uIGxpc3QgXCIiIDw8IGFk ZHIuZm9ybWF0dGVkTmFtZSgpIDw8ICJcIiB3ZWlnaHQ9IiA8PCB3ZWlnaHQgPDwgZW5kbDsKLSAg ICBhZGRDb21wbGV0aW9uSXRlbSggYWRkci5mb3JtYXR0ZWROYW1lKCksIHdlaWdodCwgc291cmNl ICk7CisgICAgUVN0cmluZ0xpc3Qgc2wgPSBRU3RyaW5nTGlzdChhZGRyKSA7CisgICAgYWRkQ29t cGxldGlvbkl0ZW0oIGFkZHIuZm9ybWF0dGVkTmFtZSgpLCB3ZWlnaHQsIHNvdXJjZSwgJnNsICk7 CiAgICAgcmV0dXJuOwogICB9CiAjZW5kaWYKICAgLy9tX2NvbnRhY3RNYXAuaW5zZXJ0KCBhZGRy LnJlYWxOYW1lKCksIGFkZHIgKTsKICAgY29uc3QgUVN0cmluZ0xpc3QgZW1haWxzID0gYWRkci5l bWFpbHMoKTsKICAgUVN0cmluZ0xpc3Q6OkNvbnN0SXRlcmF0b3IgaXQ7CisgIFFTdHJpbmdMaXN0 IGtleVdvcmRzOwogICBmb3IgKCBpdCA9IGVtYWlscy5iZWdpbigpOyBpdCAhPSBlbWFpbHMuZW5k KCk7ICsraXQgKSB7Ci0KLSAgICBpZiAoIGFkZHIuZ2l2ZW5OYW1lKCkuaXNFbXB0eSgpICYmIGFk ZHIuZmFtaWx5TmFtZSgpLmlzRW1wdHkoKSApIHsKLSAgICAgIGFkZENvbXBsZXRpb25JdGVtKCBh ZGRyLmZ1bGxFbWFpbCggKCppdCkgKSwgd2VpZ2h0LCBzb3VyY2UgKTsgLy8gdXNlIHdoYXRldmVy IGlzIHRoZXJlCi0gICAgfSBlbHNlIHsKLSAgICAgIGNvbnN0IFFTdHJpbmcgYnlGaXJzdE5hbWU9 IEtQSU06OnF1b3RlTmFtZUlmTmVjZXNzYXJ5KCBhZGRyLmdpdmVuTmFtZSgpICsgIiAiICsgYWRk ci5mYW1pbHlOYW1lKCkgKSArICIgPCIgKyAoKml0KSArICI+IjsKLSAgICAgIGNvbnN0IFFTdHJp bmcgYnlMYXN0TmFtZT0gIlwiIiArIGFkZHIuZmFtaWx5TmFtZSgpICsgIiwgIiArIGFkZHIuZ2l2 ZW5OYW1lKCkgKyAiXCIgIiAgKyAiPCIgKyAoKml0KSArICI+IjsKLSAgICAgIGNvbnN0IFFTdHJp bmcgYnlFbWFpbD0gKCppdCkgKyAiICgiICsgS1BJTTo6cXVvdGVOYW1lSWZOZWNlc3NhcnkoIGFk ZHIucmVhbE5hbWUoKSApICsgIikiOwotICAgICAgYWRkQ29tcGxldGlvbkl0ZW0oIGJ5Rmlyc3RO YW1lLCB3ZWlnaHQsIHNvdXJjZSApOwotICAgICAgYWRkQ29tcGxldGlvbkl0ZW0oIGJ5TGFzdE5h bWUsIHdlaWdodCwgc291cmNlICk7Ci0gICAgICBhZGRDb21wbGV0aW9uSXRlbSggYnlFbWFpbCwg d2VpZ2h0LCBzb3VyY2UgKTsKKyAgICBrZXlXb3Jkcy5jbGVhcigpOworICAgIFFTdHJpbmcgZ2l2 ZW5OYW1lID0gYWRkci5naXZlbk5hbWUoKTsKKyAgICBRU3RyaW5nIGZhbWlseU5hbWU9IGFkZHIu ZmFtaWx5TmFtZSgpOworICAgIFFTdHJpbmcgbmlja05hbWUgID0gYWRkci5uaWNrTmFtZSgpOwor ICAgIFFTdHJpbmcgcmVhbE5hbWUgID0gYWRkci5yZWFsTmFtZSgpOworICAgIFFTdHJpbmcgdGFy Z2V0ICAgID0gYWRkci5mdWxsRW1haWwoICgqaXQpICk7CisgICAgaWYoICFnaXZlbk5hbWUuaXNF bXB0eSgpICYmICFmYW1pbHlOYW1lLmlzRW1wdHkoKSApIHsKKyAgICAgIGtleVdvcmRzLmFwcGVu ZChnaXZlbk5hbWUpOworICAgICAga2V5V29yZHMuYXBwZW5kKGZhbWlseU5hbWUpOworICAgICAg a2V5V29yZHMuYXBwZW5kKGdpdmVuTmFtZSsiICIrZmFtaWx5TmFtZSk7CisgICAgICBrZXlXb3Jk cy5hcHBlbmQoZmFtaWx5TmFtZSsiICIrZ2l2ZW5OYW1lKTsKICAgICB9CisgICAgaWYoICFuaWNr TmFtZS5pc0VtcHR5KCkgKQorICAgICAga2V5V29yZHMuYXBwZW5kKG5pY2tOYW1lKTsKKyAgICBp ZiggIXJlYWxOYW1lLmlzRW1wdHkoKSApCisgICAgICBrZXlXb3Jkcy5hcHBlbmQocmVhbE5hbWUp OworICAgIGtleVdvcmRzLmFwcGVuZCggKCppdCkgKTsKKyAgICBhZGRDb21wbGV0aW9uSXRlbSgg dGFyZ2V0LCB3ZWlnaHQsIHNvdXJjZSwgJmtleVdvcmRzICk7CiAKICNpZiAwCiAgICAgaW50IGxl biA9ICgqaXQpLmxlbmd0aCgpOwpAQCAtNTc0LDcgKzU0Myw3IEBACiAgIH0KIH0KIAotdm9pZCBB ZGRyZXNzZWVMaW5lRWRpdDo6YWRkQ29tcGxldGlvbkl0ZW0oIGNvbnN0IFFTdHJpbmcmIHN0cmlu ZywgaW50IHdlaWdodCwgaW50IGNvbXBsZXRpb25JdGVtU291cmNlICkKK3ZvaWQgQWRkcmVzc2Vl TGluZUVkaXQ6OmFkZENvbXBsZXRpb25JdGVtKCBjb25zdCBRU3RyaW5nJiBzdHJpbmcsIGludCB3 ZWlnaHQsIGludCBjb21wbGV0aW9uSXRlbVNvdXJjZSwgY29uc3QgUVN0cmluZ0xpc3QgKiBrZXlX b3JkcyApCiB7CiAgIC8vIENoZWNrIGlmIHRoZXJlIGlzIGFuIGV4YWN0IG1hdGNoIGZvciBpdGVt IGFscmVhZHksIGFuZCB1c2UgdGhlIG1heCB3ZWlnaHQgaWYgc28uCiAgIC8vIFNpbmNlIHRoZXJl J3Mgbm8gd2F5IHRvIGdldCB0aGUgaW5mb3JtYXRpb24gZnJvbSBLQ29tcGxldGlvbiwgd2UgaGF2 ZSB0byBrZWVwIG91ciBvd24gUU1hcApAQCAtNTg1LDcgKzU1NCw3IEBACiAgIH0gZWxzZSB7CiAg ICAgc19jb21wbGV0aW9uSXRlbU1hcC0+aW5zZXJ0KCBzdHJpbmcsIHFNYWtlUGFpciggd2VpZ2h0 LCBjb21wbGV0aW9uSXRlbVNvdXJjZSApICk7CiAgIH0KLSAgc19jb21wbGV0aW9uLT5hZGRJdGVt KCBzdHJpbmcsIHdlaWdodCApOworICBzX2NvbXBsZXRpb24tPmFkZEl0ZW1XaXRoS2V5cyggc3Ry aW5nLCB3ZWlnaHQsIGtleVdvcmRzICk7CiB9CiAKIHZvaWQgQWRkcmVzc2VlTGluZUVkaXQ6OnNs b3RTdGFydExEQVBMb29rdXAoKQpAQCAtODY1LDEzICs4MzQsNyBAQAogICBRU3RyaW5nTGlzdCBp dGVtcyA9IGZ1bGxTZWFyY2ggPwogICAgIHNfY29tcGxldGlvbi0+YWxsTWF0Y2hlcyggbV9zZWFy Y2hTdHJpbmcgKQogICAgIDogc19jb21wbGV0aW9uLT5zdWJzdHJpbmdDb21wbGV0aW9uKCBtX3Nl YXJjaFN0cmluZyApOwotICBpZiAoIGZ1bGxTZWFyY2ggKQotICAgIGl0ZW1zICs9IHNfY29tcGxl dGlvbi0+YWxsTWF0Y2hlcyggIlwiIiArIG1fc2VhcmNoU3RyaW5nICk7Ci0gIHVuc2lnbmVkIGlu dCBiZWZvcmVEb2xsYXJDb21wbGV0aW9uQ291bnQgPSBpdGVtcy5jb3VudCgpOwogCi0gIGlmICgg ZnVsbFNlYXJjaCAmJiBtX3NlYXJjaFN0cmluZy5maW5kKCAnICcgKSA9PSAtMSApIC8vIG9uZSB3 b3JkLCBwb3NzaWJseSBnaXZlbiBuYW1lCi0gICAgaXRlbXMgKz0gc19jb21wbGV0aW9uLT5hbGxN YXRjaGVzKCAiJCQiICsgbV9zZWFyY2hTdHJpbmcgKTsKLQogICAvLyBrZERlYnVnKDUzMDApIDw8 ICIgICAgIEFkZHJlc3NlZUxpbmVFZGl0Ojpkb0NvbXBsZXRpb24oKSBmb3VuZDogIiA8PCBpdGVt cy5qb2luKCIgQU5EICIpIDw8IGVuZGw7CiAKICAgaW50IGxhc3RTb3VyY2VJbmRleCA9IC0xOwpA QCAtODk0LDEzICs4NTcsNiBAQAogICAgIH0KICAgICBzZWN0aW9uc1tpZHhdLmFwcGVuZCggKml0 ICk7CiAKLSAgICAgIGlmICggaSA+IGJlZm9yZURvbGxhckNvbXBsZXRpb25Db3VudCApIHsgCi0g ICAgICAvLyByZW1vdmUgdGhlICckJHdoYXRldmVyJCcgcGFydAotICAgICAgaW50IHBvcyA9ICgq aXQpLmZpbmQoICckJywgMiApOwotICAgICAgaWYgKCBwb3MgPCAwICkgLy8gPz8/Ci0gICAgICAg IGNvbnRpbnVlOwotICAgICAgKCppdCkgPSAoKml0KS5taWQoIHBvcyArIDEgKTsKLSAgICB9CiAg ICAgaWYgKCBzX2NvbXBsZXRpb24tPm9yZGVyKCkgPT0gS0NvbXBsZXRpb246OlNvcnRlZCApIHsK ICAgICAgIHNvcnRlZEl0ZW1zLmFwcGVuZCggKml0ICk7CiAgICAgfQpAQCAtOTE3LDQgKzg3Mywz MyBAQAogICB9CiAgIHJldHVybiBzb3J0ZWRJdGVtczsKIH0KKwordm9pZCBLTWFpbENvbXBsZXRp b246OmNsZWFyKCl7CisgIG1fa2V5TWFwLmNsZWFyKCk7CisgIEtDb21wbGV0aW9uOjpjbGVhcigp OworfQorCit2b2lkIEtNYWlsQ29tcGxldGlvbjo6YWRkSXRlbVdpdGhLZXlzKCBjb25zdCBRU3Ry aW5nJiBpdGVtLCBpbnQgd2VpZ2h0LCBjb25zdCBRU3RyaW5nTGlzdCogIGtleVdvcmRzKXsKKyAg Zm9yKCBRU3RyaW5nTGlzdDo6Q29uc3RJdGVyYXRvciBzaXQgKGtleVdvcmRzLT5iZWdpbigpKSwg c0VuZChrZXlXb3Jkcy0+ZW5kKCkpOyBzaXQgIT0gc0VuZDsgKytzaXQpeworICAgIFFTdHJpbmdM aXN0ICZlbWFpbExpc3QgPSBtX2tleU1hcFsoKnNpdCldOyAvL2xvb2t1cCBlbWFpbC1saXN0IGZv ciBnaXZlbiBrZXl3b3JkCisgICAgUVN0cmluZ0xpc3QgdCAgPSBlbWFpbExpc3QuZ3JlcChpdGVt KTsgICAgIC8vc2VhcmNoIGZvciBjdXJyZW50IGVtYWlsIGluIGxpc3QKKyAgICBpZiggdC5lbXB0 eSgpICkgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy9hZGQgZW1haWwgaWYgbm90IHRoZXJl CisgICAgICBlbWFpbExpc3QuYXBwZW5kKGl0ZW0pOworICAgIGFkZEl0ZW0oKCpzaXQpLHdlaWdo dCk7ICAgICAgICAgICAgICAgICAgICAvL2luZm9ybSBLQ29tcGxldGlvbiBhYm91dCBrZXl3b3Jk CisgIH0KK30KKwordm9pZCBLTWFpbENvbXBsZXRpb246OnBvc3RQcm9jZXNzTWF0Y2hlcyggUVN0 cmluZ0xpc3QgKiBwTWF0Y2hlcyApY29uc3R7CisgIC8vS0NvbXBsZXRpb24gaGFzIGZvdW5kIHRo ZSBrZXl3b3JkcyBmb3IgdXMsIHdlIGNhbiBub3cgbWFwIHRoZW0gdG8gbWFpbC1hZGRyCisgIFFT dHJpbmdMaXN0IG1haWxBZGRyOworICBRTWFwPFFTdHJpbmcsUVN0cmluZz4gbWFpbEFkZHJEaXN0 aW5jdDsKKyAgZm9yKCBRU3RyaW5nTGlzdDo6Q29uc3RJdGVyYXRvciBzaXQgKHBNYXRjaGVzLT5i ZWdpbigpKSwgc0VuZChwTWF0Y2hlcy0+ZW5kKCkpOyBzaXQgIT0gc0VuZDsgKytzaXQpeworICAg IG1haWxBZGRyID0gbV9rZXlNYXBbKCpzaXQpXTsgLy9nZXQgYWxsIG1haWxBZGRyIGZvciB0aGlz IGtleXdvcmQKKyAgICBmb3IoIFFTdHJpbmdMaXN0OjpJdGVyYXRvciBzaXQgKG1haWxBZGRyLmJl Z2luKCkpLCBzRW5kKG1haWxBZGRyLmVuZCgpKTsgc2l0ICE9IHNFbmQ7ICsrc2l0KXsKKyAgICAg IG1haWxBZGRyRGlzdGluY3RbKCpzaXQpXTsgIC8vc3RvcmUgbWFpbEFkZHIsIFFNYXAgd2lsbCBt YWtlIHRoZW0gdW5pcXVlCisgICAgfQorICB9CisgIHBNYXRjaGVzLT5jbGVhcigpOyAvL2RlbGV0 ZSBrZXl3b3JkcworICBwTWF0Y2hlcy0+b3BlcmF0b3IrPShtYWlsQWRkckRpc3RpbmN0LmtleXMo KSk7IC8vYWRkIGVtYWlsQWRkcgorfQogI2luY2x1ZGUgImFkZHJlc3NlZWxpbmVlZGl0Lm1vYyIK