upstream commit

make ssh-keygen default to ed25519 keys when compiled
 without OpenSSL; bz#2388, ok dtucker@

Upstream-ID: 85a471fa6d3fa57a7b8e882d22cfbfc1d84cdc71

1 files changed, 8 insertions, 2 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 3c2bd964a..ff1d31b91 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.272 2015/05/21 12:01:19 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.273 2015/05/28 04:40:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -58,6 +58,12 @@
 #include "krl.h"
 #include "digest.h"
 
+#ifdef WITH_OPENSSL
+# define DEFAULT_KEY_TYPE_NAME "rsa"
+#else
+# define DEFAULT_KEY_TYPE_NAME "ed25519"
+#endif
+
 /* Number of bits in the RSA/DSA key.  This value can be set on the command line. */
 #define DEFAULT_BITS            2048
 #define DEFAULT_BITS_DSA        1024
@@ -2580,7 +2586,7 @@ main(int argc, char **argv)
         }
 
         if (key_type_name == NULL)
-                key_type_name = "rsa";
+                key_type_name = DEFAULT_KEY_TYPE_NAME;
 
         type = sshkey_type_from_name(key_type_name);
         type_bits_valid(type, key_type_name, &bits);