| Message ID | 20260701074122.28795-1-gert@greenie.muc.de |
|---|---|
| State | New |
| Headers |
Return-Path: <openvpn-devel-bounces@lists.sourceforge.net>
Delivered-To: patchwork@openvpn.net
Received: by 2002:a05:7000:c319:b0:861:c897:cb9d with SMTP id
jk25csp1090323mab;
Wed, 1 Jul 2026 00:42:23 -0700 (PDT)
X-Forwarded-Encrypted: i=2;
AFNElJ9Zpt5iYj0liIDLc+vZQydz5w4SNgGHg0UsbbskJckkTz+BQmY5Ch8p6TCpypNtm2++aUcPVUfpt9A=@openvpn.net
X-Received: by 2002:a05:6820:174e:b0:6a1:4155:3548 with SMTP id
006d021491bc7-6a309b372c7mr243095eaf.36.1782891743289;
Wed, 01 Jul 2026 00:42:23 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1782891743; cv=none;
d=google.com; s=arc-20260327;
b=KBrEICxVhgFYnEyS85dufgSFz3yYDE51sYbjoJPn4/Nay2JTMkUqJ6kN/BGFQJUBfU
Cl1WMkXNRfDkm5nF2OBYSGNz0dTWzyQJjLYRp4yb3DiKtprUSxkgNyUzgSfqnoAaVO9C
/Rs2x/0odO154xze2Eo9qdmPM9//tOmogWX6gFPzmQoa+j8tkWSZ7qbkkPRFjh6mjDUV
CD9t5XUaCpPZcscjEM6EelBpX4uvmXCwSOgOLPIDcywi53Nu4RvAFNiB2SUPpseGKoFU
bu+g06A1wBsAKywbhGDK05zXqBqG0HQ8Ukt12KQYNroRhfmGzTlpRDnBc/su4+JwJ9xn
HNQg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20260327;
h=errors-to:content-transfer-encoding:list-subscribe:list-help
:list-post:list-archive:list-unsubscribe:list-id:precedence:subject
:mime-version:references:in-reply-to:message-id:date:to:from
:dkim-signature:dkim-signature:dkim-signature;
bh=VReNDh5bVA0McQZLyMTt75RieNyYS/krZvdBdUJL6nk=;
fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=;
b=UKSv5hETn0geN4EtXtCeHvMA6paUL8oBhVijw5u8qPy291LEKMdUyBpgsoCg7lbspG
smVHSZDoxcth+4Rvr/7ZGJFDlO/pyPBG/wCW3RTYqzXQammYTD3ROF88TK25nrC3OpIw
eOjik//yBNgnPfzaATBW6uhoEO+txinXkecXfznA335DWdSf98j9hWHfBGXU66eMbhMB
sQrKtq9MibqXOQLTZzMc7Vmq3TiMSGMr3QCJA+Z3psENoMTTYTgSbF8rESwIib+2ywEd
AobWAu7F4kVyzIbHg2XvFZYnHXF2q6ypi28hSVdBiqaDsKPCuqTQjvqRjybOWvoQRPq3
lCUA==;
dara=google.com
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@lists.sourceforge.net header.s=beta
header.b=PjIT9LZC;
dkim=neutral (body hash did not verify) header.i=@sourceforge.net
header.s=x header.b=bhTQjMF5;
dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x
header.b=F6k+X6iG;
spf=pass (google.com: domain of
openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as
permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net;
dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de
Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7])
by mx.google.com with ESMTPS id
006d021491bc7-6a1892fc1a7si4060337eaf.33.2026.07.01.00.42.22
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Wed, 01 Jul 2026 00:42:22 -0700 (PDT)
Received-SPF: pass (google.com: domain of
openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as
permitted sender) client-ip=216.105.38.7;
Authentication-Results: mx.google.com;
dkim=pass header.i=@lists.sourceforge.net header.s=beta
header.b=PjIT9LZC;
dkim=neutral (body hash did not verify) header.i=@sourceforge.net
header.s=x header.b=bhTQjMF5;
dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x
header.b=F6k+X6iG;
spf=pass (google.com: domain of
openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as
permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net;
dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:
List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:
Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender:
Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From:
Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner;
bh=VReNDh5bVA0McQZLyMTt75RieNyYS/krZvdBdUJL6nk=; b=PjIT9LZCAdNwtZCPBzMjqPLDMh
6vpMBmbtEeXpaE8i4+h44/IdeL0n4+LQxvpnTyAmPbltJlnHkHuUStxHr90qVEVnKy0fXHeOrBydU
77jvb+RxoB11UhZ+mDzHK7hEFe1AfmDRq3DKi6rILQHqIzDaJkTrzUXywaYLU7Ig6pFc=;
Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com)
by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95)
(envelope-from <openvpn-devel-bounces@lists.sourceforge.net>)
id 1wepaM-0007dS-Jn;
Wed, 01 Jul 2026 07:42:19 +0000
Received: from [172.30.29.66] (helo=mx.sourceforge.net)
by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95)
(envelope-from <gert@blue4.greenie.muc.de>) id 1wepZt-0007bK-QW
for openvpn-devel@lists.sourceforge.net;
Wed, 01 Jul 2026 07:41:50 +0000
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References:
In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:
Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:
Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:
List-Subscribe:List-Post:List-Owner:List-Archive;
bh=lo421tLPWdxh6dj39ps5w03lmAJhltqMVNqKioTQeBk=; b=bhTQjMF5wzvxvV2yFzvTNw1irb
KCnQxQFpK7LhOBc/pbrmMTRv/UVxKedr6+OphOUFUbd3uaU3XfPiD8YfM2fZnggy7fQfPFsepMIjl
vcknLQYxkquo4po80jsfTZlLsrGut6Q8wV9edsVyQTvJYJEXh02a6mMdXyYrQdGCOsb8=;
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x
;
h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:
Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID:
Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe:
List-Post:List-Owner:List-Archive;
bh=lo421tLPWdxh6dj39ps5w03lmAJhltqMVNqKioTQeBk=; b=F6k+X6iGLAIl5EzenK013YXk4q
21NI4ff2qeVjiMWT03uIeCmaY55gAuEwdz336a3juUWecWiR9wqCkMGJfXA3gQmjjZrY3OZM0IUiN
at7kGTjrpqsQ/tN5osUeSsRM0ragFdMQnrNwzfAE0aTjavbqucqgaXjTnVIDADkuL4OQ=;
Received: from [193.149.48.129] (helo=blue.greenie.muc.de)
by sfi-mx-2.v28.lw.sourceforge.com with esmtps
(TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95)
id 1wepZl-0003tu-B7 for openvpn-devel@lists.sourceforge.net;
Wed, 01 Jul 2026 07:41:46 +0000
Received: from blue.greenie.muc.de (localhost [127.0.0.1])
by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 6617fMvv028824
for <openvpn-devel@lists.sourceforge.net>; Wed, 1 Jul 2026 09:41:22 +0200
Received: (from gert@localhost)
by blue.greenie.muc.de (8.18.2/8.18.1/Submit) id 6617fMTF028823
for openvpn-devel@lists.sourceforge.net; Wed, 1 Jul 2026 09:41:22 +0200
From: Gert Doering <gert@greenie.muc.de>
To: openvpn-devel@lists.sourceforge.net
Date: Wed, 1 Jul 2026 09:41:15 +0200
Message-ID: <20260701074122.28795-1-gert@greenie.muc.de>
X-Mailer: git-send-email 2.53.0
In-Reply-To:
<gerrit.1782883869000.Id8945dce437da11e6fecae9550c3be52e393d4cf@gerrit.openvpn.net>
References:
<gerrit.1782883869000.Id8945dce437da11e6fecae9550c3be52e393d4cf@gerrit.openvpn.net>
MIME-Version: 1.0
X-Spam-Score: 1.3 (+)
X-Spam-Report: Spam detection software,
running on the system "sfi-spamd-2.hosts.colo.sdot.me",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: From: Ralf Lici <ralf@mandelbit.com> The debug log in
dco_install_key()
has the epoch and dco_keys_installed arguments swapped. So a line like
epoch=1,
currently 0 keys installed actually means dco_keys_installed == 1 and epoch
== false.
Content analysis details: (1.3 points, 5.0 required)
pts rule name description
---- ----------------------
--------------------------------------------------
1.3 RDNS_NONE Delivered to internal network by a host with no rDNS
X-Headers-End: 1wepZl-0003tu-B7
Subject: [Openvpn-devel] [PATCH v1] dco.c: fix argument order in
dco_install_key() log string
X-BeenThere: openvpn-devel@lists.sourceforge.net
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <openvpn-devel.lists.sourceforge.net>
List-Unsubscribe: <https://lists.sourceforge.net/lists/options/openvpn-devel>,
<mailto:openvpn-devel-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive:
<http://sourceforge.net/mailarchive/forum.php?forum_name=openvpn-devel>
List-Post: <mailto:openvpn-devel@lists.sourceforge.net>
List-Help: <mailto:openvpn-devel-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/openvpn-devel>,
<mailto:openvpn-devel-request@lists.sourceforge.net?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: openvpn-devel-bounces@lists.sourceforge.net
X-getmail-retrieved-from-mailbox: Inbox
X-GMAIL-THRID: 1869497492659309337
X-GMAIL-MSGID: 1869497492659309337
|
| Series |
[Openvpn-devel,v1] dco.c: fix argument order in dco_install_key() log string
|
|
Commit Message
Gert Doering
July 1, 2026, 7:41 a.m. UTC
From: Ralf Lici <ralf@mandelbit.com> The debug log in dco_install_key() has the epoch and dco_keys_installed arguments swapped. So a line like epoch=1, currently 0 keys installed actually means dco_keys_installed == 1 and epoch == false. Use the correct argument ordering in the log string. Change-Id: Id8945dce437da11e6fecae9550c3be52e393d4cf Signed-off-by: Ralf Lici <ralf@mandelbit.com> Acked-by: Gert Doering <gert@greenie.muc.de> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1760 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1760 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <gert@greenie.muc.de>
Comments
"Obviously correct". Fascinating oversight on the original change...
Your patch has been applied to the master and release/2.7 branch.
commit cda2f2533c27f37cfe7a741c9e042a54740e377f (master)
commit 097d259e3702a5b621399eee9b83e79fc9a577bc (release/2.7)
Author: Ralf Lici
Date: Wed Jul 1 09:41:15 2026 +0200
dco.c: fix argument order in dco_install_key() log string
Signed-off-by: Ralf Lici <ralf@mandelbit.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1760
Message-Id: <20260701074122.28795-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg37418.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index f5b7081..e944547 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -57,8 +57,8 @@ { bool epoch = ks->crypto_options.flags & CO_EPOCH_DATA_KEY_FORMAT; - msg(D_DCO_DEBUG, "%s: peer_id=%d keyid=%d epoch=%d, currently %d keys installed", __func__, - multi->dco_peer_id, ks->key_id, multi->dco_keys_installed, epoch); + msg(D_DCO_DEBUG, "%s: peer_id=%d keyid=%d epoch=%d, currently %d keys installed", + __func__, multi->dco_peer_id, ks->key_id, epoch, multi->dco_keys_installed); /* Install a key in the PRIMARY slot only when no other key exist. * From that moment on, any new key will be installed in the SECONDARY