From patchwork Sun Oct 8 10:42:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3382 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:b412:b0:f2:62eb:61c1 with SMTP id dj18csp1442564dyb; Sun, 8 Oct 2023 03:43:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMY9NSyOw1+N+Hvk7NWY6boDmJpInBl/KyD5YDUcZRCa0962SP4QkJI+vThyuAoxKIn7iB X-Received: by 2002:a17:902:ce84:b0:1c3:a4f2:7c99 with SMTP id f4-20020a170902ce8400b001c3a4f27c99mr14472933plg.4.1696761817887; Sun, 08 Oct 2023 03:43:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696761817; cv=none; d=google.com; s=arc-20160816; b=GXZ6IO1OiOxOx0P9/wMkjXSfs1WEfgjXJBr1/bZJOS2IO44u7ZH3yeXK7LyZpK6P+K uOJlbAdFXQK47vXzSxHp+aBm9JOcsKipkPi/NbwDCY2iCwfWnsfbvbqhKymP1k6ZEM16 Eh8A10P/IIrsxWyDd7OVfaLBZ5ohIlhjRsWSvXQek97o/pAU0FPZBBklJmTN7mxhlXw0 efRRsYBxDxDH65HRpFmUIfdpoXhmnw1NY14yqFuY0qT/LjYxGCx8I6EEd0iJ94HWyJSz OK/sebiOvSoNOfWEWOj8ugUAhnaUFwkYP9EKrBcjElNElpgyE0ilKXb8KrtY+uzsjELm IVeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:date:from :dkim-signature:dkim-signature:dkim-signature; bh=sXsVLbFzpt2JCazTIz7UcYrCG+KpqQ99pOHaZ21d8s0=; fh=65XNDMZDtUAVPEs22K9ZMElrrCiP292uHQHDlBUdKcw=; b=rillzGJbfaZ4hwfa2qUVFvw+qK0IBE5OdOYASzcQbma44lk/DVTCprPYzq3RJscLYj L7YOSr1PEo39y75LpPx+mPAIIWKxJdpmnfMHI5TsGGB+W8E2W+qrMsMOqOYAfF8/7OG4 Ng/+StKO4Pk/yVqgd+KGP+MP6r6GMJBSwmiaYFEnXee26n9SzTfJV3TWqNSu6D/d2Eq9 Nz/ZefmbeZbyf2GszMd05CoTpk82Ae44h4LLo3OG6sd5pXAUCXE50hZQIGdRKeWpkSP/ 5Y8U4SreVXBycrVEWGSXGCs2hE0zEDMaI5LevDJzlia0s1T9SzAQ3G00CrNd6paIGl1a 70+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=ffmKBG8s; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nCcXB8t5; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=FaWPUBwI; 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=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id c12-20020a170902d48c00b001c62161b18esi7787133plg.580.2023.10.08.03.43.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Oct 2023 03:43:37 -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=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=ffmKBG8s; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nCcXB8t5; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=FaWPUBwI; 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=openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qpRFO-0007Rr-SU; Sun, 08 Oct 2023 10:42:53 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qpRFN-0007Rl-OT for openvpn-devel@lists.sourceforge.net; Sun, 08 Oct 2023 10:42:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:Date:From :Sender:To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=3ReUCYW3NWsKjVWDdaBeKeJw1ZJ/gvLnIOPK2FAflyo=; b=ffmKBG8svLxq057YLzwrczwVLe oXafI4xmHSqbOk+hJcKxtkYVNjf+7e8PWmH6DLMSYUXYx+JKSc45bnNZ22i/xOQBwZxaWNmIeE8Q2 +9/sdbJcVt6Z5nRrNgH+1pJpwMUM0/12RPJpI0qx16NZ5Hf2okaSJ47hu+KLo5jyBbtg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:Date:From:Sender:To:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=3ReUCYW3NWsKjVWDdaBeKeJw1ZJ/gvLnIOPK2FAflyo=; b=n CcXB8t5pZnjOGeqXYahTxMEOhtNFP6d2uzvcdgLLtzluW7gAVd4VepKbLK/poZ5s0WAdXVY0CayYg UBUrlmLgjCrhM8oKbS3E6dsIk+S1w0LURhRHBEVpZrRJkkzYMIx6eylXrUfffURI6/3W6r+syVLBD 4+KVdPP8qECZuJS8=; Received: from mail-wm1-f41.google.com ([209.85.128.41]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qpRFI-0071Xr-GO for openvpn-devel@lists.sourceforge.net; Sun, 08 Oct 2023 10:42:52 +0000 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-40651a726acso32908095e9.1 for ; Sun, 08 Oct 2023 03:42:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1696761762; x=1697366562; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:date:from:from:to:cc :subject:date:message-id:reply-to; bh=3ReUCYW3NWsKjVWDdaBeKeJw1ZJ/gvLnIOPK2FAflyo=; b=FaWPUBwI74ge5HN9EE5sozU61Wr1IkgFg4/DbPihPkrAyUjdKlOGDybhxzsw8Xy1+R dUCfo+wBuvTAIawNzdHKlrd/q4edUbOEBFtH3XBtO7B+bA/0dtMHOK8FvhluBwRCY2ze V4IIVVuXAaZHL6jXnBIr7N5/1dJYLxqMFHoLl2f6pkfm5Iq7E+iAH30xGMHjlGwZRayZ 0KBkvxz+seI7IvBs9nHzz4SAm7UtiqKiMYmp0KUpEC/c/TmhZz2YtwTHQy9F3gzCTqMA aWrm4jjms9tCJ7c3EjBgmG+DQD/oT5dfHnGyC0shqVVEeTLylMRPek6+Eu+rD5Wr40Ov tNTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696761762; x=1697366562; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3ReUCYW3NWsKjVWDdaBeKeJw1ZJ/gvLnIOPK2FAflyo=; b=mNfl7fkFyZeRxyBpfqDTrQkwDTuKCWZcvURkDEd5PGmegiH42IFiZ54357Bv742uUG hU3QN/JtMGI1qiw4M6QQgDib2br7nrzlgb1TL+k1HQUMFmqH7ZAVbK+3nToE3IAl0aVm Ixc/ClQoznds+jq6KMOzWv4DgzcXAMaGdphyNbDsCx6nJYKeGRan3/tAY8riBSJHKUj2 WcSe4+LiOXKJyQ36YliJ+pNfoKTiRfg/H1sDJwEvrs19wb3jn/4+kk91WS88CCMDJQY2 ZYwphJt5TLr4mzp4ZDBChJv9ZG9DvhOUD/GXM4P9nJ/X3EG4FLkPUr8mFfRrHY2AfJDz XLXg== X-Gm-Message-State: AOJu0YzGDcoKE3KxNj8qVpKqO1gB5dGKi1Xv4t0x5cJsdgg3/M1BFAKn AZNhQP/HhW3Vq8zxuG5SYpMTU5eUwGc9wlErHxc= X-Received: by 2002:a05:600c:2a4e:b0:405:49aa:d578 with SMTP id x14-20020a05600c2a4e00b0040549aad578mr11529265wme.37.1696761762080; Sun, 08 Oct 2023 03:42:42 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id j31-20020a05600c1c1f00b004068e09a70bsm8178590wms.31.2023.10.08.03.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 03:42:41 -0700 (PDT) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 2 Date: Sun, 8 Oct 2023 10:42:41 +0000 Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: Icc86334b26ba1fcc20f4cd03644018d1d16796e3 X-Gerrit-Change-Number: 310 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 5aadb20d8e0b9d945d0d090004f5ed83d910bde9 References: Message-ID: MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: 1.0 (+) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", 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: flichtenheld has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/310?usp=email ) Change subject: generate_auth_token: simplify code Content analysis details: (1.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.2 MISSING_HEADERS Missing To: header -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.41 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.41 listed in wl.mailspike.net] 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1qpRFI-0071Xr-GO Subject: [Openvpn-devel] [S] Change in openvpn[master]: generate_auth_token: simplify code 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: , Reply-To: frank@lichtenheld.com, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net Cc: plaisthos , openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1779183719857389132?= X-GMAIL-MSGID: =?utf-8?q?1779183719857389132?= X-getmail-filter-classifier: gerrit message type newchange flichtenheld has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/310?usp=email ) Change subject: generate_auth_token: simplify code ...................................................................... generate_auth_token: simplify code The previous code went through some hoops to avoid compiler warnings. But there is a much easier way by just telling it exactly what you want to do. Also fix typo in variable name while I'm here. Change-Id: Icc86334b26ba1fcc20f4cd03644018d1d16796e3 Signed-off-by: Frank Lichtenheld --- M src/openvpn/auth_token.c 1 file changed, 5 insertions(+), 11 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/10/310/2 diff --git a/src/openvpn/auth_token.c b/src/openvpn/auth_token.c index 6787ea7..28b58b0 100644 --- a/src/openvpn/auth_token.c +++ b/src/openvpn/auth_token.c @@ -182,24 +182,18 @@ char *initial_token_copy = string_alloc(multi->auth_token_initial, &gc); char *old_sessid = initial_token_copy + strlen(SESSION_ID_PREFIX); - char *old_tsamp_initial = old_sessid + AUTH_TOKEN_SESSION_ID_LEN*8/6; + char *old_tstamp_initial = old_sessid + AUTH_TOKEN_SESSION_ID_LEN*8/6; /* * We null terminate the old token just after the session ID to let * our base64 decode function only decode the session ID */ - old_tsamp_initial[12] = '\0'; - ASSERT(openvpn_base64_decode(old_tsamp_initial, old_tstamp_decode, 9) == 9); + old_tstamp_initial[12] = '\0'; + ASSERT(openvpn_base64_decode(old_tstamp_initial, old_tstamp_decode, 9) == 9); - /* - * Avoid old gcc (4.8.x) complaining about strict aliasing - * by using a temporary variable instead of doing it in one - * line - */ - uint64_t *tstamp_ptr = (uint64_t *) old_tstamp_decode; - initial_timestamp = *tstamp_ptr; + memcpy(&initial_timestamp, &old_tstamp_decode, sizeof(initial_timestamp)); - old_tsamp_initial[0] = '\0'; + old_tstamp_initial[0] = '\0'; ASSERT(openvpn_base64_decode(old_sessid, sessid, AUTH_TOKEN_SESSION_ID_LEN) == AUTH_TOKEN_SESSION_ID_LEN); } else if (!rand_bytes(sessid, AUTH_TOKEN_SESSION_ID_LEN))