diff options
Diffstat (limited to 'packet.c')
-rw-r--r-- | packet.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.250 2017/04/30 23:23:54 djm Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.251 2017/04/30 23:26:16 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 |
@@ -68,7 +68,6 @@ | |||
68 | 68 | ||
69 | #include "xmalloc.h" | 69 | #include "xmalloc.h" |
70 | #include "crc32.h" | 70 | #include "crc32.h" |
71 | #include "deattack.h" | ||
72 | #include "compat.h" | 71 | #include "compat.h" |
73 | #include "ssh1.h" | 72 | #include "ssh1.h" |
74 | #include "ssh2.h" | 73 | #include "ssh2.h" |
@@ -216,9 +215,6 @@ struct session_state { | |||
216 | /* One-off warning about weak ciphers */ | 215 | /* One-off warning about weak ciphers */ |
217 | int cipher_warning_done; | 216 | int cipher_warning_done; |
218 | 217 | ||
219 | /* SSH1 CRC compensation attack detector */ | ||
220 | struct deattack_ctx deattack; | ||
221 | |||
222 | /* Hook for fuzzing inbound packets */ | 218 | /* Hook for fuzzing inbound packets */ |
223 | ssh_packet_hook_fn *hook_in; | 219 | ssh_packet_hook_fn *hook_in; |
224 | void *hook_in_ctx; | 220 | void *hook_in_ctx; |
@@ -315,7 +311,6 @@ ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) | |||
315 | return NULL; | 311 | return NULL; |
316 | } | 312 | } |
317 | state->newkeys[MODE_IN] = state->newkeys[MODE_OUT] = NULL; | 313 | state->newkeys[MODE_IN] = state->newkeys[MODE_OUT] = NULL; |
318 | deattack_init(&state->deattack); | ||
319 | /* | 314 | /* |
320 | * Cache the IP address of the remote connection for use in error | 315 | * Cache the IP address of the remote connection for use in error |
321 | * messages that might be generated after the connection has closed. | 316 | * messages that might be generated after the connection has closed. |