diff options
| author | Hans Nilsson <[email protected]> | 2015-08-26 09:54:11 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-08-26 09:54:11 +0200 |
| commit | 5e775a5a61f4f4549fda1ad0d9d428d0977217af (patch) | |
| tree | b4cd46d475059d6af33bb3eace42d26a84436b5c /lib/ssh/src/ssh_transport.erl | |
| parent | 624f7c336af233186da0fe0f972fc2dcd214c4f9 (diff) | |
| parent | b78c3b351fc955aa14bdfc3577890031ffffa9f0 (diff) | |
| download | otp-5e775a5a61f4f4549fda1ad0d9d428d0977217af.tar.gz otp-5e775a5a61f4f4549fda1ad0d9d428d0977217af.tar.bz2 otp-5e775a5a61f4f4549fda1ad0d9d428d0977217af.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/src/ssh_transport.erl')
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index 38a0b7ec7c..9ed6c85ff7 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -745,13 +745,20 @@ ssh_packet(Msg, Ssh) -> pack(Data0, #ssh{encrypt_block_size = BlockSize, send_sequence = SeqNum, send_mac = MacAlg, - send_mac_key = MacKey} + send_mac_key = MacKey, + random_length_padding = RandomLengthPadding} = Ssh0) when is_binary(Data0) -> {Ssh1, Data} = compress(Ssh0, Data0), PL = (BlockSize - ((4 + 1 + size(Data)) rem BlockSize)) rem BlockSize, - PaddingLen = if PL < 4 -> PL + BlockSize; - true -> PL - end, + MinPaddingLen = if PL < 4 -> PL + BlockSize; + true -> PL + end, + PadBlockSize = max(BlockSize,4), + MaxExtraBlocks = (max(RandomLengthPadding,MinPaddingLen) - MinPaddingLen) div PadBlockSize, + ExtraPaddingLen = try crypto:rand_uniform(0,MaxExtraBlocks)*PadBlockSize + catch _:_ -> 0 + end, + PaddingLen = MinPaddingLen + ExtraPaddingLen, Padding = ssh_bits:random(PaddingLen), PacketLen = 1 + PaddingLen + size(Data), PacketData = <<?UINT32(PacketLen),?BYTE(PaddingLen), |