diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2013-01-03 12:49:02 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2013-01-03 12:49:02 +0000 |
| commit | d849016105586fdd1f67236007ecf5d1e92e43bf (patch) | |
| tree | ed75a87f5b815ec4417d7e8a0c5e146331238009 | |
| parent | 188ed7dc0f8d0bd6ed66163811e606a0d40bee99 (diff) | |
fix description of MAC calculation for EtM modes; ok markus@
| -rw-r--r-- | usr.bin/ssh/PROTOCOL | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/PROTOCOL b/usr.bin/ssh/PROTOCOL index 834716cc9cc..eb5d0889c89 100644 --- a/usr.bin/ssh/PROTOCOL +++ b/usr.bin/ssh/PROTOCOL @@ -70,9 +70,10 @@ verified without decrypting unauthenticated data. As such, the MAC covers: - mac = MAC(key, sequence_number || encrypted_packet) + mac = MAC(key, sequence_number || packet_length || encrypted_packet) -where "encrypted_packet" contains: +where "packet_length" is encoded as a uint32 and "encrypted_packet" +contains: byte padding_length byte[n1] payload; n1 = packet_length - padding_length - 1 @@ -318,4 +319,4 @@ link(oldpath, newpath) and will respond with a SSH_FXP_STATUS message. This extension is advertised in the SSH_FXP_VERSION hello with version "1". -$OpenBSD: PROTOCOL,v 1.18 2012/12/11 22:31:18 markus Exp $ +$OpenBSD: PROTOCOL,v 1.19 2013/01/03 12:49:01 djm Exp $ |