- djm@cvs.openbsd.org 2013/01/03 12:49:01

[PROTOCOL]
     fix description of MAC calculation for EtM modes; ok markus@
This commit is contained in:
Damien Miller 2013-01-09 15:57:16 +11:00
parent 441384453c
commit 3739c8f041
2 changed files with 7 additions and 3 deletions

View File

@ -16,6 +16,9 @@
add a couple of ServerOptions members that should be copied to the privsep add a couple of ServerOptions members that should be copied to the privsep
child (for consistency, in this case they happen only to be accessed in child (for consistency, in this case they happen only to be accessed in
the monitor); ok dtucker@ the monitor); ok dtucker@
- djm@cvs.openbsd.org 2013/01/03 12:49:01
[PROTOCOL]
fix description of MAC calculation for EtM modes; ok markus@
20121217 20121217
- (dtucker) [Makefile.in] Add some scaffolding so that the new regress - (dtucker) [Makefile.in] Add some scaffolding so that the new regress

View File

@ -70,9 +70,10 @@ verified without decrypting unauthenticated data.
As such, the MAC covers: 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 padding_length
byte[n1] payload; n1 = packet_length - padding_length - 1 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 This extension is advertised in the SSH_FXP_VERSION hello with version
"1". "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 $