diff options
| author | job@openbsd.org <job@openbsd.org> | 2023-09-04 12:29:58 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-09-07 01:53:59 +0200 |
| commit | e1c284d60a928bcdd60bc575c6f9604663502770 (patch) | |
| tree | e7a2b0b54b306cb5317569e91af3c0bc5b12fc6f /ssh-keygen.c | |
| parent | upstream: trigger keystroke timing obfucation only if the channels (diff) | |
| download | openssh-e1c284d60a928bcdd60bc575c6f9604663502770.tar.xz openssh-e1c284d60a928bcdd60bc575c6f9604663502770.zip | |
upstream: Generate Ed25519 keys when invoked without arguments
Ed25519 public keys are very convenient due to their small size.
OpenSSH has supported Ed25519 since version 6.5 (January 2014).
OK djm@ markus@ sthen@ deraadt@
OpenBSD-Commit-ID: f498beaad19c8cdcc357381a60df4a9c69858b3f
Diffstat (limited to 'ssh-keygen.c')
| -rw-r--r-- | ssh-keygen.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 9ccea624c..5b945a849 100644 --- a/ssh-keygen.c +++ b/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 <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, 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: |