summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/atomicio.h
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2018-12-27 03:25:26 +0000
committerDamien Miller <djm@cvs.openbsd.org>2018-12-27 03:25:26 +0000
commit8b2b36ac27417559f25e726f188a854c758e0afe (patch)
treed7b2ee4ecb9d6cf7f42d13b68a74139cd10b05a1 /usr.bin/ssh/atomicio.h
parent21b4570b87638cbe37af868c56c05dae6c3dcb6b (diff)
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@
Diffstat (limited to 'usr.bin/ssh/atomicio.h')
-rw-r--r--usr.bin/ssh/atomicio.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/atomicio.h b/usr.bin/ssh/atomicio.h
index 0d728ac86ea..8b3cc6e211b 100644
--- a/usr.bin/ssh/atomicio.h
+++ b/usr.bin/ssh/atomicio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: atomicio.h,v 1.11 2010/09/22 22:58:51 djm Exp $ */
+/* $OpenBSD: atomicio.h,v 1.12 2018/12/27 03:25:25 djm Exp $ */
/*
* Copyright (c) 2006 Damien Miller. All rights reserved.
@@ -29,6 +29,8 @@
#ifndef _ATOMICIO_H
#define _ATOMICIO_H
+struct iovec;
+
/*
* Ensure all of data on socket comes through. f==read || f==vwrite
*/