From owner-svn-src-all@freebsd.org Thu Feb 4 23:28:05 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66C0AA9DF13; Thu, 4 Feb 2016 23:28:05 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 4EC49882; Thu, 4 Feb 2016 23:28:05 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 466DD13AB; Thu, 4 Feb 2016 23:28:05 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id EF9E519A65; Thu, 4 Feb 2016 23:28:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id CBe3EpcaXeQl; Thu, 4 Feb 2016 23:28:02 +0000 (UTC) Subject: Re: svn commit: r294560 - head/etc/rc.d DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com AF81D19A5E To: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201601221214.u0MCE8Jk054031@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <56B3DE8E.9020603@FreeBSD.org> Date: Thu, 4 Feb 2016 15:28:14 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <201601221214.u0MCE8Jk054031@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ngOBgO3mLCB2utkpMj8uWo1FHPUPSMnwr" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2016 23:28:05 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ngOBgO3mLCB2utkpMj8uWo1FHPUPSMnwr Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 1/22/2016 4:14 AM, Dag-Erling Sm=C3=B8rgrav wrote: > Author: des > Date: Fri Jan 22 12:14:08 2016 > New Revision: 294560 > URL: https://svnweb.freebsd.org/changeset/base/294560 >=20 > Log: > Do not generate RSA1 or DSA keys by default. >=20 > Modified: > head/etc/rc.d/sshd >=20 > Modified: head/etc/rc.d/sshd > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/etc/rc.d/sshd Fri Jan 22 12:00:56 2016 (r294559) > +++ head/etc/rc.d/sshd Fri Jan 22 12:14:08 2016 (r294560) > @@ -20,9 +20,9 @@ configtest_cmd=3D"sshd_configtest" > pidfile=3D"/var/run/${name}.pid" > extra_commands=3D"configtest keygen reload" > =20 > -: ${sshd_rsa1_enable:=3D"yes"} > +: ${sshd_rsa1_enable:=3D"no"} > : ${sshd_rsa_enable:=3D"yes"} > -: ${sshd_dsa_enable:=3D"yes"} > +: ${sshd_dsa_enable:=3D"no"} > : ${sshd_ecdsa_enable:=3D"yes"} > : ${sshd_ed25519_enable:=3D"yes"} > =20 >=20 I think perhaps you should also remove these as having default paths in the .c as well and require they be enabled in the config. Otherwise a warning is given: Feb 4 15:25:22 VM sshd[874]: error: Could not load host key: /etc/ssh/ssh_host_dsa_key Or always generate them but only load them if enabled in the config. --=20 Regards, Bryan Drewery --ngOBgO3mLCB2utkpMj8uWo1FHPUPSMnwr Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJWs96OAAoJEDXXcbtuRpfPppIIAMxrSe392ijRq6ZJRXSEop8w f/7gNluDLraY00TPLMAMUTzVZgMDel8UfOWGQbSHBOJcrv3q79B8tLL6VcS6fFkX r1RnIYZPpDgFgtOmsP0JwHJgKUTASK8fBvzJf5bnBUV9jkh6Lq/jWRWWsBeWy0Ls 8k4vtwC4wKaUL49RBfnUAdjmFhGz80y8lGYbWb3kvqvHpAwHvn9lrrFwK6cOGiBo N1GsfSTVf8871tGr0IxLsMKLJXfM+vV+OCT6zvmNko3mJPxKZgwd4fLZsXGANpD6 CaENz8NWOi1MWZFgAF/99gWTNCw0B79HYPJz3b1J6uMVr/WBUbMpxKMoih2Aqtk= =5Z6w -----END PGP SIGNATURE----- --ngOBgO3mLCB2utkpMj8uWo1FHPUPSMnwr--