summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c6
-rw-r--r--sshd.c8
3 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b21a8598..ff710913b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
13 - deraadt@cvs.openbsd.org 2002/05/19 20:54:52 13 - deraadt@cvs.openbsd.org 2002/05/19 20:54:52
14 [log.h] 14 [log.h]
15 extra commas in enum not 100% portable 15 extra commas in enum not 100% portable
16 - deraadt@cvs.openbsd.org 2002/05/22 23:18:25
17 [ssh.c sshd.c]
18 spelling; abishoff@arc.nasa.gov
16 19
1720020604 2020020604
18 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed 21 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
@@ -697,4 +700,4 @@
697 - (stevesk) entropy.c: typo in debug message 700 - (stevesk) entropy.c: typo in debug message
698 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 701 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
699 702
700$Id: ChangeLog,v 1.2147 2002/06/06 19:51:06 mouring Exp $ 703$Id: ChangeLog,v 1.2148 2002/06/06 19:51:58 mouring Exp $
diff --git a/ssh.c b/ssh.c
index f442c43af..4b82d1e7e 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.171 2002/05/16 22:09:59 stevesk Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.172 2002/05/22 23:18:25 deraadt Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -107,7 +107,7 @@ int stdin_null_flag = 0;
107 107
108/* 108/*
109 * Flag indicating that ssh should fork after authentication. This is useful 109 * Flag indicating that ssh should fork after authentication. This is useful
110 * so that the pasphrase can be entered manually, and then ssh goes to the 110 * so that the passphrase can be entered manually, and then ssh goes to the
111 * background. 111 * background.
112 */ 112 */
113int fork_after_authentication_flag = 0; 113int fork_after_authentication_flag = 0;
@@ -1124,7 +1124,7 @@ ssh_session2_setup(int id, void *arg)
1124 debug("Sending subsystem: %.*s", len, (u_char *)buffer_ptr(&command)); 1124 debug("Sending subsystem: %.*s", len, (u_char *)buffer_ptr(&command));
1125 channel_request_start(id, "subsystem", /*want reply*/ 1); 1125 channel_request_start(id, "subsystem", /*want reply*/ 1);
1126 /* register callback for reply */ 1126 /* register callback for reply */
1127 /* XXX we asume that client_loop has already been called */ 1127 /* XXX we assume that client_loop has already been called */
1128 dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &client_subsystem_reply); 1128 dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &client_subsystem_reply);
1129 dispatch_set(SSH2_MSG_CHANNEL_SUCCESS, &client_subsystem_reply); 1129 dispatch_set(SSH2_MSG_CHANNEL_SUCCESS, &client_subsystem_reply);
1130 } else { 1130 } else {
diff --git a/sshd.c b/sshd.c
index afb872665..437e0f970 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.242 2002/05/15 15:47:49 mouring Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.243 2002/05/22 23:18:25 deraadt Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -378,7 +378,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
378 fatal_cleanup(); 378 fatal_cleanup();
379 } 379 }
380 380
381 /* Read other side's version identification. */ 381 /* Read other sides version identification. */
382 memset(buf, 0, sizeof(buf)); 382 memset(buf, 0, sizeof(buf));
383 for (i = 0; i < sizeof(buf) - 1; i++) { 383 for (i = 0; i < sizeof(buf) - 1; i++) {
384 if (atomicio(read, sock_in, &buf[i], 1) != 1) { 384 if (atomicio(read, sock_in, &buf[i], 1) != 1) {
@@ -1417,7 +1417,7 @@ main(int ac, char **av)
1417 sshd_exchange_identification(sock_in, sock_out); 1417 sshd_exchange_identification(sock_in, sock_out);
1418 /* 1418 /*
1419 * Check that the connection comes from a privileged port. 1419 * Check that the connection comes from a privileged port.
1420 * Rhosts-Authentication only makes sense from priviledged 1420 * Rhosts-Authentication only makes sense from privileged
1421 * programs. Of course, if the intruder has root access on his local 1421 * programs. Of course, if the intruder has root access on his local
1422 * machine, he can connect from any port. So do not use these 1422 * machine, he can connect from any port. So do not use these
1423 * authentication methods from machines that you do not trust. 1423 * authentication methods from machines that you do not trust.
@@ -1727,7 +1727,7 @@ do_ssh1_kex(void)
1727 1727
1728 debug("Received session key; encryption turned on."); 1728 debug("Received session key; encryption turned on.");
1729 1729
1730 /* Send an acknowledgement packet. Note that this packet is sent encrypted. */ 1730 /* Send an acknowledgment packet. Note that this packet is sent encrypted. */
1731 packet_start(SSH_SMSG_SUCCESS); 1731 packet_start(SSH_SMSG_SUCCESS);
1732 packet_send(); 1732 packet_send();
1733 packet_write_wait(); 1733 packet_write_wait();