From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 24 Jun 2022 04:27:14 +0000 (+0000)
Subject: upstream: make it clear that RekeyLimit applies to both transmitted
X-Git-Tag: V_9_1_P1~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=455cee8d6c2e4c48c5af9faead3599c49948411e;p=thirdparty%2Fopenssh-portable.git

upstream: make it clear that RekeyLimit applies to both transmitted

and received data. GHPR#328 from Jan Pazdziora

OpenBSD-Commit-ID: d180a905fec9ff418a75c07bb96ea41c9308c3f9
---

diff --git a/ssh_config.5 b/ssh_config.5
index 052cc5c15..24a464600 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.372 2022/05/27 04:13:24 dtucker Exp $
-.Dd $Mdocdate: May 27 2022 $
+.\" $OpenBSD: ssh_config.5,v 1.373 2022/06/24 04:27:14 djm Exp $
+.Dd $Mdocdate: June 24 2022 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1532,9 +1532,9 @@ extension required for restricted
 .Xr ssh-agent 1
 forwarding.
 .It Cm RekeyLimit
-Specifies the maximum amount of data that may be transmitted before the
-session key is renegotiated, optionally followed by a maximum amount of
-time that may pass before the session key is renegotiated.
+Specifies the maximum amount of data that may be transmitted or received
+before the session key is renegotiated, optionally followed by a maximum
+amount of time that may pass before the session key is renegotiated.
 The first argument is specified in bytes and may have a suffix of
 .Sq K ,
 .Sq M ,
diff --git a/sshd_config.5 b/sshd_config.5
index e33aedebb..867a747d6 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.341 2022/04/12 05:09:49 dtucker Exp $
-.Dd $Mdocdate: April 12 2022 $
+.\" $OpenBSD: sshd_config.5,v 1.342 2022/06/24 04:27:14 djm Exp $
+.Dd $Mdocdate: June 24 2022 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -1572,9 +1572,9 @@ Specifies whether public key authentication is allowed.
 The default is
 .Cm yes .
 .It Cm RekeyLimit
-Specifies the maximum amount of data that may be transmitted before the
-session key is renegotiated, optionally followed by a maximum amount of
-time that may pass before the session key is renegotiated.
+Specifies the maximum amount of data that may be transmitted or received
+before the session key is renegotiated, optionally followed by a maximum
+amount of time that may pass before the session key is renegotiated.
 The first argument is specified in bytes and may have a suffix of
 .Sq K ,
 .Sq M ,