From patchwork Tue Aug 26 18:48:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4376 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:904b:b0:671:5a2c:6455 with SMTP id j11csp655515mac; Tue, 26 Aug 2025 11:49:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUXE4Qt6GWnwTmlU0aB/jGCDDxIByatw0rkYMtVyNdNUyONKd7Go4wsBDJHBAXlhWTpbwEs0ZLalC8=@openvpn.net X-Google-Smtp-Source: AGHT+IH+e+ojCrOON0uPbUGfXQ5r0BB1yepfotLXcBUvMQEg2J6EZaMzdl5QfYx5uBfsE5D1aMYc X-Received: by 2002:a05:6820:514:b0:61c:2c9:995d with SMTP id 006d021491bc7-61db9aa6bcemr9028542eaf.2.1756234162284; Tue, 26 Aug 2025 11:49:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1756234162; cv=none; d=google.com; s=arc-20240605; b=W2VMF5bZ06D5LjFGzh5Syn1/XBtGcs+/YWrqPQhQY7l7bKp18KDPDBGp+1izGEUurV 1Z8DtvU6JXw+rLOBu7eUjA4kmNt8cBxiQuT9mbifn4nsM+s7wnR35+WfkWqRiyB/vFQm nFduKv6QFQMjR+LadDxr/weD3lzhvKxn4fWrXRUNdoPqejhE3mLHu+lrO29eQbZf7OWb 1H6/lQ+whqVJ5The8iQvsx8vZH3YM2xWTdhkWQ0c1y7TBP4fdyA78VZK8+lqA/o29yDG g78S09O5RNxv4v9u2v6yXMLnM98tIQo6Enl/2hEW0kv6PvEBn7wBS626fSHnmUw1wZs9 PtJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=IE089tcKi4F8oT5ExcoLD78qVrxHFtlgfq6Pzx6lKXc=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=JlA+IU+Ui86bWaFvaiDSVwUr+nMeHteXJSrkd35s1bEyiieBicVOrhJI42T9radKSj M/2G32Xc8dSZyhQe8M5J6SS06rpsJsnrVi1w95jXi24D60eP27nfoNY5a4zMkOM9eWjF 5CkaHt0u0qAdxjGMb/hU+xVmaKUqhSb14WzXFcXBGeLUvzG80RB7/FtVEIp2Ips6ma6i zATzLemCSkuKm1fS7Fedl769cUKvu1ctSLcSuM5oy+I8JUzKV2mCFaRAEhO5SJTWErVM 8otjns+i2+fSocC3Iz7OKnxz84zt3XmGxZ+zQgzXXQL2FQTlAkaB2Mh56MjKEkGDa/Sp 85EQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b="RrMh/pus"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=EihXj8ib; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=lWS8e8Af; 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-61dc76986besi2055058eaf.5.2025.08.26.11.49.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Aug 2025 11:49: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="RrMh/pus"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=EihXj8ib; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=lWS8e8Af; 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=IE089tcKi4F8oT5ExcoLD78qVrxHFtlgfq6Pzx6lKXc=; b=RrMh/pusm293ztu8+BH+dyE8kC JSYXoUbNFw38PgImsXE5ja4WCX/zQXTFW4J3V89zLi8/+Yqk0IT7b3NBYTeYWrWIIx7i7Xenmxzda IyfgiuPAnnrt0wfQOBprkYmwAfURKlrEOlFSnwxQSzYO2B6IBZBc0vPCiih/e2SX6YGI=; 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 ) id 1uqyjO-00057G-Ar; Tue, 26 Aug 2025 18:49: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 ) id 1uqyjM-00056y-Mi for openvpn-devel@lists.sourceforge.net; Tue, 26 Aug 2025 18:49:17 +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=vOaORHqagJjI0YS0ruOixY9/lNdGgyU754Kq1bro2vk=; b=EihXj8ibL2OgNnPKZLqtB4TB1h vu8s3s3qMjpuHCwQ2bMvK9HYCOdE8UBMTJOTkOHA6ksAhiw31Pmd/FAMEnmaxqYNgK4y34koYUPCr JKCnt92TQgA1whysxCq6hSc8DRIYjezZcnVDXtKFPKPNhAgDEq7bcOOlnagSpRGlZqfw=; 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=vOaORHqagJjI0YS0ruOixY9/lNdGgyU754Kq1bro2vk=; b=lWS8e8Af3Lo20+qD9yu5+cIkmg wrG7VP0CpbmKqZA3w4O1sVZ6hWPhGAlaiYCLwNHfyERmUFLQ0V11xpHag/SPkk8M6m7Fm7uuT0RGR yvC67snJNp1+mvraYTLz/1UDZstk03DgKUmM0GebhstbyOutrP3hE1yb2uE/ooUy2/E0=; Received: from [193.149.48.143] (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 1uqyjM-0007RH-MK for openvpn-devel@lists.sourceforge.net; Tue, 26 Aug 2025 18:49:17 +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 57QIn5Co022071 for ; Tue, 26 Aug 2025 20:49:05 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 57QIn5mN022070 for openvpn-devel@lists.sourceforge.net; Tue, 26 Aug 2025 20:49:05 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 26 Aug 2025 20:48:57 +0200 Message-ID: <20250826184904.22057-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.1 In-Reply-To: References: 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: Frank Lichtenheld The variables that hold them are already unsigned, make sure the flags are as well to avoid spurious conversion warnings. Change-Id: I0937165c5efa95136bd951345a076e33e396f26a Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe --- 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: 1uqyjM-0007RH-MK Subject: [Openvpn-devel] [PATCH v9] manage: Make sure various management flags are treated as unsigned X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1841544992935425150?= X-GMAIL-MSGID: =?utf-8?q?1841544992935425150?= From: Frank Lichtenheld The variables that hold them are already unsigned, make sure the flags are as well to avoid spurious conversion warnings. Change-Id: I0937165c5efa95136bd951345a076e33e396f26a Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe --- 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/+/1105 This mail reflects revision 9 of this Change. Acked-by according to Gerrit (reflected above): Arne Schwabe diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 40ae2c8..f937ee1 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -370,7 +370,7 @@ && ((ce->flags >> CE_MAN_QUERY_REMOTE_SHIFT) & CE_MAN_QUERY_REMOTE_MASK) == CE_MAN_QUERY_REMOTE_QUERY) { - int flags = 0; + unsigned int flags = 0; if (!strcmp(p[1], "ACCEPT")) { flags = CE_MAN_QUERY_REMOTE_ACCEPT; diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h index 083caf5..911e15b 100644 --- a/src/openvpn/manage.h +++ b/src/openvpn/manage.h @@ -24,24 +24,24 @@ #define MANAGE_H /* management_open flags */ -#define MF_SERVER (1 << 0) -#define MF_QUERY_PASSWORDS (1 << 1) -#define MF_HOLD (1 << 2) -#define MF_SIGNAL (1 << 3) -#define MF_FORGET_DISCONNECT (1 << 4) -#define MF_CONNECT_AS_CLIENT (1 << 5) -#define MF_CLIENT_AUTH (1 << 6) -/* #define MF_CLIENT_PF (1<<7) *REMOVED FEATURE* */ -#define MF_UNIX_SOCK (1 << 8) -#define MF_EXTERNAL_KEY (1 << 9) -#define MF_EXTERNAL_KEY_NOPADDING (1 << 10) -#define MF_EXTERNAL_KEY_PKCS1PAD (1 << 11) -#define MF_UP_DOWN (1 << 12) -#define MF_QUERY_REMOTE (1 << 13) -#define MF_QUERY_PROXY (1 << 14) -#define MF_EXTERNAL_CERT (1 << 15) -#define MF_EXTERNAL_KEY_PSSPAD (1 << 16) -#define MF_EXTERNAL_KEY_DIGEST (1 << 17) +#define MF_SERVER (1u << 0) +#define MF_QUERY_PASSWORDS (1u << 1) +#define MF_HOLD (1u << 2) +#define MF_SIGNAL (1u << 3) +#define MF_FORGET_DISCONNECT (1u << 4) +#define MF_CONNECT_AS_CLIENT (1u << 5) +#define MF_CLIENT_AUTH (1u << 6) +/* #define MF_CLIENT_PF (1u << 7) *REMOVED FEATURE* */ +#define MF_UNIX_SOCK (1u << 8) +#define MF_EXTERNAL_KEY (1u << 9) +#define MF_EXTERNAL_KEY_NOPADDING (1u << 10) +#define MF_EXTERNAL_KEY_PKCS1PAD (1u << 11) +#define MF_UP_DOWN (1u << 12) +#define MF_QUERY_REMOTE (1u << 13) +#define MF_QUERY_PROXY (1u << 14) +#define MF_EXTERNAL_CERT (1u << 15) +#define MF_EXTERNAL_KEY_PSSPAD (1u << 16) +#define MF_EXTERNAL_KEY_DIGEST (1u << 17) #ifdef ENABLE_MANAGEMENT @@ -64,9 +64,9 @@ { unsigned long cid; -#define DAF_CONNECTION_ESTABLISHED (1 << 0) -#define DAF_CONNECTION_CLOSED (1 << 1) -#define DAF_INITIAL_AUTH (1 << 2) +#define DAF_CONNECTION_ESTABLISHED (1u << 0) +#define DAF_CONNECTION_CLOSED (1u << 1) +#define DAF_INITIAL_AUTH (1u << 2) unsigned int flags; unsigned int mda_key_id_counter; @@ -117,23 +117,23 @@ union log_entry_union u; }; -#define LOG_PRINT_LOG_PREFIX (1 << 0) -#define LOG_PRINT_ECHO_PREFIX (1 << 1) -#define LOG_PRINT_STATE_PREFIX (1 << 2) +#define LOG_PRINT_LOG_PREFIX (1u << 0) +#define LOG_PRINT_ECHO_PREFIX (1u << 1) +#define LOG_PRINT_STATE_PREFIX (1u << 2) -#define LOG_PRINT_INT_DATE (1 << 3) -#define LOG_PRINT_MSG_FLAGS (1 << 4) -#define LOG_PRINT_STATE (1 << 5) -#define LOG_PRINT_LOCAL_IP (1 << 6) +#define LOG_PRINT_INT_DATE (1u << 3) +#define LOG_PRINT_MSG_FLAGS (1u << 4) +#define LOG_PRINT_STATE (1u << 5) +#define LOG_PRINT_LOCAL_IP (1u << 6) -#define LOG_PRINT_CRLF (1 << 7) -#define LOG_FATAL_NOTIFY (1 << 8) +#define LOG_PRINT_CRLF (1u << 7) +#define LOG_FATAL_NOTIFY (1u << 8) -#define LOG_PRINT_INTVAL (1 << 9) +#define LOG_PRINT_INTVAL (1u << 9) -#define LOG_PRINT_REMOTE_IP (1 << 10) +#define LOG_PRINT_REMOTE_IP (1u << 10) -#define LOG_ECHO_TO_LOG (1 << 11) +#define LOG_ECHO_TO_LOG (1u << 11) const char *log_entry_print(const struct log_entry *e, unsigned int flags, struct gc_arena *gc); @@ -175,7 +175,7 @@ { void *arg; -#define MCF_SERVER (1 << 0) /* is OpenVPN being run as a server? */ +#define MCF_SERVER (1u << 0) /* is OpenVPN being run as a server? */ unsigned int flags; void (*status)(void *arg, const int version, struct status_output *so); @@ -253,9 +253,9 @@ int client_gid; /* flags for handling the management interface "signal" command */ -#define MANSIG_IGNORE_USR1_HUP (1 << 0) -#define MANSIG_MAP_USR1_TO_HUP (1 << 1) -#define MANSIG_MAP_USR1_TO_TERM (1 << 2) +#define MANSIG_IGNORE_USR1_HUP (1u << 0) +#define MANSIG_MAP_USR1_TO_HUP (1u << 1) +#define MANSIG_MAP_USR1_TO_TERM (1u << 2) unsigned int mansig; }; diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 38e67c8..5ee6e93 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -147,14 +147,14 @@ int explicit_exit_notification; /* Explicitly tell peer when we are exiting via OCC_EXIT or [RESTART] message */ -#define CE_DISABLED (1 << 0) -#define CE_MAN_QUERY_PROXY (1 << 1) +#define CE_DISABLED (1u << 0) +#define CE_MAN_QUERY_PROXY (1u << 1) #define CE_MAN_QUERY_REMOTE_UNDEF 0 #define CE_MAN_QUERY_REMOTE_QUERY 1 #define CE_MAN_QUERY_REMOTE_ACCEPT 2 #define CE_MAN_QUERY_REMOTE_MOD 3 #define CE_MAN_QUERY_REMOTE_SKIP 4 -#define CE_MAN_QUERY_REMOTE_MASK (0x07) +#define CE_MAN_QUERY_REMOTE_MASK (0x07u) #define CE_MAN_QUERY_REMOTE_SHIFT (2) unsigned int flags;