59004 2026-05-05 16:36:56 +0300 Поддержка свободного выбора шифров в диалоге расширенных настроек 2026-05-05 16:37:54 +0300 1 1 4 Development Sisyphus NetworkManager-openvpn unstable x86_64 Linux NEW P5 normal --- 1 qualimock sem sem qa-sisyphus oldest_to_newest 286826 0 qualimock 2026-05-05 16:36:56 +0300 Прошу рассмотреть и включить в пакет изменения: Ввод произвольного алгоритма HMAC-аутентификации. Ранее поле "Аутентификация с помощью HMAC" содержало только фиксированный список алгоритмов. Теперь поле поддерживает свободный ввод: пользователь может выбрать алгоритм из списка или ввести произвольное значение вручную. Выбор алгоритмов для поля data-ciphers. Ранее поле data-ciphers было простым текстовым полем без какой-либо помощи при вводе. Добавлен выпадающий список доступных алгоритмов рядом с полем ввода. Выбранный алгоритм добавляется к уже введенным через разделитель. Добавлен фильтр ввода, предотвращающий указание некорректных значений. Изменения NetworkManager-openvpn сформированы в Merge Request в upstream: https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/merge_requests/110 https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/merge_requests/111 Пакет пересобран с патчами в таске: https://packages.altlinux.org/ru/tasks/417215/ 286827 1 21261 qualimock 2026-05-05 16:37:22 +0300 Created attachment 21261 Выбор алгоритмов для поля data-ciphers 286828 2 21262 qualimock 2026-05-05 16:37:54 +0300 Created attachment 21262 Ввод произвольного алгоритма HMAC-аутентификации 21261 2026-05-05 16:37:22 +0300 2026-05-05 16:37:22 +0300 Выбор алгоритмов для поля data-ciphers NetworkManager-openvpn-1.12.5-alt-data-ciphers-picker.patch text/plain 5827 qualimock ZGlmZiAtLWdpdCBhL3Byb3BlcnRpZXMvbm0tb3BlbnZwbi1kaWFsb2cudWkgYi9wcm9wZXJ0aWVz L25tLW9wZW52cG4tZGlhbG9nLnVpCmluZGV4IDMxMzY2NjkuLmIwZjRhZDMgMTAwNjQ0Ci0tLSBh L3Byb3BlcnRpZXMvbm0tb3BlbnZwbi1kaWFsb2cudWkKKysrIGIvcHJvcGVydGllcy9ubS1vcGVu dnBuLWRpYWxvZy51aQpAQCAtMTc1Myw2ICsxNzUzLDIzIEBAIGNvbmZpZzogZGF0YS1jaXBoZXJz PC9wcm9wZXJ0eT4KICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InRvcC1hdHRh Y2giPjI8L3Byb3BlcnR5PgogICAgICAgICAgICAgICAgICAgPC9wYWNraW5nPgogICAgICAgICAg ICAgICAgIDwvY2hpbGQ+CisgICAgICAgICAgICAgICAgPGNoaWxkPgorICAgICAgICAgICAgICAg ICAgPG9iamVjdCBjbGFzcz0iR3RrQ29tYm9Cb3giIGlkPSJkYXRhX2NpcGhlcnNfcGlja2VyIj4K KyAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InZpc2libGUiPlRydWU8L3Byb3Bl cnR5PgorICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iY2FuLWZvY3VzIj5GYWxz ZTwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ0b29sdGlw LXRleHQiIHRyYW5zbGF0YWJsZT0ieWVzIj5TZWxlY3QgYSBjaXBoZXIgdG8gYXBwZW5kIGl0IHRv IHRoZSBsaXN0LjwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgIDxjaGlsZD4KKyAgICAg ICAgICAgICAgICAgICAgICA8b2JqZWN0IGNsYXNzPSJHdGtDZWxsUmVuZGVyZXJUZXh0IiBpZD0i cmVuZGVyZXJfZGF0YV9jaXBoZXJzX3BpY2tlciIvPgorICAgICAgICAgICAgICAgICAgICAgIDxh dHRyaWJ1dGVzPgorICAgICAgICAgICAgICAgICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJ0ZXh0 Ij4wPC9hdHRyaWJ1dGU+CisgICAgICAgICAgICAgICAgICAgICAgPC9hdHRyaWJ1dGVzPgorICAg ICAgICAgICAgICAgICAgICA8L2NoaWxkPgorICAgICAgICAgICAgICAgICAgPC9vYmplY3Q+Cisg ICAgICAgICAgICAgICAgICA8cGFja2luZz4KKyAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5 IG5hbWU9ImxlZnQtYXR0YWNoIj4yPC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgPHBy b3BlcnR5IG5hbWU9InRvcC1hdHRhY2giPjI8L3Byb3BlcnR5PgorICAgICAgICAgICAgICAgICAg PC9wYWNraW5nPgorICAgICAgICAgICAgICAgIDwvY2hpbGQ+CiAgICAgICAgICAgICAgICAgPGNo aWxkPgogICAgICAgICAgICAgICAgICAgPG9iamVjdCBjbGFzcz0iR3RrTGFiZWwiIGlkPSJsYWJl bDI0Ij4KICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InZpc2libGUiPlRydWU8 L3Byb3BlcnR5PgpkaWZmIC0tZ2l0IGEvcHJvcGVydGllcy9ubS1vcGVudnBuLWVkaXRvci5jIGIv cHJvcGVydGllcy9ubS1vcGVudnBuLWVkaXRvci5jCmluZGV4IDBmODZiN2MuLjI3YmJjZGMgMTAw NjQ0Ci0tLSBhL3Byb3BlcnRpZXMvbm0tb3BlbnZwbi1lZGl0b3IuYworKysgYi9wcm9wZXJ0aWVz L25tLW9wZW52cG4tZWRpdG9yLmMKQEAgLTE1NjQsNiArMTU2NCwxMjcgQEAgcGluZ19leGl0X3Jl c3RhcnRfY2hlY2tib3hfdG9nZ2xlZF9jYiAoR3RrV2lkZ2V0ICpjaGVjaywgZ3BvaW50ZXIgdXNl cl9kYXRhKQogCWNoZWNrYm94X3RvZ2dsZWRfdXBkYXRlX3dpZGdldF9jYiAoY2hlY2ssIHNwaW4p OwogfQogCitzdGF0aWMgdm9pZAorZGF0YV9jaXBoZXJzX2ZpbHRlcl9jYiAoR3RrRWRpdGFibGUg KmVkaXRhYmxlLCBncG9pbnRlciB1c2VyX2RhdGEpCit7CisJY29uc3QgY2hhciAqdGV4dCA9IGd0 a19lZGl0YWJsZV9nZXRfdGV4dCAoZWRpdGFibGUpOworCUdTdHJpbmcgKmZpbHRlcmVkID0gZ19z dHJpbmdfbmV3IChOVUxMKTsKKwlnYm9vbGVhbiBjaGFuZ2VkID0gRkFMU0U7CisJY29uc3QgY2hh ciAqcDsKKworCWZvciAocCA9IHRleHQ7ICpwOyBwKyspIHsKKwkJY2hhciBjID0gKnA7CisJCWlm IChnX2FzY2lpX2lzYWxudW0gKGMpIHx8IGMgPT0gJy0nIHx8IGMgPT0gJzonKQorCQkJZ19zdHJp bmdfYXBwZW5kX2MgKGZpbHRlcmVkLCBjKTsKKwkJZWxzZQorCQkJY2hhbmdlZCA9IFRSVUU7CisJ fQorCisJaWYgKGNoYW5nZWQpIHsKKwkJZ19zaWduYWxfaGFuZGxlcnNfYmxvY2tfYnlfZnVuYyAo ZWRpdGFibGUsIGRhdGFfY2lwaGVyc19maWx0ZXJfY2IsIHVzZXJfZGF0YSk7CisJCWd0a19lZGl0 YWJsZV9zZXRfdGV4dCAoZWRpdGFibGUsIGZpbHRlcmVkLT5zdHIpOworCQlnX3NpZ25hbF9oYW5k bGVyc191bmJsb2NrX2J5X2Z1bmMgKGVkaXRhYmxlLCBkYXRhX2NpcGhlcnNfZmlsdGVyX2NiLCB1 c2VyX2RhdGEpOworCX0KKworCWdfc3RyaW5nX2ZyZWUgKGZpbHRlcmVkLCBUUlVFKTsKK30KKwor c3RhdGljIHZvaWQKK3BvcHVsYXRlX2RhdGFfY2lwaGVyc19waWNrZXIgKEd0a0NvbWJvQm94ICpi b3gpCit7CisJZ3NfdW5yZWZfb2JqZWN0IEd0a0xpc3RTdG9yZSAqc3RvcmUgPSBOVUxMOworCUd0 a1RyZWVJdGVyIGl0ZXI7CisJY29uc3QgY2hhciAqb3BlbnZwbl9iaW5hcnk7CisJY2hhciAqYXJn dlszXTsKKworCXN0b3JlID0gZ3RrX2xpc3Rfc3RvcmVfbmV3ICgxLCBHX1RZUEVfU1RSSU5HKTsK KwlndGtfY29tYm9fYm94X3NldF9tb2RlbCAoYm94LCBHVEtfVFJFRV9NT0RFTCAoc3RvcmUpKTsK KworCWd0a19saXN0X3N0b3JlX2FwcGVuZCAoc3RvcmUsICZpdGVyKTsKKwlndGtfbGlzdF9zdG9y ZV9zZXQgKHN0b3JlLCAmaXRlciwgMCwgXygi4oCUIEFkZCBjaXBoZXIg4oCUIiksIC0xKTsKKwor CW9wZW52cG5fYmluYXJ5ID0gbm1fZmluZF9vcGVudnBuICgpOworCWlmIChvcGVudnBuX2JpbmFy eSkgeworCQlnc19mcmVlIGdjaGFyICp0bXAgPSBOVUxMOworCQlHRXJyb3IgKmVycm9yID0gTlVM TDsKKwkJZ2Jvb2xlYW4gaWdub3JlID0gVFJVRTsKKworCQlhcmd2WzBdID0gKGNoYXIgKikgb3Bl bnZwbl9iaW5hcnk7CisJCWFyZ3ZbMV0gPSAiLS1zaG93LWNpcGhlcnMiOworCQlhcmd2WzJdID0g TlVMTDsKKworCQlpZiAoZ19zcGF3bl9zeW5jICgiLyIsIGFyZ3YsIE5VTEwsIDAsIE5VTEwsIE5V TEwsICZ0bXAsIE5VTEwsIE5VTEwsICZlcnJvcikpIHsKKwkJCWdjaGFyICoqbGluZXMgPSBnX3N0 cnNwbGl0ICh0bXAsICJcbiIsIDApOworCQkJZ2NoYXIgKipsaW5lOworCisJCQlmb3IgKGxpbmUg PSBsaW5lczsgKmxpbmU7IGxpbmUrKykgeworCQkJCWNoYXIgKnNwYWNlOworCisJCQkJaWYgKCFz dHJsZW4gKCpsaW5lKSkgeworCQkJCQlpZ25vcmUgPSAhaWdub3JlOworCQkJCQljb250aW51ZTsK KwkJCQl9CisJCQkJaWYgKGlnbm9yZSkKKwkJCQkJY29udGludWU7CisKKwkJCQlzcGFjZSA9IHN0 cmNociAoKmxpbmUsICcgJyk7CisJCQkJaWYgKHNwYWNlKQorCQkJCQkqc3BhY2UgPSAnXDAnOwor CisJCQkJaWYgKCFzdHJjbXAgKCpsaW5lLCAibm9uZSIpKQorCQkJCQljb250aW51ZTsKKworCQkJ CWlmIChzdHJsZW4gKCpsaW5lKSkgeworCQkJCQlndGtfbGlzdF9zdG9yZV9hcHBlbmQgKHN0b3Jl LCAmaXRlcik7CisJCQkJCWd0a19saXN0X3N0b3JlX3NldCAoc3RvcmUsICZpdGVyLCAwLCAqbGlu ZSwgLTEpOworCQkJCX0KKwkJCX0KKwkJCWdfc3RyZnJlZXYgKGxpbmVzKTsKKwkJfSBlbHNlIHsK KwkJCWdfd2FybmluZyAoIiVzOiBjb3VsZG4ndCBkZXRlcm1pbmUgY2lwaGVyczogJXMiLCBfX2Z1 bmNfXywgZXJyb3ItPm1lc3NhZ2UpOworCQkJZ19jbGVhcl9lcnJvciAoJmVycm9yKTsKKwkJfQor CX0KKworCWd0a19jb21ib19ib3hfc2V0X2FjdGl2ZSAoYm94LCAwKTsKK30KKworc3RhdGljIHZv aWQKK2RhdGFfY2lwaGVyc19waWNrZXJfY2hhbmdlZF9jYiAoR3RrQ29tYm9Cb3ggKmNvbWJvLCBn cG9pbnRlciB1c2VyX2RhdGEpCit7CisJR3RrRWRpdGFibGUgKmVudHJ5ID0gR1RLX0VESVRBQkxF ICh1c2VyX2RhdGEpOworCUd0a1RyZWVNb2RlbCAqbW9kZWw7CisJR3RrVHJlZUl0ZXIgaXRlcjsK KwljaGFyICpjaXBoZXIgPSBOVUxMOworCWNvbnN0IGNoYXIgKmN1cnJlbnQ7CisKKwlpZiAoZ3Rr X2NvbWJvX2JveF9nZXRfYWN0aXZlIChjb21ibykgPT0gMCkKKwkJcmV0dXJuOworCisJbW9kZWwg PSBndGtfY29tYm9fYm94X2dldF9tb2RlbCAoY29tYm8pOworCWlmICghZ3RrX2NvbWJvX2JveF9n ZXRfYWN0aXZlX2l0ZXIgKGNvbWJvLCAmaXRlcikpCisJCXJldHVybjsKKworCWd0a190cmVlX21v ZGVsX2dldCAobW9kZWwsICZpdGVyLCAwLCAmY2lwaGVyLCAtMSk7CisJaWYgKCFjaXBoZXIgfHwg ISpjaXBoZXIpIHsKKwkJZ19mcmVlIChjaXBoZXIpOworCQlndGtfY29tYm9fYm94X3NldF9hY3Rp dmUgKGNvbWJvLCAwKTsKKwkJcmV0dXJuOworCX0KKworCWN1cnJlbnQgPSBndGtfZWRpdGFibGVf Z2V0X3RleHQgKGVudHJ5KTsKKwlpZiAoY3VycmVudCAmJiAqY3VycmVudCkgeworCQlnY2hhciAq bmV3X3RleHQgPSBnX3N0cmR1cF9wcmludGYgKCIlczolcyIsIGN1cnJlbnQsIGNpcGhlcik7CisJ CWd0a19lZGl0YWJsZV9zZXRfdGV4dCAoZW50cnksIG5ld190ZXh0KTsKKwkJZ19mcmVlIChuZXdf dGV4dCk7CisJfSBlbHNlIHsKKwkJZ3RrX2VkaXRhYmxlX3NldF90ZXh0IChlbnRyeSwgY2lwaGVy KTsKKwl9CisJZ19mcmVlIChjaXBoZXIpOworCisJZ3RrX2NvbWJvX2JveF9zZXRfYWN0aXZlIChj b21ibywgMCk7Cit9CisKICNkZWZpbmUgVEFfRElSX0NPTF9OQU1FIDAKICNkZWZpbmUgVEFfRElS X0NPTF9OVU0gMQogCkBAIC0xNzY2LDExICsxODg3LDE3IEBAIGFkdmFuY2VkX2RpYWxvZ19uZXcg KEdIYXNoVGFibGUgKmhhc2gsIGNvbnN0IGNoYXIgKmNvbnR5cGUpCiAJdmFsdWUgPSBnX2hhc2hf dGFibGVfbG9va3VwIChoYXNoLCBOTV9PUEVOVlBOX0tFWV9DSVBIRVIpOwogCXBvcHVsYXRlX2Np cGhlcl9jb21ibyAoR1RLX0NPTUJPX0JPWCAod2lkZ2V0KSwgdmFsdWUpOwogCisJd2lkZ2V0ID0g R1RLX1dJREdFVCAoZ3RrX2J1aWxkZXJfZ2V0X29iamVjdCAoYnVpbGRlciwgImRhdGFfY2lwaGVy c19lbnRyeSIpKTsKKwlnX3NpZ25hbF9jb25uZWN0IChHX09CSkVDVCAod2lkZ2V0KSwgImNoYW5n ZWQiLAorCSAgICAgICAgICAgICAgICAgIEdfQ0FMTEJBQ0sgKGRhdGFfY2lwaGVyc19maWx0ZXJf Y2IpLCBOVUxMKTsKIAl2YWx1ZSA9IGdfaGFzaF90YWJsZV9sb29rdXAgKGhhc2gsIE5NX09QRU5W UE5fS0VZX0RBVEFfQ0lQSEVSUyk7Ci0JaWYgKHZhbHVlICYmICp2YWx1ZSkgewotCQl3aWRnZXQg PSBHVEtfV0lER0VUIChndGtfYnVpbGRlcl9nZXRfb2JqZWN0IChidWlsZGVyLCAiZGF0YV9jaXBo ZXJzX2VudHJ5IikpOworCWlmICh2YWx1ZSAmJiAqdmFsdWUpCiAJCWd0a19lZGl0YWJsZV9zZXRf dGV4dCAoR1RLX0VESVRBQkxFICh3aWRnZXQpLCB2YWx1ZSk7Ci0JfQorCisJY29tYm8gPSBHVEtf V0lER0VUIChndGtfYnVpbGRlcl9nZXRfb2JqZWN0IChidWlsZGVyLCAiZGF0YV9jaXBoZXJzX3Bp Y2tlciIpKTsKKwlwb3B1bGF0ZV9kYXRhX2NpcGhlcnNfcGlja2VyIChHVEtfQ09NQk9fQk9YIChj b21ibykpOworCWdfc2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUIChjb21ibyksICJjaGFuZ2VkIiwK KwkgICAgICAgICAgICAgICAgICBHX0NBTExCQUNLIChkYXRhX2NpcGhlcnNfcGlja2VyX2NoYW5n ZWRfY2IpLCB3aWRnZXQpOwogCiAJd2lkZ2V0ID0gR1RLX1dJREdFVCAoZ3RrX2J1aWxkZXJfZ2V0 X29iamVjdCAoYnVpbGRlciwgImRhdGFfY2lwaGVyc19mYWxsYmFja19jb21ibyIpKTsKIAl2YWx1 ZSA9IGdfaGFzaF90YWJsZV9sb29rdXAgKGhhc2gsIE5NX09QRU5WUE5fS0VZX0RBVEFfQ0lQSEVS U19GQUxMQkFDSyk7Cg== 21262 2026-05-05 16:37:54 +0300 2026-05-05 16:37:54 +0300 Ввод произвольного алгоритма HMAC-аутентификации NetworkManager-openvpn-1.12.5-alt-hmac-auth-entry.patch text/plain 6331 qualimock ZGlmZiAtLWdpdCBhL3Byb3BlcnRpZXMvbm0tb3BlbnZwbi1kaWFsb2cudWkgYi9wcm9wZXJ0aWVz L25tLW9wZW52cG4tZGlhbG9nLnVpCmluZGV4IDMxMzY2NjkuLmY0YjkwODkgMTAwNjQ0Ci0tLSBh L3Byb3BlcnRpZXMvbm0tb3BlbnZwbi1kaWFsb2cudWkKKysrIGIvcHJvcGVydGllcy9ubS1vcGVu dnBuLWRpYWxvZy51aQpAQCAtMTY2Miw2ICsxNjYyLDggQEAgY29uZmlnOiBrZXlzaXplICZsdDtu Jmd0OzwvcHJvcGVydHk+CiAgICAgICAgICAgICAgICAgICA8b2JqZWN0IGNsYXNzPSJHdGtDb21i b0JveCIgaWQ9ImhtYWNhdXRoX2NvbWJvIj4KICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5 IG5hbWU9InZpc2libGUiPlRydWU8L3Byb3BlcnR5PgogICAgICAgICAgICAgICAgICAgICA8cHJv cGVydHkgbmFtZT0iY2FuX2ZvY3VzIj5GYWxzZTwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAg ICAgIDxwcm9wZXJ0eSBuYW1lPSJoYXMtZW50cnkiPlRydWU8L3Byb3BlcnR5PgorICAgICAgICAg ICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iZW50cnktdGV4dC1jb2x1bW4iPjA8L3Byb3BlcnR5 PgogICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0idG9vbHRpcF90ZXh0IiB0cmFu c2xhdGFibGU9InllcyI+QXV0aGVudGljYXRlIHBhY2tldHMgd2l0aCBITUFDIHVzaW5nIG1lc3Nh Z2UgZGlnZXN0IGFsZ29yaXRobS4gVGhlIGRlZmF1bHQgaXMgU0hBMS4KIGNvbmZpZzogYXV0aDwv cHJvcGVydHk+CiAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJtb2RlbCI+bW9k ZWw0PC9wcm9wZXJ0eT4KZGlmZiAtLWdpdCBhL3Byb3BlcnRpZXMvbm0tb3BlbnZwbi1lZGl0b3Iu YyBiL3Byb3BlcnRpZXMvbm0tb3BlbnZwbi1lZGl0b3IuYwppbmRleCAwZjg2YjdjLi42MzhmM2Yz IDEwMDY0NAotLS0gYS9wcm9wZXJ0aWVzL25tLW9wZW52cG4tZWRpdG9yLmMKKysrIGIvcHJvcGVy dGllcy9ubS1vcGVudnBuLWVkaXRvci5jCkBAIC0xMDA3LDU5ICsxMDA3LDg3IEBAIHBvcHVsYXRl X2NpcGhlcl9jb21ibyAoR3RrQ29tYm9Cb3ggKmJveCwgY29uc3QgY2hhciAqdXNlcl9jaXBoZXIp CiAjZGVmaW5lIEhNQUNBVVRIX0NPTF9OQU1FIDAKICNkZWZpbmUgSE1BQ0FVVEhfQ09MX1ZBTFVF IDEKIAotc3RhdGljIHZvaWQKK3N0YXRpYyBnYm9vbGVhbgorcXVlcnlfZGlnZXN0cyAoR3RrTGlz dFN0b3JlICpzdG9yZSwgY29uc3QgY2hhciAqaG1hY2F1dGgsIEd0a1RyZWVJdGVyICpmb3VuZF9p dGVyKQoreworCWNvbnN0IGNoYXIgKm9wZW52cG5fYmluYXJ5ID0gbm1fZmluZF9vcGVudnBuICgp OworCWNoYXIgKmFyZ3ZbM107CisJZ3NfZnJlZSBnY2hhciAqdG1wID0gTlVMTDsKKwlnY2hhciAq KmxpbmVzLCAqKmxpbmU7CisJR0Vycm9yICplcnJvciA9IE5VTEw7CisJZ2Jvb2xlYW4gZm91bmQg PSBGQUxTRTsKKworCWlmICghb3BlbnZwbl9iaW5hcnkpCisJCXJldHVybiBGQUxTRTsKKworCWFy Z3ZbMF0gPSAoY2hhciAqKSBvcGVudnBuX2JpbmFyeTsKKwlhcmd2WzFdID0gIi0tc2hvdy1kaWdl c3RzIjsKKwlhcmd2WzJdID0gTlVMTDsKKworCWlmICghZ19zcGF3bl9zeW5jICgiLyIsIGFyZ3Ys IE5VTEwsIDAsIE5VTEwsIE5VTEwsICZ0bXAsIE5VTEwsIE5VTEwsICZlcnJvcikpIHsKKwkJZ193 YXJuaW5nICgiJXM6IGNvdWxkbid0IGRldGVybWluZSBkaWdlc3RzOiAlcyIsIF9fZnVuY19fLCBl cnJvci0+bWVzc2FnZSk7CisJCWdfY2xlYXJfZXJyb3IgKCZlcnJvcik7CisJCXJldHVybiBGQUxT RTsKKwl9CisKKwlsaW5lcyA9IGdfc3Ryc3BsaXQgKHRtcCwgIlxuIiwgMCk7CisJZm9yIChsaW5l ID0gbGluZXM7ICpsaW5lOyBsaW5lKyspIHsKKwkJY29uc3QgY2hhciAqbmFtZSA9ICpsaW5lOwor CQljb25zdCBjaGFyICpzcGFjZTsKKwkJY29uc3QgY2hhciAqcDsKKwkJZ2NoYXIgKmRpZ2VzdDsK KwkJR3RrVHJlZUl0ZXIgaXRlcjsKKworCQkvKiBEYXRhIGxpbmVzOiAiPE5BTUU+IDxudW1iZXI+ IGJpdCBkaWdlc3Qgc2l6ZSIKKwkJICogU2tpcCBoZWFkZXIgbGluZXMgdGhhdCBkb24ndCBoYXZl IGEgbnVtYmVyIGFzIHNlY29uZCB0b2tlbi4gKi8KKwkJc3BhY2UgPSBzdHJjaHIgKG5hbWUsICcg Jyk7CisJCWlmICghc3BhY2UpCisJCQljb250aW51ZTsKKwkJZm9yIChwID0gc3BhY2UgKyAxOyAq cCAmJiBnX2FzY2lpX2lzZGlnaXQgKCpwKTsgcCsrKQorCQkJOworCQlpZiAocCA9PSBzcGFjZSAr IDEgfHwgKnAgIT0gJyAnKQorCQkJY29udGludWU7CisKKwkJZGlnZXN0ID0gZ19zdHJuZHVwIChu YW1lLCBzcGFjZSAtIG5hbWUpOworCQlndGtfbGlzdF9zdG9yZV9hcHBlbmQgKHN0b3JlLCAmaXRl cik7CisJCWd0a19saXN0X3N0b3JlX3NldCAoc3RvcmUsICZpdGVyLAorCQkgICAgICAgICAgICAg ICAgICAgIEhNQUNBVVRIX0NPTF9OQU1FLCBkaWdlc3QsCisJCSAgICAgICAgICAgICAgICAgICAg SE1BQ0FVVEhfQ09MX1ZBTFVFLCBkaWdlc3QsCisJCSAgICAgICAgICAgICAgICAgICAgLTEpOwor CQlpZiAoIWZvdW5kICYmIGhtYWNhdXRoICYmICFnX2FzY2lpX3N0cmNhc2VjbXAgKGRpZ2VzdCwg aG1hY2F1dGgpKSB7CisJCQkqZm91bmRfaXRlciA9IGl0ZXI7CisJCQlmb3VuZCA9IFRSVUU7CisJ CX0KKwkJZ19mcmVlIChkaWdlc3QpOworCX0KKwlnX3N0cmZyZWV2IChsaW5lcyk7CisJcmV0dXJu IGZvdW5kOworfQorCitzdGF0aWMgZ2Jvb2xlYW4KIHBvcHVsYXRlX2htYWNhdXRoX2NvbWJvIChH dGtDb21ib0JveCAqYm94LCBjb25zdCBjaGFyICpobWFjYXV0aCkKIHsKIAlnc191bnJlZl9vYmpl Y3QgR3RrTGlzdFN0b3JlICpzdG9yZSA9IE5VTEw7CiAJR3RrVHJlZUl0ZXIgaXRlcjsKLQlnYm9v bGVhbiBhY3RpdmVfaW5pdGlhbGl6ZWQgPSBGQUxTRTsKLQlpbnQgaTsKLQlzdGF0aWMgY29uc3Qg c3RydWN0IHsKLQkJY29uc3QgY2hhciAqbmFtZTsKLQkJY29uc3QgY2hhciAqcHJldHR5X25hbWU7 Ci0JfSBpdGVtc1tdID0gewotCQl7IE5NX09QRU5WUE5fQVVUSF9OT05FLCAgICAgIE5fKCJOb25l IikgfSwKLQkJeyBOTV9PUEVOVlBOX0FVVEhfUlNBX01ENCwgICBOXygiUlNBIE1ELTQiKSB9LAot CQl7IE5NX09QRU5WUE5fQVVUSF9NRDUsICAgICAgIE5fKCJNRC01IikgfSwKLQkJeyBOTV9PUEVO VlBOX0FVVEhfU0hBMSwgICAgICBOXygiU0hBLTEiKSB9LAotCQl7IE5NX09QRU5WUE5fQVVUSF9T SEEyMjQsICAgIE5fKCJTSEEtMjI0IikgfSwKLQkJeyBOTV9PUEVOVlBOX0FVVEhfU0hBMjU2LCAg ICBOXygiU0hBLTI1NiIpIH0sCi0JCXsgTk1fT1BFTlZQTl9BVVRIX1NIQTM4NCwgICAgTl8oIlNI QS0zODQiKSB9LAotCQl7IE5NX09QRU5WUE5fQVVUSF9TSEE1MTIsICAgIE5fKCJTSEEtNTEyIikg fSwKLQkJeyBOTV9PUEVOVlBOX0FVVEhfUklQRU1EMTYwLCBOXygiUklQRU1ELTE2MCIpIH0sCi0J fTsKKwlnYm9vbGVhbiBhY3RpdmVfaW5pdGlhbGl6ZWQ7CiAKLQlzdG9yZSA9IGd0a19saXN0X3N0 b3JlX25ldyAoMywgR19UWVBFX1NUUklORywgR19UWVBFX1NUUklORywgR19UWVBFX0JPT0xFQU4p OworCXN0b3JlID0gZ3RrX2xpc3Rfc3RvcmVfbmV3ICgyLCBHX1RZUEVfU1RSSU5HLCBHX1RZUEVf U1RSSU5HKTsKIAlndGtfY29tYm9fYm94X3NldF9tb2RlbCAoYm94LCBHVEtfVFJFRV9NT0RFTCAo c3RvcmUpKTsKIAogCS8qIEFkZCBkZWZhdWx0IG9wdGlvbiB3aGljaCB3b24ndCBwYXNzIC0tYXV0 aCB0byBvcGVudnBuICovCiAJZ3RrX2xpc3Rfc3RvcmVfYXBwZW5kIChzdG9yZSwgJml0ZXIpOwog CWd0a19saXN0X3N0b3JlX3NldCAoc3RvcmUsICZpdGVyLAogCSAgICAgICAgICAgICAgICAgICAg SE1BQ0FVVEhfQ09MX05BTUUsIF8oIkRlZmF1bHQiKSwKKwkgICAgICAgICAgICAgICAgICAgIEhN QUNBVVRIX0NPTF9WQUxVRSwgTlVMTCwKIAkgICAgICAgICAgICAgICAgICAgIC0xKTsKIAotCWZv ciAoaSA9IDA7IGkgPCBHX05fRUxFTUVOVFMgKGl0ZW1zKTsgaSsrKSB7Ci0JCWNvbnN0IGNoYXIg Km5hbWUgPSBpdGVtc1tpXS5uYW1lOwotCi0JCWd0a19saXN0X3N0b3JlX2FwcGVuZCAoc3RvcmUs ICZpdGVyKTsKLQkJZ3RrX2xpc3Rfc3RvcmVfc2V0IChzdG9yZSwgJml0ZXIsCi0JCSAgICAgICAg ICAgICAgICAgICAgSE1BQ0FVVEhfQ09MX05BTUUsIF8oaXRlbXNbaV0ucHJldHR5X25hbWUpLAot CQkgICAgICAgICAgICAgICAgICAgIEhNQUNBVVRIX0NPTF9WQUxVRSwgbmFtZSwKLQkJICAgICAg ICAgICAgICAgICAgICAtMSk7Ci0JCWlmIChobWFjYXV0aCAmJiAhZ19hc2NpaV9zdHJjYXNlY21w IChuYW1lLCBobWFjYXV0aCkpIHsKLQkJCWd0a19jb21ib19ib3hfc2V0X2FjdGl2ZV9pdGVyIChi b3gsICZpdGVyKTsKLQkJCWFjdGl2ZV9pbml0aWFsaXplZCA9IFRSVUU7Ci0JCX0KLQl9Ci0KLQlp ZiAoIWFjdGl2ZV9pbml0aWFsaXplZCkgewotCQlndGtfbGlzdF9zdG9yZV9hcHBlbmQgKHN0b3Jl LCAmaXRlcik7Ci0JCWd0a19saXN0X3N0b3JlX3NldCAoc3RvcmUsICZpdGVyLAotCQkgICAgICAg ICAgICAgICAgICAgIEhNQUNBVVRIX0NPTF9OQU1FLCBobWFjYXV0aCwKLQkJICAgICAgICAgICAg ICAgICAgICBITUFDQVVUSF9DT0xfVkFMVUUsIGhtYWNhdXRoLAotCQkgICAgICAgICAgICAgICAg ICAgIC0xKTsKKwlhY3RpdmVfaW5pdGlhbGl6ZWQgPSBxdWVyeV9kaWdlc3RzIChzdG9yZSwgaG1h Y2F1dGgsICZpdGVyKTsKKwlpZiAoYWN0aXZlX2luaXRpYWxpemVkKQogCQlndGtfY29tYm9fYm94 X3NldF9hY3RpdmVfaXRlciAoYm94LCAmaXRlcik7Ci0JfQorCWVsc2UKKwkJZ3RrX2NvbWJvX2Jv eF9zZXRfYWN0aXZlIChib3gsIGhtYWNhdXRoID8gLTEgOiAwKTsKKworCXJldHVybiBhY3RpdmVf aW5pdGlhbGl6ZWQ7CiB9CiAKICNkZWZpbmUgVExTX1JFTU9URV9NT0RFX05PTkUgICAgICAgICJu b25lIgpAQCAtMTc4Myw3ICsxODExLDE0IEBAIGFkdmFuY2VkX2RpYWxvZ19uZXcgKEdIYXNoVGFi bGUgKmhhc2gsIGNvbnN0IGNoYXIgKmNvbnR5cGUpCiAKIAl3aWRnZXQgPSBHVEtfV0lER0VUIChn dGtfYnVpbGRlcl9nZXRfb2JqZWN0IChidWlsZGVyLCAiaG1hY2F1dGhfY29tYm8iKSk7CiAJdmFs dWUgPSBnX2hhc2hfdGFibGVfbG9va3VwIChoYXNoLCBOTV9PUEVOVlBOX0tFWV9BVVRIKTsKLQlw b3B1bGF0ZV9obWFjYXV0aF9jb21ibyAoR1RLX0NPTUJPX0JPWCAod2lkZ2V0KSwgdmFsdWUpOwor CWlmICghcG9wdWxhdGVfaG1hY2F1dGhfY29tYm8gKEdUS19DT01CT19CT1ggKHdpZGdldCksIHZh bHVlKSAmJiB2YWx1ZSkgeworI2lmIEdUS19DSEVDS19WRVJTSU9OKDQsMCwwKQorCQllbnRyeSA9 IEdUS19XSURHRVQgKGd0a19jb21ib19ib3hfZ2V0X2NoaWxkIChHVEtfQ09NQk9fQk9YICh3aWRn ZXQpKSk7CisjZWxzZQorCQllbnRyeSA9IEdUS19XSURHRVQgKGd0a19iaW5fZ2V0X2NoaWxkIChH VEtfQklOICh3aWRnZXQpKSk7CisjZW5kaWYKKwkJZ3RrX2VkaXRhYmxlX3NldF90ZXh0IChHVEtf RURJVEFCTEUgKGVudHJ5KSwgdmFsdWUpOworCX0KIAogCWVudHJ5ID0gR1RLX1dJREdFVCAoZ3Rr X2J1aWxkZXJfZ2V0X29iamVjdCAoYnVpbGRlciwgInRsc19yZW1vdGVfZW50cnkiKSk7CiAJY29t Ym8gPSBHVEtfV0lER0VUIChndGtfYnVpbGRlcl9nZXRfb2JqZWN0IChidWlsZGVyLCAidGxzX3Jl bW90ZV9tb2RlX2NvbWJvIikpOwpAQCAtMjI2Nyw2ICsyMzAyLDE1IEBAIGFkdmFuY2VkX2RpYWxv Z19uZXdfaGFzaF9mcm9tX2RpYWxvZyAoR3RrV2lkZ2V0ICpkaWFsb2cpCiAJCSAgICAgICAgICAg ICAgICAgICAgLTEpOwogCQlpZiAoaG1hY2F1dGgpCiAJCQlnX2hhc2hfdGFibGVfaW5zZXJ0ICho YXNoLCBOTV9PUEVOVlBOX0tFWV9BVVRILCBobWFjYXV0aCk7CisJfSBlbHNlIHsKKyNpZiBHVEtf Q0hFQ0tfVkVSU0lPTig0LDAsMCkKKwkJZW50cnkgPSBHVEtfV0lER0VUIChndGtfY29tYm9fYm94 X2dldF9jaGlsZCAoR1RLX0NPTUJPX0JPWCAod2lkZ2V0KSkpOworI2Vsc2UKKwkJZW50cnkgPSBH VEtfV0lER0VUIChndGtfYmluX2dldF9jaGlsZCAoR1RLX0JJTiAod2lkZ2V0KSkpOworI2VuZGlm CisJCXZhbHVlID0gZ3RrX2VkaXRhYmxlX2dldF90ZXh0IChHVEtfRURJVEFCTEUgKGVudHJ5KSk7 CisJCWlmICh2YWx1ZSAmJiAqdmFsdWUpCisJCQlnX2hhc2hfdGFibGVfaW5zZXJ0IChoYXNoLCBO TV9PUEVOVlBOX0tFWV9BVVRILCBnX3N0cmR1cCAodmFsdWUpKTsKIAl9CiAJZW50cnkgPSBHVEtf V0lER0VUIChndGtfYnVpbGRlcl9nZXRfb2JqZWN0IChidWlsZGVyLCAidGxzX3ZlcnNpb25fbWlu IikpOwogCXZhbHVlID0gZ3RrX2VkaXRhYmxlX2dldF90ZXh0IChHVEtfRURJVEFCTEUgKGVudHJ5 KSk7Cg==