From fae7bbe544cba7a9e5e4ab47ff6faa3d978646eb Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Wed, 28 Jan 2015 21:15:47 +0000 Subject: upstream commit avoid fatal() calls in packet code makes ssh-keyscan more reliable against server failures ok dtucker@ markus@ --- packet.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packet.h') diff --git a/packet.h b/packet.h index 069af2ea..8a9d0f6c 100644 --- a/packet.h +++ b/packet.h @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.h,v 1.64 2015/01/19 20:30:23 markus Exp $ */ +/* $OpenBSD: packet.h,v 1.65 2015/01/28 21:15:47 djm Exp $ */ /* * Author: Tatu Ylonen @@ -94,7 +94,7 @@ void ssh_packet_read_expect(struct ssh *, int type); int ssh_packet_read_poll(struct ssh *); int ssh_packet_read_poll1(struct ssh *, u_char *); int ssh_packet_read_poll2(struct ssh *, u_char *, u_int32_t *seqnr_p); -void ssh_packet_process_incoming(struct ssh *, const char *buf, u_int len); +int ssh_packet_process_incoming(struct ssh *, const char *buf, u_int len); int ssh_packet_read_seqnr(struct ssh *, u_char *, u_int32_t *seqnr_p); int ssh_packet_read_poll_seqnr(struct ssh *, u_char *, u_int32_t *seqnr_p); -- cgit v1.2.1