summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-09 18:25:32 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-09 18:25:32 +0000
commitca42d5fb7f48770f856ca2e3e4389f5ee1ecbe66 (patch)
tree46c3cbe6ba3dd8e2d823b99ce83468d8dd76742a /sshd.c
parent5fc6270fe994d9c6aa47ee3fba8bbde1c007856c (diff)
- deraadt@cvs.openbsd.org 2001/03/09 12:30:29
[sshd.c] typo; slade@shore.net
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sshd.c b/sshd.c
index fcb06e0d5..2d6cbd09e 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: sshd.c,v 1.173 2001/03/05 17:17:21 markus Exp $"); 43RCSID("$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 */
151struct { 151struct {
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 */
275void 275void
276generate_empheral_server_key(void) 276generate_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 }