diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-12-27 03:25:24 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-12-27 14:38:22 +1100 |
commit | 0a843d9a0e805f14653a555f5c7a8ba99d62c12d (patch) | |
tree | 481f36e9fd1918be5449e369a97c086a1a8d2432 /atomicio.h | |
parent | 434b587afe41c19391821e7392005068fda76248 (diff) |
upstream: move client/server SSH-* banners to buffers under
ssh->kex and factor out the banner exchange. This eliminates some common code
from the client and server.
Also be more strict about handling \r characters - these should only
be accepted immediately before \n (pointed out by Jann Horn).
Inspired by a patch from Markus Schmidt.
(lots of) feedback and ok markus@
OpenBSD-Commit-ID: 1cc7885487a6754f63641d7d3279b0941890275b
Diffstat (limited to 'atomicio.h')
-rw-r--r-- | atomicio.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/atomicio.h b/atomicio.h index 0d728ac86..8b3cc6e21 100644 --- a/atomicio.h +++ b/atomicio.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: atomicio.h,v 1.11 2010/09/22 22:58:51 djm Exp $ */ | 1 | /* $OpenBSD: atomicio.h,v 1.12 2018/12/27 03:25:25 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2006 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2006 Damien Miller. All rights reserved. |
@@ -29,6 +29,8 @@ | |||
29 | #ifndef _ATOMICIO_H | 29 | #ifndef _ATOMICIO_H |
30 | #define _ATOMICIO_H | 30 | #define _ATOMICIO_H |
31 | 31 | ||
32 | struct iovec; | ||
33 | |||
32 | /* | 34 | /* |
33 | * Ensure all of data on socket comes through. f==read || f==vwrite | 35 | * Ensure all of data on socket comes through. f==read || f==vwrite |
34 | */ | 36 | */ |