From nobody Thu Sep 7 17:36:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhRHC2L8Qz4sMQx; Thu, 7 Sep 2023 17:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhRHC1dFzz4R6g; Thu, 7 Sep 2023 17:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694108167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f6rk5CNgS7/9r5fcxGk4acRjRb7QVbNY/trcAVhyONU=; b=VWSG9uBORGY07Umi10GJVqEhEiVXaigptl7Pd+g/WvigFLOYvmpZ4fWH87C2d8qNPE+ik2 9jpphFdV19dRJxJcWGwsRQTAtsP+HevHiMX6Omo0gmgXK4G5wN34iF/v1a3xj4LWRyOc07 AhfmaXq+zo62dhlFWfwreC21HuWaD6FCXg1dgxz/JQIL5UIMoi6GITXB4Xt07f0DgTfcum dkX03MgmfrD7KZKZAQ+JvkLatWA6cxJYCEwKQX1HThSLudSnLprAiFxx7zKNJjudUZeYcU 2zUA/lga3UQF2nnfEnXcaCtp5YljTLeBoWyJmn0EJJubVq2L8YeUd+L3QdRNQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694108167; a=rsa-sha256; cv=none; b=DkUbw2q9TyAo4MCfPG1X4zd1N2Uj4VXrQCpL3I01XtXbUyfd0YkWkHOMYU/SrbhIkwqV71 O63w+2wu4Q2+S+D+25xYRGV4lGygIJoAp8RciB5AnCtLok1y6pOyv2QY4pD/mf9Dq9Fy54 cXChu5DtMnPclwO396ywGGOTSfJxTL3dxjx0neGWhwZwaBRvttfyK2zMYcc/5zDcmOOk5u DDP0IOe0htyuttlH7qjhe/G4+UrOBtEHiS2eFftVSEJpsaqYQgcHyNY4z6NvPlMUIaIS/L nVcI5vov7sju6pwEOURbFNNsmpWF8AgM9Q4rHHntzidgRWX4ZojDBHS+xf8WmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694108167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f6rk5CNgS7/9r5fcxGk4acRjRb7QVbNY/trcAVhyONU=; b=Exphp2Clf58OvGNc4LSdr2xtRPf1XdsYdvTE7VIWfUBPb/4cCJt73NVFUcArgDIYVDTCGj CZVWPFL2WAkXy2dEc4vO0NMEdILzDybFJnYtWPYXlrjZkeHTxiwtROgUAVN4sYbES00wi+ ccOmUxxs++2IRs8fvRJj9CfQIKJm9k7kcMhRdmWvP6IHXNEL3SuICHffAEjcuzAmyqLrFq i2Bwxie7oj/ThOx4/DNtwE95ksllT2SZi4aVA/VMKbZqnWd1KUUr65g6HAUeMZJV7JqLcl zyjZWx6IbTdg6O7vQEi+2A5N6KIZ1rlqNXBAoxwDoMvLbQguFVtmFJL6bynsKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RhRHC0P3Bz17pC; Thu, 7 Sep 2023 17:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387Ha6YF082118; Thu, 7 Sep 2023 17:36:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Ha6nw082115; Thu, 7 Sep 2023 17:36:06 GMT (envelope-from git) Date: Thu, 7 Sep 2023 17:36:06 GMT Message-Id: <202309071736.387Ha6nw082115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c9315099f69e - main - ssh-keygen: Generate Ed25519 keys when invoked without arguments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9315099f69ead6796ef48c2ac5435f8f93c0de7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c9315099f69ead6796ef48c2ac5435f8f93c0de7 commit c9315099f69ead6796ef48c2ac5435f8f93c0de7 Author: Ed Maste AuthorDate: 2023-09-07 16:32:39 +0000 Commit: Ed Maste CommitDate: 2023-09-07 17:34:21 +0000 ssh-keygen: Generate Ed25519 keys when invoked without arguments Ed25519 keys are convenient because they're much smaller, and the next OpenSSH release (9.5) will switch to them by default. Apply the change to FreeBSD main now, to help identify issues as early as possible. Reviewed by: kevans, karels, des Relnotes: Yes Obtained from: OpenBSD 9de458a24986 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41773 --- crypto/openssh/ssh-keygen.1 | 6 +++--- crypto/openssh/ssh-keygen.c | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/crypto/openssh/ssh-keygen.1 b/crypto/openssh/ssh-keygen.1 index c760f91be14f..c392141ea127 100644 --- a/crypto/openssh/ssh-keygen.1 +++ b/crypto/openssh/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.229 2023/07/23 20:04:45 naddy Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.230 2023/09/04 10:29:58 job Exp $ .\" .\" Author: Tatu Ylonen .\" Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -35,7 +35,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 23 2023 $ +.Dd $Mdocdate: September 4 2023 $ .Dt SSH-KEYGEN 1 .Os .Sh NAME @@ -185,7 +185,7 @@ The type of key to be generated is specified with the option. If invoked without any arguments, .Nm -will generate an RSA key. +will generate an Ed25519 key. .Pp .Nm is also used to generate groups for use in Diffie-Hellman group diff --git a/crypto/openssh/ssh-keygen.c b/crypto/openssh/ssh-keygen.c index 9ccea624cd90..5b945a849202 100644 --- a/crypto/openssh/ssh-keygen.c +++ b/crypto/openssh/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.470 2023/07/17 04:01:10 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.471 2023/09/04 10:29:58 job Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland @@ -67,11 +67,7 @@ #include "sk-api.h" /* XXX for SSH_SK_USER_PRESENCE_REQD; remove */ #include "cipher.h" -#ifdef WITH_OPENSSL -# define DEFAULT_KEY_TYPE_NAME "rsa" -#else -# define DEFAULT_KEY_TYPE_NAME "ed25519" -#endif +#define DEFAULT_KEY_TYPE_NAME "ed25519" /* * Default number of bits in the RSA, DSA and ECDSA keys. These value can be @@ -263,7 +259,7 @@ ask_filename(struct passwd *pw, const char *prompt) char *name = NULL; if (key_type_name == NULL) - name = _PATH_SSH_CLIENT_ID_RSA; + name = _PATH_SSH_CLIENT_ID_ED25519; else { switch (sshkey_type_from_name(key_type_name)) { case KEY_DSA_CERT: