159220 2008-03-13 01:02:53 +0000 Non printable characters in IPTC keyword set by digiKam (UTF-8 support with IPTC metadata) [patch] 2017-08-13 07:31:33 +0000 1 1 2 Applications digikam Metadata-Iptc 0.9.2 Ubuntu Linux RESOLVED FIXED NOR normal --- 0 jm digikam-bugs-null caulier.gilles colin ebayard63-projet kde_bugs msylwester http://commits.kde.org/libkexiv2/e4cfee882303b50f17e6301a9fa7e00ab821336b 4.0.0 0 oldest_to_newest 586529 0 jm 2008-03-13 01:02:53 +0000 Version: 0.9.2-final (using KDE 3.5.8) Installed from: Ubuntu Packages OS: Linux Example at http://gallery.ruwenzori.net/main.php/v/travel/SenegalPaulineVelo2008/20080228_113839_1454_SenegalPaulineVelo.jpg.html : Look at the "IPTC: Keywords" field in the "Photo Properties" details. You'll notice that all tags are like "Transport/bicycle�;" with the "white interrogation mark on black hexagon" character just before the semicolon. All those tags were generated using Digikam. Counter example at http://gallery.ruwenzori.net/main.php/v/misc/debugging/20080301_113020_1640_SenegalPaulineVelo-bis.jpg.html : Look at the same field. The ones with the same problem were also generated using Digikam. The clean ones were added using exiv2 from the command line. Several hypothesis are credible : - Digikam produces perfectly good tags but Gallery 2 somehow misinterprets them. This seems invalidated by the clean tags produced by exiv2 which a reasonably trusted implementation. - Digikam produces tags with an illegal non-printable character. Note that this is not a browser character set problem : whether I force UTF-8 or ISO-8859-1 as the character encoding for rendering the page, the special character is always there. 586558 1 caulier.gilles 2008-03-13 06:25:39 +0000 digiKam always use ascii characters set to generate IPTC text field Gilles Caulier 586592 2 jm 2008-03-13 11:23:37 +0000 So you think that this is rather a rendering problem on the Gallery 2 side ? 586593 3 caulier.gilles 2008-03-13 11:26:14 +0000 Yes... Gilles 586594 4 caulier.gilles 2008-03-13 11:34:32 +0000 Or if you have used GalleryExport kipi-plugin, a problem relevant of this tool... Colin, What do you think about ? Gilles 586595 5 jm 2008-03-13 11:39:16 +0000 No use of the GalleryExport kipi-plugin : I copied the files to the server through scp and I imported them into Gallery 2 from there. 586596 6 jm 2008-03-13 11:39:33 +0000 I opened a ticket in the Gallery 2 project. I'll let you know how it goes. http://sourceforge.net/tracker/index.php?func=detail&aid=1913414&group_id=7130&atid=107130 675347 7 caulier.gilles 2008-12-04 20:54:13 +0000 Jean Marc, What's news about this report ? Gilles Caulier 678204 8 adjam7 2008-12-09 00:29:16 +0000 Probably fixed with commit 882181. Can you please try again and let me know? 706954 9 kde_bugs 2009-01-28 23:03:20 +0000 Maybe its a similar problem as 149029 ? 772325 10 caulier.gilles 2009-06-09 12:17:05 +0000 Jean Marc, digiKam > 0.9.x support XMP. XMP replace IPTC and support UTF-8. IPTC has never supported UTF-8 and have several limitation over strings size. XMP do not have these limitation. Gallery server must support XMP by default and use it as well instead IPTC. Gilles Caulier 772473 11 mikmach 2009-06-09 17:10:22 +0000 True, IPTC is becoming obsolete but it is still used in $BIGNUMBER of programs and digiKam should be able to play with it nicely. 795353 12 caulier.gilles 2009-07-20 11:17:32 +0000 Jean Marc, In Gallery Export plugin comming with kipi-plugins 0.4.0, i have fixed code to preserve metadata of exported and resized images. Can you test with this version ? Gilles Caulier 1200591 13 caulier.gilles 2011-12-16 16:34:30 +0000 Jean Marc, Do you see my comment #12 ? Gilles Caulier 1423038 14 ebayard63-projet 2014-01-06 14:17:12 +0000 (In reply to comment #10) > Jean Marc, > > digiKam > 0.9.x support XMP. XMP replace IPTC and support UTF-8. IPTC has > never supported UTF-8 and have several limitation over strings size. XMP do > not have these limitation. > > Gallery server must support XMP by default and use it as well instead IPTC. > > Gilles Caulier Hi Gilles, Actually this is wrong. UFT is officially part of IPTC standard since 1997 (XMP were first used in 2001 by adobe in acrobat) You can find a lot of publication on this subject. But the best is to directly check the standard on the IPTC website. Note that tha latest IPTC standard are based on XMP implementation, but this not what we are dicussing here. example: http://www.gwww.wan-ifra.org%2Fsystem%2Ffiles%2Ffield_ifra_mag_file%2FF_tp980258.pdf&ei=BrXKUq_HEYGshQeBmoHwBg&usg=AFQjCNHAaCBNHuKLvObVXCLL-ZlWs4TrTQ&sig2=JdQvFsrXcaKJOOz-ieanoA&bvm=bv.58187178,d.ZG4 or quoted from: http://www.iptc.org/std/IIM/4.1/specification/IIMV4.1.pdf (year 1999) "Coded Character Set Optional, not repeatable, up to 32 octets, consisting of one or more control functions used for the announcement, invocation or designation of coded character sets. The control functions follow the ISO 2022 standard and may consist of the escape control character and one or more graphic characters. For more details see Appendix C, the IPTC-NAA Code Library. The control functions apply to character oriented DataSets in records 2-6. They also apply to record 8, unless the objectdata explicitly, or the File Format implicitly, defines character sets otherwise. If this DataSet contains the designation function for Unicode in UTF-8 then no other announcement, designation or invocation functions are permitted in this DataSet or in records 2-6. For all other character sets, one or more escape sequences are used...." or from the metadata working group that sets the standards and use them of course: www.metadataworkinggroup.com/pdf/mwg_guidance.pdf page 28 (Note that the whole section is very interesting for digikam as it speaks about metadata reconciliation guidance) "IPTC-IIM SHOULD be written using the Coded Character Set (1:90) as UTF-8 (see “Section 1.6 Coded Character Set” in the IIM specification). If the IPTC-IIM has not been written in UTF-8 before, a robust Changer SHOULD convert all properties to UTF-8 and write the corresponding identifier for UTF-8 to the 1:90 DataSet... In a word DIGIKAM is not standard compliant It makes it incompatible with all other image management software, such as those from adobe. It also corrupts our metadata which really is a shame because it is still a really good piece of software Regards Eric 1423040 15 caulier.gilles 2014-01-06 14:24:39 +0000 Well, don't forget that digiKAm do not write IPTC metadata in file. All is delegate to Exiv2. We pass UTF-8 string to exiv2 which choose the best way to store data in right fomat. If Exiv2 support this IPTC feature, why not. I pretty sure that Exiv2 don't do it. Please report this problem to Exiv2 bugzilla first. Gilles Caulier 1433085 16 msylwester 2014-02-28 05:07:13 +0000 I had similar problem to original one: after metadata sync from images to DB I was getting a lot of tags with all non-ascii characters converted to "?" in addition to correct ones. exiftool helped me to trace this to the IPTC tags, hence here I am. I tried to follow up on where exactly the characters are replaced by "?" and it seems to be KExiv2::setIptcKeywords , where it uses toLatin1() which works exactly this way. Some changes around to change it to Utf8 made it pass my test case. When I made digikam use the modified lib it wrote the tags correctly, but they were still displayed garbled in the tags panel. 1433087 17 85355 msylwester 2014-02-28 05:18:28 +0000 Created attachment 85355 Added/changed IPTC keywords conversion to/from utf8 1433088 18 85356 msylwester 2014-02-28 05:21:48 +0000 Created attachment 85356 My test case With modified library input/output is consistent with using exiftool from command line. 1433588 19 85394 msylwester 2014-03-03 06:17:02 +0000 Created attachment 85394 Use UTF-8 when reading/writing IPTC, set charset to UTF-8. I did a little more digging, and it seems that to store UTF-8 in IPTC it is necessary to set IPTC:CodedCharacterSet to "\33%G", otherwise it's still ASCII. I've updated my path to always read and save as UTF8. Conversion ASCII->UTF8 when reading should be safe. Every time a field is changed the charset is set to UTF8, so writing should be fine as well. I think it's an overkill but checking all the characters every time is perhaps even worse. Apparently, other charsets could also be supported, but I couldn't find any details... 1433598 20 caulier.gilles 2014-03-03 08:50:12 +0000 Git commit e4cfee882303b50f17e6301a9fa7e00ab821336b by Gilles Caulier. Committed on 03/03/2014 at 08:47. Pushed by cgilles into branch 'master'. Review and apply patch #85394 from Michal Sylwester about to support UTF-8 encoding/decoding with IPTC metadata. Tested with non UTF8 IPTC image. Char still decoded as ASCII if Iptc.Envelope.CharacterSet is not present. FIXED-IN: 4.0.0 M +72 -37 libkexiv2/kexiv2iptc.cpp http://commits.kde.org/libkexiv2/e4cfee882303b50f17e6301a9fa7e00ab821336b 85355 2014-02-28 05:18:28 +0000 2014-03-03 06:17:02 +0000 Added/changed IPTC keywords conversion to/from utf8 IPTC.path text/plain 1651 msylwester LS0tIC4uLy4uL2RpZ2lrYW0tNC4wLjAtYmV0YTMvZXh0cmEvbGlia2V4aXYyL2xpYmtleGl2Mi9r ZXhpdjJpcHRjLmNwcAkyMDE0LTAyLTA5IDE4OjA0OjQyLjAwMDAwMDAwMCArMDkwMAorKysgbGli a2V4aXYyL2tleGl2MmlwdGMuY3BwCTIwMTQtMDItMjggMTM6Mzc6MjAuODI4NjUwMDU1ICswOTAw CkBAIC00OTAsNyArNDkwLDcgQEAKIAogICAgICAgICAgICAgICAgIGlmIChrZXkgPT0gUVN0cmlu ZygiSXB0Yy5BcHBsaWNhdGlvbjIuS2V5d29yZHMiKSkKICAgICAgICAgICAgICAgICB7Ci0gICAg ICAgICAgICAgICAgICAgIFFTdHJpbmcgdmFsKGl0LT50b1N0cmluZygpLmNfc3RyKCkpOworICAg ICAgICAgICAgICAgICAgICBRU3RyaW5nIHZhbCA9IFFTdHJpbmc6OmZyb21VdGY4KGl0LT50b1N0 cmluZygpLmNfc3RyKCkpOwogICAgICAgICAgICAgICAgICAgICBrZXl3b3Jkcy5hcHBlbmQodmFs KTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CkBAIC01MTcsOCArNTE3LDggQEAK ICAgICAgICAgUVN0cmluZ0xpc3Qgb2xka2V5cyA9IG9sZEtleXdvcmRzOwogICAgICAgICBRU3Ry aW5nTGlzdCBuZXdrZXlzID0gbmV3S2V5d29yZHM7CiAKLSAgICAgICAga0RlYnVnKCkgPDwgZC0+ ZmlsZVBhdGgudG9Bc2NpaSgpLmNvbnN0RGF0YSgpCi0gICAgICAgICAgICAgICAgICAgICAgPDwg IiA9PT4gSXB0YyBLZXl3b3JkczogIiA8PCBuZXdrZXlzLmpvaW4oIiwiKS50b0FzY2lpKCkuY29u c3REYXRhKCk7CisgICAgICAgIGtEZWJ1ZygpIDw8IGQtPmZpbGVQYXRoCisgICAgICAgICAgICAg ICAgICAgICAgPDwgIiA9PT4gSXB0YyBLZXl3b3JkczogIiA8PCBuZXdrZXlzOwogCiAgICAgICAg IC8vIFJlbW92ZSBhbGwgb2xkIGtleXdvcmRzLgogICAgICAgICBFeGl2Mjo6SXB0Y0RhdGEgaXB0 Y0RhdGEoZC0+aXB0Y01ldGFkYXRhKCkpOwpAQCAtNTI3LDcgKzUyNyw3IEBACiAgICAgICAgIHdo aWxlKGl0ICE9IGlwdGNEYXRhLmVuZCgpKQogICAgICAgICB7CiAgICAgICAgICAgICBRU3RyaW5n IGtleSA9IFFTdHJpbmc6OmZyb21Mb2NhbDhCaXQoaXQtPmtleSgpLmNfc3RyKCkpOwotICAgICAg ICAgICAgUVN0cmluZyB2YWwoaXQtPnRvU3RyaW5nKCkuY19zdHIoKSk7CisgICAgICAgICAgICBR U3RyaW5nIHZhbCA9IFFTdHJpbmc6OmZyb21VdGY4KGl0LT50b1N0cmluZygpLmNfc3RyKCkpOwog CiAgICAgICAgICAgICAvLyBBbHNvIHJlbW92ZSBuZXcga2V5d29yZHMgdG8gYXZvaWQgZHVwbGlj YXRlcy4gVGhleSB3aWxsIGJlIGFkZGVkIGFnYWluIGJlbG93LgogICAgICAgICAgICAgaWYgKCBr ZXkgPT0gUVN0cmluZygiSXB0Yy5BcHBsaWNhdGlvbjIuS2V5d29yZHMiKSAmJgpAQCAtNTQ3LDcg KzU0Nyw3IEBACiAgICAgICAgICAgICBrZXkudHJ1bmNhdGUoNjQpOwogCiAgICAgICAgICAgICBF eGl2Mjo6VmFsdWU6OkF1dG9QdHIgdmFsID0gRXhpdjI6OlZhbHVlOjpjcmVhdGUoRXhpdjI6OnN0 cmluZyk7Ci0gICAgICAgICAgICB2YWwtPnJlYWQoa2V5LnRvTGF0aW4xKCkuY29uc3REYXRhKCkp OworICAgICAgICAgICAgdmFsLT5yZWFkKGtleS50b1V0ZjgoKS5jb25zdERhdGEoKSk7CiAgICAg ICAgICAgICBpcHRjRGF0YS5hZGQoaXB0Y1RhZywgdmFsLmdldCgpKTsKICAgICAgICAgfQogCg== 85356 2014-02-28 05:21:48 +0000 2014-02-28 05:21:48 +0000 My test case test.cpp text/x-c++src 437 msylwester I2luY2x1ZGUgPGlvc3RyZWFtPgojaW5jbHVkZSA8UURlYnVnPgojaW5jbHVkZSAibGlia2V4aXYy L2xpYmtleGl2Mi9rZXhpdjIuaCIKCnVzaW5nIG5hbWVzcGFjZSBLRXhpdjJJZmFjZTsKCmludCBt YWluKCkgewogICAgUVN0cmluZyBmaWxlbmFtZSgiaW1nXzIyOTkuanBnIik7CiAgICBLRXhpdjIg ZGF0YShmaWxlbmFtZSk7IAogICAgUVN0cmluZ0xpc3Qga2V5d29yZHMgPSBkYXRhLmdldElwdGNL ZXl3b3JkcygpOwogICAgcURlYnVnKCkgPDwgIlJlYWQ6ICIgPDwga2V5d29yZHM7CiAgICBRU3Ry aW5nTGlzdCBuZXdrZXl3b3JkczsKICAgIG5ld2tleXdvcmRzLmFwcGVuZChRU3RyaW5nOjpmcm9t VXRmOCgi55S75YOPIikpOwogICAgZGF0YS5zZXRJcHRjS2V5d29yZHMoa2V5d29yZHMsIG5ld2tl eXdvcmRzKTsKCiAgICBkYXRhLmFwcGx5Q2hhbmdlcygpOwp9Cgo= 85394 2014-03-03 06:17:02 +0000 2014-03-03 06:17:02 +0000 Use UTF-8 when reading/writing IPTC, set charset to UTF-8. IPTC.path text/plain 6084 msylwester LS0tIC4uLy4uL2RpZ2lrYW0tNC4wLjAtYmV0YTMvZXh0cmEvbGlia2V4aXYyL2xpYmtleGl2Mi9r ZXhpdjJpcHRjLmNwcAkyMDE0LTAyLTA5IDE4OjA0OjQyLjAwMDAwMDAwMCArMDkwMAorKysgbGli a2V4aXYyL2tleGl2MmlwdGMuY3BwCTIwMTQtMDMtMDMgMTU6MDU6MDEuMTgwOTQ1NzYwICswOTAw CkBAIC0xNDYsNyArMTQ2LDE2IEBACiAgICAgICAgICAgICAvLyBEZWNvZGUgdGhlIHRhZyB2YWx1 ZSB3aXRoIGEgdXNlciBmcmllbmRseSBvdXRwdXQuCiAgICAgICAgICAgICBzdGQ6Om9zdHJpbmdz dHJlYW0gb3M7CiAgICAgICAgICAgICBvcyA8PCAqbWQ7Ci0gICAgICAgICAgICBRU3RyaW5nIHZh bHVlID0gUVN0cmluZyhvcy5zdHIoKS5jX3N0cigpKTsKKyAgICAgICAgICAgCisgICAgICAgICAg ICBRU3RyaW5nIHZhbHVlOworICAgICAgICAgICAgaWYoa2V5ID09IFFTdHJpbmcoIklwdGMuRW52 ZWxvcGUuQ2hhcmFjdGVyU2V0IikpIHsKKyAgICAgICAgICAgICAgICB2YWx1ZSA9IGlwdGNEYXRh LmRldGVjdENoYXJzZXQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGVsc2UgCisgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgdmFsdWUgPSBRU3RyaW5nOjpmcm9tVXRmOChvcy5z dHIoKS5jX3N0cigpKTsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgLy8gVG8gbWFrZSBh IHN0cmluZyBqdXN0IG9uIG9uZSBsaW5lLgogICAgICAgICAgICAgdmFsdWUucmVwbGFjZSgnXG4n LCAnICcpOwogCkBAIC0zNjgsNyArMzc3LDEwIEBACiAKICAgICB0cnkKICAgICB7Ci0gICAgICAg IGQtPmlwdGNNZXRhZGF0YSgpW2lwdGNUYWdOYW1lXSA9IHN0ZDo6c3RyaW5nKHZhbHVlLnRvQXNj aWkoKS5jb25zdERhdGEoKSk7CisgICAgICAgIGQtPmlwdGNNZXRhZGF0YSgpW2lwdGNUYWdOYW1l XSA9IHN0ZDo6c3RyaW5nKHZhbHVlLnRvVXRmOCgpLmNvbnN0RGF0YSgpKTsKKworICAgICAgICAv LyBNYWtlIHN1cmUgd2UgaGF2ZSBzZXQgdGhlIGNoYXJzZXQgdG8gVVRGLTgKKyAgICAgICAgZC0+ aXB0Y01ldGFkYXRhKClbIklwdGMuRW52ZWxvcGUuQ2hhcmFjdGVyU2V0Il0gPSAiXDMzJUciOwog ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgY2F0Y2goIEV4aXYyOjpFcnJvciYgZSAp CkBAIC0zOTQsNyArNDA2LDcgQEAKIAogICAgICAgICAgICAgICAgIGlmIChrZXkgPT0gUVN0cmlu ZyhpcHRjVGFnTmFtZSkpCiAgICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICBR U3RyaW5nIHRhZ1ZhbHVlKGl0LT50b1N0cmluZygpLmNfc3RyKCkpOworICAgICAgICAgICAgICAg ICAgICBRU3RyaW5nIHRhZ1ZhbHVlID0gUVN0cmluZzo6ZnJvbVV0ZjgoaXQtPnRvU3RyaW5nKCku Y19zdHIoKSk7CiAKICAgICAgICAgICAgICAgICAgICAgaWYgKGVzY2FwZUNSKQogICAgICAgICAg ICAgICAgICAgICAgICAgdGFnVmFsdWUucmVwbGFjZSgnXG4nLCAnICcpOwpAQCAtNDM3LDcgKzQ0 OSw3IEBACiAgICAgICAgIHdoaWxlKGl0ICE9IGlwdGNEYXRhLmVuZCgpKQogICAgICAgICB7CiAg ICAgICAgICAgICBRU3RyaW5nIGtleSA9IFFTdHJpbmc6OmZyb21Mb2NhbDhCaXQoaXQtPmtleSgp LmNfc3RyKCkpOwotICAgICAgICAgICAgUVN0cmluZyB2YWwoaXQtPnRvU3RyaW5nKCkuY19zdHIo KSk7CisgICAgICAgICAgICBRU3RyaW5nIHZhbCA9IFFTdHJpbmc6OmZyb21VdGY4KGl0LT50b1N0 cmluZygpLmNfc3RyKCkpOwogCiAgICAgICAgICAgICAvLyBBbHNvIHJlbW92ZSBuZXcgdmFsdWVz IHRvIGF2b2lkIGR1cGxpY2F0ZXMuIFRoZXkgd2lsbCBiZSBhZGRlZCBhZ2FpbiBiZWxvdy4KICAg ICAgICAgICAgIGlmICgga2V5ID09IFFTdHJpbmcoaXB0Y1RhZ05hbWUpICYmCkBAIC00NTgsMTIg KzQ3MCwxNCBAQAogICAgICAgICAgICAga2V5LnRydW5jYXRlKG1heFNpemUpOwogCiAgICAgICAg ICAgICBFeGl2Mjo6VmFsdWU6OkF1dG9QdHIgdmFsID0gRXhpdjI6OlZhbHVlOjpjcmVhdGUoRXhp djI6OnN0cmluZyk7Ci0gICAgICAgICAgICB2YWwtPnJlYWQoa2V5LnRvTGF0aW4xKCkuY29uc3RE YXRhKCkpOworICAgICAgICAgICAgdmFsLT5yZWFkKGtleS50b1V0ZjgoKS5jb25zdERhdGEoKSk7 CiAgICAgICAgICAgICBpcHRjRGF0YS5hZGQoaXB0Y1RhZywgdmFsLmdldCgpKTsKICAgICAgICAg fQotCiAgICAgICAgIGQtPmlwdGNNZXRhZGF0YSgpID0gaXB0Y0RhdGE7CiAKKyAgICAgICAgLy8g TWFrZSBzdXJlIGNoYXJhY3RlciBzZXQgaXMgVVRGLTgKKyAgICAgICAgc2V0SXB0Y1RhZ1N0cmlu ZygiSXB0Yy5FbnZlbG9wZS5DaGFyYWN0ZXJTZXQiLCAiXDMzJUciLCBmYWxzZSk7CisKICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAgIGNhdGNoKCBFeGl2Mjo6RXJyb3ImIGUgKQpAQCAt NDkwLDExICs1MDQsMTMgQEAKIAogICAgICAgICAgICAgICAgIGlmIChrZXkgPT0gUVN0cmluZygi SXB0Yy5BcHBsaWNhdGlvbjIuS2V5d29yZHMiKSkKICAgICAgICAgICAgICAgICB7Ci0gICAgICAg ICAgICAgICAgICAgIFFTdHJpbmcgdmFsKGl0LT50b1N0cmluZygpLmNfc3RyKCkpOworICAgICAg ICAgICAgICAgICAgICBRU3RyaW5nIHZhbCA9IFFTdHJpbmc6OmZyb21VdGY4KGl0LT50b1N0cmlu ZygpLmNfc3RyKCkpOwogICAgICAgICAgICAgICAgICAgICBrZXl3b3Jkcy5hcHBlbmQodmFsKTsK ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgIGtEZWJ1Zygp IDw8IGQtPmZpbGVQYXRoCisgICAgICAgICAgICAgICAgPDwgIiA9PT4gUmVhZCBJcHRjIEtleXdv cmRzOiAiIDw8IGtleXdvcmRzOwogICAgICAgICAgICAgcmV0dXJuIGtleXdvcmRzOwogICAgICAg ICB9CiAgICAgfQpAQCAtNTE3LDggKzUzMyw4IEBACiAgICAgICAgIFFTdHJpbmdMaXN0IG9sZGtl eXMgPSBvbGRLZXl3b3JkczsKICAgICAgICAgUVN0cmluZ0xpc3QgbmV3a2V5cyA9IG5ld0tleXdv cmRzOwogCi0gICAgICAgIGtEZWJ1ZygpIDw8IGQtPmZpbGVQYXRoLnRvQXNjaWkoKS5jb25zdERh dGEoKQotICAgICAgICAgICAgICAgICAgICAgIDw8ICIgPT0+IElwdGMgS2V5d29yZHM6ICIgPDwg bmV3a2V5cy5qb2luKCIsIikudG9Bc2NpaSgpLmNvbnN0RGF0YSgpOworICAgICAgICBrRGVidWco KSA8PCBkLT5maWxlUGF0aAorICAgICAgICAgICAgICAgICAgICAgIDw8ICIgPT0+IE5ldyBJcHRj IEtleXdvcmRzOiAiIDw8IG5ld2tleXM7CiAKICAgICAgICAgLy8gUmVtb3ZlIGFsbCBvbGQga2V5 d29yZHMuCiAgICAgICAgIEV4aXYyOjpJcHRjRGF0YSBpcHRjRGF0YShkLT5pcHRjTWV0YWRhdGEo KSk7CkBAIC01MjcsNyArNTQzLDcgQEAKICAgICAgICAgd2hpbGUoaXQgIT0gaXB0Y0RhdGEuZW5k KCkpCiAgICAgICAgIHsKICAgICAgICAgICAgIFFTdHJpbmcga2V5ID0gUVN0cmluZzo6ZnJvbUxv Y2FsOEJpdChpdC0+a2V5KCkuY19zdHIoKSk7Ci0gICAgICAgICAgICBRU3RyaW5nIHZhbChpdC0+ dG9TdHJpbmcoKS5jX3N0cigpKTsKKyAgICAgICAgICAgIFFTdHJpbmcgdmFsID0gUVN0cmluZzo6 ZnJvbVV0ZjgoaXQtPnRvU3RyaW5nKCkuY19zdHIoKSk7CiAKICAgICAgICAgICAgIC8vIEFsc28g cmVtb3ZlIG5ldyBrZXl3b3JkcyB0byBhdm9pZCBkdXBsaWNhdGVzLiBUaGV5IHdpbGwgYmUgYWRk ZWQgYWdhaW4gYmVsb3cuCiAgICAgICAgICAgICBpZiAoIGtleSA9PSBRU3RyaW5nKCJJcHRjLkFw cGxpY2F0aW9uMi5LZXl3b3JkcyIpICYmCkBAIC01NDcsMTIgKzU2MywxNSBAQAogICAgICAgICAg ICAga2V5LnRydW5jYXRlKDY0KTsKIAogICAgICAgICAgICAgRXhpdjI6OlZhbHVlOjpBdXRvUHRy IHZhbCA9IEV4aXYyOjpWYWx1ZTo6Y3JlYXRlKEV4aXYyOjpzdHJpbmcpOwotICAgICAgICAgICAg dmFsLT5yZWFkKGtleS50b0xhdGluMSgpLmNvbnN0RGF0YSgpKTsKKyAgICAgICAgICAgIHZhbC0+ cmVhZChrZXkudG9VdGY4KCkuY29uc3REYXRhKCkpOwogICAgICAgICAgICAgaXB0Y0RhdGEuYWRk KGlwdGNUYWcsIHZhbC5nZXQoKSk7CiAgICAgICAgIH0KIAogICAgICAgICBkLT5pcHRjTWV0YWRh dGEoKSA9IGlwdGNEYXRhOwogCisgICAgICAgIC8vIE1ha2Ugc3VyZSBjaGFyYWN0ZXIgc2V0IGlz IFVURi04CisgICAgICAgIHNldElwdGNUYWdTdHJpbmcoIklwdGMuRW52ZWxvcGUuQ2hhcmFjdGVy U2V0IiwgIlwzMyVHIiwgZmFsc2UpOworCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAg ICBjYXRjaCggRXhpdjI6OkVycm9yJiBlICkKQEAgLTYxMiw3ICs2MzEsNyBAQAogICAgICAgICB3 aGlsZShpdCAhPSBpcHRjRGF0YS5lbmQoKSkKICAgICAgICAgewogICAgICAgICAgICAgUVN0cmlu ZyBrZXkgPSBRU3RyaW5nOjpmcm9tTG9jYWw4Qml0KGl0LT5rZXkoKS5jX3N0cigpKTsKLSAgICAg ICAgICAgIFFTdHJpbmcgdmFsKGl0LT50b1N0cmluZygpLmNfc3RyKCkpOworICAgICAgICAgICAg UVN0cmluZyB2YWwgPSBRU3RyaW5nOjpmcm9tVXRmOChpdC0+dG9TdHJpbmcoKS5jX3N0cigpKTsK IAogICAgICAgICAgICAgaWYgKGtleSA9PSBRU3RyaW5nKCJJcHRjLkFwcGxpY2F0aW9uMi5TdWJq ZWN0IikgJiYgb2xkRGVmLmNvbnRhaW5zKHZhbCkpCiAgICAgICAgICAgICAgICAgaXQgPSBpcHRj RGF0YS5lcmFzZShpdCk7CkBAIC02MzAsMTIgKzY0OSwxNSBAQAogICAgICAgICAgICAga2V5LnRy dW5jYXRlKDIzNik7CiAKICAgICAgICAgICAgIEV4aXYyOjpWYWx1ZTo6QXV0b1B0ciB2YWwgPSBF eGl2Mjo6VmFsdWU6OmNyZWF0ZShFeGl2Mjo6c3RyaW5nKTsKLSAgICAgICAgICAgIHZhbC0+cmVh ZChrZXkudG9MYXRpbjEoKS5jb25zdERhdGEoKSk7CisgICAgICAgICAgICB2YWwtPnJlYWQoa2V5 LnRvVXRmOCgpLmNvbnN0RGF0YSgpKTsKICAgICAgICAgICAgIGlwdGNEYXRhLmFkZChpcHRjVGFn LCB2YWwuZ2V0KCkpOwogICAgICAgICB9Ci0KKyAgICAgICAKICAgICAgICAgZC0+aXB0Y01ldGFk YXRhKCkgPSBpcHRjRGF0YTsKIAorICAgICAgICAvLyBNYWtlIHN1cmUgY2hhcmFjdGVyIHNldCBp cyBVVEYtOAorICAgICAgICBzZXRJcHRjVGFnU3RyaW5nKCJJcHRjLkVudmVsb3BlLkNoYXJhY3Rl clNldCIsICJcMzMlRyIsIGZhbHNlKTsKKwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAg ICAgY2F0Y2goIEV4aXYyOjpFcnJvciYgZSApCkBAIC02OTUsNyArNzE3LDcgQEAKICAgICAgICAg d2hpbGUoaXQgIT0gaXB0Y0RhdGEuZW5kKCkpCiAgICAgICAgIHsKICAgICAgICAgICAgIFFTdHJp bmcga2V5ID0gUVN0cmluZzo6ZnJvbUxvY2FsOEJpdChpdC0+a2V5KCkuY19zdHIoKSk7Ci0gICAg ICAgICAgICBRU3RyaW5nIHZhbChpdC0+dG9TdHJpbmcoKS5jX3N0cigpKTsKKyAgICAgICAgICAg IFFTdHJpbmcgdmFsID0gUVN0cmluZzo6ZnJvbVV0ZjgoaXQtPnRvU3RyaW5nKCkuY19zdHIoKSk7 CiAKICAgICAgICAgICAgIGlmIChrZXkgPT0gUVN0cmluZygiSXB0Yy5BcHBsaWNhdGlvbjIuU3Vw cENhdGVnb3J5IikgJiYgb2xkU3ViQ2F0ZWdvcmllcy5jb250YWlucyh2YWwpKQogICAgICAgICAg ICAgICAgIGl0ID0gaXB0Y0RhdGEuZXJhc2UoaXQpOwpAQCAtNzE0LDEyICs3MzYsMTUgQEAKICAg ICAgICAgICAgIGtleS50cnVuY2F0ZSgzMik7CiAKICAgICAgICAgICAgIEV4aXYyOjpWYWx1ZTo6 QXV0b1B0ciB2YWwgPSBFeGl2Mjo6VmFsdWU6OmNyZWF0ZShFeGl2Mjo6c3RyaW5nKTsKLSAgICAg ICAgICAgIHZhbC0+cmVhZChrZXkudG9MYXRpbjEoKS5jb25zdERhdGEoKSk7CisgICAgICAgICAg ICB2YWwtPnJlYWQoa2V5LnRvVXRmOCgpLmNvbnN0RGF0YSgpKTsKICAgICAgICAgICAgIGlwdGNE YXRhLmFkZChpcHRjVGFnLCB2YWwuZ2V0KCkpOwogICAgICAgICB9CiAKICAgICAgICAgZC0+aXB0 Y01ldGFkYXRhKCkgPSBpcHRjRGF0YTsKIAorICAgICAgICAvLyBNYWtlIHN1cmUgY2hhcmFjdGVy IHNldCBpcyBVVEYtOAorICAgICAgICBzZXRJcHRjVGFnU3RyaW5nKCJJcHRjLkVudmVsb3BlLkNo YXJhY3RlclNldCIsICJcMzMlRyIsIGZhbHNlKTsKKyAgICAgICAgCiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIH0KICAgICBjYXRjaCggRXhpdjI6OkVycm9yJiBlICkK