From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Nikolaos Chatzikonstantinou Newsgroups: gmane.emacs.bugs Subject: bug#50507: New function in Emacs GnuTLS implementation Date: Mon, 26 Sep 2022 11:43:41 -0400 Message-ID: References: <83ee9wiozc.fsf@gnu.org> <87sflkgy49.fsf@gnus.org> <87edwd15ck.fsf@gnus.org> <87tu4u8kjv.fsf@gnus.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000fc7e1305e996646d" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9201"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 50507@debbugs.gnu.org, Eli Zaretskii To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Sep 26 18:07:41 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ocqdx-0002B3-Bw for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 26 Sep 2022 18:07:41 +0200 Original-Received: from localhost ([::1]:60314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocqdw-0000eV-FN for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 26 Sep 2022 12:07:40 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocqI3-0002U5-HO for bug-gnu-emacs@gnu.org; Mon, 26 Sep 2022 11:45:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52334) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocqI3-0007tI-8z for bug-gnu-emacs@gnu.org; Mon, 26 Sep 2022 11:45:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocqI3-0003Z5-4s for bug-gnu-emacs@gnu.org; Mon, 26 Sep 2022 11:45:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Nikolaos Chatzikonstantinou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 26 Sep 2022 15:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50507 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo Original-Received: via spool by 50507-submit@debbugs.gnu.org id=B50507.166420704813380 (code B ref 50507); Mon, 26 Sep 2022 15:45:03 +0000 Original-Received: (at 50507) by debbugs.gnu.org; 26 Sep 2022 15:44:08 +0000 Original-Received: from localhost ([127.0.0.1]:51404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocqH9-0003Tk-Nt for submit@debbugs.gnu.org; Mon, 26 Sep 2022 11:44:08 -0400 Original-Received: from mail-yb1-f170.google.com ([209.85.219.170]:35684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocqGz-0003T0-Vf for 50507@debbugs.gnu.org; Mon, 26 Sep 2022 11:44:06 -0400 Original-Received: by mail-yb1-f170.google.com with SMTP id 4so736662ybe.2 for <50507@debbugs.gnu.org>; Mon, 26 Sep 2022 08:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=9XHn5i3VFl8o6/zelFDw1gSZqqWfKVg64w35DdJQfPs=; b=eAAEXLcMCXGT5Hslh5dEzkwSCpnngumfztib4Y01oldNNyDI7zVV1/h8MLk1aZOizS zLE3HpUGtLjoV+hyWSyD/n2c87aFIELV9GT8GAJ7gDAWXB5KWwXmtMzdwZLz4/1galjs nh2CG1gF40ebFA6Nzmn4JJdFCVU2EnsM1m5rwWrJ93HMbfpU7KtC5B3EvXKaDCtKFDOn txAOIoCKOWPl5vd2r3MzgQVVuecWMyTTBgPd1StHNAmDrvaijH6XXRZ9V+ZOqwSLKj9O KUcOcgCfpb42A3jwgJK61eKbu2XL2FrFyiXD+E6E4/Hzu441zvx9gCoYqpcgUcP4nqqJ Zxvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=9XHn5i3VFl8o6/zelFDw1gSZqqWfKVg64w35DdJQfPs=; b=KcWKukGDdD42nzjz/fwr9L6dW27vGr1uXQCUddLE1HPqgKx3er/3wxI6IwBpk340C1 fA7HYnvodAyGsa2G1zA6s2wI89VALmX28PjCWKMwEy0c0KL6R2Efv/bTE0+oiz8KijCA a9/w/pr4tpjKlGfNYFbWtrnMmTp9ecsc94jX27NNaN95IPJFoB+pNv2qIvxOH5DM3xm+ mPLx4KE9yyPj+Rgwd88qGy0KbcoC8Fv65Bl9eIC4HupZVbmbB8Zea6EETX5DKpXOcqiA Pg3arnnxBkKYFum81FpJaxwBaKdpjyL+sE4EQYPJQoYjc2jJmVHZr0NzNSCojZzx96F3 zHvQ== X-Gm-Message-State: ACrzQf3r9fnB+9bfE3X8D1u0B9/YSU85DfuWqjh0QIJ408Re8uZDkXI4 ISQ0jvgCeJExDpfEGyKhwMwN7BT5QiCnMbsNozk= X-Google-Smtp-Source: AMsMyM4Alv5He3qwxbkUslJME+WYiKHZ69lJzV0pkzlFSRMRaxfRUwbulJgJfmbqOeyLzf95Q3Hmmml0elTa9Yh+4KU= X-Received: by 2002:a25:8b8b:0:b0:6af:93be:c53e with SMTP id j11-20020a258b8b000000b006af93bec53emr21602434ybl.338.1664207032155; Mon, 26 Sep 2022 08:43:52 -0700 (PDT) In-Reply-To: <87tu4u8kjv.fsf@gnus.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:243667 Archived-At: --000000000000fc7e1305e996646d Content-Type: text/plain; charset="UTF-8" On Mon, Sep 26, 2022 at 7:03 AM Lars Ingebrigtsen wrote: > > Nikolaos Chatzikonstantinou writes: > > > However, I suspect that this API is not used by most > > packages. Instead, these functions are called from Emacs' > > make-network-process and friends in src/process.c. If I just dump new > > gnutls functions in src/gnutls.c, they might not be accessible for > > use, or I might duplicate functionality. > > I'm not sure I understand what you mean here. The point was to use > gnutls_certificate_set_x509_key_file2 instead of > gnutls_certificate_set_x509_key_file in gnutls.c -- so that should be an > internal change in gnutls.c that nothing else should need to know about. Ah yes, thanks for setting me straight. I should start with that. Actually, this is not too complicated, and I just prepared this patch save for one thing: how should the ORed values be passed in the last parameter? In C, it is an 'unsigned int' of ORed values of type 'gnutls_pkcs_encrypt_flags_t', whose enumeration constants are detailed here, See the patch attached (do not merge yet?). --000000000000fc7e1305e996646d Content-Type: application/pgp-signature; name="0001-fix-gnutls-add-possibility-of-password-for-key-file.patch.sig" Content-Disposition: attachment; filename="0001-fix-gnutls-add-possibility-of-password-for-key-file.patch.sig" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l8ixvsee1 LS0tLS1CRUdJTiBQR1AgU0lHTkVEIE1FU1NBR0UtLS0tLQpIYXNoOiBTSEE1MTIKCi0gRnJvbSA5 NGVlYzQzODQzZDVkMDIyNWEyOWQzNTc0Zjg3Mzg3MTlmOWU0MjM5IE1vbiBTZXAgMTcgMDA6MDA6 MDAgMjAwMQpGcm9tOiBOaWtvbGFvcyBDaGF0emlrb25zdGFudGlub3UgPG5jaGF0ejMxNEBnbWFp bC5jb20+CkRhdGU6IE1vbiwgMjYgU2VwIDIwMjIgMTE6MDg6MTggLTA0MDAKU3ViamVjdDogW1BB VENIXSBmaXgoZ251dGxzKTogYWRkIHBvc3NpYmlsaXR5IG9mIHBhc3N3b3JkIGZvciBrZXktZmls ZQoKVGhlIEdudVRMUyBmdW5jdGlvbgoKICAgIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9r ZXlfZmlsZQoKaXMgcmVwbGFjZWQgYnkgaXRzIHNlY29uZCB2ZXJzaW9uCgogICAgZ251dGxzX2Nl cnRpZmljYXRlX3NldF94NTA5X2tleV9maWxlMgoKYW5kIHRoZSBkZWZpbml0aW9ucyBvZiBnbnV0 bHMtYm9vdCBhbmQgZ251dGxzLWJvb3QtcGFyYW1ldGVycyBhcmUKbW9kaWZpZWQgdG8gaW5jbHVk ZSB0aGUgOnBhc3MgYW5kIDpmbGFncyBrZXlzLCB3aGljaCBhcmUgYWRkaXRpb25hbApwYXJhbWV0 ZXJzIGluIHRoZSBzZWNvbmQgdmVyc2lvbi4KClNpZ25lZC1vZmYtYnk6IE5pa29sYW9zIENoYXR6 aWtvbnN0YW50aW5vdSA8bmNoYXR6MzE0QGdtYWlsLmNvbT4KLSAtLS0KIGxpc3AvbmV0L2dudXRs cy5lbCB8ICA3ICsrKysrKysKIHNyYy9nbnV0bHMuYyAgICAgICB8IDE5ICsrKysrKysrKysrKysr KysrLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9saXNwL25ldC9nbnV0bHMuZWwgYi9saXNwL25ldC9nbnV0bHMuZWwKaW5k ZXggNmUzODQ1YWVjMS4uOWFhYjE4YjhmYiAxMDA2NDQKLSAtLS0gYS9saXNwL25ldC9nbnV0bHMu ZWwKKysrIGIvbGlzcC9uZXQvZ251dGxzLmVsCkBAIC0yNjUsNiArMjY1LDcgQEAgZ251dGxzLWJv b3QtcGFyYW1ldGVycwogICAgICAgICAgICAma2V5IHR5cGUgaG9zdG5hbWUgcHJpb3JpdHktc3Ry aW5nCiAgICAgICAgICAgIHRydXN0ZmlsZXMgY3JsZmlsZXMga2V5bGlzdCBtaW4tcHJpbWUtYml0 cwogICAgICAgICAgICB2ZXJpZnktZmxhZ3MgdmVyaWZ5LWVycm9yIHZlcmlmeS1ob3N0bmFtZS1l cnJvcgorICAgICAgICAgICBwYXNzIGZsYWdzCiAgICAgICAgICAgICZhbGxvdy1vdGhlci1rZXlz KQogICAiUmV0dXJuIGEga2V5d29yZCBsaXN0IG9mIHBhcmFtZXRlcnMgc3VpdGFibGUgZm9yIHBh c3NpbmcgdG8gYGdudXRscy1ib290Jy4KIApAQCAtMjgxLDYgKzI4MiwxMCBAQCBnbnV0bHMtYm9v dC1wYXJhbWV0ZXJzCiBWRVJJRlktSE9TVE5BTUUtRVJST1IgaXMgYSBiYWNrd2FyZHMgY29tcGF0 aWJpbGl0eSBvcHRpb24gZm9yCiBwdXR0aW5nIGA6aG9zdG5hbWUnIGluIFZFUklGWS1FUlJPUi4K IAorUEFTUyBpcyBhIHN0cmluZywgdGhlIHBhc3N3b3JkIG9mIHRoZSBrZXkuCisKK0ZMQUdTIGlz IGFuIE9SZWQgc2VxdWVuY2Ugb2YgZ251dGxzX3BrY3NfZW5jcnlwdF9mbGFnc190IHZhbHVlcy4K KwogV2hlbiBWRVJJRlktRVJST1IgaXMgdCBvciBhIGxpc3QgY29udGFpbmluZyBgOnRydXN0Zmls ZXMnLCBhbgogZXJyb3Igd2lsbCBiZSByYWlzZWQgd2hlbiB0aGUgcGVlciBjZXJ0aWZpY2F0ZSB2 ZXJpZmljYXRpb24gZmFpbHMKIGFzIHBlciBHbnVUTFMnIGdudXRsc19jZXJ0aWZpY2F0ZV92ZXJp ZnlfcGVlcnMyLiAgT3RoZXJ3aXNlLCBvbmx5CkBAIC0zNTgsNiArMzYzLDggQEAgZ251dGxzLWJv b3QtcGFyYW1ldGVycwogICAgICAgICAgICAgICAgIDprZXlsaXN0ICxrZXlsaXN0CiAgICAgICAg ICAgICAgICAgOnZlcmlmeS1mbGFncyAsdmVyaWZ5LWZsYWdzCiAgICAgICAgICAgICAgICAgOnZl cmlmeS1lcnJvciAsdmVyaWZ5LWVycm9yCisgICAgICAgICAgICAgICAgOnBhc3MgLHBhc3MKKyAg ICAgICAgICAgICAgICA6ZmxhZ3MgLGZsYWdzCiAgICAgICAgICAgICAgICAgOmNhbGxiYWNrcyBu aWwpKSkKIAogKGRlZnVuIGdudXRscy0tZ2V0LWZpbGVzIChmaWxlcykKZGlmZiAtLWdpdCBhL3Ny Yy9nbnV0bHMuYyBiL3NyYy9nbnV0bHMuYwppbmRleCBhMGRlMDIzOGM0Li5jNDU3NzFjNThkIDEw MDY0NAotIC0tLSBhL3NyYy9nbnV0bHMuYworKysgYi9zcmMvZ251dGxzLmMKQEAgLTEyMSw2ICsx MjEsOSBAQCBERUZfRExMX0ZOIChpbnQsIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9jcmxf ZmlsZSwKIERFRl9ETExfRk4gKGludCwgZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9m aWxlLAogCSAgICAoZ251dGxzX2NlcnRpZmljYXRlX2NyZWRlbnRpYWxzX3QsIGNvbnN0IGNoYXIg KiwgY29uc3QgY2hhciAqLAogCSAgICAgZ251dGxzX3g1MDlfY3J0X2ZtdF90KSk7CitERUZfRExM X0ZOIChpbnQsIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9rZXlfZmlsZTIsCisJICAgIChn bnV0bHNfY2VydGlmaWNhdGVfY3JlZGVudGlhbHNfdCwgY29uc3QgY2hhciAqLCBjb25zdCBjaGFy ICosCisJICAgICBnbnV0bHNfeDUwOV9jcnRfZm10X3QsIGNvbnN0IGNoYXIgKiwgdW5zaWduZWQg aW50KSk7CiAjICBpZmRlZiBIQVZFX0dOVVRMU19YNTA5X1NZU1RFTV9UUlVTVAogREVGX0RMTF9G TiAoaW50LCBnbnV0bHNfY2VydGlmaWNhdGVfc2V0X3g1MDlfc3lzdGVtX3RydXN0LAogCSAgICAo Z251dGxzX2NlcnRpZmljYXRlX2NyZWRlbnRpYWxzX3QpKTsKQEAgLTMxNCw2ICszMTcsNyBAQCBp bml0X2dudXRsc19mdW5jdGlvbnMgKHZvaWQpCiAgIExPQURfRExMX0ZOIChsaWJyYXJ5LCBnbnV0 bHNfY2VydGlmaWNhdGVfc2V0X3ZlcmlmeV9mbGFncyk7CiAgIExPQURfRExMX0ZOIChsaWJyYXJ5 LCBnbnV0bHNfY2VydGlmaWNhdGVfc2V0X3g1MDlfY3JsX2ZpbGUpOwogICBMT0FEX0RMTF9GTiAo bGlicmFyeSwgZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9maWxlKTsKKyAgTE9BRF9E TExfRk4gKGxpYnJhcnksIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9rZXlfZmlsZTIpOwog IyAgaWZkZWYgSEFWRV9HTlVUTFNfWDUwOV9TWVNURU1fVFJVU1QKICAgTE9BRF9ETExfRk4gKGxp YnJhcnksIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9zeXN0ZW1fdHJ1c3QpOwogIyAgZW5k aWYKQEAgLTQ1NSw2ICs0NTksNyBAQCBpbml0X2dudXRsc19mdW5jdGlvbnMgKHZvaWQpCiAjICBk ZWZpbmUgZ251dGxzX2NlcnRpZmljYXRlX3NldF92ZXJpZnlfZmxhZ3MgZm5fZ251dGxzX2NlcnRp ZmljYXRlX3NldF92ZXJpZnlfZmxhZ3MKICMgIGRlZmluZSBnbnV0bHNfY2VydGlmaWNhdGVfc2V0 X3g1MDlfY3JsX2ZpbGUgZm5fZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2NybF9maWxlCiAj ICBkZWZpbmUgZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9maWxlIGZuX2dudXRsc19j ZXJ0aWZpY2F0ZV9zZXRfeDUwOV9rZXlfZmlsZQorIyAgZGVmaW5lIGdudXRsc19jZXJ0aWZpY2F0 ZV9zZXRfeDUwOV9rZXlfZmlsZTIgZm5fZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9m aWxlMgogIyAgZGVmaW5lIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9zeXN0ZW1fdHJ1c3Qg Zm5fZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X3N5c3RlbV90cnVzdAogIyAgZGVmaW5lIGdu dXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV90cnVzdF9maWxlIGZuX2dudXRsc19jZXJ0aWZpY2F0 ZV9zZXRfeDUwOV90cnVzdF9maWxlCiAjICBkZWZpbmUgZ251dGxzX2NlcnRpZmljYXRlX3R5cGVf Z2V0IGZuX2dudXRsc19jZXJ0aWZpY2F0ZV90eXBlX2dldApAQCAtMTgxMyw2ICsxODE4LDEwIEBA IERFRlVOICgiZ251dGxzLWJvb3QiLCBGZ251dGxzX2Jvb3QsIFNnbnV0bHNfYm9vdCwgMywgMywg MCwKIDpjb21wbGV0ZS1uZWdvdGlhdGlvbiwgaWYgbm9uLW5pbCwgd2lsbCBtYWtlIG5lZ290aWF0 aW9uIGNvbXBsZXRlCiBiZWZvcmUgcmV0dXJuaW5nIGV2ZW4gb24gbm9uLWJsb2NraW5nIHNvY2tl dHMuCiAKKzpwYXNzLCB0aGUgcGFzc3dvcmQgb2YgdGhlIHByaXZhdGUga2V5LgorCis6ZmxhZ3Ms IGFuIE9SZWQgc2VxdWVuY2Ugb2YgZ251dGxzX3BrY3NfZW5jcnlwdF9mbGFnc190LgorCiBUaGUg ZGVidWcgbGV2ZWwgd2lsbCBiZSBzZXQgZm9yIHRoaXMgcHJvY2VzcyBBTkQgZ2xvYmFsbHkgZm9y IEdudVRMUy4KIFNvIGlmIHlvdSBzZXQgaXQgaGlnaGVyIG9yIGxvd2VyIGF0IGFueSBwb2ludCwg aXQgYWZmZWN0cyBnbG9iYWwKIGRlYnVnZ2luZy4KQEAgLTE4NDgsNiArMTg1Nyw4IEBAIERFRlVO ICgiZ251dGxzLWJvb3QiLCBGZ251dGxzX2Jvb3QsIFNnbnV0bHNfYm9vdCwgMywgMywgMCwKICAg TGlzcF9PYmplY3QgdHJ1c3RmaWxlczsKICAgTGlzcF9PYmplY3QgY3JsZmlsZXM7CiAgIExpc3Bf T2JqZWN0IGtleWxpc3Q7CisgIExpc3BfT2JqZWN0IHBhc3M7CisgIExpc3BfT2JqZWN0IGZsYWdz OwogICAvKiBMaXNwX09iamVjdCBjYWxsYmFja3M7ICovCiAgIExpc3BfT2JqZWN0IGxvZ2xldmVs OwogICBMaXNwX09iamVjdCBob3N0bmFtZTsKQEAgLTE4NzcsNiArMTg4OCw4IEBAIERFRlVOICgi Z251dGxzLWJvb3QiLCBGZ251dGxzX2Jvb3QsIFNnbnV0bHNfYm9vdCwgMywgMywgMCwKICAgY3Js ZmlsZXMgICAgICAgICAgICAgID0gcGxpc3RfZ2V0IChwcm9wbGlzdCwgUUNjcmxmaWxlcyk7CiAg IGxvZ2xldmVsICAgICAgICAgICAgICA9IHBsaXN0X2dldCAocHJvcGxpc3QsIFFDbG9nbGV2ZWwp OwogICBwcmltZV9iaXRzICAgICAgICAgICAgPSBwbGlzdF9nZXQgKHByb3BsaXN0LCBRQ21pbl9w cmltZV9iaXRzKTsKKyAgcGFzcyAgICAgICAgICAgICAgICAgID0gcGxpc3RfZ2V0IChwcm9wbGlz dCwgUUNwYXNzKTsKKyAgZmxhZ3MgICAgICAgICAgICAgICAgID0gcGxpc3RfZ2V0IChwcm9wbGlz dCwgUUNmbGFncyk7CiAKICAgaWYgKCFTVFJJTkdQIChob3N0bmFtZSkpCiAgICAgewpAQCAtMjAz OCw4ICsyMDUxLDggQEAgREVGVU4gKCJnbnV0bHMtYm9vdCIsIEZnbnV0bHNfYm9vdCwgU2dudXRs c19ib290LCAzLCAzLCAwLAogCSAgICAgIGtleWZpbGUgPSBhbnNpX2VuY29kZV9maWxlbmFtZSAo a2V5ZmlsZSk7CiAJICAgICAgY2VydGZpbGUgPSBhbnNpX2VuY29kZV9maWxlbmFtZSAoY2VydGZp bGUpOwogIyBlbmRpZgotIC0JICAgICAgcmV0ID0gZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5 X2tleV9maWxlCi0gLQkJKHg1MDlfY3JlZCwgU1NEQVRBIChjZXJ0ZmlsZSksIFNTREFUQSAoa2V5 ZmlsZSksIGZpbGVfZm9ybWF0KTsKKwkgICAgICByZXQgPSBnbnV0bHNfY2VydGlmaWNhdGVfc2V0 X3g1MDlfa2V5X2ZpbGUyCisJCSh4NTA5X2NyZWQsIFNTREFUQSAoY2VydGZpbGUpLCBTU0RBVEEg KGtleWZpbGUpLCBmaWxlX2Zvcm1hdCwgU1NEQVRBIChwYXNzKSwgWFVGSVhOVU0gKGZsYWdzKSk7 CiAKIAkgICAgICBpZiAocmV0IDwgR05VVExTX0VfU1VDQ0VTUykKIAkJcmV0dXJuIGdudXRsc19t YWtlX2Vycm9yIChyZXQpOwpAQCAtMjg2MCw2ICsyODczLDggQEAgc3ltc19vZl9nbnV0bHMgKHZv aWQpCiAgIERFRlNZTSAoUUNtaW5fcHJpbWVfYml0cywgIjptaW4tcHJpbWUtYml0cyIpOwogICBE RUZTWU0gKFFDbG9nbGV2ZWwsICI6bG9nbGV2ZWwiKTsKICAgREVGU1lNIChRQ2NvbXBsZXRlX25l Z290aWF0aW9uLCAiOmNvbXBsZXRlLW5lZ290aWF0aW9uIik7CisgIERFRlNZTSAoUUNwYXNzLCAi OnBhc3MiKTsKKyAgREVGU1lNIChRQ2ZsYWdzLCAiOmZsYWdzIik7CiAgIERFRlNZTSAoUUN2ZXJp ZnlfZmxhZ3MsICI6dmVyaWZ5LWZsYWdzIik7CiAgIERFRlNZTSAoUUN2ZXJpZnlfZXJyb3IsICI6 dmVyaWZ5LWVycm9yIik7CiAKLSAtLSAKMi4zNy4zCgotLS0tLUJFR0lOIFBHUCBTSUdOQVRVUkUt LS0tLQoKaVFJekJBRUJDZ0FkRmlFRUhISFVDWUtOZFdsNWg4NDVEdE5SNnpjZVpFZ0ZBbU14eUY0 QUNna1FEdE5SNnpjZQpaRWhlYWhBQWx0WWpOeGNJWVVqQjlxdlhQVjQ1akE3eVdmR29nSHlhbThu WUUvTUZzWVNmOGUvOHBad1BPdXdLClh5QXcwM3J4eWdCbEdYWFpOQVVxVWJhOHd0VWV4TGNsV3k5 eW9nczV3NXI4c2tqTkpSYTRVYkxZWTBZVjhiL1IKbVR1a2J3cjh5WG9GbVF4d2p5UWl3VXJWZEZM UEJBM1MzalcxQ0xYUGRsZUI2Vjl6VEpMYXNRQ1pzc2g2TGVONQpuMzJRQ1BJamgwcGRkZWo5OHly R3ZhZTFxVHZwYzFYYklFRmtYY3pCUTNEaUZzK1hpbk5rZnRKUytGSG9FdWlUClVQWDdIWk1xN1lw RlFZa3M1ZWZyelpDWU8wMlhDWmJDcnNZN0tKamhJUVRiK0JiNDBBL3M0dmtHOW5obUN5QjAKMjFW L2FOWVErcVpROFh2VVF2bmFsNFcrRWdiRzh3VXh1R3E0OHp6NTJFazJwWS9leFIyMDhOUm5TRGc4 TE1lSgpScVhDRjd4SExoVkIva09tYmJHc1RUZTQ1d2p3cnNhMkN0NU1xR25FVHhYUkxZMVVhZnAv cHRBa1lrK29OMll6CjdTR3dya0hHTitjc283ZWpWUjhibWNEcmw3U1U1Smx6MXA5cnFpdlhaL0RN T1hrRCthR0hkWlliOUE4a0xmakcKVHBIeGpkVDRhNlFDZG5lOGJSRGkrUWltajFXK1hmcHdja01C ZWtyK3RaWFdCVS8yK0pNamlkcjV1UzdFNGlHTQo1MzNDSjJMR250L0RacjNXdXM3WDdSaUpSY3NZ Y29nN0s0Ui9OT3FndUl0ekpLYVBBUXQ5dU1rbjl2OEdwS0txCmw5MlRxaHlvTUdKV1grNWtuN0ly YzFmNnI0NGFuUmQrTHVjcHZxQVQraEUrbzEzRVc4VT0KPWl5TVAKLS0tLS1FTkQgUEdQIFNJR05B VFVSRS0tLS0tCg== --000000000000fc7e1305e996646d Content-Type: text/x-patch; charset="US-ASCII"; name="0001-fix-gnutls-add-possibility-of-password-for-key-file.patch" Content-Disposition: attachment; filename="0001-fix-gnutls-add-possibility-of-password-for-key-file.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l8ixvsdj0 RnJvbSA5NGVlYzQzODQzZDVkMDIyNWEyOWQzNTc0Zjg3Mzg3MTlmOWU0MjM5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWtvbGFvcyBDaGF0emlrb25zdGFudGlub3UgPG5jaGF0ejMx NEBnbWFpbC5jb20+CkRhdGU6IE1vbiwgMjYgU2VwIDIwMjIgMTE6MDg6MTggLTA0MDAKU3ViamVj dDogW1BBVENIXSBmaXgoZ251dGxzKTogYWRkIHBvc3NpYmlsaXR5IG9mIHBhc3N3b3JkIGZvciBr ZXktZmlsZQoKVGhlIEdudVRMUyBmdW5jdGlvbgoKICAgIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRf eDUwOV9rZXlfZmlsZQoKaXMgcmVwbGFjZWQgYnkgaXRzIHNlY29uZCB2ZXJzaW9uCgogICAgZ251 dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9maWxlMgoKYW5kIHRoZSBkZWZpbml0aW9ucyBv ZiBnbnV0bHMtYm9vdCBhbmQgZ251dGxzLWJvb3QtcGFyYW1ldGVycyBhcmUKbW9kaWZpZWQgdG8g aW5jbHVkZSB0aGUgOnBhc3MgYW5kIDpmbGFncyBrZXlzLCB3aGljaCBhcmUgYWRkaXRpb25hbApw YXJhbWV0ZXJzIGluIHRoZSBzZWNvbmQgdmVyc2lvbi4KClNpZ25lZC1vZmYtYnk6IE5pa29sYW9z IENoYXR6aWtvbnN0YW50aW5vdSA8bmNoYXR6MzE0QGdtYWlsLmNvbT4KLS0tCiBsaXNwL25ldC9n bnV0bHMuZWwgfCAgNyArKysrKysrCiBzcmMvZ251dGxzLmMgICAgICAgfCAxOSArKysrKysrKysr KysrKysrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9uZXQvZ251dGxzLmVsIGIvbGlzcC9uZXQvZ251dGxzLmVs CmluZGV4IDZlMzg0NWFlYzEuLjlhYWIxOGI4ZmIgMTAwNjQ0Ci0tLSBhL2xpc3AvbmV0L2dudXRs cy5lbAorKysgYi9saXNwL25ldC9nbnV0bHMuZWwKQEAgLTI2NSw2ICsyNjUsNyBAQCBnbnV0bHMt Ym9vdC1wYXJhbWV0ZXJzCiAgICAgICAgICAgICZrZXkgdHlwZSBob3N0bmFtZSBwcmlvcml0eS1z dHJpbmcKICAgICAgICAgICAgdHJ1c3RmaWxlcyBjcmxmaWxlcyBrZXlsaXN0IG1pbi1wcmltZS1i aXRzCiAgICAgICAgICAgIHZlcmlmeS1mbGFncyB2ZXJpZnktZXJyb3IgdmVyaWZ5LWhvc3RuYW1l LWVycm9yCisgICAgICAgICAgIHBhc3MgZmxhZ3MKICAgICAgICAgICAgJmFsbG93LW90aGVyLWtl eXMpCiAgICJSZXR1cm4gYSBrZXl3b3JkIGxpc3Qgb2YgcGFyYW1ldGVycyBzdWl0YWJsZSBmb3Ig cGFzc2luZyB0byBgZ251dGxzLWJvb3QnLgogCkBAIC0yODEsNiArMjgyLDEwIEBAIGdudXRscy1i b290LXBhcmFtZXRlcnMKIFZFUklGWS1IT1NUTkFNRS1FUlJPUiBpcyBhIGJhY2t3YXJkcyBjb21w YXRpYmlsaXR5IG9wdGlvbiBmb3IKIHB1dHRpbmcgYDpob3N0bmFtZScgaW4gVkVSSUZZLUVSUk9S LgogCitQQVNTIGlzIGEgc3RyaW5nLCB0aGUgcGFzc3dvcmQgb2YgdGhlIGtleS4KKworRkxBR1Mg aXMgYW4gT1JlZCBzZXF1ZW5jZSBvZiBnbnV0bHNfcGtjc19lbmNyeXB0X2ZsYWdzX3QgdmFsdWVz LgorCiBXaGVuIFZFUklGWS1FUlJPUiBpcyB0IG9yIGEgbGlzdCBjb250YWluaW5nIGA6dHJ1c3Rm aWxlcycsIGFuCiBlcnJvciB3aWxsIGJlIHJhaXNlZCB3aGVuIHRoZSBwZWVyIGNlcnRpZmljYXRl IHZlcmlmaWNhdGlvbiBmYWlscwogYXMgcGVyIEdudVRMUycgZ251dGxzX2NlcnRpZmljYXRlX3Zl cmlmeV9wZWVyczIuICBPdGhlcndpc2UsIG9ubHkKQEAgLTM1OCw2ICszNjMsOCBAQCBnbnV0bHMt Ym9vdC1wYXJhbWV0ZXJzCiAgICAgICAgICAgICAgICAgOmtleWxpc3QgLGtleWxpc3QKICAgICAg ICAgICAgICAgICA6dmVyaWZ5LWZsYWdzICx2ZXJpZnktZmxhZ3MKICAgICAgICAgICAgICAgICA6 dmVyaWZ5LWVycm9yICx2ZXJpZnktZXJyb3IKKyAgICAgICAgICAgICAgICA6cGFzcyAscGFzcwor ICAgICAgICAgICAgICAgIDpmbGFncyAsZmxhZ3MKICAgICAgICAgICAgICAgICA6Y2FsbGJhY2tz IG5pbCkpKQogCiAoZGVmdW4gZ251dGxzLS1nZXQtZmlsZXMgKGZpbGVzKQpkaWZmIC0tZ2l0IGEv c3JjL2dudXRscy5jIGIvc3JjL2dudXRscy5jCmluZGV4IGEwZGUwMjM4YzQuLmM0NTc3MWM1OGQg MTAwNjQ0Ci0tLSBhL3NyYy9nbnV0bHMuYworKysgYi9zcmMvZ251dGxzLmMKQEAgLTEyMSw2ICsx MjEsOSBAQCBERUZfRExMX0ZOIChpbnQsIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9jcmxf ZmlsZSwKIERFRl9ETExfRk4gKGludCwgZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9m aWxlLAogCSAgICAoZ251dGxzX2NlcnRpZmljYXRlX2NyZWRlbnRpYWxzX3QsIGNvbnN0IGNoYXIg KiwgY29uc3QgY2hhciAqLAogCSAgICAgZ251dGxzX3g1MDlfY3J0X2ZtdF90KSk7CitERUZfRExM X0ZOIChpbnQsIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9rZXlfZmlsZTIsCisJICAgIChn bnV0bHNfY2VydGlmaWNhdGVfY3JlZGVudGlhbHNfdCwgY29uc3QgY2hhciAqLCBjb25zdCBjaGFy ICosCisJICAgICBnbnV0bHNfeDUwOV9jcnRfZm10X3QsIGNvbnN0IGNoYXIgKiwgdW5zaWduZWQg aW50KSk7CiAjICBpZmRlZiBIQVZFX0dOVVRMU19YNTA5X1NZU1RFTV9UUlVTVAogREVGX0RMTF9G TiAoaW50LCBnbnV0bHNfY2VydGlmaWNhdGVfc2V0X3g1MDlfc3lzdGVtX3RydXN0LAogCSAgICAo Z251dGxzX2NlcnRpZmljYXRlX2NyZWRlbnRpYWxzX3QpKTsKQEAgLTMxNCw2ICszMTcsNyBAQCBp bml0X2dudXRsc19mdW5jdGlvbnMgKHZvaWQpCiAgIExPQURfRExMX0ZOIChsaWJyYXJ5LCBnbnV0 bHNfY2VydGlmaWNhdGVfc2V0X3ZlcmlmeV9mbGFncyk7CiAgIExPQURfRExMX0ZOIChsaWJyYXJ5 LCBnbnV0bHNfY2VydGlmaWNhdGVfc2V0X3g1MDlfY3JsX2ZpbGUpOwogICBMT0FEX0RMTF9GTiAo bGlicmFyeSwgZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9maWxlKTsKKyAgTE9BRF9E TExfRk4gKGxpYnJhcnksIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9rZXlfZmlsZTIpOwog IyAgaWZkZWYgSEFWRV9HTlVUTFNfWDUwOV9TWVNURU1fVFJVU1QKICAgTE9BRF9ETExfRk4gKGxp YnJhcnksIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9zeXN0ZW1fdHJ1c3QpOwogIyAgZW5k aWYKQEAgLTQ1NSw2ICs0NTksNyBAQCBpbml0X2dudXRsc19mdW5jdGlvbnMgKHZvaWQpCiAjICBk ZWZpbmUgZ251dGxzX2NlcnRpZmljYXRlX3NldF92ZXJpZnlfZmxhZ3MgZm5fZ251dGxzX2NlcnRp ZmljYXRlX3NldF92ZXJpZnlfZmxhZ3MKICMgIGRlZmluZSBnbnV0bHNfY2VydGlmaWNhdGVfc2V0 X3g1MDlfY3JsX2ZpbGUgZm5fZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2NybF9maWxlCiAj ICBkZWZpbmUgZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9maWxlIGZuX2dudXRsc19j ZXJ0aWZpY2F0ZV9zZXRfeDUwOV9rZXlfZmlsZQorIyAgZGVmaW5lIGdudXRsc19jZXJ0aWZpY2F0 ZV9zZXRfeDUwOV9rZXlfZmlsZTIgZm5fZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9m aWxlMgogIyAgZGVmaW5lIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9zeXN0ZW1fdHJ1c3Qg Zm5fZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X3N5c3RlbV90cnVzdAogIyAgZGVmaW5lIGdu dXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV90cnVzdF9maWxlIGZuX2dudXRsc19jZXJ0aWZpY2F0 ZV9zZXRfeDUwOV90cnVzdF9maWxlCiAjICBkZWZpbmUgZ251dGxzX2NlcnRpZmljYXRlX3R5cGVf Z2V0IGZuX2dudXRsc19jZXJ0aWZpY2F0ZV90eXBlX2dldApAQCAtMTgxMyw2ICsxODE4LDEwIEBA IERFRlVOICgiZ251dGxzLWJvb3QiLCBGZ251dGxzX2Jvb3QsIFNnbnV0bHNfYm9vdCwgMywgMywg MCwKIDpjb21wbGV0ZS1uZWdvdGlhdGlvbiwgaWYgbm9uLW5pbCwgd2lsbCBtYWtlIG5lZ290aWF0 aW9uIGNvbXBsZXRlCiBiZWZvcmUgcmV0dXJuaW5nIGV2ZW4gb24gbm9uLWJsb2NraW5nIHNvY2tl dHMuCiAKKzpwYXNzLCB0aGUgcGFzc3dvcmQgb2YgdGhlIHByaXZhdGUga2V5LgorCis6ZmxhZ3Ms IGFuIE9SZWQgc2VxdWVuY2Ugb2YgZ251dGxzX3BrY3NfZW5jcnlwdF9mbGFnc190LgorCiBUaGUg ZGVidWcgbGV2ZWwgd2lsbCBiZSBzZXQgZm9yIHRoaXMgcHJvY2VzcyBBTkQgZ2xvYmFsbHkgZm9y IEdudVRMUy4KIFNvIGlmIHlvdSBzZXQgaXQgaGlnaGVyIG9yIGxvd2VyIGF0IGFueSBwb2ludCwg aXQgYWZmZWN0cyBnbG9iYWwKIGRlYnVnZ2luZy4KQEAgLTE4NDgsNiArMTg1Nyw4IEBAIERFRlVO ICgiZ251dGxzLWJvb3QiLCBGZ251dGxzX2Jvb3QsIFNnbnV0bHNfYm9vdCwgMywgMywgMCwKICAg TGlzcF9PYmplY3QgdHJ1c3RmaWxlczsKICAgTGlzcF9PYmplY3QgY3JsZmlsZXM7CiAgIExpc3Bf T2JqZWN0IGtleWxpc3Q7CisgIExpc3BfT2JqZWN0IHBhc3M7CisgIExpc3BfT2JqZWN0IGZsYWdz OwogICAvKiBMaXNwX09iamVjdCBjYWxsYmFja3M7ICovCiAgIExpc3BfT2JqZWN0IGxvZ2xldmVs OwogICBMaXNwX09iamVjdCBob3N0bmFtZTsKQEAgLTE4NzcsNiArMTg4OCw4IEBAIERFRlVOICgi Z251dGxzLWJvb3QiLCBGZ251dGxzX2Jvb3QsIFNnbnV0bHNfYm9vdCwgMywgMywgMCwKICAgY3Js ZmlsZXMgICAgICAgICAgICAgID0gcGxpc3RfZ2V0IChwcm9wbGlzdCwgUUNjcmxmaWxlcyk7CiAg IGxvZ2xldmVsICAgICAgICAgICAgICA9IHBsaXN0X2dldCAocHJvcGxpc3QsIFFDbG9nbGV2ZWwp OwogICBwcmltZV9iaXRzICAgICAgICAgICAgPSBwbGlzdF9nZXQgKHByb3BsaXN0LCBRQ21pbl9w cmltZV9iaXRzKTsKKyAgcGFzcyAgICAgICAgICAgICAgICAgID0gcGxpc3RfZ2V0IChwcm9wbGlz dCwgUUNwYXNzKTsKKyAgZmxhZ3MgICAgICAgICAgICAgICAgID0gcGxpc3RfZ2V0IChwcm9wbGlz dCwgUUNmbGFncyk7CiAKICAgaWYgKCFTVFJJTkdQIChob3N0bmFtZSkpCiAgICAgewpAQCAtMjAz OCw4ICsyMDUxLDggQEAgREVGVU4gKCJnbnV0bHMtYm9vdCIsIEZnbnV0bHNfYm9vdCwgU2dudXRs c19ib290LCAzLCAzLCAwLAogCSAgICAgIGtleWZpbGUgPSBhbnNpX2VuY29kZV9maWxlbmFtZSAo a2V5ZmlsZSk7CiAJICAgICAgY2VydGZpbGUgPSBhbnNpX2VuY29kZV9maWxlbmFtZSAoY2VydGZp bGUpOwogIyBlbmRpZgotCSAgICAgIHJldCA9IGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9r ZXlfZmlsZQotCQkoeDUwOV9jcmVkLCBTU0RBVEEgKGNlcnRmaWxlKSwgU1NEQVRBIChrZXlmaWxl KSwgZmlsZV9mb3JtYXQpOworCSAgICAgIHJldCA9IGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUw OV9rZXlfZmlsZTIKKwkJKHg1MDlfY3JlZCwgU1NEQVRBIChjZXJ0ZmlsZSksIFNTREFUQSAoa2V5 ZmlsZSksIGZpbGVfZm9ybWF0LCBTU0RBVEEgKHBhc3MpLCBYVUZJWE5VTSAoZmxhZ3MpKTsKIAog CSAgICAgIGlmIChyZXQgPCBHTlVUTFNfRV9TVUNDRVNTKQogCQlyZXR1cm4gZ251dGxzX21ha2Vf ZXJyb3IgKHJldCk7CkBAIC0yODYwLDYgKzI4NzMsOCBAQCBzeW1zX29mX2dudXRscyAodm9pZCkK ICAgREVGU1lNIChRQ21pbl9wcmltZV9iaXRzLCAiOm1pbi1wcmltZS1iaXRzIik7CiAgIERFRlNZ TSAoUUNsb2dsZXZlbCwgIjpsb2dsZXZlbCIpOwogICBERUZTWU0gKFFDY29tcGxldGVfbmVnb3Rp YXRpb24sICI6Y29tcGxldGUtbmVnb3RpYXRpb24iKTsKKyAgREVGU1lNIChRQ3Bhc3MsICI6cGFz cyIpOworICBERUZTWU0gKFFDZmxhZ3MsICI6ZmxhZ3MiKTsKICAgREVGU1lNIChRQ3ZlcmlmeV9m bGFncywgIjp2ZXJpZnktZmxhZ3MiKTsKICAgREVGU1lNIChRQ3ZlcmlmeV9lcnJvciwgIjp2ZXJp ZnktZXJyb3IiKTsKIAotLSAKMi4zNy4zCgo= --000000000000fc7e1305e996646d--