From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.devel Subject: Re: The netsec thread Date: Thu, 05 Sep 2019 14:12:38 +0200 Message-ID: References: <87pnlg7r83.fsf@mouse.gnus.org> <87o90gd1us.fsf@mouse.gnus.org> <9308f549-adf8-e5c1-1bcd-beea2ddb0e0f@cs.ucla.edu> <87r25cb6vy.fsf@gnus.org> <791d5bcb-3684-c791-48f5-c1af765a5c9d@cs.ucla.edu> <87mufxajwq.fsf@gnus.org> <8f52a86a-bc74-47d8-f792-83ce870666fa@cs.ucla.edu> <87sgpcdx3l.fsf@gnus.org> <96152e36-3acc-0968-99e1-69b435003d65@cs.ucla.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="133705"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Lars Ingebrigtsen , emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Sep 05 14:13:43 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1i5qdz-000YeQ-Hw for ged-emacs-devel@m.gmane.org; Thu, 05 Sep 2019 14:13:43 +0200 Original-Received: from localhost ([::1]:45424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5qdy-00051X-Ax for ged-emacs-devel@m.gmane.org; Thu, 05 Sep 2019 08:13:42 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:32783) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5qdF-000509-Ud for emacs-devel@gnu.org; Thu, 05 Sep 2019 08:12:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5qdF-0007Nt-2G for emacs-devel@gnu.org; Thu, 05 Sep 2019 08:12:57 -0400 Original-Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:34306) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5qdE-0007MZ-QX for emacs-devel@gnu.org; Thu, 05 Sep 2019 08:12:57 -0400 Original-Received: by mail-wm1-x336.google.com with SMTP id y135so4851488wmc.1 for ; Thu, 05 Sep 2019 05:12:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:mail-copies-to:gmane-reply-to-list :date:in-reply-to:message-id:mime-version:content-transfer-encoding; bh=SY5UVakfCzodx1kO1g5D2NEUe+gBrDUOooYstXBU7cI=; b=JmbqQtf5dwGCsBZkfkbT+ZG+6AgJz+Hthxjhp0IG8A4p3rdNz1omY8rGmDDEawKGG5 EMoP0QOPHRBhip1bBpjlb7jk6TjhUDj3TfjRfi7yuqb1hlwA1g95dkeNIdVC2xePsBSH xTntQgY6n+0ZdCw2BTr2/+CJFIpmfU70TvPXlFzBe/36JwT4vumSCkU71Wp0grnoh0Gh O7iCPXROs9woEBwwXtVuhSlQ6zGhv3WOQhmXpdPR2qg10l9q4io5H4PN/OoIRi/tV0DC CzorKQxO311ItJJ5NBoaPxrtehnLGiJg4wOzdlZID9FcuKaTcWUc1mu0lfhGmaGiYL3A eztw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:mail-copies-to :gmane-reply-to-list:date:in-reply-to:message-id:mime-version :content-transfer-encoding; bh=SY5UVakfCzodx1kO1g5D2NEUe+gBrDUOooYstXBU7cI=; b=FFLfBXpro8rnDin5T63JwUaRlGV3LWg5Vrb/91zRSp8mVWARhc5+3QTeOBqR0QmhbE qeBe+p0il49jSax52yG9VzsaZRutwvg10IGNMRy9B/hrt7dIBaVhVg/fSuYvvj9+rgKJ WTbb+8H0ROyE4IzZpGUp0jwc/ciyo7wDmh0gdA2whYfvpdaJrYOOmLwP2XzClZV76O5T K7NvLbLHb8B8j0AmjHZJ2u/L6nYuJXUTHFzOgy5X6nlaTQ/myYGfaBDGvGeoryQeuz+R ZU9L4BZnK9Ad0hI3abxs+XQL3IVUTsztHroOOOVC/8ZU3EbtD3uB/OG0CxFvORUmwcDz udKg== X-Gm-Message-State: APjAAAVFEJUcy3yK7+GAbd35gRjdgKRqSitNqeAt4Yd06tGITin1udq9 5IVmQC0yLmqeg+GvoS+ftqvSlPGIrQQ= X-Google-Smtp-Source: APXvYqzXDx4RG49YrdKpkUErHNN88r42unQxNXuaOzcQS54hiRJ2shnHAOtsDyq/BRMIkmr42Q/ycQ== X-Received: by 2002:a1c:7ed7:: with SMTP id z206mr2925200wmc.124.1567685575050; Thu, 05 Sep 2019 05:12:55 -0700 (PDT) Original-Received: from rpluim-mac ([149.5.228.1]) by smtp.gmail.com with ESMTPSA id u83sm8116137wme.0.2019.09.05.05.12.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2019 05:12:38 -0700 (PDT) Mail-Copies-To: never Gmane-Reply-To-List: yes In-Reply-To: (Robert Pluim's message of "Wed, 04 Sep 2019 23:54:14 +0200") X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:239867 Archived-At: *sigh* there are days when I hate the C language. I screwed up, GNUTLS_TLS1_3 is not a define, it=CA=BCs an enum, so we can= =CA=BCt check for it with the pre-processor. I guess that means we have to check based on the GnuTLS version, i.e. diff --git a/src/gnutls.c b/src/gnutls.c index c74936c840..ffd8e2df4f 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1520,7 +1520,7 @@ DEFUN ("gnutls-peer-status", Fgnutls_peer_status, Sgn= utls_peer_status, 1, 1, 0, #endif =20 /* Renegotiation Indication */ -#ifdef GNUTLS_TLS1_3 +#if GNUTLS_VERSION_NUMBER >=3D 0x030603 bool older_proto =3D proto < GNUTLS_TLS1_3; #else bool older_proto =3D true;