RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2002/01/04 18:14:16 

[servconf.c sshd.8]
     protocol 2 HostKey code default is now /etc/ssh_host_rsa_key and
     /etc/ssh_host_dsa_key like we have in sshd_config.  ok markus@
This commit is contained in:
Damien Miller 2002-01-22 23:19:11 +11:00
parent f51b0e1a30
commit 7fc2373f17
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -88,6 +88,10 @@
- stevesk@cvs.openbsd.org 2002/01/04 17:59:17 - stevesk@cvs.openbsd.org 2002/01/04 17:59:17
[readconf.c servconf.c] [readconf.c servconf.c]
remove #ifdef _PATH_XAUTH/#endif; ok markus@ remove #ifdef _PATH_XAUTH/#endif; ok markus@
- stevesk@cvs.openbsd.org 2002/01/04 18:14:16
[servconf.c sshd.8]
protocol 2 HostKey code default is now /etc/ssh_host_rsa_key and
/etc/ssh_host_dsa_key like we have in sshd_config. ok markus@
20020121 20020121
@ -7236,4 +7240,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1748 2002/01/22 12:18:49 djm Exp $ $Id: ChangeLog,v 1.1749 2002/01/22 12:19:11 djm Exp $

13
servconf.c
View File

@ -10,7 +10,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: servconf.c,v 1.96 2002/01/04 17:59:17 stevesk Exp $"); RCSID("$OpenBSD: servconf.c,v 1.97 2002/01/04 18:14:16 stevesk Exp $");
#if defined(KRB4) || defined(KRB5) #if defined(KRB4) || defined(KRB5)
#include <krb.h> #include <krb.h>
@ -124,9 +124,14 @@ fill_default_server_options(ServerOptions *options)
if (options->num_host_key_files == 0) { if (options->num_host_key_files == 0) {
/* fill default hostkeys for protocols */ /* fill default hostkeys for protocols */
if (options->protocol & SSH_PROTO_1) if (options->protocol & SSH_PROTO_1)
options->host_key_files[options->num_host_key_files++] = _PATH_HOST_KEY_FILE; options->host_key_files[options->num_host_key_files++] =
if (options->protocol & SSH_PROTO_2) _PATH_HOST_KEY_FILE;
options->host_key_files[options->num_host_key_files++] = _PATH_HOST_DSA_KEY_FILE; if (options->protocol & SSH_PROTO_2) {
options->host_key_files[options->num_host_key_files++] =
_PATH_HOST_RSA_KEY_FILE;
options->host_key_files[options->num_host_key_files++] =
_PATH_HOST_DSA_KEY_FILE;
}
} }
if (options->num_ports == 0) if (options->num_ports == 0)
options->ports[options->num_ports++] = SSH_DEFAULT_PORT; options->ports[options->num_ports++] = SSH_DEFAULT_PORT;

26
sshd.8
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd.8,v 1.159 2001/12/28 22:37:48 stevesk Exp $ .\" $OpenBSD: sshd.8,v 1.160 2002/01/04 18:14:16 stevesk Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSHD 8 .Dt SSHD 8
.Os .Os
@ -208,12 +208,18 @@ If the client fails to authenticate the user within
this many seconds, the server disconnects and exits. this many seconds, the server disconnects and exits.
A value of zero indicates no limit. A value of zero indicates no limit.
.It Fl h Ar host_key_file .It Fl h Ar host_key_file
Specifies the file from which the host key is read (default Specifies a file from which a host key is read.
.Pa /etc/ssh_host_key ) .
This option must be given if This option must be given if
.Nm .Nm
is not run as root (as the normal is not run as root (as the normal
host file is normally not readable by anyone but root). host key files are normally not readable by anyone but root).
The default is
.Pa /etc/ssh_host_key
for protocol version 1, and
.Pa /etc/ssh_host_rsa_key
and
.Pa /etc/ssh_host_dsa_key
for protocol version 2.
It is possible to have multiple host key files for It is possible to have multiple host key files for
the different protocol versions and host key algorithms. the different protocol versions and host key algorithms.
.It Fl i .It Fl i
@ -475,9 +481,15 @@ and applies to protocol version 2 only.
The default is The default is
.Dq no . .Dq no .
.It Cm HostKey .It Cm HostKey
Specifies the file containing the private host keys (default Specifies a file containing a private host key
.Pa /etc/ssh_host_key ) used by SSH.
used by SSH protocol versions 1 and 2. The default is
.Pa /etc/ssh_host_key
for protocol version 1, and
.Pa /etc/ssh_host_rsa_key
and
.Pa /etc/ssh_host_dsa_key
for protocol version 2.
Note that Note that
.Nm .Nm
will refuse to use a file if it is group/world-accessible. will refuse to use a file if it is group/world-accessible.