summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--authfd.c4
-rw-r--r--packet.c8
-rw-r--r--ssh-agent.c6
4 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d44707a16..9386369b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
119991216 119991216
2 - Makefile changes for Solaris from Peter Kocks 2 - Makefile changes for Solaris from Peter Kocks
3 <peter.kocks@baygate.com> 3 <peter.kocks@baygate.com>
4 - Minor updates to docs
5 - Merged OpenBSD CVS changes:
6 - [authfd.c ssh-agent.c]
7 keysize warnings talk about identity files
8 - [packet.c]
9 "Connection closed by x.x.x.x": fatal() -> log()
4 10
519991215 1119991215
6 - Integrated patchs from Juergen Keil <jk@tools.de> 12 - Integrated patchs from Juergen Keil <jk@tools.de>
diff --git a/authfd.c b/authfd.c
index 1a62c3ed0..cb7bbd5e7 100644
--- a/authfd.c
+++ b/authfd.c
@@ -14,7 +14,7 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$Id: authfd.c,v 1.9 1999/12/07 04:38:32 damien Exp $"); 17RCSID("$Id: authfd.c,v 1.10 1999/12/16 02:18:04 damien Exp $");
18 18
19#include "ssh.h" 19#include "ssh.h"
20#include "rsa.h" 20#include "rsa.h"
@@ -222,7 +222,7 @@ ssh_get_next_identity(AuthenticationConnection *auth,
222 *comment = buffer_get_string(&auth->identities, NULL); 222 *comment = buffer_get_string(&auth->identities, NULL);
223 223
224 if (bits != BN_num_bits(n)) 224 if (bits != BN_num_bits(n))
225 error("Warning: keysize mismatch: actual %d, announced %u", 225 error("Warning: identity keysize mismatch: actual %d, announced %u",
226 BN_num_bits(n), bits); 226 BN_num_bits(n), bits);
227 227
228 /* Decrement the number of remaining entries. */ 228 /* Decrement the number of remaining entries. */
diff --git a/packet.c b/packet.c
index 9e8cf2e31..17f6f6e3d 100644
--- a/packet.c
+++ b/packet.c
@@ -15,7 +15,7 @@
15 */ 15 */
16 16
17#include "includes.h" 17#include "includes.h"
18RCSID("$Id: packet.c,v 1.7 1999/12/06 00:47:29 damien Exp $"); 18RCSID("$Id: packet.c,v 1.8 1999/12/16 02:18:04 damien Exp $");
19 19
20#include "xmalloc.h" 20#include "xmalloc.h"
21#include "buffer.h" 21#include "buffer.h"
@@ -415,8 +415,10 @@ packet_read(int *payload_len_ptr)
415 415
416 /* Read data from the socket. */ 416 /* Read data from the socket. */
417 len = read(connection_in, buf, sizeof(buf)); 417 len = read(connection_in, buf, sizeof(buf));
418 if (len == 0) 418 if (len == 0) {
419 fatal("Connection closed by %.200s", get_remote_ipaddr()); 419 log("Connection closed by %.200s", get_remote_ipaddr());
420 fatal_cleanup();
421 }
420 if (len < 0) 422 if (len < 0)
421 fatal("Read from socket failed: %.100s", strerror(errno)); 423 fatal("Read from socket failed: %.100s", strerror(errno));
422 /* Append it to the buffer. */ 424 /* Append it to the buffer. */
diff --git a/ssh-agent.c b/ssh-agent.c
index 90c64ea8a..d224386c8 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.23 1999/11/24 19:53:51 markus Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -9,7 +9,7 @@
9 */ 9 */
10 10
11#include "includes.h" 11#include "includes.h"
12RCSID("$OpenBSD: ssh-agent.c,v 1.23 1999/11/24 19:53:51 markus Exp $"); 12RCSID("$OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $");
13 13
14#include "ssh.h" 14#include "ssh.h"
15#include "rsa.h" 15#include "rsa.h"
@@ -183,7 +183,7 @@ process_remove_identity(SocketEntry *e)
183 buffer_get_bignum(&e->input, n); 183 buffer_get_bignum(&e->input, n);
184 184
185 if (bits != BN_num_bits(n)) 185 if (bits != BN_num_bits(n))
186 error("Warning: keysize mismatch: actual %d, announced %d", 186 error("Warning: identity keysize mismatch: actual %d, announced %d",
187 BN_num_bits(n), bits); 187 BN_num_bits(n), bits);
188 188
189 /* Check if we have the key. */ 189 /* Check if we have the key. */