From patchwork Wed Jul 15 04:14:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1247 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id mLZWCn8PD19TAwAAIUCqbw for ; Wed, 15 Jul 2020 10:15:27 -0400 Received: from proxy7.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id CKgJCn8PD1+9aAAAvGGmqA ; Wed, 15 Jul 2020 10:15:27 -0400 Received: from smtp4.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.ord1d.rsapps.net with LMTP id sJGgCX8PD1+wPwAAMe1Fpw ; Wed, 15 Jul 2020 10:15:27 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp4.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: a08297f6-c6a5-11ea-8a08-525400760ffc-1-1 Received: from [216.105.38.7] ([216.105.38.7:40872] helo=lists.sourceforge.net) by smtp4.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id BE/BD-11464-D7F0F0F5; Wed, 15 Jul 2020 10:15:26 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jviBH-0002jk-Kn; Wed, 15 Jul 2020 14:14:43 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jviBG-0002jV-07 for openvpn-devel@lists.sourceforge.net; Wed, 15 Jul 2020 14:14:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=rX6Ksa/UCRFlbIEeLYN/JRokxBq0LMCXb0zDJEtl94c=; b=QHwuuXl5qJ+JA/mTso+yeJDCch uWtaqOwpC74Ozp7v6/v1A4DVPKbDZraKfPoKhBQjVb3kdAze1RX/dzk6wpYNC24S4XXbUjMLwT1Qa labo0PfT7q9XBSted5IMEEmVA6Qzw5H7yTaTiacyma1I9cqolcwH2tyTQtyEbc3e/ptI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=rX6Ksa/UCRFlbIEeLYN/JRokxBq0LMCXb0zDJEtl94c=; b=Ql3CEwH12bVu4SPldcRioTNRRX k7gMWXDZL7z9PXki7XYcStNLT2JHXiD55CLYzn7/B+YQV8qdpxu7ibd2eyUsGudGadlU9bVgL2Iin B3rmkG9kILqPueKU6r5QiepOv6v9bsN0Y0odIMADx3nl3AYYF9PQ7Se2g6/zXb1HnxQM=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jviBE-004XiY-CW for openvpn-devel@lists.sourceforge.net; Wed, 15 Jul 2020 14:14:41 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1jviAz-0005M6-5f for openvpn-devel@lists.sourceforge.net; Wed, 15 Jul 2020 16:14:25 +0200 Received: (nullmailer pid 26338 invoked by uid 10006); Wed, 15 Jul 2020 14:14:25 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 15 Jul 2020 16:14:25 +0200 Message-Id: <20200715141425.26293-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1jviBE-004XiY-CW Subject: [Openvpn-devel] [PATCH] reformat multi_client_generate_tls_keys according to uncrustify 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox The refactor accidently used a wrong code style template and ended up using 2 instead of 4 as indent. Signed-off-by: Arne Schwabe Acked-by: Antonio Quartulli --- src/openvpn/multi.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 4cf42440..97b7df16 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -2003,23 +2003,23 @@ cleanup: static bool multi_client_generate_tls_keys(struct context *c) { - struct frame *frame_fragment = NULL; + struct frame *frame_fragment = NULL; #ifdef ENABLE_FRAGMENT - if (c->options.ce.fragment) + if (c->options.ce.fragment) { - frame_fragment = &c->c2.frame_fragment; + frame_fragment = &c->c2.frame_fragment; } #endif - struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE]; - if (!tls_session_update_crypto_params(session, &c->options, - &c->c2.frame, frame_fragment)) + struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE]; + if (!tls_session_update_crypto_params(session, &c->options, + &c->c2.frame, frame_fragment)) { - msg(D_TLS_ERRORS, "TLS Error: initializing data channel failed"); - register_signal(c, SIGUSR1, "process-push-msg-failed"); - return false; + msg(D_TLS_ERRORS, "TLS Error: initializing data channel failed"); + register_signal(c, SIGUSR1, "process-push-msg-failed"); + return false; } - return true; + return true; } static void