Attachment #944 for bug #1064

Lines 655-660 Link Here

(-)openssh-4.1p1/key.c (+2 lines)
655	return KEY_UNSPEC;	655	return KEY_UNSPEC;
656	}	656	}
657		657
		658	const char *known_key_names = "rsa1, rsa, dsa, ssh-rsa, ssh-dss";
		659
658	int	660	int
659	key_names_valid2(const char *names)	661	key_names_valid2(const char *names)
660	{	662	{

Lines 70-75 Link Here

(-)openssh-4.1p1/key.h (+1 lines)
70	Key *key_generate(int, u_int);	70	Key *key_generate(int, u_int);
71	Key key_from_private(const Key );	71	Key key_from_private(const Key );
72	int key_type_from_name(char *);	72	int key_type_from_name(char *);
		73	const char *known_key_names;
73		74
74	Key key_from_blob(const u_char , u_int);	75	Key key_from_blob(const u_char , u_int);
75	int key_to_blob(const Key , u_char , u_int );	76	int key_to_blob(const Key , u_char , u_int );

Lines 1230-1236 Link Here

(-)openssh-4.1p1/ssh-keygen.c (-1 / +4 lines)
1230	}	1230	}
1231	type = key_type_from_name(key_type_name);	1231	type = key_type_from_name(key_type_name);
1232	if (type == KEY_UNSPEC) {	1232	if (type == KEY_UNSPEC) {
1233	fprintf(stderr, "unknown key type %s\n", key_type_name);	1233	fprintf(stderr,
		1234	"unknown key type %s\n"
		1235	"known key types are: %s\n",
		1236	key_type_name, known_key_names);
1234	exit(1);	1237	exit(1);
1235	}	1238	}
1236	if (!quiet)	1239	if (!quiet)

Return to bug 1064