diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-10-11 21:47:45 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-10-13 18:55:25 +1100 |
commit | 39af7b444db28c1cb01b7ea468a4f574a44f375b (patch) | |
tree | fcfba47f83bd07ba4ee90fc5dc4b2a641c412075 /packet.c | |
parent | ec165c392ca54317dbe3064a8c200de6531e89ad (diff) |
upstream commit
Add a per-packet input hook that is called with the
decrypted packet contents. This will be used for fuzzing; ok markus@
Upstream-ID: a3221cee6b1725dd4ae1dd2c13841b4784cb75dc
Diffstat (limited to 'packet.c')
-rw-r--r-- | packet.c | 17 |
1 files changed, 16 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.242 2016/09/30 09:19:13 markus Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.243 2016/10/11 21:47:45 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -219,6 +219,10 @@ struct session_state { | |||
219 | /* SSH1 CRC compensation attack detector */ | 219 | /* SSH1 CRC compensation attack detector */ |
220 | struct deattack_ctx deattack; | 220 | struct deattack_ctx deattack; |
221 | 221 | ||
222 | /* Hook for fuzzing inbound packets */ | ||
223 | ssh_packet_hook_fn *hook_in; | ||
224 | void *hook_in_ctx; | ||
225 | |||
222 | TAILQ_HEAD(, packet) outgoing; | 226 | TAILQ_HEAD(, packet) outgoing; |
223 | }; | 227 | }; |
224 | 228 | ||
@@ -263,6 +267,13 @@ ssh_alloc_session_state(void) | |||
263 | return NULL; | 267 | return NULL; |
264 | } | 268 | } |
265 | 269 | ||
270 | void | ||
271 | ssh_packet_set_input_hook(struct ssh *ssh, ssh_packet_hook_fn *hook, void *ctx) | ||
272 | { | ||
273 | ssh->state->hook_in = hook; | ||
274 | ssh->state->hook_in_ctx = ctx; | ||
275 | } | ||
276 | |||
266 | /* Returns nonzero if rekeying is in progress */ | 277 | /* Returns nonzero if rekeying is in progress */ |
267 | int | 278 | int |
268 | ssh_packet_is_rekeying(struct ssh *ssh) | 279 | ssh_packet_is_rekeying(struct ssh *ssh) |
@@ -1884,6 +1895,10 @@ ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) | |||
1884 | return r; | 1895 | return r; |
1885 | return SSH_ERR_PROTOCOL_ERROR; | 1896 | return SSH_ERR_PROTOCOL_ERROR; |
1886 | } | 1897 | } |
1898 | if (state->hook_in != NULL && | ||
1899 | (r = state->hook_in(ssh, state->incoming_packet, typep, | ||
1900 | state->hook_in_ctx)) != 0) | ||
1901 | return r; | ||
1887 | if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side) | 1902 | if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side) |
1888 | r = ssh_packet_enable_delayed_compress(ssh); | 1903 | r = ssh_packet_enable_delayed_compress(ssh); |
1889 | else | 1904 | else |