summaryrefslogtreecommitdiff
path: root/ssh_config.0
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2015-08-22 10:59:58 +0100
committerColin Watson <cjwatson@debian.org>2015-08-22 10:59:58 +0100
commit651211fd4a199b299540c00c54a46e27fadb04be (patch)
tree26dbf99c8861a7f94d0c00be71b38869728ebd81 /ssh_config.0
parent58ddb8ad21f21f5358db0204c4ba9abf94a1ca11 (diff)
parente91346dc2bbf460246df2ab591b7613908c1b0ad (diff)
Import openssh_7.1p1.orig.tar.gz
Diffstat (limited to 'ssh_config.0')
-rw-r--r--ssh_config.04
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh_config.0 b/ssh_config.0
index 654807779..67133cd4d 100644
--- a/ssh_config.0
+++ b/ssh_config.0
@@ -205,9 +205,9 @@ DESCRIPTION
205 205
206 The default is: 206 The default is:
207 207
208 chacha20-poly1305@openssh.com,
208 aes128-ctr,aes192-ctr,aes256-ctr, 209 aes128-ctr,aes192-ctr,aes256-ctr,
209 aes128-gcm@openssh.com,aes256-gcm@openssh.com, 210 aes128-gcm@openssh.com,aes256-gcm@openssh.com,
210 chacha20-poly1305@openssh.com,
211 arcfour256,arcfour128, 211 arcfour256,arcfour128,
212 aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc, 212 aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,
213 aes192-cbc,aes256-cbc,arcfour 213 aes192-cbc,aes256-cbc,arcfour
@@ -1023,4 +1023,4 @@ AUTHORS
1023 created OpenSSH. Markus Friedl contributed the support for SSH protocol 1023 created OpenSSH. Markus Friedl contributed the support for SSH protocol
1024 versions 1.5 and 2.0. 1024 versions 1.5 and 2.0.
1025 1025
1026OpenBSD 5.8 July 30, 2015 OpenBSD 5.8 1026OpenBSD 5.8 August 14, 2015 OpenBSD 5.8