From patchwork Tue Apr 2 00:22:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3677 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:5a41:b0:55c:c090:46f0 with SMTP id w1csp3458657may; Mon, 1 Apr 2024 17:22:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWT63r6NAZsUyT0he9SNpjzN+CR6hTcfZ0PV8BA/iga5gXgc69xrX3lrdtLmr2GNY2iGPKW7igk7tpk8Rhjol6vhdF8Kr4= X-Google-Smtp-Source: AGHT+IGSseUpwvyPOS/rr5/1VU/+Hl3p1qI9U4ZE+WDJhtIhR9aV9CNQl8cO67eYe7HcIq/OKyEd X-Received: by 2002:a6b:6d16:0:b0:7d0:c0e7:b577 with SMTP id a22-20020a6b6d16000000b007d0c0e7b577mr5333240iod.2.1712017375482; Mon, 01 Apr 2024 17:22:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712017375; cv=none; d=google.com; s=arc-20160816; b=VIrQOTsXcp+mjLpEM8KHxSFt3dpTYt5dGeSR0UjDKg76sTZqPgs8dOF37z3niK/AUA XNG7v+sTs8Z7BZAC3eBAaCvy1xotUosRznJsRzzC6p83Z+QhUfdySbckvnQF0sMA9Vds L+LKTh6NsS/swiBy8BSETdyg9cdr08B6XeUdyxN2yz+2ORLLskUGTqee+0CuO8sbwkHo Gy3/9fep6K8WQoPYCRp+KmLdD7qQ3EzHAsba4iiVggMSTenOn4pknfFnIGDDtuv3JDzj PMqKCCyiHQTwKh1g51RIrT2I1yFYabeZ32kD7UOw/HNsERBBd9hAhmricoK4YKplVSTT lyQw== 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:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=OsyG76LjEA/e1QfXUWAzGNFItclRJGGbRosEMVCa3lM=; fh=lm0MLPW7DntlrDqRECIiC9JlE1uPxhepE0URYHIf+eE=; b=gdJZn1gu04Zkc2pBS/GmXmERxQNUgnOOUSE1dJ4pU4atdhIcrSkir09ZEcxieyv0fz me8RNOst5rKOuDjbml1S4QcWHRotUszBFkR4dqsBAULsyJGh/cXd/TfX1FlqNXr+KT3P A9PjCC/thzXf0uZOGSKRzs32iFILQI1FDzQq2x56cyWCKItC4gQl48ZxdN0dbckf94ik kd1CHsxhQh2gbuL34UnHxxy1TjjyXJEnRTdREBY84FqtTZShcFNzOKxW2fk71ZEl2faC B0vbiUIl8l8E8UPDInny60AFGDt5fwdAFRs+hGu+KvD0PGCqiRi8kq7BUMD8Yz9jtGXl AaBA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=PAQvPK12; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=jDja1IYB; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=R1U2Ld4s; 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 s68-20020a632c47000000b005dc528d603bsi9594403pgs.675.2024.04.01.17.22.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2024 17:22:55 -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=PAQvPK12; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=jDja1IYB; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=R1U2Ld4s; 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1rrRuv-0006Iz-BU; Tue, 02 Apr 2024 00:22:21 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rrRut-0006Ir-W8 for openvpn-devel@lists.sourceforge.net; Tue, 02 Apr 2024 00:22:20 +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:To:Date: From:Sender: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=1RN+EQGVIOcaUZS1MfbsaHulNTo3aKiLURECL0omQRQ=; b=PAQvPK12+MVfbVrgiUupG6R0/u iQtEopLNODU0xyaec7p54wrLvA7ww1HTaUnuTuVt0qhbahvxUb+C3IK+JzodgZaCig0+cud27Plk0 eG5XWmgpS/0Dukpx0nNmxWc0CnRrGeQwU5i8OZbJjLdg2DVunStAKcnuZj6g696HVFcY=; 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:To:Date:From:Sender: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=1RN+EQGVIOcaUZS1MfbsaHulNTo3aKiLURECL0omQRQ=; b=j Dja1IYBzvfaGE7I21ijb+aja6M6Gu7IalS9GdZkmai8q3ULob4fwlB0TlvnTLgsQMsv939P8sXRG0 u2arclNKn0y5jTjpyNF04DLco9vqQ77fb1daaNZvY3CLe9Vi4dDbKuPH6Idwe7hofOvu3FmPyg7ni 5Rr6K4x6w2EDQPFM=; Received: from mail-wm1-f51.google.com ([209.85.128.51]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1rrRup-0003Y7-Ex for openvpn-devel@lists.sourceforge.net; Tue, 02 Apr 2024 00:22:20 +0000 Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4156c76656bso5475485e9.0 for ; Mon, 01 Apr 2024 17:22:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1712017324; x=1712622124; 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:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=1RN+EQGVIOcaUZS1MfbsaHulNTo3aKiLURECL0omQRQ=; b=R1U2Ld4s22ArHaRH3qIQkEF/wRqc9kK9I/ISSvpWLUfNEDNrxHZbHSSoNuveBwxqks /pwGfXQVRo7Tkr6/HJvUAZ+AT7lyvK/VNcT1kIIw301STgupfwOVLwhZyeji3DuhOfOb ++n/ulzS8asPOOcDp32jiu7fD4+PexjBsIl0CiOIzunXudFTXjinIngr5iDwVcVE2Se2 E4DMd3JPKTFScTdInYJtFcG6MWgLodsl8Xgum5c6cJ6B5/ivlP890avHCUBI6VtCQ1ZQ aFEA+2xnR56yBvLzVybECFJiJ5rBC+iMkiSnay8NUkbp00ZzgRDEQ1QMIFQpgdQqlUr0 H12Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712017324; x=1712622124; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1RN+EQGVIOcaUZS1MfbsaHulNTo3aKiLURECL0omQRQ=; b=n512H+gbuuNwGnbTcdsedqTMYm3ax12tPlzX67JEKgiC4FprFk3d1AD2shJnDGVzdK EoSgpR61b33+yn03dl/ifiDCWNTZ9r9UuY9+PsKIJX+P9rZerAWR6yjEgLyaaANezGf3 WuXJ7KP4GWCIEotISzsaF31XV3DnLLaq1JUeX7rrWEXlkVSxEoEwFjIg2yhb+0tcUVK3 oiURgnsodUrwRF2zFpPMbRPTKftO24tcQ4d9P1n9sTob1cGQMQWm9glGxa/cru7dY+QP RFQMPM+wXrNcFZLw+BgUYMtYp+Dis25znECs0VkXhgOji22z+Hc+gdjknJ6cmaYE/Fi0 FsgA== X-Gm-Message-State: AOJu0Yy+vrE3P5tdrPJ8GKQgVVQDPgN4xhTS6KTRqacCaDuZYR649aP8 w5NQU8meLrtRa7f9mlsH/oGBKC/rggLEBUcv+Cm7CiyPEyaSXufTre7jRq2TFO97eSg/xfH0y8q N X-Received: by 2002:a05:600c:1ca6:b0:414:8ff6:ef33 with SMTP id k38-20020a05600c1ca600b004148ff6ef33mr5604717wms.40.1712017323937; Mon, 01 Apr 2024 17:22:03 -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 bg34-20020a05600c3ca200b004148cd4d484sm19442415wmb.9.2024.04.01.17.22.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 17:22:03 -0700 (PDT) From: "plaisthos (Code Review)" X-Google-Original-From: "plaisthos (Code Review)" X-Gerrit-PatchSet: 1 Date: Tue, 2 Apr 2024 00:22:02 +0000 To: flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I911e25949a8647b567fd4178683534d4404ab469 X-Gerrit-Change-Number: 552 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 987b4d3efc1ad185a980b6a9b74091ab4a56df17 References: Message-ID: <6eee5b0654aece503b1a0da0cdd5ff4f7aa65ae6-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) 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: Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.51 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.51 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: 1rrRup-0003Y7-Ex Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Remove redundant call of EVP_CipherInit before EVP_CipherInit_Ex 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: arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1795180331255300614?= X-GMAIL-MSGID: =?utf-8?q?1795180331255300614?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/552?usp=email to review the following change. Change subject: Remove redundant call of EVP_CipherInit before EVP_CipherInit_Ex ...................................................................... Remove redundant call of EVP_CipherInit before EVP_CipherInit_Ex EVP_CipherInit basically is the same EVP_CipherInit_ex except that it in some instances it resets/inits the ctx parameter first. We already call EVP_CIPHER_CTX_reset to reset/init the ctx before so this call does not do anything useful Change-Id: I911e25949a8647b567fd4178683534d4404ab469 Signed-off-by: Arne Schwabe --- M src/openvpn/crypto_openssl.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/52/552/1 diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index bfc5e37..13dfa8c 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -846,10 +846,6 @@ evp_cipher_type *kt = cipher_get(ciphername); EVP_CIPHER_CTX_reset(ctx); - if (!EVP_CipherInit(ctx, kt, NULL, NULL, enc)) - { - crypto_msg(M_FATAL, "EVP cipher init #1"); - } if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, NULL, enc)) { crypto_msg(M_FATAL, "EVP cipher init #2");