RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Merged OpenBSD CVS changes: 

- [authfd.c ssh-agent.c]
     keysize warnings talk about identity files
   - [packet.c]
     "Connection closed by x.x.x.x": fatal() -> log()
This commit is contained in:
Damien Miller 1999-12-16 13:18:04 +11:00
parent 18ccf85863
commit 5e7c10eedb
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,6 +1,12 @@
19991216
- Makefile changes for Solaris from Peter Kocks
<peter.kocks@baygate.com>
- Minor updates to docs
- Merged OpenBSD CVS changes:
- [authfd.c ssh-agent.c]
keysize warnings talk about identity files
- [packet.c]
"Connection closed by x.x.x.x": fatal() -> log()
19991215
- Integrated patchs from Juergen Keil <jk@tools.de>

4
authfd.c
View File

@ -14,7 +14,7 @@
*/
#include "includes.h"
RCSID("$Id: authfd.c,v 1.9 1999/12/07 04:38:32 damien Exp $");
RCSID("$Id: authfd.c,v 1.10 1999/12/16 02:18:04 damien Exp $");
#include "ssh.h"
#include "rsa.h"
@ -222,7 +222,7 @@ ssh_get_next_identity(AuthenticationConnection *auth,
*comment = buffer_get_string(&auth->identities, NULL);
if (bits != BN_num_bits(n))
error("Warning: keysize mismatch: actual %d, announced %u",
error("Warning: identity keysize mismatch: actual %d, announced %u",
BN_num_bits(n), bits);
/* Decrement the number of remaining entries. */

8
packet.c
View File

@ -15,7 +15,7 @@
*/
#include "includes.h"
RCSID("$Id: packet.c,v 1.7 1999/12/06 00:47:29 damien Exp $");
RCSID("$Id: packet.c,v 1.8 1999/12/16 02:18:04 damien Exp $");
#include "xmalloc.h"
#include "buffer.h"
@ -415,8 +415,10 @@ packet_read(int *payload_len_ptr)
/* Read data from the socket. */
len = read(connection_in, buf, sizeof(buf));
if (len == 0)
fatal("Connection closed by %.200s", get_remote_ipaddr());
if (len == 0) {
log("Connection closed by %.200s", get_remote_ipaddr());
fatal_cleanup();
}
if (len < 0)
fatal("Read from socket failed: %.100s", strerror(errno));
/* Append it to the buffer. */

6
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.23 1999/11/24 19:53:51 markus Exp $ */
/* $OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -9,7 +9,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: ssh-agent.c,v 1.23 1999/11/24 19:53:51 markus Exp $");
RCSID("$OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $");
#include "ssh.h"
#include "rsa.h"
@ -183,7 +183,7 @@ process_remove_identity(SocketEntry *e)
buffer_get_bignum(&e->input, n);
if (bits != BN_num_bits(n))
error("Warning: keysize mismatch: actual %d, announced %d",
error("Warning: identity keysize mismatch: actual %d, announced %d",
BN_num_bits(n), bits);
/* Check if we have the key. */