diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd.c | 12 |
2 files changed, 10 insertions, 7 deletions
@@ -4,6 +4,9 @@ | |||
4 | [ssh-keygen.c] | 4 | [ssh-keygen.c] |
5 | create *.pub files with umask 0644, so that you can mv them to | 5 | create *.pub files with umask 0644, so that you can mv them to |
6 | authorized_keys | 6 | authorized_keys |
7 | - deraadt@cvs.openbsd.org 2001/03/09 12:30:29 | ||
8 | [sshd.c] | ||
9 | typo; slade@shore.net | ||
7 | 10 | ||
8 | 20010309 | 11 | 20010309 |
9 | - OpenBSD CVS Sync | 12 | - OpenBSD CVS Sync |
@@ -4464,4 +4467,4 @@ | |||
4464 | - Wrote replacements for strlcpy and mkdtemp | 4467 | - Wrote replacements for strlcpy and mkdtemp |
4465 | - Released 1.0pre1 | 4468 | - Released 1.0pre1 |
4466 | 4469 | ||
4467 | $Id: ChangeLog,v 1.931 2001/03/09 18:19:24 mouring Exp $ | 4470 | $Id: ChangeLog,v 1.932 2001/03/09 18:25:32 mouring Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.173 2001/03/05 17:17:21 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.174 2001/03/09 12:30:29 deraadt Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -149,7 +149,7 @@ char *server_version_string = NULL; | |||
149 | * not very useful. Currently, memory locking is not implemented. | 149 | * not very useful. Currently, memory locking is not implemented. |
150 | */ | 150 | */ |
151 | struct { | 151 | struct { |
152 | Key *server_key; /* empheral server key */ | 152 | Key *server_key; /* ephemeral server key */ |
153 | Key *ssh1_host_key; /* ssh1 host key */ | 153 | Key *ssh1_host_key; /* ssh1 host key */ |
154 | Key **host_keys; /* all private host keys */ | 154 | Key **host_keys; /* all private host keys */ |
155 | int have_ssh1_key; | 155 | int have_ssh1_key; |
@@ -273,7 +273,7 @@ grace_alarm_handler(int sig) | |||
273 | * problems. | 273 | * problems. |
274 | */ | 274 | */ |
275 | void | 275 | void |
276 | generate_empheral_server_key(void) | 276 | generate_ephemeral_server_key(void) |
277 | { | 277 | { |
278 | u_int32_t rand = 0; | 278 | u_int32_t rand = 0; |
279 | int i; | 279 | int i; |
@@ -820,7 +820,7 @@ main(int ac, char **av) | |||
820 | */ | 820 | */ |
821 | debug("inetd sockets after dupping: %d, %d", sock_in, sock_out); | 821 | debug("inetd sockets after dupping: %d, %d", sock_in, sock_out); |
822 | if (options.protocol & SSH_PROTO_1) | 822 | if (options.protocol & SSH_PROTO_1) |
823 | generate_empheral_server_key(); | 823 | generate_ephemeral_server_key(); |
824 | } else { | 824 | } else { |
825 | for (ai = options.listen_addrs; ai; ai = ai->ai_next) { | 825 | for (ai = options.listen_addrs; ai; ai = ai->ai_next) { |
826 | if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) | 826 | if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) |
@@ -898,7 +898,7 @@ main(int ac, char **av) | |||
898 | } | 898 | } |
899 | } | 899 | } |
900 | if (options.protocol & SSH_PROTO_1) | 900 | if (options.protocol & SSH_PROTO_1) |
901 | generate_empheral_server_key(); | 901 | generate_ephemeral_server_key(); |
902 | 902 | ||
903 | /* Arrange to restart on SIGHUP. The handler needs listen_sock. */ | 903 | /* Arrange to restart on SIGHUP. The handler needs listen_sock. */ |
904 | signal(SIGHUP, sighup_handler); | 904 | signal(SIGHUP, sighup_handler); |
@@ -944,7 +944,7 @@ main(int ac, char **av) | |||
944 | if (ret < 0 && errno != EINTR) | 944 | if (ret < 0 && errno != EINTR) |
945 | error("select: %.100s", strerror(errno)); | 945 | error("select: %.100s", strerror(errno)); |
946 | if (key_used && key_do_regen) { | 946 | if (key_used && key_do_regen) { |
947 | generate_empheral_server_key(); | 947 | generate_ephemeral_server_key(); |
948 | key_used = 0; | 948 | key_used = 0; |
949 | key_do_regen = 0; | 949 | key_do_regen = 0; |
950 | } | 950 | } |