summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ttymodes.h
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2017-04-30 23:26:54 +0000
committerdjm <djm@openbsd.org>2017-04-30 23:26:54 +0000
commit0ccaed78deef9477c51d39cd8df049e65cd78ecc (patch)
treeda25d72b8168099c2013bf56fc70c0d5bdf874f1 /usr.bin/ssh/ttymodes.h
parentremove the (in)famous SSHv1 CRC compensation attack detector. (diff)
downloadwireguard-openbsd-0ccaed78deef9477c51d39cd8df049e65cd78ecc.tar.xz
wireguard-openbsd-0ccaed78deef9477c51d39cd8df049e65cd78ecc.zip
purge the last traces of SSHv1 from the TTY modes handling code
ok markus
Diffstat (limited to 'usr.bin/ssh/ttymodes.h')
-rw-r--r--usr.bin/ssh/ttymodes.h21
1 files changed, 6 insertions, 15 deletions
diff --git a/usr.bin/ssh/ttymodes.h b/usr.bin/ssh/ttymodes.h
index f3522ad9988..c257f87baaf 100644
--- a/usr.bin/ssh/ttymodes.h
+++ b/usr.bin/ssh/ttymodes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttymodes.h,v 1.15 2016/05/03 09:03:49 dtucker Exp $ */
+/* $OpenBSD: ttymodes.h,v 1.16 2017/04/30 23:26:54 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -38,22 +38,13 @@
*/
/*
- * SSH1:
- * The tty mode description is a stream of bytes. The stream consists of
+ * The tty mode description is a string, consisting of
* opcode-arguments pairs. It is terminated by opcode TTY_OP_END (0).
- * Opcodes 1-127 have one-byte arguments. Opcodes 128-159 have integer
- * arguments. Opcodes 160-255 are not yet defined, and cause parsing to
- * stop (they should only be used after any other data).
+ * Opcodes 1-159 have uint32 arguments.
+ * Opcodes 160-255 are not yet defined and cause parsing to stop (they
+ * should only be used after any other data).
*
- * SSH2:
- * Differences between SSH1 and SSH2 terminal mode encoding include:
- * 1. Encoded terminal modes are represented as a string, and a stream
- * of bytes within that string.
- * 2. Opcode arguments are uint32 (1-159); 160-255 remain undefined.
- * 3. The values for TTY_OP_ISPEED and TTY_OP_OSPEED are different;
- * 128 and 129 vs. 192 and 193 respectively.
- *
- * The client puts in the stream any modes it knows about, and the
+ * The client puts in the string any modes it knows about, and the
* server ignores any modes it does not know about. This allows some degree
* of machine-independence, at least between systems that use a posix-like
* tty interface. The protocol can support other systems as well, but might