From unknown Sun Jun 22 04:29:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#53345] [PATCH core-updates] gnu: libssh2: Update to 1.10.0. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jan 2022 14:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53345 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53345@debbugs.gnu.org Cc: Attila Lendvai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16425165639850 (code B ref -1); Tue, 18 Jan 2022 14:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Jan 2022 14:36:03 +0000 Received: from localhost ([127.0.0.1]:49307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n9pac-0002Yo-OL for submit@debbugs.gnu.org; Tue, 18 Jan 2022 09:36:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:47500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n9pab-0002YO-44 for submit@debbugs.gnu.org; Tue, 18 Jan 2022 09:36:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9paZ-0005sp-Lq for guix-patches@gnu.org; Tue, 18 Jan 2022 09:36:00 -0500 Received: from [2a00:1450:4864:20::52e] (port=37641 helo=mail-ed1-x52e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n9paU-0000TV-1U for guix-patches@gnu.org; Tue, 18 Jan 2022 09:35:59 -0500 Received: by mail-ed1-x52e.google.com with SMTP id j7so31959554edr.4 for ; Tue, 18 Jan 2022 06:35:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eaEelCC/rtGLUBKZAYqXkg9yMqMOFtk8dqWLkQ/ekow=; b=bybt8/EkM/cWtfPlnIH6JDdwwAE3IhSt/a03p7PQlF22kwju81x3qTEkXri80sli+p IWEq3/9iEF8RR5nLSvVYofoWoBilSRrWoECdkEvLeIzgcfUgymYzsnQetKeXAzPqEfaJ L80V0ebnlqL2DTQj+tYzXk6bCLA0EulLWsQzVKYcYtFMjoAePV5HB7xIKuWWPdZkgLjI Mef6Ym4+PLBrXfr6vDlkHxa3UTG2YQrok1OIIW/4kGHo5hFqhy1kQ6RyaQfEfx2jpfgF I845kRDa8iBNohV480TE76SmcRamCimRbHe+sIbP2JVKNJoO6+ZsmYsqSEP2ICBG40zA +IxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=eaEelCC/rtGLUBKZAYqXkg9yMqMOFtk8dqWLkQ/ekow=; b=BVAPQi3E2Oe/Mr+cdjip2ZMCmku2/pBR1+nElMM7GWbiMVsHLV9fhN7GRt/+GxNX8E I7SUFjKXRIq/50jU5Y1BmEJvZogvJKaL/wXMmA8VZsDK78ktNdUmy4RrxFEDbtc6KeKk MoGm6pyLrn0WrIlhbau5YY5TxIgxuUD0FylYGDm92hYce6YRmOaJh4noeNbn51FJ0q5I wpm44BlCPgBpVzSX79XSvDA671kVtAQ8Ljfo1ErM5OwceTHbJ6ppG394BhGd/uduAZS+ 0MWMgSt/P1D+SVbgEf8v0LLU0hm80y20ooGZc+pl1kCH9imqPgRRn+cPZZIBsZDOtHbU 1H4Q== X-Gm-Message-State: AOAM530niWetL1P9UFy/jQxfVIVLJuQA/sUFBMPyGRYT3FWdbuMOtSqU yRQ8Y2hPciucicGzPxTkBcGGHRxEstI= X-Google-Smtp-Source: ABdhPJzho9V83iiO17xLSzoQCcW8d4Ckv/8hq59vlinKHl7k1PzG1NmTzVH58Cmrw8hF0Rasis8YSA== X-Received: by 2002:a17:906:4782:: with SMTP id cw2mr21174283ejc.337.1642516541421; Tue, 18 Jan 2022 06:35:41 -0800 (PST) Received: from lelap.local (catv-89-132-245-188.catv.broadband.hu. [89.132.245.188]) by smtp.gmail.com with ESMTPSA id a18sm4174475ejt.49.2022.01.18.06.35.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 06:35:40 -0800 (PST) From: Attila Lendvai Date: Tue, 18 Jan 2022 15:34:48 +0100 Message-Id: <20220118143447.14183-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.4 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Also change origin to git-fetch the project's git repository using git tags. --- note: i have tested this to build cleanly, but nothing beyond that. gnu/local.mk | 1 - .../patches/libssh2-CVE-2019-17498.patch | 126 ------------------ gnu/packages/ssh.scm | 16 ++- 3 files changed, 9 insertions(+), 134 deletions(-) delete mode 100644 gnu/packages/patches/libssh2-CVE-2019-17498.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0bae6ffa63..cf9a602042 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1393,7 +1393,6 @@ dist_patch_DATA = \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ %D%/packages/patches/libquicktime-ffmpeg.patch \ - %D%/packages/patches/libssh2-CVE-2019-17498.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ %D%/packages/patches/libtgvoip-disable-sse2.patch \ %D%/packages/patches/libtgvoip-disable-webrtc.patch \ diff --git a/gnu/packages/patches/libssh2-CVE-2019-17498.patch b/gnu/packages/patches/libssh2-CVE-2019-17498.patch deleted file mode 100644 index 6f69e562e2..0000000000 --- a/gnu/packages/patches/libssh2-CVE-2019-17498.patch +++ /dev/null @@ -1,126 +0,0 @@ -https://github.com/libssh2/libssh2/commit/dedcbd106f8e52d5586b0205bc7677e4c9868f9c.patch - -From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001 -From: Will Cosgrove -Date: Fri, 30 Aug 2019 09:57:38 -0700 -Subject: [PATCH] packet.c: improve message parsing (#402) - -* packet.c: improve parsing of packets - -file: packet.c - -notes: -Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST. ---- - src/packet.c | 68 ++++++++++++++++++++++------------------------------ - 1 file changed, 29 insertions(+), 39 deletions(-) - -diff --git a/src/packet.c b/src/packet.c -index 38ab62944..2e01bfc5d 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - size_t datalen, int macstate) - { - int rc = 0; -- char *message = NULL; -- char *language = NULL; -+ unsigned char *message = NULL; -+ unsigned char *language = NULL; - size_t message_len = 0; - size_t language_len = 0; - LIBSSH2_CHANNEL *channelp = NULL; -@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - - case SSH_MSG_DISCONNECT: - if(datalen >= 5) { -- size_t reason = _libssh2_ntohu32(data + 1); -+ uint32_t reason = 0; -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr++; /* advance past type */ - -- if(datalen >= 9) { -- message_len = _libssh2_ntohu32(data + 5); -+ _libssh2_get_u32(&buf, &reason); -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - -- if(message_len < datalen-13) { -- /* 9 = packet_type(1) + reason(4) + message_len(4) */ -- message = (char *) data + 9; -- -- language_len = -- _libssh2_ntohu32(data + 9 + message_len); -- language = (char *) data + 9 + message_len + 4; -- -- if(language_len > (datalen-13-message_len)) { -- /* bad input, clear info */ -- language = message = NULL; -- language_len = message_len = 0; -- } -- } -- else -- /* bad size, clear it */ -- message_len = 0; -- } - if(session->ssh_msg_disconnect) { -- LIBSSH2_DISCONNECT(session, reason, message, -- message_len, language, language_len); -+ LIBSSH2_DISCONNECT(session, reason, (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } -+ - _libssh2_debug(session, LIBSSH2_TRACE_TRANS, - "Disconnect(%d): %s(%s)", reason, - message, language); -@@ -539,24 +529,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - int always_display = data[1]; - - if(datalen >= 6) { -- message_len = _libssh2_ntohu32(data + 2); -- -- if(message_len <= (datalen - 10)) { -- /* 6 = packet_type(1) + display(1) + message_len(4) */ -- message = (char *) data + 6; -- language_len = _libssh2_ntohu32(data + 6 + -- message_len); -- -- if(language_len <= (datalen - 10 - message_len)) -- language = (char *) data + 10 + message_len; -- } -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr += 2; /* advance past type & always display */ -+ -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - } - - if(session->ssh_msg_debug) { -- LIBSSH2_DEBUG(session, always_display, message, -- message_len, language, language_len); -+ LIBSSH2_DEBUG(session, always_display, -+ (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } - } -+ - /* - * _libssh2_debug will actually truncate this for us so - * that it's not an inordinate about of data -@@ -579,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - uint32_t len = 0; - unsigned char want_reply = 0; - len = _libssh2_ntohu32(data + 1); -- if(datalen >= (6 + len)) { -+ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { - want_reply = data[5 + len]; - _libssh2_debug(session, - LIBSSH2_TRACE_CONN, diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index ae64e99948..a3411c687f 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -157,17 +157,19 @@ (define-public libssh (define-public libssh2 (package (name "libssh2") - (version "1.9.0") + (version "1.10.0") (source (origin - (method url-fetch) - (uri (string-append - "https://www.libssh2.org/download/libssh2-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libssh2/libssh2") + (commit (string-append "libssh2-" version)))) (sha256 (base32 - "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym")) - (patches (search-patches "libssh2-CVE-2019-17498.patch")))) + "0iiwdnvzq7mw1h1frbsszzhhf259jvjmzbp15mkgdfypnhgh3ri5")))) (build-system gnu-build-system) + (native-inputs (list autoconf + automake + libtool)) ;; The installed libssh2.pc file does not include paths to libgcrypt and ;; zlib libraries, so we need to propagate the inputs. (propagated-inputs (list libgcrypt zlib)) -- 2.34.0 From unknown Sun Jun 22 04:29:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#53345] [PATCH core-updates] gnu: libssh2: Update to 1.10.0. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Mar 2022 07:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53345 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Attila Lendvai Cc: 53345@debbugs.gnu.org Received: via spool by 53345-submit@debbugs.gnu.org id=B53345.164845352319513 (code B ref 53345); Mon, 28 Mar 2022 07:46:02 +0000 Received: (at 53345) by debbugs.gnu.org; 28 Mar 2022 07:45:23 +0000 Received: from localhost ([127.0.0.1]:57222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYk42-00054f-R2 for submit@debbugs.gnu.org; Mon, 28 Mar 2022 03:45:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYk41-00054U-Tl for 53345@debbugs.gnu.org; Mon, 28 Mar 2022 03:45:22 -0400 Received: from [2001:470:142:3::e] (port=59470 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYk3w-00029R-Gg; Mon, 28 Mar 2022 03:45:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=u+u2n//2N1ILtcvH6nbUe2Z7dAgYPIAM7i7NlKYIdCI=; b=SP/BtvZx8Qo0B9TdrfnC QZUj3MTwpEkBn9NGHz6Enpuovb1hrCdRPlu1vI+fc9ESTBOQveiRR+opi0BW1Joh5Nht/eWQ/BHMF jgz1egvSAuyso/9tE6zfT252ZwnufpI3igGTjuhrIvN2d0FeCvmaNvTaY9flr9Ir8+xOjgHh+CNCJ GgjLNW6zt6PCJvwWUcW0irq+aStArgCR3oB9AsuxNdztef88J2p0uOCi/7hLF2840xBT8xhZZfcRS aUiE45MnTnPzr7KWdwJheqH4TVZxzQOGYNDPGLnXl5ohXbslYnsKyo6xe6xRk2K8+jJ2ejwrkKaRg FqAQefFkWJYRJg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:59091 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYk3q-0006f5-A1; Mon, 28 Mar 2022 03:45:10 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20220118143447.14183-1-attila@lendvai.name> Date: Mon, 28 Mar 2022 09:45:07 +0200 In-Reply-To: <20220118143447.14183-1-attila@lendvai.name> (Attila Lendvai's message of "Tue, 18 Jan 2022 15:34:48 +0100") Message-ID: <87zgla4j24.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Attila, Finally getting around to this patch=E2=80=A6 Attila Lendvai skribis: > Also change origin to git-fetch the project's git repository using git ta= gs. I think we can stick to tarballs for now, which avoids the extra autotools dependencies. Could you send an updated patch? Bonus points if you can add a commit log that follows our conventions: https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html > note: i have tested this to build cleanly, but nothing beyond that. Would be great if you could check some of the =E2=80=9Cimportant=E2=80=9D d= irect dependents as shown by: guix graph -t reverse-package -M1 libssh2 | xdot -f fdp - Thanks! Ludo=E2=80=99. From unknown Sun Jun 22 04:29:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#53345] [PATCH core-updates] gnu: libssh2: Update to 1.10.0. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Apr 2022 07:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53345 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 53345@debbugs.gnu.org Reply-To: Attila Lendvai Received: via spool by 53345-submit@debbugs.gnu.org id=B53345.164905606316337 (code B ref 53345); Mon, 04 Apr 2022 07:08:01 +0000 Received: (at 53345) by debbugs.gnu.org; 4 Apr 2022 07:07:43 +0000 Received: from localhost ([127.0.0.1]:50354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbGoR-0004FR-81 for submit@debbugs.gnu.org; Mon, 04 Apr 2022 03:07:43 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:11142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbGoQ-0004FB-4P for 53345@debbugs.gnu.org; Mon, 04 Apr 2022 03:07:42 -0400 Date: Mon, 04 Apr 2022 07:07:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail3; t=1649056056; bh=bXhG67CclF/8A4N8elKqRcmMq3NdW+9LlgBnkQpoqZU=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=VfTUbhkabCKnc/jf0rRV1IsuqOtDDIovTpgTzpbCjhXEoXAsujkLjsls+iy9lYvmv 1cj5S+vrxBpL2LSkKVgjZ5Krx354lmMFNS35/Xvx8PHO28lLXSd//FioISerhvBF4B Rr5tiZl3Ef/St5yoe2W/tQXkApymBGnFPOrGxi2tQ5kEOU0u392Kzl88GXxJRqibjh ms2L9EjuEq0AU4iRenk4y3lhRmyfUXOvja/dLCVpvPls4GfTrTotCreiYB8/WyCLUP h4Mxo5YFGgnKemAWI25iHObfSEYUY6DcTAfzY1ILn9hR78MWIATwfJRyXMUnf4gowm 7+A6rOfard7kg== From: Attila Lendvai Message-ID: In-Reply-To: <87zgla4j24.fsf@gnu.org> References: <20220118143447.14183-1-attila@lendvai.name> <87zgla4j24.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) FTR, i'm abandoning this because i have realized that a change like this, a= nd to a package this central, is beyond my current level of understanding o= f Guix internals and development processes. -- =E2=80=A2 attila lendvai =E2=80=A2 PGP: 963F 5D5F 45C7 DFCD 0A39 -- =E2=80=9CA man sees in the world what he carries in his heart.=E2=80=9D =09=E2=80=94 Johann Wolfgang von Goethe (1749=E2=80=931832), 'Faust' From unknown Sun Jun 22 04:29:48 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Attila Lendvai Subject: bug#53345: closed (Re: [bug#53345] [PATCH core-updates] gnu: libssh2: Update to 1.10.0.) Message-ID: References: <87bkelsg28.fsf@wireframe> <20220118143447.14183-1-attila@lendvai.name> X-Gnu-PR-Message: they-closed 53345 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 53345@debbugs.gnu.org Date: Fri, 01 Sep 2023 22:09:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1693606142-17138-1" This is a multi-part message in MIME format... ------------=_1693606142-17138-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #53345: [PATCH core-updates] gnu: libssh2: Update to 1.10.0. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 53345@debbugs.gnu.org. --=20 53345: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D53345 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1693606142-17138-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 53345-done) by debbugs.gnu.org; 1 Sep 2023 22:08:08 +0000 Received: from localhost ([127.0.0.1]:34348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcCJE-0004RK-0h for submit@debbugs.gnu.org; Fri, 01 Sep 2023 18:08:08 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:36052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcCJB-0004Qq-PK for 53345-done@debbugs.gnu.org; Fri, 01 Sep 2023 18:08:06 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 465D51AA7B; Fri, 1 Sep 2023 15:07:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1693606067; bh=4PbiV/iClo3sHJmDlvsGXlAIA7zkoEKLAE1Dqu+Lz7w=; h=From:To:Subject:In-Reply-To:References:Date:From; b=A3GP0vYIfudX7Ns80umjJwNxzgkXLmt8sq5InvP/7ePuxlIMnC35YNda0pbtzbYM8 H+G0wtMdD9wLIvkMInlGrE1s4FJY1JAoc3JjM3aJwD87tjUgaeitz8VzxlQ+AdU7Ca 6DNY/xttH11Ha7OWztbhon+5vHbcO50xAbaWdEMybQpNIpYtyUFVIm4PKGlov5QECL iXgJ4d5/ah99Xsd+e+wjq6Fsf3KPT8OHuTxDTC/nimfdbEQM36fk58FP5kfdqKlpRg jeJtW++V/1WUO3jqleeWLzoTcuEfrZ6a1HUYvL+uxN5q8KRkZWagxSHf7Zoj6Y+Rzj DWwAT9MoCCcUA== From: Vagrant Cascadian To: Attila Lendvai , 53345-done@debbugs.gnu.org Subject: Re: [bug#53345] [PATCH core-updates] gnu: libssh2: Update to 1.10.0. In-Reply-To: <20220118143447.14183-1-attila@lendvai.name> References: <20220118143447.14183-1-attila@lendvai.name> Date: Fri, 01 Sep 2023 15:07:43 -0700 Message-ID: <87bkelsg28.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 53345-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2022-01-18, Attila Lendvai wrote: > (define-public libssh2 > (package > (name "libssh2") > - (version "1.9.0") > + (version "1.10.0") libssh2 was updated to 1.10.0: 09a3f7c6fcbb5c63ecd402daef7fd9714d3720d3 gnu: libssh2: Update to 1.10.0. Marking as done. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZPJgrwAKCRDcUY/If5cW qp0zAP4+ASSYaRJlSM9rfMpxwskuIubwQVLx55xzYcYZSfvSbAD/bILm1MO5Xm+D 5zTYzsRqBXNRlTQRVfj5D7DGgW97ngk= =p3yv -----END PGP SIGNATURE----- --=-=-=-- ------------=_1693606142-17138-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 18 Jan 2022 14:36:03 +0000 Received: from localhost ([127.0.0.1]:49307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n9pac-0002Yo-OL for submit@debbugs.gnu.org; Tue, 18 Jan 2022 09:36:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:47500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n9pab-0002YO-44 for submit@debbugs.gnu.org; Tue, 18 Jan 2022 09:36:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9paZ-0005sp-Lq for guix-patches@gnu.org; Tue, 18 Jan 2022 09:36:00 -0500 Received: from [2a00:1450:4864:20::52e] (port=37641 helo=mail-ed1-x52e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n9paU-0000TV-1U for guix-patches@gnu.org; Tue, 18 Jan 2022 09:35:59 -0500 Received: by mail-ed1-x52e.google.com with SMTP id j7so31959554edr.4 for ; Tue, 18 Jan 2022 06:35:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eaEelCC/rtGLUBKZAYqXkg9yMqMOFtk8dqWLkQ/ekow=; b=bybt8/EkM/cWtfPlnIH6JDdwwAE3IhSt/a03p7PQlF22kwju81x3qTEkXri80sli+p IWEq3/9iEF8RR5nLSvVYofoWoBilSRrWoECdkEvLeIzgcfUgymYzsnQetKeXAzPqEfaJ L80V0ebnlqL2DTQj+tYzXk6bCLA0EulLWsQzVKYcYtFMjoAePV5HB7xIKuWWPdZkgLjI Mef6Ym4+PLBrXfr6vDlkHxa3UTG2YQrok1OIIW/4kGHo5hFqhy1kQ6RyaQfEfx2jpfgF I845kRDa8iBNohV480TE76SmcRamCimRbHe+sIbP2JVKNJoO6+ZsmYsqSEP2ICBG40zA +IxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=eaEelCC/rtGLUBKZAYqXkg9yMqMOFtk8dqWLkQ/ekow=; b=BVAPQi3E2Oe/Mr+cdjip2ZMCmku2/pBR1+nElMM7GWbiMVsHLV9fhN7GRt/+GxNX8E I7SUFjKXRIq/50jU5Y1BmEJvZogvJKaL/wXMmA8VZsDK78ktNdUmy4RrxFEDbtc6KeKk MoGm6pyLrn0WrIlhbau5YY5TxIgxuUD0FylYGDm92hYce6YRmOaJh4noeNbn51FJ0q5I wpm44BlCPgBpVzSX79XSvDA671kVtAQ8Ljfo1ErM5OwceTHbJ6ppG394BhGd/uduAZS+ 0MWMgSt/P1D+SVbgEf8v0LLU0hm80y20ooGZc+pl1kCH9imqPgRRn+cPZZIBsZDOtHbU 1H4Q== X-Gm-Message-State: AOAM530niWetL1P9UFy/jQxfVIVLJuQA/sUFBMPyGRYT3FWdbuMOtSqU yRQ8Y2hPciucicGzPxTkBcGGHRxEstI= X-Google-Smtp-Source: ABdhPJzho9V83iiO17xLSzoQCcW8d4Ckv/8hq59vlinKHl7k1PzG1NmTzVH58Cmrw8hF0Rasis8YSA== X-Received: by 2002:a17:906:4782:: with SMTP id cw2mr21174283ejc.337.1642516541421; Tue, 18 Jan 2022 06:35:41 -0800 (PST) Received: from lelap.local (catv-89-132-245-188.catv.broadband.hu. [89.132.245.188]) by smtp.gmail.com with ESMTPSA id a18sm4174475ejt.49.2022.01.18.06.35.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 06:35:40 -0800 (PST) From: Attila Lendvai To: guix-patches@gnu.org Subject: [PATCH core-updates] gnu: libssh2: Update to 1.10.0. Date: Tue, 18 Jan 2022 15:34:48 +0100 Message-Id: <20220118143447.14183-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: submit Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Also change origin to git-fetch the project's git repository using git tags. --- note: i have tested this to build cleanly, but nothing beyond that. gnu/local.mk | 1 - .../patches/libssh2-CVE-2019-17498.patch | 126 ------------------ gnu/packages/ssh.scm | 16 ++- 3 files changed, 9 insertions(+), 134 deletions(-) delete mode 100644 gnu/packages/patches/libssh2-CVE-2019-17498.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0bae6ffa63..cf9a602042 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1393,7 +1393,6 @@ dist_patch_DATA = \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ %D%/packages/patches/libquicktime-ffmpeg.patch \ - %D%/packages/patches/libssh2-CVE-2019-17498.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ %D%/packages/patches/libtgvoip-disable-sse2.patch \ %D%/packages/patches/libtgvoip-disable-webrtc.patch \ diff --git a/gnu/packages/patches/libssh2-CVE-2019-17498.patch b/gnu/packages/patches/libssh2-CVE-2019-17498.patch deleted file mode 100644 index 6f69e562e2..0000000000 --- a/gnu/packages/patches/libssh2-CVE-2019-17498.patch +++ /dev/null @@ -1,126 +0,0 @@ -https://github.com/libssh2/libssh2/commit/dedcbd106f8e52d5586b0205bc7677e4c9868f9c.patch - -From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001 -From: Will Cosgrove -Date: Fri, 30 Aug 2019 09:57:38 -0700 -Subject: [PATCH] packet.c: improve message parsing (#402) - -* packet.c: improve parsing of packets - -file: packet.c - -notes: -Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST. ---- - src/packet.c | 68 ++++++++++++++++++++++------------------------------ - 1 file changed, 29 insertions(+), 39 deletions(-) - -diff --git a/src/packet.c b/src/packet.c -index 38ab62944..2e01bfc5d 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - size_t datalen, int macstate) - { - int rc = 0; -- char *message = NULL; -- char *language = NULL; -+ unsigned char *message = NULL; -+ unsigned char *language = NULL; - size_t message_len = 0; - size_t language_len = 0; - LIBSSH2_CHANNEL *channelp = NULL; -@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - - case SSH_MSG_DISCONNECT: - if(datalen >= 5) { -- size_t reason = _libssh2_ntohu32(data + 1); -+ uint32_t reason = 0; -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr++; /* advance past type */ - -- if(datalen >= 9) { -- message_len = _libssh2_ntohu32(data + 5); -+ _libssh2_get_u32(&buf, &reason); -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - -- if(message_len < datalen-13) { -- /* 9 = packet_type(1) + reason(4) + message_len(4) */ -- message = (char *) data + 9; -- -- language_len = -- _libssh2_ntohu32(data + 9 + message_len); -- language = (char *) data + 9 + message_len + 4; -- -- if(language_len > (datalen-13-message_len)) { -- /* bad input, clear info */ -- language = message = NULL; -- language_len = message_len = 0; -- } -- } -- else -- /* bad size, clear it */ -- message_len = 0; -- } - if(session->ssh_msg_disconnect) { -- LIBSSH2_DISCONNECT(session, reason, message, -- message_len, language, language_len); -+ LIBSSH2_DISCONNECT(session, reason, (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } -+ - _libssh2_debug(session, LIBSSH2_TRACE_TRANS, - "Disconnect(%d): %s(%s)", reason, - message, language); -@@ -539,24 +529,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - int always_display = data[1]; - - if(datalen >= 6) { -- message_len = _libssh2_ntohu32(data + 2); -- -- if(message_len <= (datalen - 10)) { -- /* 6 = packet_type(1) + display(1) + message_len(4) */ -- message = (char *) data + 6; -- language_len = _libssh2_ntohu32(data + 6 + -- message_len); -- -- if(language_len <= (datalen - 10 - message_len)) -- language = (char *) data + 10 + message_len; -- } -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr += 2; /* advance past type & always display */ -+ -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - } - - if(session->ssh_msg_debug) { -- LIBSSH2_DEBUG(session, always_display, message, -- message_len, language, language_len); -+ LIBSSH2_DEBUG(session, always_display, -+ (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } - } -+ - /* - * _libssh2_debug will actually truncate this for us so - * that it's not an inordinate about of data -@@ -579,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - uint32_t len = 0; - unsigned char want_reply = 0; - len = _libssh2_ntohu32(data + 1); -- if(datalen >= (6 + len)) { -+ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { - want_reply = data[5 + len]; - _libssh2_debug(session, - LIBSSH2_TRACE_CONN, diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index ae64e99948..a3411c687f 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -157,17 +157,19 @@ (define-public libssh (define-public libssh2 (package (name "libssh2") - (version "1.9.0") + (version "1.10.0") (source (origin - (method url-fetch) - (uri (string-append - "https://www.libssh2.org/download/libssh2-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libssh2/libssh2") + (commit (string-append "libssh2-" version)))) (sha256 (base32 - "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym")) - (patches (search-patches "libssh2-CVE-2019-17498.patch")))) + "0iiwdnvzq7mw1h1frbsszzhhf259jvjmzbp15mkgdfypnhgh3ri5")))) (build-system gnu-build-system) + (native-inputs (list autoconf + automake + libtool)) ;; The installed libssh2.pc file does not include paths to libgcrypt and ;; zlib libraries, so we need to propagate the inputs. (propagated-inputs (list libgcrypt zlib)) -- 2.34.0 ------------=_1693606142-17138-1--