← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/ssh/src/ssh_transport.erl

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2009-06-11 12:18:07 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090611121807-ks7eb4xrt7dsysgx
Tags: 1:13.b.1-dfsg-1
http://bugs.debian.org/529512
* New upstream release.
* Removed unnecessary dependency of erlang-os-mon on erlang-observer and
  erlang-tools and added missing dependency of erlang-nox on erlang-os-mon
  (closes: #529512).
* Removed a patch to eunit application because the bug was fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ssh/src/ssh_transport.erl
685
685
pack(Data0, #ssh{encrypt_block_size = BlockSize, 
686
686
                 send_sequence = SeqNum, send_mac = MacAlg,
687
687
                 send_mac_key = MacKey} 
688
 
     = Ssh0) when binary(Data0) ->
 
688
     = Ssh0) when is_binary(Data0) ->
689
689
    {Ssh1, Data} = compress(Ssh0, Data0),
690
690
    PL = (BlockSize - ((4 + 1 + size(Data)) rem BlockSize)) rem BlockSize,
691
691
    PaddingLen = if PL <  4 -> PL + BlockSize;