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: Re: Fgnutls_available_p: Avoid duplicating capabilities. Date: Thu, 3 Nov 2022 04:31:28 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="000000000000db2d5705ec8899bc" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34221"; 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:32:47 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 1oqQyF-0008jb-ND for ged-emacs-devel@m.gmane-mx.org; Thu, 03 Nov 2022 04:32:47 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqQxf-0007vP-DW; Wed, 02 Nov 2022 23:32:11 -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 1oqQxd-0007vI-5F for emacs-devel@gnu.org; Wed, 02 Nov 2022 23:32:09 -0400 Original-Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oqQxb-000270-Dg for emacs-devel@gnu.org; Wed, 02 Nov 2022 23:32:08 -0400 Original-Received: by mail-ed1-x530.google.com with SMTP id a13so1256444edj.0 for ; Wed, 02 Nov 2022 20:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=RpJmdjivrggf5aSnqe/SRfvrgWwGBHVBcugF3tEb7A8=; b=FHypKYOjqi5aYcPOvnFYd4+IcCYhUzZyBPvB3ZjJfR9qE2YvQArBdPc0jPhGlyKzPn 20dSMXNSa5MEDC5qyg72lRkJ9m1skAaImSExdAlOl7IUERtuBVMTuNvxpoJMHOhcrKW7 nCw1Lpv45L98Cf0khmFwRchHMlRmQqdIt9gbwGveDqai4hLOer7Pa+wolNjWvQbXd5hJ w1elcSGI608mP69P7MipctMe5k1NAUZtGv+6P+7WBMtOL46DTyjtTQU+x4lnd9fuM4cr lQFcj9KsiSCQ++FweILcNaTbb9A+zya2Jr21qb0EatZlPQqnGKCbrCMOc5+EwShCUebo ytZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RpJmdjivrggf5aSnqe/SRfvrgWwGBHVBcugF3tEb7A8=; b=R0wbVAYzIkxJxApbSG5gfjzH2XC9IcN1zH/XIfwsL1C4SIjL8/wtrwgZsnxW45kl/t Ff7wYX15TE9kEC35P1MCHhA1X7rGshTfI6MntTm0Qxq0jbTHfo41Wln7tqK/EJmX/eeg 9KOP1+ymsIZSac9+Jt8gsVraxbkM2i8rflItHKVUOATimweNzpV1v69K1ngZF14yKHGH b8ukGslrSbakU7TtJ65kUZt6cX6x8wsfYK5YExsPaadGSWfRTXfblfp5lqngPYbGnJj1 8g6U1Q5Vo0eajCwVSWfwKjLV852xs0wh/wqpMEW543WgPBo/6IKrnEghj1Krxiom52os 37Ug== X-Gm-Message-State: ACrzQf3RwgTwx8Ixo0tI4xIu2La18dInPYxNH8jcGhvJDkzYHtHpjWA7 rXnZOvB9hoAYydha8cTSxkFqODMbYNVvvZJ1weT20eyV0sfruGLn X-Google-Smtp-Source: AMsMyM6Ja8U8yHejk7omifNblAESpShLQKpNceEgUKEGzW5swVtINE0toyEJc1OgNujk6Awbo1IrqiK/5rhj+15vMNo= X-Received: by 2002:a05:6402:e01:b0:442:dd7e:f49d with SMTP id h1-20020a0564020e0100b00442dd7ef49dmr27812948edh.355.1667446324537; Wed, 02 Nov 2022 20:32:04 -0700 (PDT) In-Reply-To: Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=lekktu@gmail.com; helo=mail-ed1-x530.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:299055 Archived-At: --000000000000db2d5705ec8899bc Content-Type: text/plain; charset="UTF-8" Oops, braino. I accidentally moved the #ifdef HAVE_GNUTLS_EXT__DUMBFW block inside the HAVE_GNUTLS3 one. Corrected patch: diff --git i/src/gnutls.c w/src/gnutls.c index a0de0238c4..5ee5c984a7 100644 --- i/src/gnutls.c +++ w/src/gnutls.c @@ -2791,4 +2791,8 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, capabilities = Fcons (intern("gnutls"), capabilities); +# ifdef HAVE_GNUTLS_EXT__DUMBFW + capabilities = Fcons (intern("ClientHello Padding"), capabilities); +# endif + # ifdef HAVE_GNUTLS3 capabilities = Fcons (intern("gnutls3"), capabilities); @@ -2808,5 +2812,7 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, if (name != NULL) { - capabilities = Fcons (intern(name), capabilities); + Lisp_Object cap = intern (name); + if (NILP (Fmemq (cap, capabilities))) + capabilities = Fcons (intern(name), capabilities); } } @@ -2814,8 +2820,4 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, # 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); --000000000000db2d5705ec8899bc Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Oops, braino. I accidentally moved the #ifdef HAVE_GNUTLS_EXT__DUMBFW bl= ock inside the HAVE_GNUTLS3 one.

Corrected patch:


diff --git i/src/gnutls.c w/src/gn= utls.c
index a0de0238c4..5ee5c984a7 100644
--- i/src/gnutls.c
+++ = w/src/gnutls.c
@@ -2791,4 +2791,8 @@ DEFUN ("gnutls-available-p&quo= t;, Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0,
=C2=A0 =C2=A0capa= bilities =3D Fcons (intern("gnutls"), capabilities);
=C2=A0+# =C2=A0ifdef HAVE_GNUTLS_EXT__DUMBFW
+ =C2=A0capabilities =3D Fcons (= intern("ClientHello Padding"), capabilities);
+# =C2=A0endif+
=C2=A0# ifdef HAVE_GNUTLS3
=C2=A0 =C2=A0capabilities =3D Fcons (i= ntern("gnutls3"), capabilities);
@@ -2808,5 +2812,7 @@ DEFUN (= "gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0= , 0, 0,
=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 (intern(name), capabilities);
=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0}
@@ -2814,8 +28= 20,4 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls= _available_p, 0, 0, 0,
=C2=A0# endif =C2=A0/* HAVE_GNUTLS3 */
=C2=A0=
-# =C2=A0ifdef HAVE_GNUTLS_EXT__DUMBFW
- =C2=A0capabilities =3D Fcon= s (intern("ClientHello Padding"), capabilities);
-# =C2=A0endi= f
-
=C2=A0# ifdef WINDOWSNT
=C2=A0 =C2=A0Vlibrary_cache =3D Fcons = (Fcons (Qgnutls, capabilities), Vlibrary_cache);
--000000000000db2d5705ec8899bc--