From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Fgnutls_available_p: Avoid duplicating capabilities. Date: Thu, 3 Nov 2022 04:21:47 +0100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="00000000000036fe1c05ec887722" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29602"; mail-complaints-to="usenet@ciao.gmane.io" To: Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Nov 03 04:23:07 2022 Return-path: Envelope-to: ged-emacs-devel@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 1oqQos-0007Z5-1d for ged-emacs-devel@m.gmane-mx.org; Thu, 03 Nov 2022 04:23:06 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqQoT-0003I2-Np; Wed, 02 Nov 2022 23:22:41 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqQoN-0003Fi-40 for emacs-devel@gnu.org; Wed, 02 Nov 2022 23:22:35 -0400 Original-Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oqQoL-0000i9-AR for emacs-devel@gnu.org; Wed, 02 Nov 2022 23:22:34 -0400 Original-Received: by mail-ed1-x52f.google.com with SMTP id z18so1136919edb.9 for ; Wed, 02 Nov 2022 20:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=xf2jlXizjyuLjehlhB11bEIrmzWLbzZLhbHr+1mb9Ho=; b=gusASL+v59rE/EL3fW63gBYiXEBJJzwYUgp2kV7RAQ8C+257FOmFCpKFPyE5U7t/s3 uCpCCBVb/diMdk2GKnFyG/Zx7D7I6raKeJFaaO/9KJrJwy8Hxw80s/Dk6JhssfXjiff+ oPSghhXWOExHsSfi8keTlgQgTu3+RIux0nr6AlYw9GPfVO5CvsEoDqpXhN+CLkCjeF0y r2uojrB5ThWrApWxBmlHGWtrp4V2A2C6fDqbEk6r+PUg9nVYcX5TT2s/TBgTxqCQau4O xycCLdSxHzLqqUYn19Y7cluG/TygktGJMtIF8aY8B1junchz8EYeBRVDwbxZCpwYM/9g 0mXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=xf2jlXizjyuLjehlhB11bEIrmzWLbzZLhbHr+1mb9Ho=; b=D8Wg8EX8RT2B+qOwC3Q7ZXfO4lbkPahVZ3gXtwnsXgivW15UUivE0lvAHXRbu+0NYf wZpq16Dsn6WM45KBPdBbohZB420RXk7StOYz/GVoXB8+FOIoigAeTTAb4OVYr42hGz9V n28ZLpUUWhB+IgrThLn9wOSwU0pWvblyEPDHVP0Gs6mP7Scr4uNo6ls9AXDSn6Lx/KlL dhFp5V55djlqpygRtaVUaDoudm/ko6iKEO+n1vMBFgvF8wAGf5I9dbskb6VwUXcEzhrT aOKoqsuJXFTiqMchsGKYV5a+IMqC9CdR8FNFxDn3ztvSYI8HICkTdOzQ1hkjB9FDg8IK stVw== X-Gm-Message-State: ACrzQf31wT1T78+35cvYKsvn2/WqMycKGjBjDIXMUW9iKxWDWCEWFln3 TmyhNPFNRyeSalPue8z8KAZSR7qcFowUA9N4Mraew4Rv8CH+RjM2 X-Google-Smtp-Source: AMsMyM5tgFoOzPS6u+jtTWDOsQFxyKy4S6L9vD+gTs2EdsWDFiQGHumP9ZkJM4sAHtEBPoZwhIun6qUTZUSU8Xeg9Vo= X-Received: by 2002:a05:6402:26cc:b0:462:2426:4953 with SMTP id x12-20020a05640226cc00b0046224264953mr28220292edd.13.1667445743352; Wed, 02 Nov 2022 20:22:23 -0700 (PDT) Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=lekktu@gmail.com; helo=mail-ed1-x52f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "Emacs-devel" Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:299054 Archived-At: --00000000000036fe1c05ec887722 Content-Type: text/plain; charset="UTF-8" gnutls-available-p can return duplicate capabilities; on my system, for example, 'ClientHello Padding' appears twice. Ok to commit? * src/gnutls.c (Fgnutls_available_p): Avoid duplicating capabilities. --- src/gnutls.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gnutls.c b/src/gnutls.c index a0de0238c4..2840c2abe9 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -2801,22 +2801,24 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, capabilities = Fcons (intern("macs"), capabilities); +# ifdef HAVE_GNUTLS_EXT__DUMBFW + capabilities = Fcons (intern("ClientHello Padding"), capabilities); +# endif + # ifdef HAVE_GNUTLS_EXT_GET_NAME for (unsigned int ext=0; ext < 100; ext++) { const char* name = gnutls_ext_get_name(ext); if (name != NULL) { - capabilities = Fcons (intern(name), capabilities); + Lisp_Object cap = intern (name); + if (NILP (Fmemq (cap, capabilities))) + capabilities = Fcons (cap, capabilities); } } # endif # endif /* HAVE_GNUTLS3 */ -# ifdef HAVE_GNUTLS_EXT__DUMBFW - capabilities = Fcons (intern("ClientHello Padding"), capabilities); -# endif - # ifdef WINDOWSNT Vlibrary_cache = Fcons (Fcons (Qgnutls, capabilities), Vlibrary_cache); # endif /* WINDOWSNT */ -- 2.38.1.windows.1 --00000000000036fe1c05ec887722 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
gnutls-available-p can return duplicate capabilities; on my system, for = example, 'ClientHello Padding' appears twice.

