diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | msg.c | 37 | ||||
-rw-r--r-- | msg.h | 4 | ||||
-rw-r--r-- | ssh-keysign.c | 5 | ||||
-rw-r--r-- | sshconnect2.c | 5 |
5 files changed, 35 insertions, 21 deletions
@@ -40,6 +40,9 @@ | |||
40 | - markus@cvs.openbsd.org 2003/11/14 13:19:09 | 40 | - markus@cvs.openbsd.org 2003/11/14 13:19:09 |
41 | [sshconnect2.c] | 41 | [sshconnect2.c] |
42 | cleanup and minor fixes for the client code; from Simon Wilkinson | 42 | cleanup and minor fixes for the client code; from Simon Wilkinson |
43 | - djm@cvs.openbsd.org 2003/11/17 09:45:39 | ||
44 | [msg.c msg.h sshconnect2.c ssh-keysign.c] | ||
45 | return error on msg send/receive failure (rather than fatal); ok markus@ | ||
43 | 46 | ||
44 | 20031115 | 47 | 20031115 |
45 | - (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and | 48 | - (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and |
@@ -1460,4 +1463,4 @@ | |||
1460 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1463 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1461 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1464 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1462 | 1465 | ||
1463 | $Id: ChangeLog,v 1.3108 2003/11/17 10:20:18 djm Exp $ | 1466 | $Id: ChangeLog,v 1.3109 2003/11/17 10:20:47 djm Exp $ |
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: msg.c,v 1.6 2003/06/28 16:23:06 deraadt Exp $"); | 25 | RCSID("$OpenBSD: msg.c,v 1.7 2003/11/17 09:45:39 djm Exp $"); |
26 | 26 | ||
27 | #include "buffer.h" | 27 | #include "buffer.h" |
28 | #include "getput.h" | 28 | #include "getput.h" |
@@ -30,7 +30,7 @@ RCSID("$OpenBSD: msg.c,v 1.6 2003/06/28 16:23:06 deraadt Exp $"); | |||
30 | #include "atomicio.h" | 30 | #include "atomicio.h" |
31 | #include "msg.h" | 31 | #include "msg.h" |
32 | 32 | ||
33 | void | 33 | int |
34 | ssh_msg_send(int fd, u_char type, Buffer *m) | 34 | ssh_msg_send(int fd, u_char type, Buffer *m) |
35 | { | 35 | { |
36 | u_char buf[5]; | 36 | u_char buf[5]; |
@@ -40,10 +40,15 @@ ssh_msg_send(int fd, u_char type, Buffer *m) | |||
40 | 40 | ||
41 | PUT_32BIT(buf, mlen + 1); | 41 | PUT_32BIT(buf, mlen + 1); |
42 | buf[4] = type; /* 1st byte of payload is mesg-type */ | 42 | buf[4] = type; /* 1st byte of payload is mesg-type */ |
43 | if (atomicio(vwrite, fd, buf, sizeof(buf)) != sizeof(buf)) | 43 | if (atomicio(vwrite, fd, buf, sizeof(buf)) != sizeof(buf)) { |
44 | fatal("ssh_msg_send: write"); | 44 | error("ssh_msg_send: write"); |
45 | if (atomicio(vwrite, fd, buffer_ptr(m), mlen) != mlen) | 45 | return (-1); |
46 | fatal("ssh_msg_send: write"); | 46 | } |
47 | if (atomicio(vwrite, fd, buffer_ptr(m), mlen) != mlen) { | ||
48 | error("ssh_msg_send: write"); | ||
49 | return (-1); | ||
50 | } | ||
51 | return (0); | ||
47 | } | 52 | } |
48 | 53 | ||
49 | int | 54 | int |
@@ -57,17 +62,21 @@ ssh_msg_recv(int fd, Buffer *m) | |||
57 | 62 | ||
58 | res = atomicio(read, fd, buf, sizeof(buf)); | 63 | res = atomicio(read, fd, buf, sizeof(buf)); |
59 | if (res != sizeof(buf)) { | 64 | if (res != sizeof(buf)) { |
60 | if (res == 0) | 65 | if (res != 0) |
61 | return -1; | 66 | error("ssh_msg_recv: read: header %ld", (long)res); |
62 | fatal("ssh_msg_recv: read: header %ld", (long)res); | 67 | return (-1); |
63 | } | 68 | } |
64 | msg_len = GET_32BIT(buf); | 69 | msg_len = GET_32BIT(buf); |
65 | if (msg_len > 256 * 1024) | 70 | if (msg_len > 256 * 1024) { |
66 | fatal("ssh_msg_recv: read: bad msg_len %u", msg_len); | 71 | error("ssh_msg_recv: read: bad msg_len %u", msg_len); |
72 | return (-1); | ||
73 | } | ||
67 | buffer_clear(m); | 74 | buffer_clear(m); |
68 | buffer_append_space(m, msg_len); | 75 | buffer_append_space(m, msg_len); |
69 | res = atomicio(read, fd, buffer_ptr(m), msg_len); | 76 | res = atomicio(read, fd, buffer_ptr(m), msg_len); |
70 | if (res != msg_len) | 77 | if (res != msg_len) { |
71 | fatal("ssh_msg_recv: read: %ld != msg_len", (long)res); | 78 | error("ssh_msg_recv: read: %ld != msg_len", (long)res); |
72 | return 0; | 79 | return (-1); |
80 | } | ||
81 | return (0); | ||
73 | } | 82 | } |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: msg.h,v 1.2 2002/12/19 00:07:02 djm Exp $ */ | 1 | /* $OpenBSD: msg.h,v 1.3 2003/11/17 09:45:39 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -25,7 +25,7 @@ | |||
25 | #ifndef SSH_MSG_H | 25 | #ifndef SSH_MSG_H |
26 | #define SSH_MSG_H | 26 | #define SSH_MSG_H |
27 | 27 | ||
28 | void ssh_msg_send(int, u_char, Buffer *); | 28 | int ssh_msg_send(int, u_char, Buffer *); |
29 | int ssh_msg_recv(int, Buffer *); | 29 | int ssh_msg_recv(int, Buffer *); |
30 | 30 | ||
31 | #endif | 31 | #endif |
diff --git a/ssh-keysign.c b/ssh-keysign.c index c7ca5c4e4..b3db628c6 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: ssh-keysign.c,v 1.13 2003/07/03 08:09:06 djm Exp $"); | 25 | RCSID("$OpenBSD: ssh-keysign.c,v 1.14 2003/11/17 09:45:39 djm Exp $"); |
26 | 26 | ||
27 | #include <openssl/evp.h> | 27 | #include <openssl/evp.h> |
28 | #include <openssl/rand.h> | 28 | #include <openssl/rand.h> |
@@ -233,7 +233,8 @@ main(int argc, char **argv) | |||
233 | /* send reply */ | 233 | /* send reply */ |
234 | buffer_clear(&b); | 234 | buffer_clear(&b); |
235 | buffer_put_string(&b, signature, slen); | 235 | buffer_put_string(&b, signature, slen); |
236 | ssh_msg_send(STDOUT_FILENO, version, &b); | 236 | if (ssh_msg_send(STDOUT_FILENO, version, &b) == -1) |
237 | fatal("ssh_msg_send failed"); | ||
237 | 238 | ||
238 | return (0); | 239 | return (0); |
239 | } | 240 | } |
diff --git a/sshconnect2.c b/sshconnect2.c index 045f3081f..388a25741 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.130 2003/11/14 13:19:09 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.131 2003/11/17 09:45:39 djm Exp $"); |
27 | 27 | ||
28 | #include "openbsd-compat/sys-queue.h" | 28 | #include "openbsd-compat/sys-queue.h" |
29 | 29 | ||
@@ -1240,7 +1240,8 @@ ssh_keysign(Key *key, u_char **sigp, u_int *lenp, | |||
1240 | buffer_init(&b); | 1240 | buffer_init(&b); |
1241 | buffer_put_int(&b, packet_get_connection_in()); /* send # of socket */ | 1241 | buffer_put_int(&b, packet_get_connection_in()); /* send # of socket */ |
1242 | buffer_put_string(&b, data, datalen); | 1242 | buffer_put_string(&b, data, datalen); |
1243 | ssh_msg_send(to[1], version, &b); | 1243 | if (ssh_msg_send(to[1], version, &b) == -1) |
1244 | fatal("ssh_keysign: couldn't send request"); | ||
1244 | 1245 | ||
1245 | if (ssh_msg_recv(from[0], &b) < 0) { | 1246 | if (ssh_msg_recv(from[0], &b) < 0) { |
1246 | error("ssh_keysign: no reply"); | 1247 | error("ssh_keysign: no reply"); |