From patchwork Wed Jul 18 04:27:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 419 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id PYyjFtROT1sfVAAAIUCqbw for ; Wed, 18 Jul 2018 10:29:40 -0400 Received: from proxy20.mail.iad3b.rsapps.net ([172.31.255.6]) by director12.mail.ord1d.rsapps.net (Dovecot) with LMTP id e28bJdROT1vrDgAAIasKDg ; Wed, 18 Jul 2018 10:29:40 -0400 Received: from smtp4.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy20.mail.iad3b.rsapps.net with LMTP id oLpKI9ROT1vsNgAAcDxLoQ ; Wed, 18 Jul 2018 10:29:40 -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.iad3b.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=fox-it.com X-Suspicious-Flag: YES X-Classification-ID: 00ecb876-8a97-11e8-9c95-525400789c6c-1-1 Received: from [216.105.38.7] ([216.105.38.7:38962] helo=lists.sourceforge.net) by smtp4.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id BF/C8-13784-4DE4F4B5; Wed, 18 Jul 2018 10:29:40 -0400 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.90_1) (envelope-from ) id 1ffnRW-0006Qs-8J; Wed, 18 Jul 2018 14:28:38 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ffnRU-0006Qm-Th for openvpn-devel@lists.sourceforge.net; Wed, 18 Jul 2018 14:28:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Sender:Reply-To:Content-Transfer-Encoding: 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=BQhnNLtBLG5+6gSHaR5lzM4GEMoez+KEvoW6LQISJzs=; b=doxTe2yYf6XWXBsyFDebvl/8vR AbKzamKCzJQBdg7guQ8BPIDq+uveBR0pj6VgGuzAsk12k++T+SgvPKVy1nuvEQHMXfTcgL+kgDoi0 oZ5hvwe0G/G627i3lsbe3rDNtYBRl+0GS7CxmvyQQ7chyt6pgebs4LHWR3O3dbo2HFvA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject: CC:To:From:Sender:Reply-To:Content-Transfer-Encoding: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=BQhnNLtBLG5+6gSHaR5lzM4GEMoez+KEvoW6LQISJzs=; b=cru8CpX6VLCAwK1lH+9VnRSKIS y3Bc/M98a4AEDASiYl5mnHKPT5dJo9G+qU/ObCcBkiNaPMzZFFV5bc4myF2GCfQAGXfAsK17hnvDM FC1Wtag1CqGiPZ7fTg9oYSJ05VOWfSpGpprqEJ0rDZRHs3uzVkesoNouiVJWpe/w7xYg=; Received: from ns2.fox-it.com ([178.250.144.131]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1:ECDHE-RSA-AES256-SHA:256) (Exim 4.90_1) id 1ffnRT-00CMBn-Fq for openvpn-devel@lists.sourceforge.net; Wed, 18 Jul 2018 14:28:36 +0000 Received: from FOXDFT52.FOX.local (unknown [10.0.0.129]) by ns2.fox-it.com (Postfix) with ESMTPS id AE0811AF64E for ; Wed, 18 Jul 2018 16:28:28 +0200 (CEST) Received: from steffan-fox.fox.local (10.0.3.178) by FOXDFT52.FOX.local (10.0.0.129) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Wed, 18 Jul 2018 16:28:28 +0200 From: Steffan Karger To: Date: Wed, 18 Jul 2018 16:27:51 +0200 Message-ID: <1531924073-29243-2-git-send-email-steffan.karger@fox-it.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531924073-29243-1-git-send-email-steffan.karger@fox-it.com> References: <1531924073-29243-1-git-send-email-steffan.karger@fox-it.com> MIME-Version: 1.0 X-ClientProxiedBy: FOXDFT52.FOX.local (10.0.0.129) To FOXDFT52.FOX.local (10.0.0.129) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1ffnRT-00CMBn-Fq Subject: [Openvpn-devel] [PATCH 1/3] Minor reliability layer documentation fixes 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: , Cc: Gert van Dijk Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Gert van Dijk Signed-off-by: Steffan Karger Acked-by: Gert Doering --- doc/doxygen/doc_protocol_overview.h | 2 +- src/openvpn/ssl.c | 4 ++-- src/openvpn/ssl.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/doxygen/doc_protocol_overview.h b/doc/doxygen/doc_protocol_overview.h index db24d3b..3f48b18 100644 --- a/doc/doxygen/doc_protocol_overview.h +++ b/doc/doxygen/doc_protocol_overview.h @@ -134,7 +134,7 @@ * without wasting resources on attempting a TLS handshake which will * ultimately fail. * - * @subsection network_protocol_control_key_methods Control channel key methods and + * @subsection network_protocol_control_key_methods Control channel key methods * * Once the TLS session has been initialized and authenticated, the TLS * channel is used to exchange random %key material for bidirectional diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 669f941..dcb5445 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -3660,8 +3660,8 @@ tls_pre_decrypt(struct tls_multi *multi, } /* - * We have an authenticated packet (if --tls-auth was set). - * Now pass to our reliability level which deals with + * We have an authenticated control channel packet (if --tls-auth was set). + * Now pass to our reliability layer which deals with * packet acknowledgements, retransmits, sequencing, etc. */ { diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h index a2501c9..72227d9 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -76,7 +76,7 @@ /* * Define number of buffers for send and receive in the reliability layer. */ -#define TLS_RELIABLE_N_SEND_BUFFERS 4 /* also window size for reliablity layer */ +#define TLS_RELIABLE_N_SEND_BUFFERS 4 /* also window size for reliability layer */ #define TLS_RELIABLE_N_REC_BUFFERS 8 /*