Ok to commit?<= br>
* src/gnutls.c (Fgnutls_available_p): Avoid duplicating capabilities= .

---
=C2=A0src/gnutls.c | 12 +++++++-----
=C2=A01 file change= d, 7 insertions(+), 5 deletions(-)

diff --git a/src/gnutls.c b/src/g= nutls.c
index a0de0238c4..2840c2abe9 100644
--- a/src/gnutls.c
+++= b/src/gnutls.c
@@ -2801,22 +2801,24 @@ DEFUN ("gnutls-available-p&= quot;, Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0,
=C2=A0
=C2= =A0 =C2=A0capabilities =3D Fcons (intern("macs"), capabilities);<= br>=C2=A0
+# =C2=A0ifdef HAVE_GNUTLS_EXT__DUMBFW
+ =C2=A0capabilities= =3D Fcons (intern("ClientHello Padding"), capabilities);
+# = =C2=A0endif
+
=C2=A0# =C2=A0ifdef HAVE_GNUTLS_EXT_GET_NAME
=C2=A0 = =C2=A0for (unsigned int ext=3D0; ext < 100; ext++)
=C2=A0 =C2=A0 =C2= =A0{
=C2=A0 =C2=A0 =C2=A0 =C2=A0const char* name =3D gnutls_ext_get_name= (ext);
=C2=A0 =C2=A0 =C2=A0 =C2=A0if (name !=3D NULL)
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0{
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0capabilities = =3D Fcons (intern(name), capabilities);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 Lisp_Object cap =3D intern (name);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 if (NILP (Fmemq (cap, capabilities)))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 capabilities =3D Fcons (cap, capabilities);
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0}
=C2=A0# =C2=A0endif
= =C2=A0# endif =C2=A0/* HAVE_GNUTLS3 */
=C2=A0
-# =C2=A0ifdef HAVE_GN= UTLS_EXT__DUMBFW
- =C2=A0capabilities =3D Fcons (intern("ClientHell= o Padding"), capabilities);
-# =C2=A0endif
-
=C2=A0# ifdef WI= NDOWSNT
=C2=A0 =C2=A0Vlibrary_cache =3D Fcons (Fcons (Qgnutls, capabilit= ies), Vlibrary_cache);
=C2=A0# endif /* WINDOWSNT */
--
2.38.1.wi= ndows.1

--00000000000036fe1c05ec887722--