upstream: catch up documentation: AES-GCM is preferred to AES-CTR

OpenBSD-Commit-ID: 63360924b6834507fe70020edb936f5075043a9e

diff --git a/ssh_config.5 b/ssh_config.5
index 2793a955a3481b19e6fe73d78328302ea0cdbbb9..fed1a5caab5a086c050004a19c065f37a423dab2 100644 (file)
--- 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.405 2024/10/25 21:53:24 naddy Exp $
-.Dd $Mdocdate: October 25 2024 $
+.\" $OpenBSD: ssh_config.5,v 1.406 2024/12/05 22:45:03 naddy Exp $
+.Dd $Mdocdate: December 5 2024 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -581,8 +581,8 @@ chacha20-poly1305@openssh.com
 The default is:
 .Bd -literal -offset indent
 chacha20-poly1305@openssh.com,
-aes128-ctr,aes192-ctr,aes256-ctr,
-aes128-gcm@openssh.com,aes256-gcm@openssh.com
+aes128-gcm@openssh.com,aes256-gcm@openssh.com,
+aes128-ctr,aes192-ctr,aes256-ctr
 .Ed
 .Pp
 The list of available ciphers may also be obtained using

diff --git a/sshd_config.5 b/sshd_config.5
index baca8f25c78c010635741c297e4b062d9d0aca69..ab71970b9c93d8653306e15d52ddf6afab8923d6 100644 (file)
--- 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.378 2024/10/25 21:53:24 naddy Exp $
-.Dd $Mdocdate: October 25 2024 $
+.\" $OpenBSD: sshd_config.5,v 1.379 2024/12/05 22:45:03 naddy Exp $
+.Dd $Mdocdate: December 5 2024 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -576,8 +576,8 @@ chacha20-poly1305@openssh.com
 The default is:
 .Bd -literal -offset indent
 chacha20-poly1305@openssh.com,
-aes128-ctr,aes192-ctr,aes256-ctr,
-aes128-gcm@openssh.com,aes256-gcm@openssh.com
+aes128-gcm@openssh.com,aes256-gcm@openssh.com,
+aes128-ctr,aes192-ctr,aes256-ctr
 .Ed
 .Pp
 The list of available ciphers may also be obtained using