summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-04-05 22:54:28 +0000
committerDamien Miller <djm@mindrot.org>2018-04-06 14:20:33 +1000
commit00c5222ddc0c8edcaa4ea45ac03befdc8013d137 (patch)
tree2094e61b0b5f97f88c568951aeba67ca1d2bc728
parent5ee8448ad7c306f05a9f56769f95336a8269f379 (diff)
upstream: We don't offer CBC cipher by default any more. Spotted by
Renaud Allard (via otto@) OpenBSD-Commit-ID: a559b1eef741557dd959ae378b665a2977d92dca
-rw-r--r--ssh_config.57
1 files changed, 3 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 010bca479..75a21b595 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.269 2018/04/04 15:12:17 job Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.270 2018/04/05 22:54:28 djm Exp $
37.Dd $Mdocdate: April 4 2018 $ 37.Dd $Mdocdate: April 5 2018 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -425,8 +425,7 @@ The default is:
425.Bd -literal -offset indent 425.Bd -literal -offset indent
426chacha20-poly1305@openssh.com, 426chacha20-poly1305@openssh.com,
427aes128-ctr,aes192-ctr,aes256-ctr, 427aes128-ctr,aes192-ctr,aes256-ctr,
428aes128-gcm@openssh.com,aes256-gcm@openssh.com, 428aes128-gcm@openssh.com,aes256-gcm@openssh.com
429aes128-cbc,aes192-cbc,aes256-cbc
430.Ed 429.Ed
431.Pp 430.Pp
432The list of available ciphers may also be obtained using 431The list of available ciphers may also be obtained using