View | Details | Raw Unified | Return to bug 2686 | Differences between
and this patch

Collapse All | Expand All

(-)a/sshd.c (-3 / +4 lines)
Lines 689-695 list_hostkey_types(void) Link Here
689
{
689
{
690
	Buffer b;
690
	Buffer b;
691
	const char *p;
691
	const char *p;
692
	char *ret;
692
	char *ret, *keystr;
693
	int i;
693
	int i;
694
	Key *key;
694
	Key *key;
695
695
Lines 701-710 list_hostkey_types(void) Link Here
701
		if (key == NULL)
701
		if (key == NULL)
702
			continue;
702
			continue;
703
		/* Check that the key is accepted in HostkeyAlgorithms */
703
		/* Check that the key is accepted in HostkeyAlgorithms */
704
		if (match_pattern_list(sshkey_ssh_name(key),
704
		keystr = sshkey_ssh_name(key);
705
		if (keystr == NULL || match_pattern_list(keystr,
705
		    options.hostkeyalgorithms, 0) != 1) {
706
		    options.hostkeyalgorithms, 0) != 1) {
706
			debug3("%s: %s key not permitted by HostkeyAlgorithms",
707
			debug3("%s: %s key not permitted by HostkeyAlgorithms",
707
			    __func__, sshkey_ssh_name(key));
708
			    __func__, keystr ? keystr : "rsa1");
708
			continue;
709
			continue;
709
		}
710
		}
710
		switch (key->type) {
711
		switch (key->type) {

Return to bug 2686