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: Wed, 28 Sep 2022 08:15:26 -0400 Message-ID: References: <83ee9wiozc.fsf@gnu.org> <87sflkgy49.fsf@gnus.org> <87edwd15ck.fsf@gnus.org> <87tu4u8kjv.fsf@gnus.org> <878rm69hop.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000f8abbd05e9bbb77b" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15043"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 50507@debbugs.gnu.org, Lars Ingebrigtsen , Eli Zaretskii To: Robert Pluim Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Sep 28 14:40:27 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 1odWMV-0003nf-14 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 28 Sep 2022 14:40:27 +0200 Original-Received: from localhost ([::1]:46144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odWMT-0003MG-TP for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 28 Sep 2022 08:40:25 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odVys-0006FQ-M6 for bug-gnu-emacs@gnu.org; Wed, 28 Sep 2022 08:16:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:33143) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odVys-00046F-BK for bug-gnu-emacs@gnu.org; Wed, 28 Sep 2022 08:16:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1odVys-0001iM-5s for bug-gnu-emacs@gnu.org; Wed, 28 Sep 2022 08:16:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Nikolaos Chatzikonstantinou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 28 Sep 2022 12:16:02 +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.16643673506567 (code B ref 50507); Wed, 28 Sep 2022 12:16:02 +0000 Original-Received: (at 50507) by debbugs.gnu.org; 28 Sep 2022 12:15:50 +0000 Original-Received: from localhost ([127.0.0.1]:60454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1odVyf-0001hp-IC for submit@debbugs.gnu.org; Wed, 28 Sep 2022 08:15:49 -0400 Original-Received: from mail-yb1-f178.google.com ([209.85.219.178]:46958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1odVyZ-0001ha-Vr for 50507@debbugs.gnu.org; Wed, 28 Sep 2022 08:15:47 -0400 Original-Received: by mail-yb1-f178.google.com with SMTP id e81so15659763ybb.13 for <50507@debbugs.gnu.org>; Wed, 28 Sep 2022 05:15:43 -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=+uRCoyNHQ2K+zoY5gsmVEzUdHIvE3ESYj5J0IVChk/k=; b=d38qHrLLl3YqLdYx4rx+5SaHkLApLH0095SeblzQ3dM/xjsEKXlErRcga21YaZZKr0 PLBQh51VoJ8IJSqKSCIukoihVT/skqBBuXVhN1VNJd+OAOl/LeEfLWM74RrbspAkkN7j cN5Y9bxxmeP34X6gXSuH7C3rCbpfeB7KMp7188CPbW0dkXOkZJkSnrAJ2xExdD1ZcyU8 kMzDoX3EkI8QkFtXrALnbcVeFrg3WW0F+hTGzTgSCjL6rINrkmfBtAD/nLFeS95gIwY4 RHepRFwRBqLrZTm6KXiTK3T9DGdvZhu7BXxhyxOXzcC7n2Hp2hbgBJaCnIImU4tnNWwT CN5w== 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=+uRCoyNHQ2K+zoY5gsmVEzUdHIvE3ESYj5J0IVChk/k=; b=cMCbaXlu6YTdba2CDeqWNGg5jsWDTSUpxaEAU7cfsCpuaGcPEy8FmoX72Rw7ZEuR7/ V/52sfO3FdoX7LoEThgeTvRxskmn5xGkfyeDNbZd4+Hy9P2KAtmAvPtKSWrEnNUTPvir gMQI9n19SazTxHiGk4COk3FoZ/mTdVbI6Zic7BJLRIGdziimI6Yf6S5D2e/PQ7JX2xtX 7/nKlXv6VyS2XXcxunaPVBmZEgSYoVCb4feyjw/9WC9CQp4yU9axqRF3VxPwkAoHvvNi XlWvI4L5G5ErahBWsDGUbznPpv189SYz59aSJC8BLvdPOE54SAX+MCh4SYBbroFW4sae +ypg== X-Gm-Message-State: ACrzQf3IqMTDpGNN0ffaetrU1ceIcg+svhZF4IcdE4LdQhfo0quYM0VN F6gWQ39JadrHG/Q/iXr2CtbC2oKdWX6/EAU5a0k= X-Google-Smtp-Source: AMsMyM46a3VyfLPTkSXwR7a1E9IsGbqu875+i4gcI7rGdudJncaOcvmaZVDaWxiliWSq/xWCqNKT6mWFzl7UBZZTfbw= X-Received: by 2002:a05:6902:8d:b0:6bc:47ea:42da with SMTP id h13-20020a056902008d00b006bc47ea42damr5087485ybs.529.1664367338217; Wed, 28 Sep 2022 05:15:38 -0700 (PDT) In-Reply-To: <878rm69hop.fsf@gmail.com> 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:243795 Archived-At: --000000000000f8abbd05e9bbb77b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Sep 26, 2022 at 1:19 PM Robert Pluim wrote: > > >>>>> On Mon, 26 Sep 2022 11:43:41 -0400, Nikolaos Chatzikonstantinou said: > Nikolaos> Date: Mon, 26 Sep 2022 11:08:18 -0400 > Nikolaos> Subject: [PATCH] fix(gnutls): add possibility of password f= or key-file > > Nikolaos> The GnuTLS function > > Nikolaos> gnutls_certificate_set_x509_key_file > > Nikolaos> is replaced by its second version > > Nikolaos> gnutls_certificate_set_x509_key_file2 > > Nikolaos> and the definitions of gnutls-boot and gnutls-boot-paramete= rs are > Nikolaos> modified to include the :pass and :flags keys, which are ad= ditional > Nikolaos> parameters in the second version. > > Nikolaos> Signed-off-by: Nikolaos Chatzikonstantinou > Nikolaos> > > We don=CA=BCt use Signed-off-by, and the commit message has some rules > which are described in CONTRIBUTE (start at "** Commit messages" and > read up to and including "** Committing your changes") Okay, I'm submitting this patch with corrections included, see attachment. --000000000000f8abbd05e9bbb77b Content-Type: application/pgp-signature; name="0001-add-pass-and-flags-to-gnutls-boot-for-keylist.patch.sig" Content-Disposition: attachment; filename="0001-add-pass-and-flags-to-gnutls-boot-for-keylist.patch.sig" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l8llbyad0 LS0tLS1CRUdJTiBQR1AgU0lHTkVEIE1FU1NBR0UtLS0tLQpIYXNoOiBTSEE1MTIKCi0gRnJvbSAy NDY0NDFmNWM5OWZmMThhODhiY2YyN2E0ZjQ5NDhhMDg2YTc4YWM1IE1vbiBTZXAgMTcgMDA6MDA6 MDAgMjAwMQpGcm9tOiBOaWtvbGFvcyBDaGF0emlrb25zdGFudGlub3UgPG5jaGF0ejMxNEBnbWFp bC5jb20+CkRhdGU6IE1vbiwgMjYgU2VwIDIwMjIgMTE6MDg6MTggLTA0MDAKU3ViamVjdDogW1BB VENIXSBhZGQgOnBhc3MgYW5kIDpmbGFncyB0byBnbnV0bHMtYm9vdCBmb3IgOmtleWxpc3QKCiog bGlzcC9uZXQvZ251dGxzLmVsIChnbnV0bHMtYm9vdC1wYXJhbWV0ZXJzKTogYWRkIHRoZSBrZXlz IDpwYXNzIGFuZAo6ZmxhZ3MsIGFuZCB1cGRhdGUgdGhlIGRvY3VtZW50YXRpb24uCiogc3JjL2du dXRscy5jIChnbnV0bHMtYm9vdCk6IGFkZCB0aGUga2V5cyA6cGFzcyBhbmQgOmZsYWdzLCBhbmQK dXBkYXRlIHRoZSBkb2N1bWVudGF0aW9uLgooc3ltc19vZl9nbnV0bHMpOiBhZGQgdGhlIHN5bWJv bHMgOnBhc3MsIDpmbGFncywgYW5kIHRoZSBzeW1ib2xzIHRoYXQKY29ycmVzcG9uZCB0byB0aGUg ZW51bWVyYXRpb24gY29uc3RhbnRzIG9mIHRoZSBHbnVUTFMgZW51bQpgZ251dGxzX3BrY3NfZW5j cnlwdF9mbGFnc190YC4KOyAoa2V5X2ZpbGUyX2F1eCk6IHByaXZhdGUgZnVuY3Rpb24gdGhhdCB0 cmFuc2xhdGVzIGEgbGlzdCBvZiBzeW1ib2xzCjsgdG8gaXRzIGNvcnJlc3BvbmRpbmcgdW5zaWdu ZWQgaW50IHZhbHVlIG9mIHRoZSBHbnVUTFMgQyBlbnVtCjsgYGdudXRsc19wa2NzX2VuY3J5cHRf ZmxhZ3NfdGAuCi0gLS0tCiBsaXNwL25ldC9nbnV0bHMuZWwgfCAgIDcgKysrCiBzcmMvZ251dGxz LmMgICAgICAgfCAxMDQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrCiAyIGZpbGVzIGNoYW5nZWQsIDExMSBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvbGlz cC9uZXQvZ251dGxzLmVsIGIvbGlzcC9uZXQvZ251dGxzLmVsCmluZGV4IDZlMzg0NWFlYzEuLjlh YWIxOGI4ZmIgMTAwNjQ0Ci0gLS0tIGEvbGlzcC9uZXQvZ251dGxzLmVsCisrKyBiL2xpc3AvbmV0 L2dudXRscy5lbApAQCAtMjY1LDYgKzI2NSw3IEBAIGdudXRscy1ib290LXBhcmFtZXRlcnMKICAg ICAgICAgICAgJmtleSB0eXBlIGhvc3RuYW1lIHByaW9yaXR5LXN0cmluZwogICAgICAgICAgICB0 cnVzdGZpbGVzIGNybGZpbGVzIGtleWxpc3QgbWluLXByaW1lLWJpdHMKICAgICAgICAgICAgdmVy aWZ5LWZsYWdzIHZlcmlmeS1lcnJvciB2ZXJpZnktaG9zdG5hbWUtZXJyb3IKKyAgICAgICAgICAg cGFzcyBmbGFncwogICAgICAgICAgICAmYWxsb3ctb3RoZXIta2V5cykKICAgIlJldHVybiBhIGtl eXdvcmQgbGlzdCBvZiBwYXJhbWV0ZXJzIHN1aXRhYmxlIGZvciBwYXNzaW5nIHRvIGBnbnV0bHMt Ym9vdCcuCiAKQEAgLTI4MSw2ICsyODIsMTAgQEAgZ251dGxzLWJvb3QtcGFyYW1ldGVycwogVkVS SUZZLUhPU1ROQU1FLUVSUk9SIGlzIGEgYmFja3dhcmRzIGNvbXBhdGliaWxpdHkgb3B0aW9uIGZv cgogcHV0dGluZyBgOmhvc3RuYW1lJyBpbiBWRVJJRlktRVJST1IuCiAKK1BBU1MgaXMgYSBzdHJp bmcsIHRoZSBwYXNzd29yZCBvZiB0aGUga2V5LgorCitGTEFHUyBpcyBhbiBPUmVkIHNlcXVlbmNl IG9mIGdudXRsc19wa2NzX2VuY3J5cHRfZmxhZ3NfdCB2YWx1ZXMuCisKIFdoZW4gVkVSSUZZLUVS Uk9SIGlzIHQgb3IgYSBsaXN0IGNvbnRhaW5pbmcgYDp0cnVzdGZpbGVzJywgYW4KIGVycm9yIHdp bGwgYmUgcmFpc2VkIHdoZW4gdGhlIHBlZXIgY2VydGlmaWNhdGUgdmVyaWZpY2F0aW9uIGZhaWxz CiBhcyBwZXIgR251VExTJyBnbnV0bHNfY2VydGlmaWNhdGVfdmVyaWZ5X3BlZXJzMi4gIE90aGVy d2lzZSwgb25seQpAQCAtMzU4LDYgKzM2Myw4IEBAIGdudXRscy1ib290LXBhcmFtZXRlcnMKICAg ICAgICAgICAgICAgICA6a2V5bGlzdCAsa2V5bGlzdAogICAgICAgICAgICAgICAgIDp2ZXJpZnkt ZmxhZ3MgLHZlcmlmeS1mbGFncwogICAgICAgICAgICAgICAgIDp2ZXJpZnktZXJyb3IgLHZlcmlm eS1lcnJvcgorICAgICAgICAgICAgICAgIDpwYXNzICxwYXNzCisgICAgICAgICAgICAgICAgOmZs YWdzICxmbGFncwogICAgICAgICAgICAgICAgIDpjYWxsYmFja3MgbmlsKSkpCiAKIChkZWZ1biBn bnV0bHMtLWdldC1maWxlcyAoZmlsZXMpCmRpZmYgLS1naXQgYS9zcmMvZ251dGxzLmMgYi9zcmMv Z251dGxzLmMKaW5kZXggYTBkZTAyMzhjNC4uZmY3YjFkNTkzMSAxMDA2NDQKLSAtLS0gYS9zcmMv Z251dGxzLmMKKysrIGIvc3JjL2dudXRscy5jCkBAIC0zNCw2ICszNCw3IEBACiAjIGVuZGlmCiAK ICMgaWYgR05VVExTX1ZFUlNJT05fTlVNQkVSID49IDB4MDMwMjAwCisjICBkZWZpbmUgSEFWRV9H TlVUTFNfQ0VSVElGSUNBVEVfU0VUX1g1MDlfS0VZX0ZJTEUyCiAjICBkZWZpbmUgSEFWRV9HTlVU TFNfQ0lQSEVSX0dFVF9JVl9TSVpFCiAjIGVuZGlmCiAKQEAgLTEyMSw2ICsxMjIsOSBAQCBERUZf RExMX0ZOIChpbnQsIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9jcmxfZmlsZSwKIERFRl9E TExfRk4gKGludCwgZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9maWxlLAogCSAgICAo Z251dGxzX2NlcnRpZmljYXRlX2NyZWRlbnRpYWxzX3QsIGNvbnN0IGNoYXIgKiwgY29uc3QgY2hh ciAqLAogCSAgICAgZ251dGxzX3g1MDlfY3J0X2ZtdF90KSk7CitERUZfRExMX0ZOIChpbnQsIGdu dXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9rZXlfZmlsZTIsCisJICAgIChnbnV0bHNfY2VydGlm aWNhdGVfY3JlZGVudGlhbHNfdCwgY29uc3QgY2hhciAqLCBjb25zdCBjaGFyICosCisJICAgICBn bnV0bHNfeDUwOV9jcnRfZm10X3QsIGNvbnN0IGNoYXIgKiwgdW5zaWduZWQgaW50KSk7CiAjICBp ZmRlZiBIQVZFX0dOVVRMU19YNTA5X1NZU1RFTV9UUlVTVAogREVGX0RMTF9GTiAoaW50LCBnbnV0 bHNfY2VydGlmaWNhdGVfc2V0X3g1MDlfc3lzdGVtX3RydXN0LAogCSAgICAoZ251dGxzX2NlcnRp ZmljYXRlX2NyZWRlbnRpYWxzX3QpKTsKQEAgLTMxNCw2ICszMTgsNyBAQCBpbml0X2dudXRsc19m dW5jdGlvbnMgKHZvaWQpCiAgIExPQURfRExMX0ZOIChsaWJyYXJ5LCBnbnV0bHNfY2VydGlmaWNh dGVfc2V0X3ZlcmlmeV9mbGFncyk7CiAgIExPQURfRExMX0ZOIChsaWJyYXJ5LCBnbnV0bHNfY2Vy dGlmaWNhdGVfc2V0X3g1MDlfY3JsX2ZpbGUpOwogICBMT0FEX0RMTF9GTiAobGlicmFyeSwgZ251 dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9maWxlKTsKKyAgTE9BRF9ETExfRk4gKGxpYnJh cnksIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9rZXlfZmlsZTIpOwogIyAgaWZkZWYgSEFW RV9HTlVUTFNfWDUwOV9TWVNURU1fVFJVU1QKICAgTE9BRF9ETExfRk4gKGxpYnJhcnksIGdudXRs c19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9zeXN0ZW1fdHJ1c3QpOwogIyAgZW5kaWYKQEAgLTQ1NSw2 ICs0NjAsNyBAQCBpbml0X2dudXRsc19mdW5jdGlvbnMgKHZvaWQpCiAjICBkZWZpbmUgZ251dGxz X2NlcnRpZmljYXRlX3NldF92ZXJpZnlfZmxhZ3MgZm5fZ251dGxzX2NlcnRpZmljYXRlX3NldF92 ZXJpZnlfZmxhZ3MKICMgIGRlZmluZSBnbnV0bHNfY2VydGlmaWNhdGVfc2V0X3g1MDlfY3JsX2Zp bGUgZm5fZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2NybF9maWxlCiAjICBkZWZpbmUgZ251 dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9maWxlIGZuX2dudXRsc19jZXJ0aWZpY2F0ZV9z ZXRfeDUwOV9rZXlfZmlsZQorIyAgZGVmaW5lIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9r ZXlfZmlsZTIgZm5fZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9maWxlMgogIyAgZGVm aW5lIGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV9zeXN0ZW1fdHJ1c3QgZm5fZ251dGxzX2Nl cnRpZmljYXRlX3NldF94NTA5X3N5c3RlbV90cnVzdAogIyAgZGVmaW5lIGdudXRsc19jZXJ0aWZp Y2F0ZV9zZXRfeDUwOV90cnVzdF9maWxlIGZuX2dudXRsc19jZXJ0aWZpY2F0ZV9zZXRfeDUwOV90 cnVzdF9maWxlCiAjICBkZWZpbmUgZ251dGxzX2NlcnRpZmljYXRlX3R5cGVfZ2V0IGZuX2dudXRs c19jZXJ0aWZpY2F0ZV90eXBlX2dldApAQCAtMTc3NCw2ICsxNzgwLDU3IEBAIGdudXRsc192ZXJp ZnlfYm9vdCAoTGlzcF9PYmplY3QgcHJvYywgTGlzcF9PYmplY3QgcHJvcGxpc3QpCiAgIHJldHVy biBnbnV0bHNfbWFrZV9lcnJvciAocmV0KTsKIH0KIAorLyogSGVscGVyIGZ1bmN0aW9uIGZvciBn bnV0bHMtYm9vdC4KKworICAgVGhlIGtleSA6ZmxhZ3MgcmVjZWl2ZXMgYSBsaXNwIG9mIHN5bWJv bHMsIGVhY2ggb2Ygd2hpY2gKKyAgIGNvcnJlc3BvbmRzIHRvIGEgR251VExTIEMgZmxhZywgdGhl IE9SZWQgcmVzdWx0IGlzIHRvIGJlIHBhc3NlZCB0bworICAgdGhlIGZ1bmN0aW9uIGdudXRsc19j ZXJ0aWZpY2F0ZV9zZXRfeDUwOV9rZXlfZmlsZTIoKSBhcyBpdHMgbGFzdAorICAgYXJndW1lbnQu CisqLwordW5zaWduZWQgaW50CitrZXlfZmlsZTJfYXV4IChMaXNwX09iamVjdCBmbGFncykKK3sK KyAgdW5zaWduZWQgaW50IHJ2ID0gMDsKKyAgTGlzcF9PYmplY3QgdGFpbDsKKyAgZm9yICh0YWls ID0gZmxhZ3M7IENPTlNQICh0YWlsKTsgdGFpbCA9IFhDRFIgKHRhaWwpKQorICAgIHsKKyAgICAg IExpc3BfT2JqZWN0IGZsYWcgPSBYQ0FSKHRhaWwpOworICAgICAgaWYgKEVRKGZsYWcsIFFnbnV0 bHNfcGtjc19wbGFpbikpCisJcnYgfD0gR05VVExTX1BLQ1NfUExBSU47CisgICAgICBlbHNlIGlm KEVRKGZsYWcsIFFnbnV0bHNfcGtjc19wa2NzMTJfM2RlcykpCisJcnYgfD0gR05VVExTX1BLQ1Nf UEtDUzEyXzNERVM7CisgICAgICBlbHNlIGlmKEVRKGZsYWcsIFFnbnV0bHNfcGtjc19wa2NzMTJf YXJjZm91cikpCisJcnYgfD0gR05VVExTX1BLQ1NfUEtDUzEyX0FSQ0ZPVVI7CisgICAgICBlbHNl IGlmKEVRKGZsYWcsIFFnbnV0bHNfcGtjc19wa2NzMTJfcmMyXzQwKSkKKwlydiB8PSBHTlVUTFNf UEtDU19QS0NTMTJfUkMyXzQwOworICAgICAgZWxzZSBpZihFUShmbGFnLCBRZ251dGxzX3BrY3Nf cGJlczJfM2RlcykpCisJcnYgfD0gR05VVExTX1BLQ1NfUEJFUzJfM0RFUzsKKyAgICAgIGVsc2Ug aWYoRVEoZmxhZywgUWdudXRsc19wa2NzX3BiZXMyX2Flc18xMjgpKQorCXJ2IHw9IEdOVVRMU19Q S0NTX1BCRVMyX0FFU18xMjg7CisgICAgICBlbHNlIGlmKEVRKGZsYWcsIFFnbnV0bHNfcGtjc19w YmVzMl9hZXNfMTkyKSkKKwlydiB8PSBHTlVUTFNfUEtDU19QQkVTMl9BRVNfMTkyOworICAgICAg ZWxzZSBpZihFUShmbGFnLCBRZ251dGxzX3BrY3NfcGJlczJfYWVzXzI1NikpCisJcnYgfD0gR05V VExTX1BLQ1NfUEJFUzJfQUVTXzI1NjsKKyAgICAgIGVsc2UgaWYoRVEoZmxhZywgUWdudXRsc19w a2NzX251bGxfcGFzc3dvcmQpKQorCXJ2IHw9IEdOVVRMU19QS0NTX05VTExfUEFTU1dPUkQ7Cisg ICAgICBlbHNlIGlmKEVRKGZsYWcsIFFnbnV0bHNfcGtjc19wYmVzMl9kZXMpKQorCXJ2IHw9IEdO VVRMU19QS0NTX1BCRVMyX0RFUzsKKyAgICAgIGVsc2UgaWYoRVEoZmxhZywgUWdudXRsc19wa2Nz X3BiZXMxX2Rlc19tZDUpKQorCXJ2IHw9IEdOVVRMU19QS0NTX1BCRVMxX0RFU19NRDU7CisgICAg ICBlbHNlIGlmKEVRKGZsYWcsIFFnbnV0bHNfcGtjc19wYmVzMl9nb3N0X3RjMjZ6KSkKKwlydiB8 PSBHTlVUTFNfUEtDU19QQkVTMl9HT1NUX1RDMjZaOworICAgICAgZWxzZSBpZihFUShmbGFnLCBR Z251dGxzX3BrY3NfcGJlczJfZ29zdF9jcGEpKQorCXJ2IHw9IEdOVVRMU19QS0NTX1BCRVMyX0dP U1RfQ1BBOworICAgICAgZWxzZSBpZihFUShmbGFnLCBRZ251dGxzX3BrY3NfcGJlczJfZ29zdF9j cGIpKQorCXJ2IHw9IEdOVVRMU19QS0NTX1BCRVMyX0dPU1RfQ1BCOworICAgICAgZWxzZSBpZihF UShmbGFnLCBRZ251dGxzX3BrY3NfcGJlczJfZ29zdF9jcGMpKQorCXJ2IHw9IEdOVVRMU19QS0NT X1BCRVMyX0dPU1RfQ1BDOworICAgICAgZWxzZSBpZihFUShmbGFnLCBRZ251dGxzX3BrY3NfcGJl czJfZ29zdF9jcGQpKQorCXJ2IHw9IEdOVVRMU19QS0NTX1BCRVMyX0dPU1RfQ1BEOworICAgIH0K KyAgcmV0dXJuIHJ2OworfQorCiBERUZVTiAoImdudXRscy1ib290IiwgRmdudXRsc19ib290LCBT Z251dGxzX2Jvb3QsIDMsIDMsIDAsCiAgICAgICAgZG9jOiAvKiBJbml0aWFsaXplIEdudVRMUyBj bGllbnQgZm9yIHByb2Nlc3MgUFJPQyB3aXRoIFRZUEUrUFJPUExJU1QuCiBDdXJyZW50bHkgb25s eSBjbGllbnQgbW9kZSBpcyBzdXBwb3J0ZWQuICBSZXR1cm4gYSBzdWNjZXNzL2ZhaWx1cmUKQEAg LTE4MTMsNiArMTg3MCwxOSBAQCBERUZVTiAoImdudXRscy1ib290IiwgRmdudXRsc19ib290LCBT Z251dGxzX2Jvb3QsIDMsIDMsIDAsCiA6Y29tcGxldGUtbmVnb3RpYXRpb24sIGlmIG5vbi1uaWws IHdpbGwgbWFrZSBuZWdvdGlhdGlvbiBjb21wbGV0ZQogYmVmb3JlIHJldHVybmluZyBldmVuIG9u IG5vbi1ibG9ja2luZyBzb2NrZXRzLgogCis6cGFzcywgdGhlIHBhc3N3b3JkIG9mIHRoZSBwcml2 YXRlIGtleSBhcyBwZXIgR251VExTJworZ251dGxzX2NlcnRpZmljYXRlX3NldF94NTA5X2tleV9m aWxlMi4KKworOmZsYWdzLCBhIGxpc3Qgb2Ygc3ltYm9scyByZWxhdGluZyB0byA6cGFzcywgZWFj aCBzcGVjaWZ5aW5nIGEgZmxhZzoKK0dOVVRMU19QS0NTX1BMQUlOLCBHTlVUTFNfUEtDU19QS0NT MTJfM0RFUywKK0dOVVRMU19QS0NTX1BLQ1MxMl9BUkNGT1VSLCBHTlVUTFNfUEtDU19QS0NTMTJf UkMyXzQwLAorR05VVExTX1BLQ1NfUEJFUzJfM0RFUywgR05VVExTX1BLQ1NfUEJFUzJfQUVTXzEy OCwKK0dOVVRMU19QS0NTX1BCRVMyX0FFU18xOTIsIEdOVVRMU19QS0NTX1BCRVMyX0FFU18yNTYs CitHTlVUTFNfUEtDU19OVUxMX1BBU1NXT1JELCBHTlVUTFNfUEtDU19QQkVTMl9ERVMsCitHTlVU TFNfUEtDU19QQkVTMl9ERVNfTUQ1LCBHTlVUTFNfUEtDU19QQkVTMl9HT1NUX1RDMjZaLAorR05V VExTX1BLQ1NfUEJFUzJfR09TVF9DUEEsIEdOVVRMU19QS0NTX1BCRVMyX0dPU1RfQ1BCLAorR05V VExTX1BLQ1NfUEJFUzJfR09TVF9DUEMsIEdOVVRMU19QS0NTX1BCRVMyX0dPU1RfQ1BELgorCiBU aGUgZGVidWcgbGV2ZWwgd2lsbCBiZSBzZXQgZm9yIHRoaXMgcHJvY2VzcyBBTkQgZ2xvYmFsbHkg Zm9yIEdudVRMUy4KIFNvIGlmIHlvdSBzZXQgaXQgaGlnaGVyIG9yIGxvd2VyIGF0IGFueSBwb2lu dCwgaXQgYWZmZWN0cyBnbG9iYWwKIGRlYnVnZ2luZy4KQEAgLTE4MjUsNiArMTg5NSw5IEBAIERF RlVOICgiZ251dGxzLWJvb3QiLCBGZ251dGxzX2Jvb3QsIFNnbnV0bHNfYm9vdCwgMywgMywgMCwK IGZ1bmN0aW9ucyBhcmUgdXNlZC4gIFRoaXMgZnVuY3Rpb24gYWxsb2NhdGVzIHJlc291cmNlcyB3 aGljaCBjYW4gb25seQogYmUgZGVhbGxvY2F0ZWQgYnkgY2FsbGluZyBgZ251dGxzLWRlaW5pdCcg b3IgYnkgY2FsbGluZyBpdCBhZ2Fpbi4KIAorVGhlIDpwYXNzIGFuZCA6ZmxhZ3Mga2V5cyBhcmUg aWdub3JlZCB3aXRoIG9sZCB2ZXJzaW9ucyBvZiBHbnVUTFMsIGFuZAorOmZsYWdzIGlzIGlnbm9y ZWQgaWYgOnBhc3MgaXMgbm90IHNwZWNpZmllZC4KKwogVGhlIGNhbGxiYWNrcyBhbGlzdCBjYW4g aGF2ZSBhIGB2ZXJpZnknIGtleSwgYXNzb2NpYXRlZCB3aXRoIGEKIHZlcmlmaWNhdGlvbiBmdW5j dGlvbiAoVU5VU0VEKS4KIApAQCAtMTg0OCw2ICsxOTIxLDggQEAgREVGVU4gKCJnbnV0bHMtYm9v dCIsIEZnbnV0bHNfYm9vdCwgU2dudXRsc19ib290LCAzLCAzLCAwLAogICBMaXNwX09iamVjdCB0 cnVzdGZpbGVzOwogICBMaXNwX09iamVjdCBjcmxmaWxlczsKICAgTGlzcF9PYmplY3Qga2V5bGlz dDsKKyAgTGlzcF9PYmplY3QgcGFzczsKKyAgTGlzcF9PYmplY3QgZmxhZ3M7CiAgIC8qIExpc3Bf T2JqZWN0IGNhbGxiYWNrczsgKi8KICAgTGlzcF9PYmplY3QgbG9nbGV2ZWw7CiAgIExpc3BfT2Jq ZWN0IGhvc3RuYW1lOwpAQCAtMTg3Nyw2ICsxOTUyLDggQEAgREVGVU4gKCJnbnV0bHMtYm9vdCIs IEZnbnV0bHNfYm9vdCwgU2dudXRsc19ib290LCAzLCAzLCAwLAogICBjcmxmaWxlcyAgICAgICAg ICAgICAgPSBwbGlzdF9nZXQgKHByb3BsaXN0LCBRQ2NybGZpbGVzKTsKICAgbG9nbGV2ZWwgICAg ICAgICAgICAgID0gcGxpc3RfZ2V0IChwcm9wbGlzdCwgUUNsb2dsZXZlbCk7CiAgIHByaW1lX2Jp dHMgICAgICAgICAgICA9IHBsaXN0X2dldCAocHJvcGxpc3QsIFFDbWluX3ByaW1lX2JpdHMpOwor ICBwYXNzICAgICAgICAgICAgICAgICAgPSBwbGlzdF9nZXQgKHByb3BsaXN0LCBRQ3Bhc3MpOwor ICBmbGFncyAgICAgICAgICAgICAgICAgPSBwbGlzdF9nZXQgKHByb3BsaXN0LCBRQ2ZsYWdzKTsK IAogICBpZiAoIVNUUklOR1AgKGhvc3RuYW1lKSkKICAgICB7CkBAIC0yMDM4LDggKzIxMTUsMTcg QEAgREVGVU4gKCJnbnV0bHMtYm9vdCIsIEZnbnV0bHNfYm9vdCwgU2dudXRsc19ib290LCAzLCAz LCAwLAogCSAgICAgIGtleWZpbGUgPSBhbnNpX2VuY29kZV9maWxlbmFtZSAoa2V5ZmlsZSk7CiAJ ICAgICAgY2VydGZpbGUgPSBhbnNpX2VuY29kZV9maWxlbmFtZSAoY2VydGZpbGUpOwogIyBlbmRp ZgorIyBpZmRlZiBIQVZFX0dOVVRMU19DRVJUSUZJQ0FURV9TRVRfWDUwOV9LRVlfRklMRTIKKwkg ICAgICBpZiAoU1RSSU5HUCAocGFzcykpCisJCXJldCA9IGdudXRsc19jZXJ0aWZpY2F0ZV9zZXRf eDUwOV9rZXlfZmlsZTIKKwkJICAoeDUwOV9jcmVkLCBTU0RBVEEgKGNlcnRmaWxlKSwgU1NEQVRB IChrZXlmaWxlKSwgZmlsZV9mb3JtYXQsIFNTREFUQSAocGFzcyksIGtleV9maWxlMl9hdXggKGZs YWdzKSk7CisJICAgICAgZWxzZQorCQlyZXQgPSBnbnV0bHNfY2VydGlmaWNhdGVfc2V0X3g1MDlf a2V5X2ZpbGUKKwkJICAoeDUwOV9jcmVkLCBTU0RBVEEgKGNlcnRmaWxlKSwgU1NEQVRBIChrZXlm aWxlKSwgZmlsZV9mb3JtYXQpOworIyBlbHNlCiAJICAgICAgcmV0ID0gZ251dGxzX2NlcnRpZmlj YXRlX3NldF94NTA5X2tleV9maWxlCiAJCSh4NTA5X2NyZWQsIFNTREFUQSAoY2VydGZpbGUpLCBT U0RBVEEgKGtleWZpbGUpLCBmaWxlX2Zvcm1hdCk7CisjIGVuZGlmCiAKIAkgICAgICBpZiAocmV0 IDwgR05VVExTX0VfU1VDQ0VTUykKIAkJcmV0dXJuIGdudXRsc19tYWtlX2Vycm9yIChyZXQpOwpA QCAtMjg2MCw4ICsyOTQ2LDI2IEBAIHN5bXNfb2ZfZ251dGxzICh2b2lkKQogICBERUZTWU0gKFFD bWluX3ByaW1lX2JpdHMsICI6bWluLXByaW1lLWJpdHMiKTsKICAgREVGU1lNIChRQ2xvZ2xldmVs LCAiOmxvZ2xldmVsIik7CiAgIERFRlNZTSAoUUNjb21wbGV0ZV9uZWdvdGlhdGlvbiwgIjpjb21w bGV0ZS1uZWdvdGlhdGlvbiIpOworICBERUZTWU0gKFFDcGFzcywgIjpwYXNzIik7CisgIERFRlNZ TSAoUUNmbGFncywgIjpmbGFncyIpOwogICBERUZTWU0gKFFDdmVyaWZ5X2ZsYWdzLCAiOnZlcmlm eS1mbGFncyIpOwogICBERUZTWU0gKFFDdmVyaWZ5X2Vycm9yLCAiOnZlcmlmeS1lcnJvciIpOwor ICBERUZTWU0gKFFnbnV0bHNfcGtjc19wbGFpbiwgIkdOVVRMU19QS0NTX1BMQUlOIik7CisgIERF RlNZTSAoUWdudXRsc19wa2NzX3BrY3MxMl8zZGVzLCAiR05VVExTX1BLQ1NfUEtDUzEyXzNERVMi KTsKKyAgREVGU1lNIChRZ251dGxzX3BrY3NfcGtjczEyX2FyY2ZvdXIsICJHTlVUTFNfUEtDU19Q S0NTMTJfQVJDRk9VUiIpOworICBERUZTWU0gKFFnbnV0bHNfcGtjc19wa2NzMTJfcmMyXzQwLCAi R05VVExTX1BLQ1NfUEtDUzEyX1JDMl80MCIpOworICBERUZTWU0gKFFnbnV0bHNfcGtjc19wYmVz Ml8zZGVzLCAiR05VVExTX1BLQ1NfUEJFUzJfM0RFUyIpOworICBERUZTWU0gKFFnbnV0bHNfcGtj c19wYmVzMl9hZXNfMTI4LCAiR05VVExTX1BLQ1NfUEJFUzJfQUVTXzEyOCIpOworICBERUZTWU0g KFFnbnV0bHNfcGtjc19wYmVzMl9hZXNfMTkyLCAiR05VVExTX1BLQ1NfUEJFUzJfQUVTXzE5MiIp OworICBERUZTWU0gKFFnbnV0bHNfcGtjc19wYmVzMl9hZXNfMjU2LCAiR05VVExTX1BLQ1NfUEJF UzJfQUVTXzI1NiIpOworICBERUZTWU0gKFFnbnV0bHNfcGtjc19udWxsX3Bhc3N3b3JkLCAiR05V VExTX1BLQ1NfTlVMTF9QQVNTV09SRCIpOworICBERUZTWU0gKFFnbnV0bHNfcGtjc19wYmVzMl9k ZXMsICJHTlVUTFNfUEtDU19QQkVTMl9ERVMiKTsKKyAgREVGU1lNIChRZ251dGxzX3BrY3NfcGJl czFfZGVzX21kNSwgIkdOVVRMU19QS0NTX1BCRVMxX0RFU19NRDUiKTsKKyAgREVGU1lNIChRZ251 dGxzX3BrY3NfcGJlczJfZ29zdF90YzI2eiwgIkdOVVRMU19QS0NTX1BCRVMyX0dPU1RfVEMyNloi KTsKKyAgREVGU1lNIChRZ251dGxzX3BrY3NfcGJlczJfZ29zdF9jcGEsICJHTlVUTFNfUEtDU19Q QkVTMl9HT1NUX0NQQSIpOworICBERUZTWU0gKFFnbnV0bHNfcGtjc19wYmVzMl9nb3N0X2NwYiwg IkdOVVRMU19QS0NTX1BCRVMyX0dPU1RfQ1BCIik7CisgIERFRlNZTSAoUWdudXRsc19wa2NzX3Bi ZXMyX2dvc3RfY3BjLCAiR05VVExTX1BLQ1NfUEJFUzJfR09TVF9DUEMiKTsKKyAgREVGU1lNIChR Z251dGxzX3BrY3NfcGJlczJfZ29zdF9jcGQsICJHTlVUTFNfUEtDU19QQkVTMl9HT1NUX0NQRCIp OwogCiAgIERFRlNZTSAoUUNjaXBoZXJfaWQsICI6Y2lwaGVyLWlkIik7CiAgIERFRlNZTSAoUUNj aXBoZXJfYWVhZF9jYXBhYmxlLCAiOmNpcGhlci1hZWFkLWNhcGFibGUiKTsKLSAtLSAKMi4zNy4z CgotLS0tLUJFR0lOIFBHUCBTSUdOQVRVUkUtLS0tLQoKaVFJekJBRUJDZ0FkRmlFRUhISFVDWUtO ZFdsNWg4NDVEdE5SNnpjZVpFZ0ZBbU0wT1lnQUNna1FEdE5SNnpjZQpaRWhJbUJBQXkzbWFuVDlP cjd0Q20zaHJVN2xPSzJybUdnWmZxMi9UZmFJT0ZlU3p1YzdXZ2dyWWJuZ3lqbmNCCjFjN2hEUFZQ QWVMMVZZSVdQa3lsakpPSjEyRUlWQ0Q4R2lXNTg4YlNkNHBKd1VLREkzQU9RZUp1djU3dWdobVIK azhtK0RFNDFveVNaNXRmRlZ6b09QempUMWVSZzRDRjlwS1Z5Z0Z4R3RRNU1RMVBOOHdiNUppOVc2 ZVFtVWJ3Rwo3M3RNQlE4bENEZ0RBaWpKTnhLRWVBcFF2TnNQUkFMNytaeWxsV0hDMTVONzFwM3U2 ZlJxRVVRS3l5cStsUEVUCjR6VXcrd0Njc0RkTkxuTzZXRWhncHB5c3RQQlpENGE1VSsrL2YwV0NZ RllCWGlFT2pNN2xDQ0Z5eEozT3VWaFoKTitNMk80TkFxQ3BIZFpSdXdNa2Y5QzYvYjQwOWhSOGF2 aEd1aWRkbUNTZElqU1ZwQUV2WnBmbVVjenk3SlJaLwpIRGRSY1FRdlVzR2FSTWMxSzJkWG14Mkxz eUhMWks4emNwMWFqc1RGK0hFc2lTTEZmbmtqdW0xUmFVc3piWXlFCkI2OVVlSWp5M2F0QnJ6ZW1K d2Z6OTBmV3pRQXJvM0tVY1NZalFCbTMrcXNrMnU3cHA2bytaN0lTT0FSNTc4WkMKOHp5ZndvMTY1 UzZEaGx6TFJiZ1JRYm4xQ3E2cSthUG5XaHpTOS8zbVphWm9FaUpQY1EvaHdvckwyN3o5cGk5Vgp4 enY3a1hhTCt0QmNnS1FzN3BrOEMvNnVmZU9EdThuMzV3QkJ6bW5wK2VQaDhVemNNQmNNeUJHb2cx YzdjdzBsClhXR3c2MzJJLzhzWXNUU2FIcGYzeW1yRFdKaS9qU3JGQ204U21VSUhZdmpZRi9ETlg2 UT0KPXdIR2IKLS0tLS1FTkQgUEdQIFNJR05BVFVSRS0tLS0tCg== --000000000000f8abbd05e9bbb77b--