diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/servconf.c | 11 | ||||
| -rw-r--r-- | usr.bin/ssh/servconf.h | 3 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.h | 10 |
4 files changed, 8 insertions, 22 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 4e002a9a869..4605c423bf8 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -12,7 +12,7 @@ Created: Mon Aug 21 15:48:58 1995 ylo */ #include "includes.h" -RCSID("$Id: servconf.c,v 1.6 1999/09/30 05:11:29 deraadt Exp $"); +RCSID("$Id: servconf.c,v 1.7 1999/10/01 02:38:09 provos Exp $"); #include "ssh.h" #include "servconf.h" @@ -26,7 +26,6 @@ void initialize_server_options(ServerOptions *options) options->port = -1; options->listen_addr.s_addr = htonl(INADDR_ANY); options->host_key_file = NULL; - options->random_seed_file = NULL; options->server_key_bits = -1; options->login_grace_time = -1; options->key_regeneration_time = -1; @@ -73,8 +72,6 @@ void fill_default_server_options(ServerOptions *options) } if (options->host_key_file == NULL) options->host_key_file = HOST_KEY_FILE; - if (options->random_seed_file == NULL) - options->random_seed_file = SSH_DAEMON_SEED_FILE; if (options->server_key_bits == -1) options->server_key_bits = 768; if (options->login_grace_time == -1) @@ -314,8 +311,10 @@ void read_server_config(ServerOptions *options, const char *filename) break; case sRandomSeedFile: - charptr = &options->random_seed_file; - goto parse_pathname; + fprintf(stderr, "%s line %d: option is obsolete.\n", + filename, linenum); + cp = strtok(NULL, WHITESPACE); + break; case sPermitRootLogin: intptr = &options->permit_root_login; diff --git a/usr.bin/ssh/servconf.h b/usr.bin/ssh/servconf.h index 71d9be8832e..d87b83c965d 100644 --- a/usr.bin/ssh/servconf.h +++ b/usr.bin/ssh/servconf.h @@ -13,7 +13,7 @@ Definitions for server configuration data and for the functions reading it. */ -/* RCSID("$Id: servconf.h,v 1.3 1999/09/29 18:16:20 dugsong Exp $"); */ +/* RCSID("$Id: servconf.h,v 1.4 1999/10/01 02:38:09 provos Exp $"); */ #ifndef SERVCONF_H #define SERVCONF_H @@ -26,7 +26,6 @@ typedef struct int port; /* Port number to listen on. */ struct in_addr listen_addr; /* Address on which the server listens. */ char *host_key_file; /* File containing host key. */ - char *random_seed_file; /* File containing random seed. */ int server_key_bits; /* Size of the server key. */ int login_grace_time; /* Disconnect if no auth in this time (sec). */ int key_regeneration_time; /* Server key lifetime (seconds). */ diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 995e7ffe168..4e60db7ced0 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/ssh-keygen.c @@ -14,7 +14,7 @@ Identity and host key generation and maintenance. */ #include "includes.h" -RCSID("$Id: ssh-keygen.c,v 1.5 1999/09/29 21:14:16 deraadt Exp $"); +RCSID("$Id: ssh-keygen.c,v 1.6 1999/10/01 02:38:09 provos Exp $"); #include "rsa.h" #include "ssh.h" @@ -409,10 +409,6 @@ main(int ac, char **av) if (change_comment) do_change_comment(pw); - /* Initialize random number generator. This may take a while if the - user has no seed file, so display a message to the user. */ - if (!quiet) - printf("Initializing random number generator...\n"); arc4random_stir(); if (quiet) diff --git a/usr.bin/ssh/ssh.h b/usr.bin/ssh/ssh.h index 95f95a74732..05812fc2761 100644 --- a/usr.bin/ssh/ssh.h +++ b/usr.bin/ssh/ssh.h @@ -13,7 +13,7 @@ Generic header file for ssh. */ -/* RCSID("$Id: ssh.h,v 1.4 1999/09/29 18:16:21 dugsong Exp $"); */ +/* RCSID("$Id: ssh.h,v 1.5 1999/10/01 02:38:10 provos Exp $"); */ #ifndef SSH_H #define SSH_H @@ -70,10 +70,6 @@ only by root, whereas ssh_config should be world-readable. */ #define SSH_PROGRAM "/usr/bin/ssh" -/* Random seed file for the daemon. This file should be readable only by - root. */ -#define SSH_DAEMON_SEED_FILE ETCDIR "/ssh_random_seed" - /* The process id of the daemon listening for connections is saved here to make it easier to kill the correct daemon when necessary. */ #define SSH_DAEMON_PID_FILE PIDDIR "/sshd.pid" @@ -87,10 +83,6 @@ only by root, whereas ssh_config should be world-readable. */ not contain anything particularly secret. */ #define SSH_USER_HOSTFILE "~/.ssh/known_hosts" -/* Name of the file containing client-side random seed. This file should - only be readable by the user him/herself. */ -#define SSH_CLIENT_SEEDFILE ".ssh/random_seed" - /* Name of the default file containing client-side authentication key. This file should only be readable by the user him/herself. */ #define SSH_CLIENT_IDENTITY ".ssh/identity" |