Attachment 2606 Details for Bug 2388 – make ed25519 default ssh-keygen type when no SSL

[patch] make ed25519 default ssh-keygen type when no SSL

0004-ssh-keygen.c-man-ed25519-default-without-openssl.patch (text/plain), 976 bytes, created by Reuben Hawkins on 2015-04-25 08:15:04 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Reuben Hawkins

Created: 2015-04-25 08:15:04 AEST

Size: 976 bytes

patch

obsolete

>From 318f1b673908d423f44ee50792f344098f37bd84 Mon Sep 17 00:00:00 2001
>From: Reuben Hawkins <reubenhwk@gmail.com>
>Date: Wed, 22 Apr 2015 20:42:51 -0700
>Subject: [PATCH 4/4] ssh-keygen.c: man ed25519 default without openssl
>
>The default key type was hardcoded to rsa, which isn't available
>in without-openssl builds.  This change makes the default ed25519
>when openssl is disabled.
>
>Signed-off-by: Reuben Hawkins <reubenhwk@gmail.com>
>---
> ssh-keygen.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/ssh-keygen.c b/ssh-keygen.c
>index c993736..d50dd11 100644
>--- a/ssh-keygen.c
>+++ b/ssh-keygen.c
>@@ -2625,8 +2625,13 @@ main(int argc, char **argv)
> 		return (0);
> 	}
> 
>-	if (key_type_name == NULL)
>+	if (key_type_name == NULL) {
>+#ifdef WITH_OPENSSL
> 		key_type_name = "rsa";
>+#else
>+		key_type_name = "ed25519";
>+#endif /* WITH_OPENSSL */
>+	}
> 
> 	type = sshkey_type_from_name(key_type_name);
> 	type_bits_valid(type, key_type_name, &bits);
>-- 
>2.3.0
>

Actions: View | Diff

Attachments on bug 2388: 2599 | 2603 | 2604 | 2605 | 2606 | 2633 | 2634