summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2024-12-05 23:45:03 +0100
committerDarren Tucker <dtucker@dtucker.net>2024-12-06 10:19:27 +0100
commit8252f346eb21cd6b30816f905b7d94f10962373e (patch)
tree6947735c8528032ce6d57dfa7f153b017e000fd4
parentChange text from "login to" to "log in to". (diff)
downloadopenssh-8252f346eb21cd6b30816f905b7d94f10962373e.tar.xz
openssh-8252f346eb21cd6b30816f905b7d94f10962373e.zip
upstream: catch up documentation: AES-GCM is preferred to AES-CTR
OpenBSD-Commit-ID: 63360924b6834507fe70020edb936f5075043a9e
-rw-r--r--ssh_config.58
-rw-r--r--sshd_config.58
2 files changed, 8 insertions, 8 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 2793a955a..fed1a5caa 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.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 baca8f25c..ab71970b9 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.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