Attachment 944 Details for Bug 1064 – Patch against openssh-4.1p1 to improve ssh-keygen -t error message

[patch] Patch against openssh-4.1p1 to improve ssh-keygen -t error message

diff (text/plain), 1.25 KB, created by Ed Avis on 2005-07-31 21:41:26 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Avis

Created: 2005-07-31 21:41:26 AEST

Size: 1.25 KB

patch

obsolete

>diff -ru openssh-4.1p1/key.c openssh-4.1p1-new/key.c
>--- openssh-4.1p1/key.c	2004-11-05 09:42:29.000000000 +0000
>+++ openssh-4.1p1-new/key.c	2005-07-30 18:02:52.026486712 +0100
>@@ -655,6 +655,8 @@
> 	return KEY_UNSPEC;
> }
> 
>+const char *known_key_names = "rsa1, rsa, dsa, ssh-rsa, ssh-dss";
>+
> int
> key_names_valid2(const char *names)
> {
>diff -ru openssh-4.1p1/key.h openssh-4.1p1-new/key.h
>--- openssh-4.1p1/key.h	2003-11-17 10:18:23.000000000 +0000
>+++ openssh-4.1p1-new/key.h	2005-07-30 18:03:25.611381032 +0100
>@@ -70,6 +70,7 @@
> Key	*key_generate(int, u_int);
> Key	*key_from_private(const Key *);
> int	 key_type_from_name(char *);
>+const char *known_key_names;
> 
> Key		*key_from_blob(const u_char *, u_int);
> int		 key_to_blob(const Key *, u_char **, u_int *);
>diff -ru openssh-4.1p1/ssh-keygen.c openssh-4.1p1-new/ssh-keygen.c
>--- openssh-4.1p1/ssh-keygen.c	2005-03-14 12:09:19.000000000 +0000
>+++ openssh-4.1p1-new/ssh-keygen.c	2005-07-30 18:04:36.964533704 +0100
>@@ -1230,7 +1230,10 @@
> 	}
> 	type = key_type_from_name(key_type_name);
> 	if (type == KEY_UNSPEC) {
>-		fprintf(stderr, "unknown key type %s\n", key_type_name);
>+		fprintf(stderr,
>+			"unknown key type %s\n"
>+			"known key types are: %s\n",
>+			key_type_name, known_key_names);
> 		exit(1);
> 	}
> 	if (!quiet)

Actions: View | Diff

Attachments on bug 1064: 944 | 1017