Attachment #2930 for bug #2662

View | Details | Raw Unified | Return to bug 2662
Collapse All | Expand All

Lines 201-208 fill_default_server_options(ServerOptions *options) Link Here

(-)a/servconf.c (-2 lines)
201	/* fill default hostkeys for protocols */	201	/* fill default hostkeys for protocols */
202	options->host_key_files[options->num_host_key_files++] =	202	options->host_key_files[options->num_host_key_files++] =
203	_PATH_HOST_RSA_KEY_FILE;	203	_PATH_HOST_RSA_KEY_FILE;
204	options->host_key_files[options->num_host_key_files++] =
205	_PATH_HOST_DSA_KEY_FILE;
206	#ifdef OPENSSL_HAS_ECC	204	#ifdef OPENSSL_HAS_ECC
207	options->host_key_files[options->num_host_key_files++] =	205	options->host_key_files[options->num_host_key_files++] =
208	_PATH_HOST_ECDSA_KEY_FILE;	206	_PATH_HOST_ECDSA_KEY_FILE;

Lines 164-174 This option must be given if Link Here

(-)a/sshd.8 (-4 / +3 lines)
164	is not run as root (as the normal	164	is not run as root (as the normal
165	host key files are normally not readable by anyone but root).	165	host key files are normally not readable by anyone but root).
166	The default is	166	The default is
167	.Pa /etc/ssh/ssh_host_dsa_key ,	167	.Pa /etc/ssh/ssh_host_rsa_key ,
168	.Pa /etc/ssh/ssh_host_ecdsa_key ,	168	.Pa /etc/ssh/ssh_host_ecdsa_key
169	.Pa /etc/ssh/ssh_host_ed25519_key
170	and	169	and
171	.Pa /etc/ssh/ssh_host_rsa_key .	170	.Pa /etc/ssh/ssh_host_ed25519_key .
172	It is possible to have multiple host key files for	171	It is possible to have multiple host key files for
173	the different host key algorithms.	172	the different host key algorithms.
174	.It Fl i	173	.It Fl i

Lines 16-22 Link Here

(-)a/sshd_config (-1 lines)
16	#ListenAddress ::	16	#ListenAddress ::
17		17
18	#HostKey /etc/ssh/ssh_host_rsa_key	18	#HostKey /etc/ssh/ssh_host_rsa_key
19	#HostKey /etc/ssh/ssh_host_dsa_key
20	#HostKey /etc/ssh/ssh_host_ecdsa_key	19	#HostKey /etc/ssh/ssh_host_ecdsa_key
21	#HostKey /etc/ssh/ssh_host_ed25519_key	20	#HostKey /etc/ssh/ssh_host_ed25519_key
22		21




Specifies a file containing a private host key
used by SSH.
The defaults are
.Pa /etc/ssh/ssh_host_rsa_key ,
.Pa /etc/ssh/ssh_host_ecdsa_key
.Pa /etc/ssh/ssh_host_ed25519_key
and
.Pa /etc/ssh/ssh_host_ed25519_key .
.Pp
Note that
.Xr sshd 8
- 

Return to bug 2662

Lines 697-707 is not to load any certificates. Link Here

(-)a/sshd_config.5 (-5 / +3 lines)
697	Specifies a file containing a private host key	697	Specifies a file containing a private host key
698	used by SSH.	698	used by SSH.
699	The defaults are	699	The defaults are
700	.Pa /etc/ssh/ssh_host_dsa_key ,	700	.Pa /etc/ssh/ssh_host_rsa_key ,
701	.Pa /etc/ssh/ssh_host_ecdsa_key ,	701	.Pa /etc/ssh/ssh_host_ecdsa_key
702	.Pa /etc/ssh/ssh_host_ed25519_key
703	and	702	and
704	.Pa /etc/ssh/ssh_host_rsa_key .	703	.Pa /etc/ssh/ssh_host_ed25519_key .
705	.Pp	704	.Pp
706	Note that	705	Note that
707	.Xr sshd 8	706	.Xr sshd 8
708	-