185411 2007-07-15 13:37 0000 app-crypt/chntpw-0.99.4.070409 add ~amd64 keyword 2007-11-15 22:18:35 0000 1 1 1 Unclassified Gentoo Linux Ebuilds unspecified All Linux RESOLVED WONTFIX http://home.eunet.no/pnordahl/ntpasswd/ P2 enhancement --- 1 gentoo@cconstruct.de amd64@gentoo.org maintainer-needed@gentoo.org gentoo@cconstruct.de 2007-07-15 13:37:00 0000 Hi there, I just discovered that you can't compile chntpw for amd64. But if you use the "-m32" compiler-option as suggested by the Makefile you get a working 32-bit application. Problem seams to be, that the application tries to read dword-values and relies on int-values for this. As you know 64-bit system use bigger int's so it will compile but won't work. My suggestions: change emake LIBS="-lcrypto" CFLAGS="${CFLAGS}" to emake LIBS="-lcrypto" CFLAGS="${CFLAGS} -m32" and add ~amd64. As the programm is not memory intense and does no big calculations this should be ok. Maybe you need app-emulation/emul-linux-x86-baselibs for it provides /usr/lib32/libcrypto.so Resulting Programm was tested for Windows XP. alonbl@gentoo.org 2007-07-16 03:58:00 0000 As I wrote in bug#185183, the best way you can help is helping upstream to adjust his implementation to 64bit. There is no reason why this package is not able to run as pure 64bit... amd64, it is your call. kingtaco@gentoo.org 2007-07-16 05:13:28 0000 Created an attachment (id=124991) conversion of longs to int32_t I have no nt password stuff to test on, but this patch will probably work. gentoo@cconstruct.de 2007-07-16 09:49:29 0000 It generates more warnings than 32bit compile but it seams to work (I tested on some Win XP passwords) I would have written this patch myself if I was more into C, but I had no idea how to get a number with a specific bit-length. So thank you Mike. alonbl@gentoo.org 2007-07-16 18:26:26 0000 Sent a message to upstream to confirm this. alonbl@gentoo.org 2007-07-27 20:34:22 0000 Well... Upstream does not response... Matthias, have you seen some activity there? Can you please try to contact them too? tanderson@gentoo.org 2007-08-12 13:20:44 0000 ====amd64==== 1. Compiles(I don't get any warnings) 2. Installs. 3. Runs. Portage 2.1.2.11 (default-linux/amd64/2007.0, gcc-4.1.2, glibc-2.5-r4, 2.6.20-gentoo-r7 x86_64) ================================================================= System uname: 2.6.20-gentoo-r7 x86_64 unknown Gentoo Base System release 1.12.9 Timestamp of tree: Sat, 11 Aug 2007 21:50:01 +0000 ccache version 2.4 [enabled] dev-java/java-config: 1.3.7, 2.0.33-r1 dev-lang/python: 2.4.4-r4 dev-python/pycrypto: 2.0.1-r6 dev-util/ccache: 2.4-r7 sys-apps/sandbox: 1.2.17 sys-devel/autoconf: 2.13, 2.61 sys-devel/automake: 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10 sys-devel/binutils: 2.17 sys-devel/gcc-config: 1.3.16 sys-devel/libtool: 1.5.23b virtual/os-headers: 2.6.21 ACCEPT_KEYWORDS="amd64" AUTOCLEAN="yes" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=athlon64 -O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/share/X11/xkb /usr/share/config" CONFIG_PROTECT_MASK="/etc/env.d /etc/env.d/java/ /etc/gconf /etc/revdep-rebuild /etc/terminfo" CXXFLAGS="-march=athlon64 -O2 -pipe" DISTDIR="/distfiles" FEATURES="ccache collision-protect distlocks metadata-transfer multilib-strict parallel-fetch sandbox sfperms strict test userpriv" GENTOO_MIRRORS="http://mirrors.acm.cs.rpi.edu/gentoo/ http://distfiles.gentoo.org/" MAKEOPTS="-j2" PKGDIR="/usr/portage/packages" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --filter=H_**/files/digest-*" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/overlay" SYNC="rsync://192.168.1.30/gentoo-portage" USE="X acl aiglx aim amd64 berkdb bitmap-fonts branding cli cracklib crypt cups dri fortran gdbm gpm gtk iconv imap ipv6 isdnlog midi mmx mpeg3 mudflap ncurses nls nptl nptlonly nvidia opengl openmp pam pcre perl pppd python qt3 readline reflection session sockets spl sqlite3 sse sse2 ssl tcpd test truetype-fonts type1-fonts unicode vim xcomposite xine xorg zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mulaw multi null plug rate route share shm softvol" ELIBC="glibc" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" USERLAND="GNU" VIDEO_CARDS="nvidia" Unset: CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LANG, LC_ALL, LDFLAGS, LINGUAS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS alonbl@gentoo.org 2007-08-12 17:38:30 0000 I will tell you why I am so afraid of none ack patch from upstream... An invalid operation may cause the Windows machine unbootable. gentoo@cconstruct.de 2007-08-12 20:29:43 0000 Strange you did not get any warnings... Did you try the unpatched version? Prior to appyling the patch your cflags have to contain the -m32 flag, because the ebuild diasbles it and the programm won't work on any regestry file (complains about wrong format and so on) alonbl@gentoo.org 2007-11-05 20:11:47 0000 Upstream is dead, so I will move this package to maintainer-needed. Sorry. gentoo@cconstruct.de 2007-11-05 20:32:24 0000 Strange... there are two "new" news entries dated to September 2007... (which is somewhere between my report an now) So upstream can't be that dead... I'll try to contact him tomorrow... maybe I'm lucky... alonbl@gentoo.org 2007-11-09 09:36:35 0000 Any luck? alonbl@gentoo.org 2007-11-15 22:07:04 0000 No cooperative upstream... beandog@gentoo.org 2007-11-15 22:14:41 0000 (In reply to comment #9) > Upstream is dead, so I will move this package to maintainer-needed. > Sorry. > Dont really see any reason to keep this open if its a keyword request (or at least assigned to amd64). Close as WONTFIX? alonbl@gentoo.org 2007-11-15 22:18:35 0000 Opps. Thanks! 124991 2007-07-16 05:13 0000 conversion of longs to int32_t chntpw-64bit.diff text/plain ZGlmZiAtdSAtYiAtQiAtciBjaG50cHctMDcwNDA5Lm9yaWcvTWFrZWZpbGUgY2hudHB3LTA3MDQw OS9NYWtlZmlsZQotLS0gY2hudHB3LTA3MDQwOS5vcmlnL01ha2VmaWxlCTIwMDctMDQtMDkgMDY6 MTc6NDIuMDAwMDAwMDAwIC0wNzAwCisrKyBjaG50cHctMDcwNDA5L01ha2VmaWxlCTIwMDctMDct MTUgMjI6MDA6NDUuMDAwMDAwMDAwIC0wNzAwCkBAIC0xMiw3ICsxMiw3IEBACiBPU1NMSU5DPSQo T1NTTFBBVEgpL2luY2x1ZGUKIAogQ0M9Z2NjCi1DRkxBR1M9IC1EVVNFT1BFTlNTTCAtZyAtSS4g LUkkKE9TU0xJTkMpIC1XYWxsIC1tMzIKK0NGTEFHUz0gLURVU0VPUEVOU1NMIC1nIC1JLiAtSSQo T1NTTElOQykgLVdhbGwKIAogCiAjIFRoaXMgaXMgdG8gbGluayB3aXRoIHdoYXRldmVyIHdlIGhh dmUsIFNTTCBjcnlwdG8gbGliIHdlIHB1dCBpbiBzdGF0aWMKZGlmZiAtdSAtYiAtQiAtciBjaG50 cHctMDcwNDA5Lm9yaWcvY2hudHB3LmMgY2hudHB3LTA3MDQwOS9jaG50cHcuYwotLS0gY2hudHB3 LTA3MDQwOS5vcmlnL2NobnRwdy5jCTIwMDctMDQtMDkgMDY6MTc6NDIuMDAwMDAwMDAwIC0wNzAw CisrKyBjaG50cHctMDcwNDA5L2NobnRwdy5jCTIwMDctMDctMTUgMjI6MDM6NDEuMDAwMDAwMDAw IC0wNzAwCkBAIC01MSw2ICs1MSw4IEBACiAjaW5jbHVkZSA8c3RkbGliLmg+CiAjaW5jbHVkZSA8 c3RyaW5nLmg+CiAjaW5jbHVkZSA8dW5pc3RkLmg+CisjaW5jbHVkZSA8c3lzL3R5cGVzLmg+Cisj aW5jbHVkZSA8aW50dHlwZXMuaD4KIAogI2luY2x1ZGUgPG9wZW5zc2wvZGVzLmg+CiAjaW5jbHVk ZSA8b3BlbnNzbC9tZDQuaD4KQEAgLTEzNiw3ICsxMzgsNyBAQAogICogRnVuY3Rpb24gdG8gY29u dmVydCB0aGUgUklEIHRvIHRoZSBmaXJzdCBkZWNyeXB0IGtleS4KICAqLwogCi12b2lkIHNpZF90 b19rZXkxKHVuc2lnbmVkIGxvbmcgc2lkLHVuc2lnbmVkIGNoYXIgZGVza2V5WzhdKQordm9pZCBz aWRfdG9fa2V5MSh1aW50MzJfdCBzaWQsdW5zaWduZWQgY2hhciBkZXNrZXlbOF0pCiB7CiAJdW5z aWduZWQgY2hhciBzWzddOwogCkBAIC0xNTUsNyArMTU3LDcgQEAKICAqIEZ1bmN0aW9uIHRvIGNv bnZlcnQgdGhlIFJJRCB0byB0aGUgc2Vjb25kIGRlY3J5cHQga2V5LgogICovCiAKLXZvaWQgc2lk X3RvX2tleTIodW5zaWduZWQgbG9uZyBzaWQsdW5zaWduZWQgY2hhciBkZXNrZXlbOF0pCit2b2lk IHNpZF90b19rZXkyKHVpbnQzMl90IHNpZCx1bnNpZ25lZCBjaGFyIGRlc2tleVs4XSkKIHsKIAl1 bnNpZ25lZCBjaGFyIHNbN107CiAJCkBAIC0xMjI0LDcgKzEyMjYsNyBAQAogICB9CiAKICAgaWYg KHYtPmxlbiA8IDB4Y2MpIHsKLSAgICBwcmludGYoIlZhbHVlIDwlcz4gaXMgdG9vIHNob3J0IChv bmx5ICVsZCBieXRlcykgdG8gYmUgYSBTQU0gdXNlciBWLXN0cnVjdCFcbiIsCisgICAgcHJpbnRm KCJWYWx1ZSA8JXM+IGlzIHRvbyBzaG9ydCAob25seSAlZCBieXRlcykgdG8gYmUgYSBTQU0gdXNl ciBWLXN0cnVjdCFcbiIsCiAJICAgcywgdmtrZXktPmxlbl9kYXRhKTsKICAgfSBlbHNlIHsKICAg ICBjaGFuZ2VfcHcoIChjaGFyICopJnYtPmRhdGEgLCByaWQsIHYtPmxlbiwgMCk7Ck9ubHkgaW4g Y2hudHB3LTA3MDQwOS5vcmlnOiBjaG50cHcuc3RhdGljCmRpZmYgLXUgLWIgLUIgLXIgY2hudHB3 LTA3MDQwOS5vcmlnL2NwbnQuYyBjaG50cHctMDcwNDA5L2NwbnQuYwotLS0gY2hudHB3LTA3MDQw OS5vcmlnL2NwbnQuYwkyMDA3LTA0LTA5IDA2OjE3OjQyLjAwMDAwMDAwMCAtMDcwMAorKysgY2hu dHB3LTA3MDQwOS9jcG50LmMJMjAwNy0wNy0xNSAyMjowMzo0MS4wMDAwMDAwMDAgLTA3MDAKQEAg LTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlIDxlcnJuby5oPgogI2luY2x1ZGUgPHN0cmluZy5oPgog I2luY2x1ZGUgPHVuaXN0ZC5oPgorI2luY2x1ZGUgPGludHR5cGVzLmg+CiAKIAogI2RlZmluZSBC VUZTSVpFIDE2Mzg0Ck9ubHkgaW4gY2hudHB3LTA3MDQwOTogbWFrZS5vdXQKZGlmZiAtdSAtYiAt QiAtciBjaG50cHctMDcwNDA5Lm9yaWcvbnRyZWcuYyBjaG50cHctMDcwNDA5L250cmVnLmMKLS0t IGNobnRwdy0wNzA0MDkub3JpZy9udHJlZy5jCTIwMDctMDQtMDkgMDY6MTc6NDIuMDAwMDAwMDAw IC0wNzAwCisrKyBjaG50cHctMDcwNDA5L250cmVnLmMJMjAwNy0wNy0xNSAyMjoxMDozMy4wMDAw MDAwMDAgLTA3MDAKQEAgLTM5LDYgKzM5LDcgQEAKICNpbmNsdWRlIDxlcnJuby5oPgogI2luY2x1 ZGUgPHN0cmluZy5oPgogI2luY2x1ZGUgPHVuaXN0ZC5oPgorI2luY2x1ZGUgPGludHR5cGVzLmg+ CiAKICNpbmNsdWRlICJudHJlZy5oIgogCkBAIC0zODEsMTMgKzM4MiwxMyBAQAogI2RlZmluZSBE X09GRlMobykgKCAodm9pZCAqKSYoa2V5LT5vKS0odm9pZCAqKWhkZXNjLT5idWZmZXItdm9mcyAp CiAKICAga2V5ID0gKHN0cnVjdCBua19rZXkgKikoaGRlc2MtPmJ1ZmZlciArIHZvZnMpOwotICBw cmludGYoIiUwNHggICB0eXBlICAgICAgICAgICAgICA9IDB4JTAyeCAlc1xuIiwgRF9PRkZTKHR5 cGUpICAsIGtleS0+dHlwZSwKKyAgcHJpbnRmKCIlMDR4ICAgdHlwZSAgICAgICAgICAgICAgPSAw eCUwMnggJXNcbiIsIERfT0ZGUyh0eXBlKSAgLGtleS0+dHlwZSwKIAkgICAgICAgICAgICAgICAg ICAgICAgICAgICAoa2V5LT50eXBlID09IEtFWV9ST09UID8gIlJPT1RfS0VZIiA6ICIiKSApOwog ICBwcmludGYoIiUwNHggICB0aW1lc3RhbXAgc2tpcHBlZFxuIiwgRF9PRkZTKHRpbWVzdGFtcCkg KTsKICAgcHJpbnRmKCIlMDR4ICAgcGFyZW50IGtleSBvZmZzZXQgPSAweCUwbHhcbiIsIERfT0ZG UyhvZnNfcGFyZW50KSAsa2V5LT5vZnNfcGFyZW50KTsKLSAgcHJpbnRmKCIlMDR4ICAgbnVtYmVy IG9mIHN1YmtleXMgPSAlbGRcbiIsIERfT0ZGUyhub19zdWJrZXlzKSxrZXktPm5vX3N1YmtleXMp OworICBwcmludGYoIiUwNHggICBudW1iZXIgb2Ygc3Via2V5cyA9ICVkXG4iLCBEX09GRlMobm9f c3Via2V5cyksa2V5LT5ub19zdWJrZXlzKTsKICAgcHJpbnRmKCIlMDR4ICAgbGYtcmVjb3JkIG9m ZnNldCAgPSAweCUwbHhcbiIsRF9PRkZTKG9mc19sZiksa2V5LT5vZnNfbGYpOwotICBwcmludGYo IiUwNHggICBudW1iZXIgb2YgdmFsdWVzICA9ICVsZFxuIiwgRF9PRkZTKG5vX3ZhbHVlcyksa2V5 LT5ub192YWx1ZXMpOworICBwcmludGYoIiUwNHggICBudW1iZXIgb2YgdmFsdWVzICA9ICVkXG4i LCBEX09GRlMobm9fdmFsdWVzKSxrZXktPm5vX3ZhbHVlcyk7CiAgIHByaW50ZigiJTA0eCAgIHZh bC1saXN0IG9mZnNldCAgID0gMHglMGx4XG4iLERfT0ZGUyhvZnNfdmFsbGlzdCksa2V5LT5vZnNf dmFsbGlzdCk7CiAgIHByaW50ZigiJTA0eCAgIHNrLXJlY29yZCBvZmZzZXQgID0gMHglMGx4XG4i LERfT0ZGUyhvZnNfc2spLGtleS0+b2ZzX3NrKTsKICAgcHJpbnRmKCIlMDR4ICAgY2xhc3NuYW1l IG9mZnNldCAgPSAweCUwbHhcbiIsRF9PRkZTKG9mc19jbGFzc25hbSksa2V5LT5vZnNfY2xhc3Nu YW0pOwpAQCAtNDE1LDcgKzQxNiw3IEBACiAgIGtleSA9IChzdHJ1Y3Qgdmtfa2V5ICopKGhkZXNj LT5idWZmZXIgKyB2b2ZzKTsKICAgcHJpbnRmKCIlMDR4ICAgbmFtZSBsZW5ndGggICAgICAgPSAl ZCAoMHglMHgpXG4iLCBEX09GRlMobGVuX25hbWUpLAogCSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAga2V5LT5sZW5fbmFtZSwga2V5LT5sZW5fbmFtZSAgKTsKLSAgcHJpbnRmKCIlMDR4ICAg bGVuZ3RoIG9mIGRhdGEgICAgPSAlbGQgKDB4JTBseClcbiIsIERfT0ZGUyhsZW5fZGF0YSksCisg IHByaW50ZigiJTA0eCAgIGxlbmd0aCBvZiBkYXRhICAgID0gJWQgKDB4JTBseClcbiIsIERfT0ZG UyhsZW5fZGF0YSksCiAJICAgICAgICAgICAgICAgICAgICAgICAgICAgICBrZXktPmxlbl9kYXRh LCBrZXktPmxlbl9kYXRhICApOwogICBwcmludGYoIiUwNHggICBkYXRhIG9mZnNldCAgICAgICA9 IDB4JTBseFxuIixEX09GRlMob2ZzX2RhdGEpLGtleS0+b2ZzX2RhdGEpOwogICBwcmludGYoIiUw NHggICB2YWx1ZSB0eXBlICAgICAgICA9IDB4JTBseCAgJXNcbiIsIERfT0ZGUyh2YWxfdHlwZSks IGtleS0+dmFsX3R5cGUsCkBAIC00NDUsOSArNDQ2LDkgQEAKICAgcHJpbnRmKCIlMDR4ICAgKnVu dXNlZD8qICAgICAgICAgPSAlZFxuIiAgICwgRF9PRkZTKGR1bW15MSksICAgICBrZXktPmR1bW15 MSAgICApOwogICBwcmludGYoIiUwNHggICBPZmZzZXQgdG8gcHJldiBzayA9IDB4JTBseFxuIiwg RF9PRkZTKG9mc19wcmV2c2spLCBrZXktPm9mc19wcmV2c2spOwogICBwcmludGYoIiUwNHggICBP ZmZzZXQgdG8gbmV4dCBzayA9IDB4JTBseFxuIiwgRF9PRkZTKG9mc19uZXh0c2spLCBrZXktPm9m c19uZXh0c2spOwotICBwcmludGYoIiUwNHggICBVc2FnZSBjb3VudGVyICAgICA9ICVsZCAoMHgl MGx4KVxuIiwgRF9PRkZTKG5vX3VzYWdlKSwKKyAgcHJpbnRmKCIlMDR4ICAgVXNhZ2UgY291bnRl ciAgICAgPSAlZCAoMHglMGx4KVxuIiwgRF9PRkZTKG5vX3VzYWdlKSwKIAkgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGtleS0+bm9fdXNhZ2Usa2V5LT5ub191c2Fn ZSk7Ci0gIHByaW50ZigiJTA0eCAgIFNlY3VyaXR5IGRhdGEgbGVuID0gJWxkICgweCUwbHgpXG4i LCBEX09GRlMobGVuX3NrKSwKKyAgcHJpbnRmKCIlMDR4ICAgU2VjdXJpdHkgZGF0YSBsZW4gPSAl ZCAoMHglMGx4KVxuIiwgRF9PRkZTKGxlbl9zayksCiAJICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBrZXktPmxlbl9zayxrZXktPmxlbl9zayk7CiAKICAgcHJpbnRm KCI9PSBFbmQgb2Yga2V5IGluZm8uXG4iKTsKQEAgLTEyMDksOSArMTIxMCw5IEBACiB7CiAgIHN0 cnVjdCB2a19rZXkgKnZra2V5OwogICBpbnQgaSx2a29mczsKLSAgbG9uZyAqdmxpc3RrZXk7Cisg IGludDMyX3QgKnZsaXN0a2V5OwogCi0gIHZsaXN0a2V5ID0gKGxvbmcgKikoaGRlc2MtPmJ1ZmZl ciArIHZsaXN0b2ZzKTsKKyAgdmxpc3RrZXkgPSAoaW50MzJfdCAqKShoZGVzYy0+YnVmZmVyICsg dmxpc3RvZnMpOwogCiAgIGZvciAoaSA9IDA7IGkgPCBudW12YWw7IGkrKykgewogICAgIHZrb2Zz ID0gdmxpc3RrZXlbaV0gKyAweDEwMDQ7CkBAIC0xMjQyLDcgKzEyNDMsNyBAQAogICBzdHJ1Y3Qg bGlfa2V5ICpsaWtleTsKICAgc3RydWN0IHJpX2tleSAqcmlrZXk7CiAKLSAgbG9uZyAqdmxpc3Rr ZXk7CisgIGludDMyX3QgKnZsaXN0a2V5OwogICBpbnQgbmV3bmtvZnMsIHBsZW4sIGksIGxmb2Zz LCB2bGlzdG9mcywgYWRqdXN0LCByLCByaWNudCwgc3ViczsKICAgY2hhciAqYnVmOwogICBjaGFy IHBhcnRbQUJTUEFUSExFTisxXTsKQEAgLTEyOTEsNyArMTI5Miw3IEBACiAgIGlmICghcGF0aFtw bGVuXSAmJiB0eXBlID09IDEgJiYga2V5LT5ub192YWx1ZXMpIHsgICAKICAgICAvKiAgICBwcmlu dGYoIlZLIG5hbWVtYXRjaCBmb3IgPCVzPlxuIixwYXJ0KTsgKi8KICAgICB2bGlzdG9mcyA9IGtl eS0+b2ZzX3ZhbGxpc3QgKyAweDEwMDQ7Ci0gICAgdmxpc3RrZXkgPSAobG9uZyAqKShidWYgKyB2 bGlzdG9mcyk7CisgICAgdmxpc3RrZXkgPSAoaW50MzJfdCAqKShidWYgKyB2bGlzdG9mcyk7CiAg ICAgaSA9IHZsaXN0X2ZpbmQoaGRlc2MsIHZsaXN0b2ZzLCBrZXktPm5vX3ZhbHVlcywgcGFydCk7 CiAgICAgaWYgKGkgIT0gLTEpIHsKICAgICAgIHJldHVybih2bGlzdGtleVtpXSArIDB4MTAwMCk7 CkBAIC0xMzkwLDcgKzEzOTEsNyBAQAogICAgIAogICB9CiAgIAotICBwcmludGYoIk5vZGUgaGFz ICVsZCBzdWJrZXlzIGFuZCAlbGQgdmFsdWVzIixrZXktPm5vX3N1YmtleXMsa2V5LT5ub192YWx1 ZXMpOworICBwcmludGYoIk5vZGUgaGFzICVkIHN1YmtleXMgYW5kICVkIHZhbHVlcyIsa2V5LT5u b19zdWJrZXlzLGtleS0+bm9fdmFsdWVzKTsKICAgaWYgKGtleS0+bGVuX2NsYXNzbmFtKSBwcmlu dGYoIiwgYW5kIGNsYXNzLWRhdGEgb2YgJWQgYnl0ZXMiLGtleS0+bGVuX2NsYXNzbmFtKTsKICAg cHJpbnRmKCJcbiIpOwogCkBAIC0xNzU0LDcgKzE3NTUsNyBAQAogdm9pZCBkZWxfYWxsdmFsdWVz KHN0cnVjdCBoaXZlICpoZGVzYywgaW50IG5rb2ZzKQogewogICBpbnQgdmxpc3RvZnMsIG8sIHZr b2ZzOwotICBsb25nICp2bGlzdGtleTsKKyAgaW50MzJfdCAqdmxpc3RrZXk7CiAgIHN0cnVjdCBu a19rZXkgKm5rOwogCiAgIG5rID0gKHN0cnVjdCBua19rZXkgKikoaGRlc2MtPmJ1ZmZlciArIG5r b2ZzKTsKQEAgLTE3NjksNyArMTc3MCw3IEBACiAgIH0KIAogICB2bGlzdG9mcyA9IG5rLT5vZnNf dmFsbGlzdCArIDB4MTAwNDsKLSAgdmxpc3RrZXkgPSAobG9uZyAqKShoZGVzYy0+YnVmZmVyICsg dmxpc3RvZnMpOworICB2bGlzdGtleSA9IChpbnQzMl90ICopKGhkZXNjLT5idWZmZXIgKyB2bGlz dG9mcyk7CiAKICAgLyogTG9vcCB0aHJvdWdoIGluZGV4IGFuZCBkZWxldGUgYWxsIHZrJ3MgKi8K ICAgZm9yIChvID0gMDsgbyA8IG5rLT5ub192YWx1ZXM7IG8rKykgewpAQCAtMTc5NCw3ICsxNzk1 LDcgQEAKIGludCBkZWxfdmFsdWUoc3RydWN0IGhpdmUgKmhkZXNjLCBpbnQgbmtvZnMsIGNoYXIg Km5hbWUpCiB7CiAgIGludCB2bGlzdG9mcywgc2xvdCwgbywgbiwgdmtvZnMsIG5ld2xpc3RvZnM7 Ci0gIGxvbmcgKnZsaXN0a2V5LCAqdG1wbGlzdCwgKm5ld2xpc3RrZXk7CisgIGludDMyX3QgKnZs aXN0a2V5LCAqdG1wbGlzdCwgKm5ld2xpc3RrZXk7CiAgIHN0cnVjdCBua19rZXkgKm5rOwogICBj aGFyICpibGFuaz0iIjsKIApAQCAtMTgxNCw3ICsxODE1LDcgQEAKICAgfQogCiAgIHZsaXN0b2Zz ID0gbmstPm9mc192YWxsaXN0ICsgMHgxMDA0OwotICB2bGlzdGtleSA9IChsb25nICopKGhkZXNj LT5idWZmZXIgKyB2bGlzdG9mcyk7CisgIHZsaXN0a2V5ID0gKGludDMyX3QgKikoaGRlc2MtPmJ1 ZmZlciArIHZsaXN0b2ZzKTsKIAogICBzbG90ID0gdmxpc3RfZmluZChoZGVzYywgdmxpc3RvZnMs IG5rLT5ub192YWx1ZXMsIG5hbWUpOwogCkBAIC0xODI4LDIxICsxODI5LDIxIEBACiAgIGRlbF92 ayhoZGVzYywgdmtvZnMpOwogCiAgIC8qIENvcHkgb3V0IG9sZCBpbmRleCBsaXN0ICovCi0gIENS RUFURSh0bXBsaXN0LGxvbmcsbmstPm5vX3ZhbHVlcyk7Ci0gIG1lbWNweSh0bXBsaXN0LCB2bGlz dGtleSwgbmstPm5vX3ZhbHVlcyAqIHNpemVvZihsb25nKSk7CisgIENSRUFURSh0bXBsaXN0LGlu dDMyX3QsbmstPm5vX3ZhbHVlcyk7CisgIG1lbWNweSh0bXBsaXN0LCB2bGlzdGtleSwgbmstPm5v X3ZhbHVlcyAqIHNpemVvZihpbnQzMl90KSk7CiAKICAgZnJlZV9ibG9jayhoZGVzYyx2bGlzdG9m cy00KTsgIC8qIEdldCByaWQgb2Ygb2xkIGxpc3QgKi8KIAogICBuay0+bm9fdmFsdWVzLS07CiAK ICAgaWYgKG5rLT5ub192YWx1ZXMpIHsKLSAgICBuZXdsaXN0b2ZzID0gYWxsb2NfYmxvY2soaGRl c2MsIHZsaXN0b2ZzLCBuay0+bm9fdmFsdWVzICogc2l6ZW9mKGxvbmcpKTsKKyAgICBuZXdsaXN0 b2ZzID0gYWxsb2NfYmxvY2soaGRlc2MsIHZsaXN0b2ZzLCBuay0+bm9fdmFsdWVzICogc2l6ZW9m KGludDMyX3QpKTsKICAgICBpZiAoIW5ld2xpc3RvZnMpIHsKICAgICAgIHByaW50ZigiZGVsX3Zh bHVlOiBGQVRBTDogV2FzIG5vdCBhYmxlIHRvIGFsbG9jIG5ldyBpbmRleCBsaXN0XG4iKTsKICAg ICAgIGFib3J0KCk7CiAgICAgfQogICAgIC8qIE5vdyBjb3B5IG92ZXIsIG9taXR0aW5nIGRlbGV0 ZWQgZW50cnkgKi8KLSAgICBuZXdsaXN0a2V5ID0gKGxvbmcgKikoaGRlc2MtPmJ1ZmZlciArIG5l d2xpc3RvZnMgKyA0KTsKKyAgICBuZXdsaXN0a2V5ID0gKGludDMyX3QgKikoaGRlc2MtPmJ1ZmZl ciArIG5ld2xpc3RvZnMgKyA0KTsKICAgICBmb3IgKG4gPSAwLCBvID0gMDsgbyA8IG5rLT5ub192 YWx1ZXMrMTsgbysrLCBuKyspIHsKICAgICAgIGlmIChvID09IHNsb3QpIG8rKzsKICAgICAgIG5l d2xpc3RrZXlbbl0gPSB0bXBsaXN0W29dOwpAQCAtMTg3Niw3ICsxODc3LDcgQEAKICAgc3RydWN0 IGxmX2tleSAqbmV3bGYgPSBOVUxMLCAqb2xkbGY7CiAgIHN0cnVjdCBsaV9rZXkgKm5ld2xpID0g TlVMTCwgKm9sZGxpOwogICBzdHJ1Y3Qgbmtfa2V5ICprZXksICpuZXduaywgKm9uazsKLSAgbG9u ZyBoYXNoOworICBpbnQzMl90IGhhc2g7CiAKICAga2V5ID0gKHN0cnVjdCBua19rZXkgKikoaGRl c2MtPmJ1ZmZlciArIG5rb2ZzKTsKIApAQCAtMjQwNSw3ICsyNDA2LDcgQEAKICAgfQogICAKICNp ZiAwCi0gIHByaW50ZigiTm9kZSBoYXMgJWxkIHN1YmtleXMgYW5kICVsZCB2YWx1ZXNcbiIsa2V5 LT5ub19zdWJrZXlzLGtleS0+bm9fdmFsdWVzKTsKKyAgcHJpbnRmKCJOb2RlIGhhcyAlZCBzdWJr ZXlzIGFuZCAlZCB2YWx1ZXNcbiIsa2V5LT5ub19zdWJrZXlzLGtleS0+bm9fdmFsdWVzKTsKICNl bmRpZgogICBpZiAoa2V5LT5ub19zdWJrZXlzKSB7CiAgICAgd2hpbGUgKChleF9uZXh0X24oaGRl c2MsIG5rb2ZzLCAmY291bnQsICZjb3VudHJpLCAmZXgpID4gMCkpIHsKQEAgLTI0MjYsNyArMjQy Nyw3IEBACiAgIAogCiAvKiBHZXQgYW5kIGNvcHkga2V5cyBDTEFTUy1kYXRhIChpZiBhbnkpIHRv IGJ1ZmZlcgotICogUmV0dXJucyBhIGJ1ZmZlciB3aXRoIHRoZSBkYXRhIChmaXJzdCBsb25nIGlz IHNpemUpLiBzZWUgbnRyZWcuaAorICogUmV0dXJucyBhIGJ1ZmZlciB3aXRoIHRoZSBkYXRhIChm aXJzdCBpbnQzMl90IGlzIHNpemUpLiBzZWUgbnRyZWcuaAogICogTk9URTogY2FsbGVyIG11c3Qg ZGVhbGxvY2F0ZSBidWZmZXIhIGEgc2ltcGxlIGZyZWUoa2V5dmFsKSB3aWxsIHN1ZmZpY2UuCiAg Ki8KIHN0cnVjdCBrZXl2YWwgKmdldF9jbGFzcyhzdHJ1Y3QgaGl2ZSAqaGRlc2MsCkBAIC0yNTc0 LDcgKzI1NzUsNyBAQAogICBzdHJ1Y3QgaGl2ZSAqaGRlc2M7CiAgIGludCBmbW9kZSxyLHZvZnM7 CiAgIHN0cnVjdCBzdGF0IHNidWY7Ci0gIHVuc2lnbmVkIGxvbmcgcG9mczsKKyAgdWludDMyX3Qg cG9mczsKICAgLyogb2ZmX3QgbDsgKi8KICAgY2hhciAqYzsKICAgc3RydWN0IGhiaW5fcGFnZSAq cDsKZGlmZiAtdSAtYiAtQiAtciBjaG50cHctMDcwNDA5Lm9yaWcvbnRyZWcuaCBjaG50cHctMDcw NDA5L250cmVnLmgKLS0tIGNobnRwdy0wNzA0MDkub3JpZy9udHJlZy5oCTIwMDctMDQtMDkgMDY6 MTc6NDIuMDAwMDAwMDAwIC0wNzAwCisrKyBjaG50cHctMDcwNDA5L250cmVnLmgJMjAwNy0wNy0x NSAyMTo1NjowNy4wMDAwMDAwMDAgLTA3MDAKQEAgLTU4LDE5ICs1OCwxOSBAQAogCiBzdHJ1Y3Qg cmVnZl9oZWFkZXIgewogCi0gIGxvbmcgaWQ7ICAgICAgICAgICAgLyogMHgwMDAwMDAwMAlELVdv cmQJSUQ6IEFTQ0lJLSJyZWdmIiA9IDB4NjY2NzY1NzIgKi8KLSAgbG9uZyB1bmtub3duMTsgICAg ICAvKiAweDAwMDAwMDA0CUQtV29yZAk/Pz8/ICovCi0gIGxvbmcgdW5rbm93bjI7ICAgICAgLyog MHgwMDAwMDAwOAlELVdvcmQJPz8/PyBBbHdheXMgdGhlIHNhbWUgdmFsdWUgYXMgYXQgMHgwMDAw MDAwNCAgKi8KKyAgaW50MzJfdCBpZDsgICAgICAgICAgICAvKiAweDAwMDAwMDAwCUQtV29yZAlJ RDogQVNDSUktInJlZ2YiID0gMHg2NjY3NjU3MiAqLworICBpbnQzMl90IHVua25vd24xOyAgICAg IC8qIDB4MDAwMDAwMDQJRC1Xb3JkCT8/Pz8gKi8KKyAgaW50MzJfdCB1bmtub3duMjsgICAgICAv KiAweDAwMDAwMDA4CUQtV29yZAk/Pz8/IEFsd2F5cyB0aGUgc2FtZSB2YWx1ZSBhcyBhdCAweDAw MDAwMDA0ICAqLwogICBjaGFyIHRpbWVzdGFtcFs4XTsgIC8qIDB4MDAwMDAwMEMJUS1Xb3JkCWxh c3QgbW9kaWZ5IGRhdGUgaW4gV2luTlQgZGF0ZS1mb3JtYXQgKi8KLSAgbG9uZyB1bmtub3duMzsg ICAgICAvKiAweDAwMDAwMDE0CUQtV29yZAkxICovCi0gIGxvbmcgdW5rbm93bjQ7ICAgICAgLyog MHgwMDAwMDAxOAlELVdvcmQJMyAtIHByb2JhYmx5IHZlcnNpb24gIy4gMiBpbiBOVDMuNTEgKi8K LSAgbG9uZyB1bmtub3duNTsgICAgICAvKiAweDAwMDAwMDFDCUQtV29yZAkwICovCi0gIGxvbmcg dW5rbm93bjY7ICAgICAgLyogMHgwMDAwMDAyMAlELVdvcmQJMSAqLwotICBsb25nIG9mc19yb290 a2V5OyAgIC8qIDB4MDAwMDAwMjQJRC1Xb3JkCU9mZnNldCBvZiAxc3Qga2V5IHJlY29yZCAqLwot ICBsb25nIGZpbGVzaXplOyAgICAgIC8qIDB4MDAwMDAwMjgJRC1Xb3JkCVNpemUgb2YgdGhlIGRh dGEtYmxvY2tzIChGaWxlc2l6ZS00a2IpICovCi0gIGxvbmcgdW5rbm93bjc7ICAgICAgLyogMHgw MDAwMDAyQwlELVdvcmQJMSAqLworICBpbnQzMl90IHVua25vd24zOyAgICAgIC8qIDB4MDAwMDAw MTQJRC1Xb3JkCTEgKi8KKyAgaW50MzJfdCB1bmtub3duNDsgICAgICAvKiAweDAwMDAwMDE4CUQt V29yZAkzIC0gcHJvYmFibHkgdmVyc2lvbiAjLiAyIGluIE5UMy41MSAqLworICBpbnQzMl90IHVu a25vd241OyAgICAgIC8qIDB4MDAwMDAwMUMJRC1Xb3JkCTAgKi8KKyAgaW50MzJfdCB1bmtub3du NjsgICAgICAvKiAweDAwMDAwMDIwCUQtV29yZAkxICovCisgIGludDMyX3Qgb2ZzX3Jvb3RrZXk7 ICAgLyogMHgwMDAwMDAyNAlELVdvcmQJT2Zmc2V0IG9mIDFzdCBrZXkgcmVjb3JkICovCisgIGlu dDMyX3QgZmlsZXNpemU7ICAgICAgLyogMHgwMDAwMDAyOAlELVdvcmQJU2l6ZSBvZiB0aGUgZGF0 YS1ibG9ja3MgKEZpbGVzaXplLTRrYikgKi8KKyAgaW50MzJfdCB1bmtub3duNzsgICAgICAvKiAw eDAwMDAwMDJDCUQtV29yZAkxICovCiAgIGNoYXIgbmFtZVsweDFmYy0weDJjXTsgICAvKiBTZWVt cyBsaWtlIHRoZSBoaXZlJ3MgbmFtZSBpcyBidXJpZWQgaGVyZSwgbWF4IGxlbiB1bmtub3duICov Ci0gIGxvbmcgY2hlY2tzdW07ICAgICAgLyogMHgwMDAwMDFGQwlELVdvcmQJU3VtIG9mIGFsbCBE LVdvcmRzIGZyb20gMHgwMDAwMDAwMCB0byAweDAwMDAwMUZCICovCisgIGludDMyX3QgY2hlY2tz dW07ICAgICAgLyogMHgwMDAwMDFGQwlELVdvcmQJU3VtIG9mIGFsbCBELVdvcmRzIGZyb20gMHgw MDAwMDAwMCB0byAweDAwMDAwMUZCICovCiB9OwogCiAvKiBUaGUgcGFnZSBoZWFkZXIsIEkgZG9u J3Qga25vdyBpZiB0aGUgMTQgImR1bW15IiBieXRlcyBoYXMgYSBtZWFuaW5nLApAQCAtNzksMTEg Kzc5LDExIEBACiAKIHN0cnVjdCAgaGJpbl9wYWdlIHsKIAotICBsb25nIGlkOyAgICAgICAgICAv KiAweDAwMDAJRC1Xb3JkCUlEOiBBU0NJSS0iaGJpbiIgPSAweDZFNjk2MjY4ICAqLwotICBsb25n IG9mc19mcm9tMTsgICAvKiAweDAwMDQJRC1Xb3JkCU9mZnNldCBmcm9tIHRoZSAxc3QgaGJpbi1C bG9jayAqLwotICBsb25nIG9mc19uZXh0OyAgICAvKiAweDAwMDgJRC1Xb3JkCU9mZnNldCB0byB0 aGUgbmV4dCBoYmluLUJsb2NrIChmcm9tIFRISVMgT05FKSAgKi8KKyAgaW50MzJfdCBpZDsgICAg ICAgICAgLyogMHgwMDAwCUQtV29yZAlJRDogQVNDSUktImhiaW4iID0gMHg2RTY5NjI2OCAgKi8K KyAgaW50MzJfdCBvZnNfZnJvbTE7ICAgLyogMHgwMDA0CUQtV29yZAlPZmZzZXQgZnJvbSB0aGUg MXN0IGhiaW4tQmxvY2sgKi8KKyAgaW50MzJfdCBvZnNfbmV4dDsgICAgLyogMHgwMDA4CUQtV29y ZAlPZmZzZXQgdG8gdGhlIG5leHQgaGJpbi1CbG9jayAoZnJvbSBUSElTIE9ORSkgICovCiAgIGNo YXIgZHVtbXkxWzE0XTsKLSAgbG9uZyBsZW5fcGFnZTsgICAgLyogMHgwMDFDCUQtV29yZAlCbG9j ay1zaXplPz8/IERvbid0IGxvb2sgbGlrZSBpdCwKKyAgaW50MzJfdCBsZW5fcGFnZTsgICAgLyog MHgwMDFDCUQtV29yZAlCbG9jay1zaXplPz8/IERvbid0IGxvb2sgbGlrZSBpdCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJIG9ubHkgdXNlIHRoZSBuZXh0LW9mZnNl dCBpbiB0aGlzIHByb2dyYW0gICovCiAgIGNoYXIgZGF0YVsxXTsgICAgIC8qIDB4MDAyMCAgIEZp cnN0IGRhdGEgYmxvY2sgc3RhcnRzIGhlcmUgICAgICAgICAgICovCiAKQEAgLTExMCwxMCArMTEw LDEwIEBACiAKICAgc2hvcnQgaWQ7ICAgICAgICAgIC8qIDB4MDAwMAlXb3JkCUlEOiBBU0NJSS0i c2siID0gMHg2QjczICAgICAgICAqLwogICBzaG9ydCBkdW1teTE7ICAgICAgLyogMHgwMDAyCVdv cmQJVW51c2VkICAgICAgICAgICAgICAgICAgICAgICAgICovCi0gIGxvbmcgIG9mc19wcmV2c2s7 ICAvKiAweDAwMDQJRC1Xb3JkCU9mZnNldCBvZiBwcmV2aW91cyAic2siLVJlY29yZCAqLwotICBs b25nICBvZnNfbmV4dHNrOyAgLyogMHgwMDA4CUQtV29yZAlPZmZzZXQgb2YgbmV4dCAic2siLVJl Y29yZCAgICAgKi8KLSAgbG9uZyAgbm9fdXNhZ2U7ICAgIC8qIDB4MDAwQwlELVdvcmQJdXNhZ2Ut Y291bnRlciAgICAgICAgICAgICAgICAgICovCi0gIGxvbmcgIGxlbl9zazsgICAgICAvKiAweDAw MTAJRC1Xb3JkCVNpemUgb2YgInNrIi1yZWNvcmQgaW4gYnl0ZXMgICAqLworICBpbnQzMl90ICBv ZnNfcHJldnNrOyAgLyogMHgwMDA0CUQtV29yZAlPZmZzZXQgb2YgcHJldmlvdXMgInNrIi1SZWNv cmQgKi8KKyAgaW50MzJfdCAgb2ZzX25leHRzazsgIC8qIDB4MDAwOAlELVdvcmQJT2Zmc2V0IG9m IG5leHQgInNrIi1SZWNvcmQgICAgICovCisgIGludDMyX3QgIG5vX3VzYWdlOyAgICAvKiAweDAw MEMJRC1Xb3JkCXVzYWdlLWNvdW50ZXIgICAgICAgICAgICAgICAgICAqLworICBpbnQzMl90ICBs ZW5fc2s7ICAgICAgLyogMHgwMDEwCUQtV29yZAlTaXplIG9mICJzayItcmVjb3JkIGluIGJ5dGVz ICAgKi8KICAgY2hhciAgZGF0YVs0XTsgICAgIC8qIFNlY3VyaXR5IGRhdGEgdXAgdG8gbGVuX3Nr IGJ5dGVzICAgICAgICAgICAgICAgKi8KIAogfTsKQEAgLTEzNCw3ICsxMzQsNyBAQAogIHVuaW9u IHsKIAogICAgIHN0cnVjdCBsZl9oYXNoIHsKLSAgICAgIGxvbmcgb2ZzX25rOyAgICAvKiAweDAw MDAJRC1Xb3JkCU9mZnNldCBvZiBjb3JyZXNwb25kaW5nICJuayItUmVjb3JkICAqLworICAgICAg aW50MzJfdCBvZnNfbms7ICAgIC8qIDB4MDAwMAlELVdvcmQJT2Zmc2V0IG9mIGNvcnJlc3BvbmRp bmcgIm5rIi1SZWNvcmQgICovCiAgICAgICBjaGFyIG5hbWVbNF07ICAgLyogMHgwMDA0CUQtV29y ZAlBU0NJSTogdGhlIGZpcnN0IDQgY2hhcmFjdGVycyBvZiB0aGUga2V5LW5hbWUsICAqLwogICAg IH0gaGFzaFsxXTsKIApAQCAtMTQyLDggKzE0Miw4IEBACiAgICAgICAvKiAJCXBhZGRlZCB3aXRo IDAncy4gQ2FzZSBzZW5zaXRpdiEgICAgICAgICAgICAgICAgICAgICAgICAgKi8KIAogICAgIHN0 cnVjdCBsaF9oYXNoIHsKLSAgICAgIGxvbmcgb2ZzX25rOyAgICAvKiAweDAwMDAJRC1Xb3JkCU9m ZnNldCBvZiBjb3JyZXNwb25kaW5nICJuayItUmVjb3JkICAqLwotICAgICAgbG9uZyBoYXNoOyAg ICAgIC8qIDB4MDAwNAlELVdvcmQJQVNDSUk6IHRoZSBmaXJzdCA0IGNoYXJhY3RlcnMgb2YgdGhl IGtleS1uYW1lLCAgKi8KKyAgICAgIGludDMyX3Qgb2ZzX25rOyAgICAvKiAweDAwMDAJRC1Xb3Jk CU9mZnNldCBvZiBjb3JyZXNwb25kaW5nICJuayItUmVjb3JkICAqLworICAgICAgaW50MzJfdCBo YXNoOyAgICAgIC8qIDB4MDAwNAlELVdvcmQJQVNDSUk6IHRoZSBmaXJzdCA0IGNoYXJhY3RlcnMg b2YgdGhlIGtleS1uYW1lLCAgKi8KICAgICB9IGxoX2hhc2hbMV07CiAgIH07CiAKQEAgLTE1OCw3 ICsxNTgsNyBAQAogICBzaG9ydCBub19rZXlzOyAgICAvKiAweDAwMDIJV29yZAludW1iZXIgb2Yg a2V5cyAgICAgICAgICAqLwogICAgICAgICAgICAgICAgICAgICAvKiAweDAwMDQJPz8/PwlIYXNo LVJlY29yZHMgICAgICAgICAgICAqLwogICBzdHJ1Y3QgbGlfaGFzaCB7Ci0gICAgbG9uZyBvZnNf bms7ICAgIC8qIDB4MDAwMAlELVdvcmQJT2Zmc2V0IG9mIGNvcnJlc3BvbmRpbmcgIm5rIi1SZWNv cmQgICovCisgICAgaW50MzJfdCBvZnNfbms7ICAgIC8qIDB4MDAwMAlELVdvcmQJT2Zmc2V0IG9m IGNvcnJlc3BvbmRpbmcgIm5rIi1SZWNvcmQgICovCiAgIH0gaGFzaFsxXTsKIH07CiAKQEAgLTE3 OSw3ICsxNzksNyBAQAogICBzaG9ydCBub19saXM7ICAgIC8qIDB4MDAwMglXb3JkCW51bWJlciBv ZiBwb2ludGVycyB0byBsaSAqLwogICAgICAgICAgICAgICAgICAgICAvKiAweDAwMDQJPz8/PwlI YXNoLVJlY29yZHMgICAgICAgICAgICAqLwogICBzdHJ1Y3QgcmlfaGFzaCB7Ci0gICAgICBsb25n IG9mc19saTsgICAgLyogMHgwMDAwCUQtV29yZAlPZmZzZXQgb2YgY29ycmVzcG9uZGluZyAibGki LVJlY29yZCAgKi8KKyAgICAgIGludDMyX3Qgb2ZzX2xpOyAgICAvKiAweDAwMDAJRC1Xb3JkCU9m ZnNldCBvZiBjb3JyZXNwb25kaW5nICJsaSItUmVjb3JkICAqLwogICB9IGhhc2hbMV07CiB9Owog CkBAIC0xOTgsOSArMTk4LDkgQEAKICAgICAgICAgICAgICAgICAgICAgLyogT2Zmc2V0CVNpemUJ Q29udGVudHMgICAgICAgICAgICAgICAgICovCiAgIHNob3J0IGlkOyAgICAgICAgIC8qIDB4MDAw MAlXb3JkCUlEOiBBU0NJSS0idmsiID0gMHg2Qjc2ICAqLwogICBzaG9ydCBsZW5fbmFtZTsgICAv KiAweDAwMDIJV29yZAluYW1lIGxlbmd0aCAgICAgICAgICAgICAgKi8KLSAgbG9uZyAgbGVuX2Rh dGE7ICAgLyogMHgwMDA0CUQtV29yZAlsZW5ndGggb2YgdGhlIGRhdGEgICAgICAgKi8KLSAgbG9u ZyAgb2ZzX2RhdGE7ICAgLyogMHgwMDA4CUQtV29yZAlPZmZzZXQgb2YgRGF0YSAgICAgICAgICAg Ki8KLSAgbG9uZyAgdmFsX3R5cGU7ICAgLyogMHgwMDBDCUQtV29yZAlUeXBlIG9mIHZhbHVlICAg ICAgICAgICAgKi8KKyAgaW50MzJfdCAgbGVuX2RhdGE7ICAgLyogMHgwMDA0CUQtV29yZAlsZW5n dGggb2YgdGhlIGRhdGEgICAgICAgKi8KKyAgaW50MzJfdCAgb2ZzX2RhdGE7ICAgLyogMHgwMDA4 CUQtV29yZAlPZmZzZXQgb2YgRGF0YSAgICAgICAgICAgKi8KKyAgaW50MzJfdCAgdmFsX3R5cGU7 ICAgLyogMHgwMDBDCUQtV29yZAlUeXBlIG9mIHZhbHVlICAgICAgICAgICAgKi8KICAgc2hvcnQg ZmxhZzsgICAgICAgLyogMHgwMDEwCVdvcmQJRmxhZyAgICAgICAgICAgICAgICAgICAgICovCiAg IHNob3J0IGR1bW15MTsgICAgIC8qIDB4MDAxMglXb3JkCVVudXNlZCAoZGF0YS10cmFzaCkgICAg ICAqLwogICBjaGFyICBrZXluYW1lWzFdOyAvKiAweDAwMTQJPz8/PwlOYW1lICAgICAgICAgICAg ICAgICAgICAgKi8KQEAgLTIyMCwxNyArMjIwLDE3IEBACiAgIHNob3J0IGlkOyAgICAgICAgICAg ICAvKiAgMHgwMDAwCVdvcmQJSUQ6IEFTQ0lJLSJuayIgPSAweDZCNkUgICAgICAgICAgICAgICAg Ki8KICAgc2hvcnQgdHlwZTsgICAgICAgICAgIC8qICAweDAwMDIJV29yZAlmb3IgdGhlIHJvb3Qt a2V5OiAweDJDLCBvdGhlcndpc2UgMHgyMCAqLwogICBjaGFyICB0aW1lc3RhbXBbMTJdOyAgLyog IDB4MDAwNAlRLVdvcmQJd3JpdGUtZGF0ZS90aW1lIGluIHdpbmRvd3MgbnQgbm90YXRpb24gKi8K LSAgbG9uZyAgb2ZzX3BhcmVudDsgICAgIC8qICAweDAwMTAJRC1Xb3JkCU9mZnNldCBvZiBPd25l ci9QYXJlbnQga2V5ICAgICAgICAgICAgICovCi0gIGxvbmcgIG5vX3N1YmtleXM7ICAgICAvKiAg MHgwMDE0CUQtV29yZAludW1iZXIgb2Ygc3ViLUtleXMgICAgICAgICAgICAgICAgICAgICAqLwor ICBpbnQzMl90ICBvZnNfcGFyZW50OyAgICAgLyogIDB4MDAxMAlELVdvcmQJT2Zmc2V0IG9mIE93 bmVyL1BhcmVudCBrZXkgICAgICAgICAgICAgKi8KKyAgaW50MzJfdCAgbm9fc3Via2V5czsgICAg IC8qICAweDAwMTQJRC1Xb3JkCW51bWJlciBvZiBzdWItS2V5cyAgICAgICAgICAgICAgICAgICAg ICovCiAgIGNoYXIgIGR1bW15MVs0XTsKLSAgbG9uZyAgb2ZzX2xmOyAgICAgICAgIC8qICAweDAw MUMJRC1Xb3JkCU9mZnNldCBvZiB0aGUgc3ViLWtleSBsZi1SZWNvcmRzICAgICAgICovCisgIGlu dDMyX3QgIG9mc19sZjsgICAgICAgICAvKiAgMHgwMDFDCUQtV29yZAlPZmZzZXQgb2YgdGhlIHN1 Yi1rZXkgbGYtUmVjb3JkcyAgICAgICAqLwogICBjaGFyICBkdW1teTJbNF07Ci0gIGxvbmcgIG5v X3ZhbHVlczsgICAgICAvKiAgMHgwMDI0CUQtV29yZAludW1iZXIgb2YgdmFsdWVzICAgICAgICAg ICAgICAgICAgICAgICAqLwotICBsb25nICBvZnNfdmFsbGlzdDsgICAgLyogIDB4MDAyOAlELVdv cmQJT2Zmc2V0IG9mIHRoZSBWYWx1ZS1MaXN0ICAgICAgICAgICAgICAgKi8KLSAgbG9uZyAgb2Zz X3NrOyAgICAgICAgIC8qICAweDAwMkMJRC1Xb3JkCU9mZnNldCBvZiB0aGUgc2stUmVjb3JkICAg ICAgICAgICAgICAgICovCi0gIGxvbmcgIG9mc19jbGFzc25hbTsgICAvKiAgMHgwMDMwCUQtV29y ZAlPZmZzZXQgb2YgdGhlIENsYXNzLU5hbWUgICAgICAgICAgICAgICAqLworICBpbnQzMl90ICBu b192YWx1ZXM7ICAgICAgLyogIDB4MDAyNAlELVdvcmQJbnVtYmVyIG9mIHZhbHVlcyAgICAgICAg ICAgICAgICAgICAgICAgKi8KKyAgaW50MzJfdCAgb2ZzX3ZhbGxpc3Q7ICAgIC8qICAweDAwMjgJ RC1Xb3JkCU9mZnNldCBvZiB0aGUgVmFsdWUtTGlzdCAgICAgICAgICAgICAgICovCisgIGludDMy X3QgIG9mc19zazsgICAgICAgICAvKiAgMHgwMDJDCUQtV29yZAlPZmZzZXQgb2YgdGhlIHNrLVJl Y29yZCAgICAgICAgICAgICAgICAqLworICBpbnQzMl90ICBvZnNfY2xhc3NuYW07ICAgLyogIDB4 MDAzMAlELVdvcmQJT2Zmc2V0IG9mIHRoZSBDbGFzcy1OYW1lICAgICAgICAgICAgICAgKi8KICAg Y2hhciAgZHVtbXkzWzE2XTsKLSAgbG9uZyAgZHVtbXk0OyAgICAgICAgIC8qICAweDAwNDQJRC1X b3JkCVVudXNlZCAoZGF0YS10cmFzaCkgICAgICAgICAgICAgICAgICAgICovCisgIGludDMyX3Qg IGR1bW15NDsgICAgICAgICAvKiAgMHgwMDQ0CUQtV29yZAlVbnVzZWQgKGRhdGEtdHJhc2gpICAg ICAgICAgICAgICAgICAgICAqLwogICBzaG9ydCBsZW5fbmFtZTsgICAgICAgLyogIDB4MDA0OAlX b3JkCW5hbWUtbGVuZ3RoICAgICAgICAgICAgICAgICAgICAgICAgICAgICovCiAgIHNob3J0IGxl bl9jbGFzc25hbTsgICAvKiAgMHgwMDRBCVdvcmQJY2xhc3MtbmFtZSBsZW5ndGggICAgICAgICAg ICAgICAgICAgICAgKi8KICAgY2hhciAga2V5bmFtZVsxXTsgICAgIC8qICAweDAwNEMJPz8/Pwlr ZXktbmFtZSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqLwpkaWZmIC11IC1iIC1CIC1y IGNobnRwdy0wNzA0MDkub3JpZy9zYW0uaCBjaG50cHctMDcwNDA5L3NhbS5oCi0tLSBjaG50cHct MDcwNDA5Lm9yaWcvc2FtLmgJMjAwNy0wNC0wOSAwNjoxNzo0Mi4wMDAwMDAwMDAgLTA3MDAKKysr IGNobnRwdy0wNzA0MDkvc2FtLmgJMjAwNy0wNy0xNSAyMjowMDowNy4wMDAwMDAwMDAgLTA3MDAK QEAgLTIyLDYgKzIyLDkgQEAKICNpZm5kZWYgX0lOQ0xVREVfU0FNX0gKICNkZWZpbmUgX0lOQ0xV REVfU0FNX0ggMQogCisjaW5jbHVkZSA8c3lzL3R5cGVzLmg+CisjaW5jbHVkZSA8aW50dHlwZXMu aD4KKwogLyogVGhpcyBjb250YWlucyBzb21lIHBvbGljeSBzZXR0aW5ncyBmb3IgdGhlIGFjY291 bnQgZGF0YWJhc2UgKi8KIAogI2RlZmluZSBBQ0NPVU5UREJfRl9QQVRIICJcXFNBTVxcRG9tYWlu c1xcQWNjb3VudFxcRiIKQEAgLTMwLDcgKzMzLDcgQEAKIHN0cnVjdCBhY2NvdW50ZGJfRiB7CiAg IGNoYXIgdW5rbm93bjFbOF07IC8qIDAgKi8KICAgY2hhciB1bmtub3duMls4XTsgLyogOCAqLwot ICB1bnNpZ25lZCBsb25nIHVwZGF0ZWNudDsgICAvKiAxMCBOdW1iZXIgb2YgdGltZXMgcG9saWN5 IGRhdGEgdXBkYXRlZCAqLworICB1aW50MzJfdCB1cGRhdGVjbnQ7ICAgLyogMTAgTnVtYmVyIG9m IHRpbWVzIHBvbGljeSBkYXRhIHVwZGF0ZWQgKi8KICAgY2hhciB1bmtub3duM1s0XTsgLyogMTQg Ki8KICAgY2hhciB0X21heHB3YWdlWzhdOyAgLyogMTggTWF4aW11bSBwYXNzd29yZCBhZ2UsIEdV SSBzaG93cyBvbmx5IGRheXMgKi8KICAgY2hhciB0X21pbnB3YWdlWzhdOyAgLyogMjAgTWluaW11 bSBwYXNzd29yZCBhZ2UsIEdVSSBzaG93cyBvbmx5IGRheXMgKi8KQEAgLTM4LDggKzQxLDggQEAK ICAgY2hhciB0X2xvY2tkdXJbOF07ICAvKiAgMzAgQWNjb3VudCBsb2Nrb3V0IGR1cmF0aW9uLCBH VUkgc2hvd3MgbWludXRlcyAqLwogICBjaGFyIHRfbG9ja3JlbFs4XTsgIC8qICAzOCBSZWxlYXNl IGFjY291bnQgbG9ja291dCBhZnRlciwgR1VJIHNob3cgbWludXRlcyAqLwogICBjaGFyIHVua25v d241WzhdOyAgIC8qICA0MCAqLwotICB1bnNpZ25lZCBsb25nIHJpZDsgIC8qICA0OCBSSUQgb2Yg dXNlciBkb2luZyBsYXN0IGVkaXQ/ICovCi0gIHVuc2lnbmVkIGxvbmcgZmxhZ3M7IC8qIDRjIFNv bWUgZmxhZ3MgJiBvcHRpb25zLCBzZWUgYmVsb3cgKi8KKyAgdWludDMyX3QgcmlkOyAgLyogIDQ4 IFJJRCBvZiB1c2VyIGRvaW5nIGxhc3QgZWRpdD8gKi8KKyAgdWludDMyX3QgZmxhZ3M7IC8qIDRj IFNvbWUgZmxhZ3MgJiBvcHRpb25zLCBzZWUgYmVsb3cgKi8KICAgdW5zaWduZWQgc2hvcnQgbWlu cHdsZW47IC8qIDUwIE1pbmltdW0gcGFzc3dvcmQgbGVuZ2h0ICovCiAgIHVuc2lnbmVkIHNob3J0 IG51bWhpc3Q7ICAvKiA1MiBIb3cgbWFueSBwYXNzd29yZHMgdG8ga2VlcCBpbiBoaXN0b3J5ICov CiAgIHVuc2lnbmVkIHNob3J0IGxvY2tsaW1pdDsgLyo1NCAgSG93IG1hbnkgdHJpZXMgYmVmb3Jl IGxvY2tvdXQgKi8KQEAgLTYzLDcgKzY2LDcgQEAKICAgY2hhciB0X2NyZWF0aW9uWzhdOyAvKiBU aW1lIG9mIGFjY291bnQgY3JlYXRpb24gKi8KICAgY2hhciB1bmtub3duM1s4XTsKICAgY2hhciB0 X2xvZ2luWzhdOyAgICAvKiBUaW1lIG9mIGxhc3QgbG9naW4gKi8KLSAgbG9uZyByaWQ7CisgIGlu dDMyX3QgcmlkOwogICBjaGFyIHVua25vd240WzRdOwogICB1bnNpZ25lZCBzaG9ydCBBQ0JfYml0 czsgIC8qIEFjY291bnQgdHlwZSBhbmQgc3RhdHVzIGZsYWdzICovCiAgIGNoYXIgdW5rbm93bjVb Nl07Cg==