33226 2017-03-10 13:20:42 +0300 Поддержка ГОСТ-овых ключей 2017-05-10 11:09:36 +0300 1 1 4 Development Sisyphus pam_pkcs11 unstable all Linux CLOSED FIXED P3 normal --- 1 dd imz cas manowar max mike vitty qa-sisyphus oldest_to_newest 162432 0 7000 dd 2017-03-10 13:20:42 +0300 Created attachment 7000 Патч Элвиса, добавляющий поддержку ГОСТ-овых ключей Коллеги из Элвиса хакнули pam_pkcs11 на предмет поддержки ключей. Просьба попробовать интегрировать этот патч и проверить, не разломалась ли поддержка RSA. Они не проверяли. Спасибо! 163150 1 imz 2017-04-11 15:32:53 +0300 В этом диффе есть ссылки на коммиты (в .gear/rules). Мне было бы приятнее сделать у Макса Космача или кого-нибудь ещё git fetch, чем самому воспроизводить. Если есть сомнения про что-то, не беспокойтесь, это не страшно, я могу просмотреть (и поправить, если что-то некрасивое) перед сборкой. 163606 2 repository-robot 2017-05-10 11:09:36 +0300 pam_pkcs11-0.6.9-alt3.M70C.1 -> c7: Wed Apr 12 2017 Andrey Cherepanov <cas@altlinux.org> 0.6.9-alt3.M70C.1 - Backport to c7 branch Wed Apr 12 2017 Andrey Cherepanov <cas@altlinux.org> 0.6.9-alt4 - Add support for GOST certificates (thanks Max Kosmach for patch) (ALT #33226) - Complete Russian localization (thanks Max Kosmach for help) - Package executable pkcs11_make_hash_link with its manpage 7000 2017-03-10 13:20:42 +0300 2017-03-10 13:20:42 +0300 Патч Элвиса, добавляющий поддержку ГОСТ-овых ключей to_dd.diff text/plain 15039 dd ZGlmZiAtLWdpdCBhLy5nZWFyL3BhbV9wa2NzMTEuc3BlYyBiLy5nZWFyL3BhbV9wa2NzMTEuc3Bl YwppbmRleCAxOTM3MzQ4Li4zNTEwYzhmIDEwMDY0NAotLS0gYS8uZ2Vhci9wYW1fcGtjczExLnNw ZWMKKysrIGIvLmdlYXIvcGFtX3BrY3MxMS5zcGVjCkBAIC0yLDcgKzIsNyBAQAogCiBOYW1lOiBw YW1fcGtjczExCiBWZXJzaW9uOiAwLjYuOQotUmVsZWFzZTogYWx0Mi5NNzBULjAuTTcwQy4xCitS ZWxlYXNlOiBhbHQyLk03MFQuMS5lbHZpcy4xCiAKIFN1bW1hcnk6IFBLQ1MgIzExIFBBTSBNb2R1 bGUgYW5kIExvZ2luIFRvb2xzCiBHcm91cDogU3lzdGVtL0Jhc2UKQEAgLTIwLDYgKzIwLDggQEAg UGF0Y2g2OiAlbmFtZS0ldmVyc2lvbi1vcHRpb24tYXNrX3Bpbi5wYXRjaAogCiBQYXRjaDcwOiAg dXNlLWF1dG9jb25mLTIuNjgucGF0Y2gKIAorUGF0Y2g4MDogJW5hbWUtJXZlcnNpb24tZ29zdC1l bHZpcy5wYXRjaAorCiBCdWlsZFJlcXVpcmVzOiBkb2Nib29rLXN0eWxlLXhzbCBmbGV4IGxpYmxk YXAtZGV2ZWwgbGlicGFtLWRldmVsIGxpYnBjc2NsaXRlLWRldmVsIGxpYnNzbC1kZXZlbCB4c2x0 cHJvYwogQnVpbGRSZXF1aXJlczogZG94eWdlbgogQnVpbGRSZXF1aXJlczogZG9jYm9vay1kdGRz CkBAIC03NSw2ICs3Nyw3IEBAIGFzIGEgc2VwYXJhdGUgcGFja2FnZS4KICVwYXRjaDYgLXAxCiAK ICVwYXRjaDcwIC1wMQorJXBhdGNoODAgLXAxCiAKICMgZml4dXAgY29uZmlncwogc2VkIC1pIC1l ICcKQEAgLTE1Nyw2ICsxNjAsMTAgQEAgcm0gJWJ1aWxkcm9vdC8lX2xpYi8qLyoubGEKIC8lX2xp Yi8lbmFtZS9sZGFwX21hcHBlci5zbwogCiAlY2hhbmdlbG9nCisqIEZyaSBKYW4gMjcgMjAxNyBN YXggS29zbWFjaCA8bWF4QGVsdmlzLnJ1PiAwLjYuOS1hbHQyLk03MFQuMS5lbHZpcy4xCistIEFk ZCBzdXBwb3J0IGZvciBHT1NUIGNlcnRpZmljYXRlcworCisKICogVHVlIE5vdiAyMiAyMDE2IEl2 YW4gWmFraGFyeWFzY2hldiA8aW16QGFsdGxpbnV4Lm9yZz4gMC42LjktYWx0Mi5NNzBULjAuTTcw Qy4xCiAtIEJ1aWxkIGZvciBjNwogCmRpZmYgLS1naXQgYS8uZ2Vhci9ydWxlcyBiLy5nZWFyL3J1 bGVzCmluZGV4IDM4YjQ0MjQuLjEzNTQ1YjkgMTAwNjQ0Ci0tLSBhLy5nZWFyL3J1bGVzCisrKyBi Ly5nZWFyL3J1bGVzCkBAIC05LDMgKzksNCBAQCBkaWZmOiBAbmFtZUAtQHZlcnNpb25AOi4gQG5h bWVALUB2ZXJzaW9uQC1ydS5wbzouIG5hbWU9QG5hbWVALUB2ZXJzaW9uQC1ydS5wby5wYQogZGlm ZjogQG5hbWVALUB2ZXJzaW9uQDouIEBuYW1lQC1AdmVyc2lvbkAtYnVmZmVyOi4gbmFtZT1AbmFt ZUAtQHZlcnNpb25ALWJ1ZmZlci5wYXRjaAogZGlmZjogQG5hbWVALUB2ZXJzaW9uQC1idWZmZXI6 LiBAbmFtZUAtQHZlcnNpb25ALWFzay1waW4tbGF0ZXI6LiBuYW1lPUBuYW1lQC1AdmVyc2lvbkAt YXNrLXBpbi1sYXRlci5wYXRjaAogZGlmZjogQG5hbWVALUB2ZXJzaW9uQC1hc2stcGluLWxhdGVy Oi4gQG5hbWVALUB2ZXJzaW9uQC1hc2stcGluLWxhdGVyLXdpdGgtb3B0aW9uLWFza19waW46LiBu YW1lPUBuYW1lQC1AdmVyc2lvbkAtb3B0aW9uLWFza19waW4ucGF0Y2gKK2RpZmY6IEBuYW1lQC1A dmVyc2lvbkAtYzc6LiBlNjcxOWJkYzg0MzY2ZjYxNWFkNWNiNmQ3MTRmODgxYTM4ZjgxNjJhOi4g bmFtZT1AbmFtZUAtQHZlcnNpb25ALWdvc3QtZWx2aXMucGF0Y2gKZGlmZiAtLWdpdCBhLy5nZWFy L3RhZ3MvbGlzdCBiLy5nZWFyL3RhZ3MvbGlzdAppbmRleCA2Y2RkMDc2Li4zMGQ3ZGZhIDEwMDY0 NAotLS0gYS8uZ2Vhci90YWdzL2xpc3QKKysrIGIvLmdlYXIvdGFncy9saXN0CkBAIC02LDMgKzYs NCBAQAogNDE5OGU0YmMzODE4YTc2ZTlmYTcxODQyYTg0N2EzNTZmOTg3Mzc0OSBwYW1fcGtjczEx LTAuNi45LWJ1ZmZlcgogOWEyNjhjNjdiNzhlOGE2NjhkMjZhMzdiNDFiZDJkYjM5Njc1OTE0ZiBw YW1fcGtjczExLTAuNi45LWFzay1waW4tbGF0ZXIKIDgyNDcyMTdjNjA4ZGVlN2MzZDQyOWZjZTYx MDY4YzRjZGU3ZGYwN2UgcGFtX3BrY3MxMS0wLjYuOS1hc2stcGluLWxhdGVyLXdpdGgtb3B0aW9u LWFza19waW4KKzdkZDU3Y2ExNDVlODZiY2U4Njk1N2M2NTU5NGYwYWVkNDAzNmNlZTEgcGFtX3Br Y3MxMS0wLjYuOS1jNwpkaWZmIC0tZ2l0IGEvcG8vcnUucG8gYi9wby9ydS5wbwppbmRleCA2ZDRm ZDRmLi5jY2U1NDMzIDEwMDY0NAotLS0gYS9wby9ydS5wbworKysgYi9wby9ydS5wbwpAQCAtMzYs NyArMzYsNyBAQCBtc2dzdHIgIiIKIAogIzogc3JjL3BhbV9wa2NzMTEvcGFtX3BrY3MxMS5jOjM4 NwogbXNnaWQgIkVycm9yIDIzMDY6IE5vIHN1aXRhYmxlIHRva2VuIGF2YWlsYWJsZSIKLW1zZ3N0 ciAiIgorbXNnc3RyICLQntGI0LjQsdC60LAgMjMwNjog0J3QtdGCINC/0L7QtNGF0L7QtNGP0YnQ tdCz0L4g0YLQvtC60LXQvdCwIgogCiAjOiBzcmMvcGFtX3BrY3MxMS9wYW1fcGtjczExLmM6NDAx CiAjLCBjLWZvcm1hdApAQCAtNDksMTEgKzQ5LDExIEBAIG1zZ3N0ciAi0J/QvtC20LDQu9GD0LnR gdGC0LAsINCy0YHRgtCw0LLRjNGC0LUg0YLQvtC60LXQvS4iCiAKICM6IHNyYy9wYW1fcGtjczEx L3BhbV9wa2NzMTEuYzo0MjIKIG1zZ2lkICJFcnJvciAyMzA4OiBObyBzbWFydGNhcmQgZm91bmQi Ci1tc2dzdHIgIiIKK21zZ3N0ciAi0J7RiNC40LHQutCwIDIzMDg6INCd0LUg0L3QsNC50LTQtdC9 0LAg0YHQvNCw0YDRgi3QutCw0YDRgtCwIgogCiAjOiBzcmMvcGFtX3BrY3MxMS9wYW1fcGtjczEx LmM6NDQ5CiBtc2dpZCAiRXJyb3IgMjMxMDogTm8gc21hcnRjYXJkIGZvdW5kIgotbXNnc3RyICIi Cittc2dzdHIgItCe0YjQuNCx0LrQsCAyMzEwOiDQndC1INC90LDQudC00LXQvdCwINGB0LzQsNGA 0YIt0LrQsNGA0YLQsCIKIAogIzogc3JjL3BhbV9wa2NzMTEvcGFtX3BrY3MxMS5jOjQ1OQogIywg Yy1mb3JtYXQKQEAgLTkzLDMxICs5MywzMSBAQCBtc2dzdHIgIiIKIAogIzogc3JjL3BhbV9wa2Nz MTEvcGFtX3BrY3MxMS5jOjU1MwogbXNnaWQgIkVycm9yIDIzMjA6IFdyb25nIHNtYXJ0Y2FyZCBQ SU4iCi1tc2dzdHIgIiIKK21zZ3N0ciAi0J7RiNC40LHQutCwIDIzMjA6INCd0LXQstC10YDQvdGL 0Lkg0J/QmNCdIgogCiAjOiBzcmMvcGFtX3BrY3MxMS9wYW1fcGtjczExLmM6NTY1CiBtc2dpZCAi RXJyb3IgMjMyMjogTm8gY2VydGlmaWNhdGUgZm91bmQiCi1tc2dzdHIgIiIKK21zZ3N0ciAi0J7R iNC40LHQutCwIDIzMjI6INCd0LUg0L3QsNC50LTQtdC9INGB0LXRgNGC0LjRhNC40LrQsNGCIgog CiAjOiBzcmMvcGFtX3BrY3MxMS9wYW1fcGtjczExLmM6NTgwCiBtc2dpZCAidmVyaWZ5aW5nIGNl cnRpZmljYXRlIgotbXNnc3RyICIiCittc2dzdHIgItCf0YDQvtCy0LXRgNC60LAg0YHQtdGA0YLQ uNGE0LjQutCw0YLQsCIKIAogIzogc3JjL3BhbV9wa2NzMTEvcGFtX3BrY3MxMS5jOjU5MwogbXNn aWQgIkVycm9yIDIzMjQ6IENlcnRpZmljYXRlIGhhcyBleHBpcmVkIgotbXNnc3RyICIiCittc2dz dHIgItCe0YjQuNCx0LrQsCAyMzI0OiDQmNGB0YLQtdC6INGB0YDQvtC6INC00LXQudGB0YLQstC4 0Y8g0YHQtdGA0YLQuNGE0LjQutCw0YLQsCIKIAogIzogc3JjL3BhbV9wa2NzMTEvcGFtX3BrY3Mx MS5jOjU5NwogbXNnaWQgIkVycm9yIDIzMjY6IENlcnRpZmljYXRlIG5vdCB5ZXQgdmFsaWQiCi1t c2dzdHIgIiIKK21zZ3N0ciAi0J7RiNC40LHQutCwIDIzMjY6INCh0YDQvtC6INC00LXQudGB0YLQ stC40Y8g0YHQtdGA0YLQuNGE0LjQutCw0YLQsCDQtdGJ0LUg0L3QtSDQvdCw0YHRgtGD0L/QuNC7 IgogCiAjOiBzcmMvcGFtX3BrY3MxMS9wYW1fcGtjczExLmM6NjAxCiBtc2dpZCAiRXJyb3IgMjMy ODogQ2VydGlmaWNhdGUgc2lnbmF0dXJlIGludmFsaWQiCi1tc2dzdHIgIiIKK21zZ3N0ciAi0J7R iNC40LHQutCwIDIzMjg6INCd0LXQstC10YDQvdCw0Y8g0L/QvtC00L/QuNGB0Ywg0YHQtdGA0YLQ uNGE0LjQutCw0YLQsCIKIAogIzogc3JjL3BhbV9wa2NzMTEvcGFtX3BrY3MxMS5jOjYwNQogbXNn aWQgIkVycm9yIDIzMzA6IENlcnRpZmljYXRlIGludmFsaWQiCi1tc2dzdHIgIiIKK21zZ3N0ciAi 0J7RiNC40LHQutCwIDIzMzA6INCd0LXQstC10YDQvdGL0Lkg0YHQtdGA0YLQuNGE0LjQutCw0YIi CiAKICM6IHNyYy9wYW1fcGtjczExL3BhbV9wa2NzMTEuYzo2NDAKIG1zZ2lkICJFcnJvciAyMzMy OiBzZXR0aW5nIFBBTSB1c2VyZW50cnkgZmFpbGVkIgpAQCAtMTI1LDE1ICsxMjUsMTUgQEAgbXNn c3RyICIiCiAKICM6IHNyYy9wYW1fcGtjczExL3BhbV9wa2NzMTEuYzo2NTYKIG1zZ2lkICJFcnJv ciAyMzM0OiBObyBtYXRjaGluZyB1c2VyIgotbXNnc3RyICIiCittc2dzdHIgItCe0YjQuNCx0LrQ sCAyMzM0OiDQndC10YIg0L/QvtC00YXQvtC00Y/RidC10LPQviDQv9C+0LvRjNC30L7QstCw0YLQ tdC70Y8iCiAKICM6IHNyYy9wYW1fcGtjczExL3BhbV9wa2NzMTEuYzo2NzcKIG1zZ2lkICJFcnJv ciAyMzM2OiBObyBtYXRjaGluZyBjZXJ0aWZpY2F0ZSBmb3VuZCIKLW1zZ3N0ciAiIgorbXNnc3Ry ICLQntGI0LjQsdC60LAgMjMzNjog0J3QtdGCINC/0L7QtNGF0L7QtNGP0YnQtdCz0L4g0YHQtdGA 0YLQuNGE0LjQutCw0YLQsCIKIAogIzogc3JjL3BhbV9wa2NzMTEvcGFtX3BrY3MxMS5jOjY4Ngog bXNnaWQgIkNoZWNraW5nIHNpZ25hdHVyZSIKLW1zZ3N0ciAiIgorbXNnc3RyICLQn9GA0L7QstC1 0YDQutCwINC/0L7QtNC/0LjRgdC4IgogCiAjOiBzcmMvcGFtX3BrY3MxMS9wYW1fcGtjczExLmM6 NzA2CiBtc2dpZCAiRXJyb3IgMjMzODogR2V0dGluZyByYW5kb20gdmFsdWUgZmFpbGVkIgpAQCAt MTQxLDExICsxNDEsMTEgQEAgbXNnc3RyICIiCiAKICM6IHNyYy9wYW1fcGtjczExL3BhbV9wa2Nz MTEuYzo3MjAKIG1zZ2lkICJFcnJvciAyMzQwOiBTaWduaW5nIGZhaWxlZCIKLW1zZ3N0ciAiIgor bXNnc3RyICLQntGI0LjQsdC60LAgMjM0MDog0J3QtSDRg9C00LDQu9C+0YHRjCDRgdGE0L7RgNC8 0LjRgNC+0LLQsNGC0Ywg0L/QvtC00L/QuNGB0YwiCiAKICM6IHNyYy9wYW1fcGtjczExL3BhbV9w a2NzMTEuYzo3MzkKIG1zZ2lkICJFcnJvciAyMzQyOiBWZXJpZnlpbmcgc2lnbmF0dXJlIGZhaWxl ZCIKLW1zZ3N0ciAiIgorbXNnc3RyICLQntGI0LjQsdC60LAgMjM0Mjog0J3QtSDRg9C00LDQu9C+ 0YHRjCDQv9GA0L7QstC10YDQuNGC0Ywg0L/QvtC00L/QuNGB0YwiCiAKICM6IHNyYy9wYW1fcGtj czExL3BhbV9wa2NzMTEuYzo4ODYKIG1zZ2lkICJDYW5ub3QgY2hhbmdlIHRoZSBwYXNzd29yZCBv biB5b3VyIHNtYXJ0IGNhcmQuIgpkaWZmIC0tZ2l0IGEvc3JjL2NvbW1vbi9jZXJ0X3ZmeS5jIGIv c3JjL2NvbW1vbi9jZXJ0X3ZmeS5jCmluZGV4IGMxNTI1MGQuLjAzYzIwNjkgMTAwNjQ0Ci0tLSBh L3NyYy9jb21tb24vY2VydF92ZnkuYworKysgYi9zcmMvY29tbW9uL2NlcnRfdmZ5LmMKQEAgLTQ5 MSwxNiArNDkxLDI4IEBAIGludCB2ZXJpZnlfc2lnbmF0dXJlKFg1MDkgKiB4NTA5LCB1bnNpZ25l ZCBjaGFyICpkYXRhLCBpbnQgZGF0YV9sZW5ndGgsCiAgIGludCBydjsKICAgRVZQX1BLRVkgKnB1 YmtleTsKICAgRVZQX01EX0NUWCAqbWRfY3R4ID0gTlVMTDsKLQorICBjb25zdCBFVlBfTUQqIG1k OworICBpbnQgbmlkOwogICAvKiBnZXQgdGhlIHB1YmxpYy1rZXkgKi8KICAgcHVia2V5ID0gWDUw OV9nZXRfcHVia2V5KHg1MDkpOwogICBpZiAocHVia2V5ID09IE5VTEwpIHsKICAgICBzZXRfZXJy b3IoIlg1MDlfZ2V0X3B1YmtleSgpIGZhaWxlZDogJXMiLCBFUlJfZXJyb3Jfc3RyaW5nKEVSUl9n ZXRfZXJyb3IoKSwgTlVMTCkpOwogICAgIHJldHVybiAtMTsKICAgfQotICBtZF9jdHggPSBFVlBf TURfQ1RYX25ldygpOworCisgIG5pZCA9IE9CSl9vYmoybmlkKHg1MDktPmNlcnRfaW5mby0+a2V5 LT5hbGdvci0+YWxnb3JpdGhtKTsKKyAgaWYoIE5JRF9pZF9Hb3N0UjM0MTBfMjAwMSA9PSBuaWQg KQorICAgIG1kID0gRVZQX2dldF9kaWdlc3RieW5hbWUoIm1kX2dvc3Q5NCIpOworICBlbHNlCisg ICAgbWQgPSBFVlBfc2hhMSgpOworICBpZiAoIW1kKSB7CisgICAgc2V0X2Vycm9yKCJ1bnN1cHBv cnRlZCBrZXkgYWxnb3JpdGhtLCBuaWQ6ICVkIiwgbmlkKTsKKyAgICByZXR1cm4gLTE7CisgIH0K KworICBtZF9jdHggPSBFVlBfTURfQ1RYX2NyZWF0ZSgpOwogICAvKiB2ZXJpZnkgdGhlIHNpZ25h dHVyZSAqLwotICBFVlBfVmVyaWZ5SW5pdChtZF9jdHgsIEVWUF9zaGExKCkpOworICBFVlBfVmVy aWZ5SW5pdChtZF9jdHgsIG1kKTsKICAgRVZQX1ZlcmlmeVVwZGF0ZShtZF9jdHgsIGRhdGEsIGRh dGFfbGVuZ3RoKTsKICAgcnYgPSBFVlBfVmVyaWZ5RmluYWwobWRfY3R4LCBzaWduYXR1cmUsIHNp Z25hdHVyZV9sZW5ndGgsIHB1YmtleSk7CiAgIEVWUF9QS0VZX2ZyZWUocHVia2V5KTsKQEAgLTUx Miw0ICs1MjQsMzAgQEAgaW50IHZlcmlmeV9zaWduYXR1cmUoWDUwOSAqIHg1MDksIHVuc2lnbmVk IGNoYXIgKmRhdGEsIGludCBkYXRhX2xlbmd0aCwKICAgREJHKCJzaWduYXR1cmUgaXMgdmFsaWQi KTsKICAgcmV0dXJuIDA7CiB9CisKK2ludCB2ZXJpZnlfZWt1X3NjX2xvZ29uKFg1MDkgKiB4NTA5 KQoreworICBzdGF0aWMgdW5zaWduZWQgY2hhciBpZF9rcF9zY19sb2dvbltdID0gezB4MmIsIDYs IDEsIDQsIDEsIDB4ODIsIDB4MzcsIDIwLCAyLCAyfTsgLy8gMS4zLjYuMS40LjEuMzExLjIwLjIu MgorICBpbnQgcnYgPSAwOworICBFWFRFTkRFRF9LRVlfVVNBR0UqIGVrdSA9IFg1MDlfZ2V0X2V4 dF9kMmkoeDUwOSwgTklEX2V4dF9rZXlfdXNhZ2UsIE5VTEwsIE5VTEwpOworICBpZiggTlVMTCAh PSBla3UgKQorICB7CisgICAgaW50IGkgPSAwLCBuID0gc2tfQVNOMV9PQkpFQ1RfbnVtKGVrdSk7 CisgICAgZm9yKCA7IGkgPCBuOyArK2kgKQorICAgIHsKKyAgICAgIEFTTjFfT0JKRUNUKiBleHRv YmogPSBza19BU04xX09CSkVDVF92YWx1ZSggZWt1LCBpICk7CisgICAgICBpZiggTlVMTCA9PSBl eHRvYmogKQorICAgICAgICBjb250aW51ZTsKKyAgICAgIGlmKCBzaXplb2YoaWRfa3Bfc2NfbG9n b24pID09IGV4dG9iai0+bGVuZ3RoCisgICAgICAgICAgJiYgMCA9PSBtZW1jbXAoZXh0b2JqLT5k YXRhLCBpZF9rcF9zY19sb2dvbiwgc2l6ZW9mKGlkX2twX3NjX2xvZ29uKSkgKQorICAgICAgewor ICAgICAgICBydiA9IDE7CisgICAgICAgIGJyZWFrOworICAgICAgfQorICAgIH0KKyAgICBFWFRF TkRFRF9LRVlfVVNBR0VfZnJlZShla3UpOworICB9CisgIHJldHVybiBydjsKK30KKwogI2VuZGlm CmRpZmYgLS1naXQgYS9zcmMvY29tbW9uL2NlcnRfdmZ5LmggYi9zcmMvY29tbW9uL2NlcnRfdmZ5 LmgKaW5kZXggOTRhOGQ3ZC4uMTg3M2I5YiAxMDA2NDQKLS0tIGEvc3JjL2NvbW1vbi9jZXJ0X3Zm eS5oCisrKyBiL3NyYy9jb21tb24vY2VydF92ZnkuaApAQCAtNTQsNiArNTQsNyBAQCBzdHJ1Y3Qg Y2VydF9wb2xpY3lfc3QgewogCWNvbnN0IGNoYXIgKmNybF9kaXI7CiAJY29uc3QgY2hhciAqbnNz X2RpcjsKIAlpbnQgb2NzcF9wb2xpY3k7CisJaW50IGVrdV9zY19sb2dvbl9wb2xpY3k7CiB9Owog CiAjaWZuZGVmIF9fQ0VSVF9WRllfQwpAQCAtODEsNiArODIsOCBAQCBDRVJUVkZZX0VYVEVSTiBp bnQgdmVyaWZ5X2NlcnRpZmljYXRlKFg1MDkgKiB4NTA5LCBjZXJ0X3BvbGljeSAqcG9saWN5KTsK ICovCiBDRVJUVkZZX0VYVEVSTiBpbnQgdmVyaWZ5X3NpZ25hdHVyZShYNTA5ICogeDUwOSwgdW5z aWduZWQgY2hhciAqZGF0YSwgaW50IGRhdGFfbGVuZ3RoLCB1bnNpZ25lZCBjaGFyICpzaWduYXR1 cmUsIGludCBzaWduYXR1cmVfbGVuZ3RoKTsKIAorQ0VSVFZGWV9FWFRFUk4gaW50IHZlcmlmeV9l a3Vfc2NfbG9nb24oWDUwOSAqIHg1MDkpOworCiAjdW5kZWYgQ0VSVFZGWV9FWFRFUk4KIAogI2Vu ZGlmIC8qIF9fQ0VSVF9WRllfSF8gKi8KZGlmZiAtLWdpdCBhL3NyYy9jb21tb24vcGtjczExX2xp Yi5jIGIvc3JjL2NvbW1vbi9wa2NzMTFfbGliLmMKaW5kZXggNDFiNTVkMS4uMWNhMTg0YyAxMDA2 NDQKLS0tIGEvc3JjL2NvbW1vbi9wa2NzMTFfbGliLmMKKysrIGIvc3JjL2NvbW1vbi9wa2NzMTFf bGliLmMKQEAgLTMyLDcgKzMyLDcgQEAKICNpbmNsdWRlICJlcnJvci5oIgogI2luY2x1ZGUgImNl cnRfaW5mby5oIgogI2luY2x1ZGUgInBrY3MxMV9saWIuaCIKLQorI2luY2x1ZGUgPG9wZW5zc2wv Y29uZi5oPgogCiAvKgogICogdGhpcyBmdW5jdGlvbnMgaXMgY29tcGxldGVseSBjb21tb24gYmV0 d2VlbiBib3RoIGltcGxlbWVudGF0aW9uLgpAQCAtOTc5LDYgKzk3OSw3IEBAIGludCBjcnlwdG9f aW5pdChjZXJ0X3BvbGljeSAqcG9saWN5KQogewogICAvKiBhcmcgaXMgaWdub3JlZCBmb3IgT1BF TlNTTCAqLwogICAodm9pZClwb2xpY3k7CisgIE9QRU5TU0xfY29uZmlnKE5VTEwpOwogICBPcGVu U1NMX2FkZF9hbGxfYWxnb3JpdGhtcygpOwogICBFUlJfbG9hZF9jcnlwdG9fc3RyaW5ncygpOwog ICByZXR1cm4gMDsKQEAgLTE2NzEsNiArMTY3Miw3IEBAIGdldGxpc3RfZXJyb3I6CiBpbnQgZ2V0 X3ByaXZhdGVfa2V5KHBrY3MxMV9oYW5kbGVfdCAqaCwgY2VydF9vYmplY3RfdCAqY2VydCkgewog ICBDS19PQkpFQ1RfQ0xBU1Mga2V5X2NsYXNzID0gQ0tPX1BSSVZBVEVfS0VZOwogICBDS19CQk9P TCBrZXlfc2lnbiA9IENLX1RSVUU7CisgIENLX0FUVFJJQlVURSBhdHRyOwogICBDS19BVFRSSUJV VEUga2V5X3RlbXBsYXRlW10gPSB7CiAgICAge0NLQV9DTEFTUywgJmtleV9jbGFzcywgc2l6ZW9m KGtleV9jbGFzcyl9CiAgICAgLApAQCAtMTcxOCw3ICsxNzIwLDE2IEBAIGludCBnZXRfcHJpdmF0 ZV9rZXkocGtjczExX2hhbmRsZV90ICpoLCBjZXJ0X29iamVjdF90ICpjZXJ0KSB7CiAgIH0KIAog ICBjZXJ0LT5wcml2YXRlX2tleSA9IG9iamVjdDsKLSAgY2VydC0+a2V5X3R5cGUgPSBDS0tfUlNB OworICBhdHRyLnR5cGUgPSBDS0FfS0VZX1RZUEU7CisgIGF0dHIudWxWYWx1ZUxlbiA9IHNpemVv ZihjZXJ0LT5rZXlfdHlwZSk7CisgIGF0dHIucFZhbHVlID0gJihjZXJ0LT5rZXlfdHlwZSk7Cisg IHJ2ID0gaC0+ZmwtPkNfR2V0QXR0cmlidXRlVmFsdWUoaC0+c2Vzc2lvbiwgb2JqZWN0LCAmYXR0 ciwxKTsKKyAgaWYgKHJ2ICE9IENLUl9PSykgeworICAgIHNldF9lcnJvcigiQ19HZXRBdHRyaWJ1 dGVWYWx1ZSgpIGZhaWxlZDogMHglMDhsWCIsIHJ2KTsKKyAgICByZXR1cm4gLTE7CisgIH0KKyAg CisgIERCRzEoIkNfR2V0QXR0cmlidXRlVmFsdWUga2V5dHlwZTogJXgiLGNlcnQtPmtleV90eXBl KTsKIAogICByZXR1cm4gMDsKIApAQCAtMTc1OSwyOSArMTc3MCwzOCBAQCBpbnQgc2lnbl92YWx1 ZShwa2NzMTFfaGFuZGxlX3QgKmgsIGNlcnRfb2JqZWN0X3QgKmNlcnQsIENLX0JZVEUgKmRhdGEs CiAgICAgY2FzZSBDS0tfUlNBOgogICAgICAgbWVjaGFuaXNtLm1lY2hhbmlzbSA9IENLTV9SU0Ff UEtDUzsKICAgICAgIGJyZWFrOworICAgIGNhc2UgQ0tLX0dPU1RSMzQxMDoKKyAgICAgIG1lY2hh bmlzbS5tZWNoYW5pc20gPSBDS01fR09TVFIzNDEwX1dJVEhfR09TVFIzNDExOworICAgICAgYnJl YWs7CiAgICAgZGVmYXVsdDoKICAgICAgIHNldF9lcnJvcigidW5zdXBwb3J0ZWQga2V5IHR5cGUg JWQiLCBjZXJ0LT50eXBlKTsKICAgICAgIHJldHVybiAtMTsKICAgfQogICAvKiBjb21wdXRlIGhh c2gtdmFsdWUgKi8KLSAgU0hBMShkYXRhLCBsZW5ndGgsICZoYXNoWzE1XSk7Ci0gIERCRzUoImhh c2hbJWxkXSA9IFsuLi46JTAyeDolMDJ4OiUwMng6Li4uOiUwMnhdIiwgc2l6ZW9mKGhhc2gpLAot ICAgICAgaGFzaFsxNV0sIGhhc2hbMTZdLCBoYXNoWzE3XSwgaGFzaFtzaXplb2YoaGFzaCkgLSAx XSk7CisgIGlmKCBDS0tfUlNBID09IGNlcnQtPmtleV90eXBlICkgeworICAgIFNIQTEoZGF0YSwg bGVuZ3RoLCAmaGFzaFsxNV0pOworICAgIERCRzUoImhhc2hbJWxkXSA9IFsuLi46JTAyeDolMDJ4 OiUwMng6Li4uOiUwMnhdIiwgc2l6ZW9mKGhhc2gpLAorICAgICAgICBoYXNoWzE1XSwgaGFzaFsx Nl0sIGhhc2hbMTddLCBoYXNoW3NpemVvZihoYXNoKSAtIDFdKTsKKyAgfQogICAvKiBzaWduIHRo ZSB0b2tlbiAqLworICBEQkcyKCJDX1NpZ25Jbml0OiBtZWNoOiAleCwga2V5dHlwZTogJXgiLCBt ZWNoYW5pc20ubWVjaGFuaXNtLCBjZXJ0LT5rZXlfdHlwZSk7CiAgIHJ2ID0gaC0+ZmwtPkNfU2ln bkluaXQoaC0+c2Vzc2lvbiwgJm1lY2hhbmlzbSwgY2VydC0+cHJpdmF0ZV9rZXkpOwogICBpZiAo cnYgIT0gQ0tSX09LKSB7CiAgICAgc2V0X2Vycm9yKCJDX1NpZ25Jbml0KCkgZmFpbGVkOiAweCUw OGxYIiwgcnYpOwogICAgIHJldHVybiAtMTsKICAgfQogICAqc2lnbmF0dXJlID0gTlVMTDsKLSAg KnNpZ25hdHVyZV9sZW5ndGggPSAxMjg7CisgICpzaWduYXR1cmVfbGVuZ3RoID0gMjU2OwogICB3 aGlsZSAoKnNpZ25hdHVyZSA9PSBOVUxMKSB7CiAgICAgKnNpZ25hdHVyZSA9IG1hbGxvYygqc2ln bmF0dXJlX2xlbmd0aCk7CiAgICAgaWYgKCpzaWduYXR1cmUgPT0gTlVMTCkgewogICAgICAgc2V0 X2Vycm9yKCJub3QgZW5vdWdoIGZyZWUgbWVtb3J5IGF2YWlsYWJsZSIpOwogICAgICAgcmV0dXJu IC0xOwogICAgIH0KLSAgICBydiA9IGgtPmZsLT5DX1NpZ24oaC0+c2Vzc2lvbiwgaGFzaCwgc2l6 ZW9mKGhhc2gpLCAqc2lnbmF0dXJlLCBzaWduYXR1cmVfbGVuZ3RoKTsKKyAgICBpZiggQ0tLX1JT QSA9PSBjZXJ0LT5rZXlfdHlwZSApCisgICAgICBydiA9IGgtPmZsLT5DX1NpZ24oaC0+c2Vzc2lv biwgaGFzaCwgc2l6ZW9mKGhhc2gpLCAqc2lnbmF0dXJlLCBzaWduYXR1cmVfbGVuZ3RoKTsKKyAg ICBlbHNlCisgICAgICBydiA9IGgtPmZsLT5DX1NpZ24oaC0+c2Vzc2lvbiwgZGF0YSwgbGVuZ3Ro LCAqc2lnbmF0dXJlLCBzaWduYXR1cmVfbGVuZ3RoKTsKICAgICBpZiAocnYgPT0gQ0tSX0JVRkZF Ul9UT09fU01BTEwpIHsKICAgICAgIC8qIGluY3JlYXNlIHNpZ25hdHVyZSBsZW5ndGggYXMgbG9u ZyBhcyBpdCBpdCB0byBzaG9ydCAqLwogICAgICAgZnJlZSgqc2lnbmF0dXJlKTsKZGlmZiAtLWdp dCBhL3NyYy9jb21tb24vcnNhcmVmL3BrY3MxMXQuaCBiL3NyYy9jb21tb24vcnNhcmVmL3BrY3Mx MXQuaAppbmRleCBhODA0ODJiLi4zNzM3NWVhIDEwMDY0NAotLS0gYS9zcmMvY29tbW9uL3JzYXJl Zi9wa2NzMTF0LmgKKysrIGIvc3JjL2NvbW1vbi9yc2FyZWYvcGtjczExdC5oCkBAIC0zODMsNiAr MzgzLDExIEBAIHR5cGVkZWYgQ0tfVUxPTkcgQ0tfS0VZX1RZUEU7CiAjZGVmaW5lIENLS19DRE1G ICAgICAgICAgICAgMHgwMDAwMDAxRQogI2RlZmluZSBDS0tfQUVTICAgICAgICAgICAgIDB4MDAw MDAwMUYKIAorLyogRWx2aXMgKi8KKyNkZWZpbmUgQ0tLX0dPU1RSMzQxMAkweDAwMDAwMDMwCisj ZGVmaW5lIENLS19HT1NUUjM0MTEJMHgwMDAwMDAzMQorI2RlZmluZSBDS0tfR09TVDI4MTQ3CTB4 MDAwMDAwMzIKKwogI2RlZmluZSBDS0tfVkVORE9SX0RFRklORUQgIDB4ODAwMDAwMDAKIAogCkBA IC03NzQsNiArNzc5LDIxIEBAIHR5cGVkZWYgQ0tfVUxPTkcgQ0tfTUVDSEFOSVNNX1RZUEU7CiAj ZGVmaW5lIENLTV9ESF9QS0NTX1BBUkFNRVRFUl9HRU4gICAgICAweDAwMDAyMDAxCiAjZGVmaW5l IENLTV9YOV80Ml9ESF9QQVJBTUVURVJfR0VOICAgICAweDAwMDAyMDAyCiAKKy8qIEVsdmlzICov CisjZGVmaW5lIENLTV9HT1NUUjM0MTBfS0VZX1BBSVJfR0VOCQkweDAwMDAxMjAwCisjZGVmaW5l IENLTV9HT1NUUjM0MTAJCQkJCTB4MDAwMDEyMDEKKyNkZWZpbmUgQ0tNX0dPU1RSMzQxMF9XSVRI X0dPU1RSMzQxMQkweDAwMDAxMjAyCisjZGVmaW5lIENLTV9HT1NUUjM0MTBfS0VZX1dSQVAJCQkw eDAwMDAxMjAzCisjZGVmaW5lIENLTV9HT1NUUjM0MTBfREVSSVZFCQkJMHgwMDAwMTIwNAorI2Rl ZmluZSBDS01fR09TVFIzNDExCQkJCQkweDAwMDAxMjEwCisjZGVmaW5lIENLTV9HT1NUUjM0MTFf SE1BQwkJCQkweDAwMDAxMjExCisjZGVmaW5lIENLTV9HT1NUMjgxNDdfS0VZX0dFTgkJCTB4MDAw MDEyMjAKKyNkZWZpbmUgQ0tNX0dPU1QyODE0N19FQ0IJCQkJMHgwMDAwMTIyMQorI2RlZmluZSBD S01fR09TVDI4MTQ3CQkJCQkweDAwMDAxMjIyCisjZGVmaW5lIENLTV9HT1NUMjgxNDdfTUFDCQkJ CTB4MDAwMDEyMjMKKyNkZWZpbmUgQ0tNX0dPU1QyODE0N19LRVlfV1JBUAkweDAwMDAxMjI0CisK KwogI2RlZmluZSBDS01fVkVORE9SX0RFRklORUQgICAgICAgICAgICAgMHg4MDAwMDAwMAogCiB0 eXBlZGVmIENLX01FQ0hBTklTTV9UWVBFIENLX1BUUiBDS19NRUNIQU5JU01fVFlQRV9QVFI7CmRp ZmYgLS1naXQgYS9zcmMvcGFtX3BrY3MxMS9wYW1fY29uZmlnLmMgYi9zcmMvcGFtX3BrY3MxMS9w YW1fY29uZmlnLmMKaW5kZXggZmNiMmRiOS4uYWM5ZDRjZiAxMDA2NDQKLS0tIGEvc3JjL3BhbV9w a2NzMTEvcGFtX2NvbmZpZy5jCisrKyBiL3NyYy9wYW1fcGtjczExL3BhbV9jb25maWcuYwpAQCAt OTEsNiArOTEsNyBAQCBzdGF0aWMgdm9pZCBkaXNwbGF5X2NvbmZpZyAodm9pZCkgewogICAgICAg ICBEQkcxKCJjcmxfcG9saWN5ICVkIixjb25maWd1cmF0aW9uLnBvbGljeS5jcmxfcG9saWN5KTsK ICAgICAgICAgREJHMSgic2lnbmF0dXJlX3BvbGljeSAlZCIsY29uZmlndXJhdGlvbi5wb2xpY3ku c2lnbmF0dXJlX3BvbGljeSk7CiAgICAgICAgIERCRzEoIm9jc3BfcG9saWN5ICVkIixjb25maWd1 cmF0aW9uLnBvbGljeS5vY3NwX3BvbGljeSk7CisgICAgICAgIERCRzEoImVrdV9zY19sb2dvbl9w b2xpY3kgJWQiLGNvbmZpZ3VyYXRpb24ucG9saWN5LmVrdV9zY19sb2dvbl9wb2xpY3kpOwogICAg ICAgICBEQkcxKCJlcnJfZGlzcGxheV90aW1lICVkIiwgY29uZmlndXJhdGlvbi5lcnJfZGlzcGxh eV90aW1lKTsKICAgICAgICAgREJHMSgiYXNrX3BpbiAlZCIsY29uZmlndXJhdGlvbi5hc2tfcGlu KTsKIH0KQEAgLTE5Miw2ICsxOTMsNyBAQCBzdGF0aWMgdm9pZCBwYXJzZV9jb25maWdfZmlsZSh2 b2lkKSB7CiAJCQljb25maWd1cmF0aW9uLnBvbGljeS5nbG9iYWxfY2FfcG9saWN5PTA7CiAJCQlj b25maWd1cmF0aW9uLnBvbGljeS5jYV9wb2xpY3k9MDsKIAkJCWNvbmZpZ3VyYXRpb24ucG9saWN5 LnNpZ25hdHVyZV9wb2xpY3k9MDsKKwkJCWNvbmZpZ3VyYXRpb24ucG9saWN5LmVrdV9zY19sb2dv bl9wb2xpY3k9MDsKIAkJCWJyZWFrOwogCQl9IGVsc2UgaWYgKCAhc3RyY21wKHBvbGljeV9saXN0 LT5kYXRhLCJjcmxfYXV0byIpICkgewogCQkJY29uZmlndXJhdGlvbi5wb2xpY3kuY3JsX3BvbGlj eT1DUkxQX0FVVE87CkBAIC0yMDcsNiArMjA5LDggQEAgc3RhdGljIHZvaWQgcGFyc2VfY29uZmln X2ZpbGUodm9pZCkgewogCQkJY29uZmlndXJhdGlvbi5wb2xpY3kuY2FfcG9saWN5PTE7CiAJCX0g ZWxzZSBpZiAoICFzdHJjbXAocG9saWN5X2xpc3QtPmRhdGEsInNpZ25hdHVyZSIpICkgewogCQkJ Y29uZmlndXJhdGlvbi5wb2xpY3kuc2lnbmF0dXJlX3BvbGljeT0xOworCQl9IGVsc2UgaWYgKCAh c3RyY21wKHBvbGljeV9saXN0LT5kYXRhLCJla3Vfc2Nsb2dvbiIpICkgeworCQkJY29uZmlndXJh dGlvbi5wb2xpY3kuZWt1X3NjX2xvZ29uX3BvbGljeT0xOwogCQl9IGVsc2UgewogICAgICAgICAg ICAgICAgICAgIERCRzEoIkludmFsaWQgQ1JMIHBvbGljeTogJXMiLHBvbGljeV9saXN0LT5kYXRh KTsKIAkgICAgICAgIH0KQEAgLTM0MCw2ICszNDQsNyBAQCBzdHJ1Y3QgY29uZmlndXJhdGlvbl9z dCAqcGtfY29uZmlndXJlKCBpbnQgYXJnYywgY29uc3QgY2hhciAqKmFyZ3YgKSB7CiAJCQljb25m aWd1cmF0aW9uLnBvbGljeS5jYV9wb2xpY3k9MDsKIAkJCWNvbmZpZ3VyYXRpb24ucG9saWN5LnNp Z25hdHVyZV9wb2xpY3k9MDsKIAkJCWNvbmZpZ3VyYXRpb24ucG9saWN5Lm9jc3BfcG9saWN5PU9D U1BfTk9ORTsKKwkJCWNvbmZpZ3VyYXRpb24ucG9saWN5LmVrdV9zY19sb2dvbl9wb2xpY3k9MDsK IAkJfQogCQlpZiAoc3Ryc3RyKGFyZ3ZbaV0sImNybF9vbmxpbmUiKSkgewogCQkJY29uZmlndXJh dGlvbi5wb2xpY3kuY3JsX3BvbGljeT1DUkxQX09OTElORTsKQEAgLTM1OSw2ICszNjQsOSBAQCBz dHJ1Y3QgY29uZmlndXJhdGlvbl9zdCAqcGtfY29uZmlndXJlKCBpbnQgYXJnYywgY29uc3QgY2hh ciAqKmFyZ3YgKSB7CiAJCWlmIChzdHJzdHIoYXJndltpXSwic2lnbmF0dXJlIikpIHsKIAkJCWNv bmZpZ3VyYXRpb24ucG9saWN5LnNpZ25hdHVyZV9wb2xpY3k9MTsKIAkJfQorCQlpZiAoc3Ryc3Ry KGFyZ3ZbaV0sImVrdV9zY2xvZ29uIikpIHsKKwkJCWNvbmZpZ3VyYXRpb24ucG9saWN5LmVrdV9z Y19sb2dvbl9wb2xpY3k9MTsKKwkJfQogCQljb250aW51ZTsKIAkgICB9CiAKZGlmZiAtLWdpdCBh L3NyYy9wYW1fcGtjczExL3BhbV9wa2NzMTEuYyBiL3NyYy9wYW1fcGtjczExL3BhbV9wa2NzMTEu YwppbmRleCAzY2FkYWJiLi4zNTAzZDFmIDEwMDY0NAotLS0gYS9zcmMvcGFtX3BrY3MxMS9wYW1f cGtjczExLmMKKysrIGIvc3JjL3BhbV9wa2NzMTEvcGFtX3BrY3MxMS5jCkBAIC01MzIsNyArNTMy LDEyIEBAIFBBTV9FWFRFUk4gaW50IHBhbV9zbV9hdXRoZW50aWNhdGUocGFtX2hhbmRsZV90ICpw YW1oLCBpbnQgZmxhZ3MsIGludCBhcmdjLCBjb25zCiAJaWYgKCFjb25maWd1cmF0aW9uLT5xdWll dCkgewogCQlwYW1fcHJvbXB0KHBhbWgsIFBBTV9URVhUX0lORk8sIE5VTEwsIF8oInZlcmlmeWlu ZyBjZXJ0aWZpY2F0ZSIpKTsKIAl9Ci0KKyAgICBpZiAoY29uZmlndXJhdGlvbi0+cG9saWN5LmVr dV9zY19sb2dvbl9wb2xpY3kpIHsKKyAgICAgIGlmICghdmVyaWZ5X2VrdV9zY19sb2dvbih4NTA5 KSkgeworICAgICAgICBEQkcoIkNlcnRpZmljYXRlIGRvZXMgbm90IGNvbnRhaW4gRUtVIFNtYXJ0 IENhcmQgTG9nb24iKTsKKyAgICAgICAgY29udGludWU7IC8qIHRyeSBuZXh0IGNlcnRpZmljYXRl ICovCisgICAgICB9CisgICAgfQogICAgICAgLyogdmVyaWZ5IGNlcnRpZmljYXRlIChkYXRlLCBz aWduYXR1cmUsIENSTCwgLi4uKSAqLwogICAgICAgcnYgPSB2ZXJpZnlfY2VydGlmaWNhdGUoeDUw OSwmY29uZmlndXJhdGlvbi0+cG9saWN5KTsKICAgICAgIGlmIChydiA8IDApIHsK