From owner-svn-src-head@freebsd.org Sat Jul 28 19:35:50 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07D3D105BA72; Sat, 28 Jul 2018 19:35:50 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B26937C6A1; Sat, 28 Jul 2018 19:35:49 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F5CD30CA; Sat, 28 Jul 2018 19:35:49 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SJZnRH005834; Sat, 28 Jul 2018 19:35:49 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SJZn9G005833; Sat, 28 Jul 2018 19:35:49 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201807281935.w6SJZn9G005833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Sat, 28 Jul 2018 19:35:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336836 - head/release/tools X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/release/tools X-SVN-Commit-Revision: 336836 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 19:35:50 -0000 Author: cem Date: Sat Jul 28 19:35:49 2018 New Revision: 336836 URL: https://svnweb.freebsd.org/changeset/base/336836 Log: Remove insecure ciphers from GCE sshd configuration They were added for unclear reasons in r277263. The current OpenSSH defaults (7.5+) are reasonable, and do not include the insecure rc4 cipher: chacha20-poly1305@openssh.com, aes128-ctr,aes192-ctr,aes256-ctr, aes128-gcm@openssh.com,aes256-gcm@openssh.com, aes128-cbc,aes192-cbc,aes256-cbc I think I recall there being a reason for a specific list of ciphers on GCE at the time, but I do not recall what it was, and cannot find any current GCE documentation of such a list. So, just revert the explicit configuration and use sane openssh defaults. PR: 230092 Submitted by: Gustavo Scalet MFC after: 3 days Security: yes Modified: head/release/tools/gce.conf Modified: head/release/tools/gce.conf ============================================================================== --- head/release/tools/gce.conf Sat Jul 28 19:08:00 2018 (r336835) +++ head/release/tools/gce.conf Sat Jul 28 19:35:49 2018 (r336836) @@ -66,7 +66,6 @@ EOF ChallengeResponseAuthentication no X11Forwarding no AcceptEnv LANG -Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc AllowAgentForwarding no ClientAliveInterval 420 EOF