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

Collapse All | Expand All

(-)sshd.c (+9 lines)
Lines 1551-1556 main(int ac, char **av) Link Here
1551
			continue;
1551
			continue;
1552
		key = key_load_private(options.host_key_files[i], "", NULL);
1552
		key = key_load_private(options.host_key_files[i], "", NULL);
1553
		pubkey = key_load_public(options.host_key_files[i], NULL);
1553
		pubkey = key_load_public(options.host_key_files[i], NULL);
1554
1555
		if ((pubkey != NULL && pubkey->type == KEY_RSA1) ||
1556
		    (key != NULL && key->type == KEY_RSA1)) {
1557
			verbose("Ignoring RSA1 key %s",
1558
			    options.host_key_files[i])
1559
			key_free(key);
1560
			key_free(pubkey);
1561
			continue;
1562
		}
1554
		if (pubkey == NULL && key != NULL)
1563
		if (pubkey == NULL && key != NULL)
1555
			pubkey = key_demote(key);
1564
			pubkey = key_demote(key);
1556
		sensitive_data.host_keys[i] = key;
1565
		sensitive_data.host_keys[i] = key;

Return to bug 2686