diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2009-06-21 18:17:19 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2009-06-21 18:17:19 +1000 |
| commit | 1cc55d7a607455d75db0204b5acebce47667b0f8 (patch) | |
| tree | b3686fc7c5e0af15be7140231729e207e928ac1e | |
| parent | 761c38918aecbbe2df97d13aea29c6bbf9212617 (diff) | |
- andreas@cvs.openbsd.org 2009/05/28 16:50:16
[sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c
monitor.c]
Keep track of number of bytes read and written. Needed for upcoming
changes. Most code from Martin Forssen, maf at appgate dot com.
ok markus@
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sshconnect.c | 4 | ||||
| -rw-r--r-- | sshconnect.h | 4 |
3 files changed, 11 insertions, 3 deletions
@@ -81,6 +81,12 @@ Un-static ssh_exchange_identification(), part of a larger change from Martin Forssen and needed for upcoming changes. ok markus@ + - andreas@cvs.openbsd.org 2009/05/28 16:50:16 + [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c + monitor.c] + Keep track of number of bytes read and written. Needed for upcoming + changes. Most code from Martin Forssen, maf at appgate dot com. + ok markus@ 20090616 - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t diff --git a/sshconnect.c b/sshconnect.c index c04aa105..dee3ba54 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.212 2008/10/14 18:11:33 stevesk Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.213 2009/05/27 06:38:16 andreas Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -413,7 +413,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, * Waits for the server identification string, and sends our own * identification string. */ -static void +void ssh_exchange_identification(int timeout_ms) { char buf[256], remote_version[256]; /* must be same size! */ diff --git a/sshconnect.h b/sshconnect.h index 75bde1a4..c59a097f 100644 --- a/sshconnect.h +++ b/sshconnect.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.h,v 1.24 2007/09/04 11:15:56 djm Exp $ */ +/* $OpenBSD: sshconnect.h,v 1.25 2009/05/27 06:38:16 andreas Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -38,6 +38,8 @@ ssh_connect(const char *, struct sockaddr_storage *, u_short, int, int, void ssh_login(Sensitive *, const char *, struct sockaddr *, struct passwd *, int); +void ssh_exchange_identification(int); + int verify_host_key(char *, struct sockaddr *, Key *); void ssh_kex(char *, struct sockaddr *); |