← Back to branch summary

~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to lib/ssl/src/ssl_ssl3.erl

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2011-12-15 19:20:10 UTC
  • mfrom: (1.1.18) (3.5.15 sid)
  • mto: (3.5.16 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: package-import@ubuntu.com-20111215192010-jnxcfe3tbrpp0big
Tags: 1:15.b-dfsg-1
* New upstream release.
* Upload to experimental because this release breaks external drivers
  API along with ABI, so several applications are to be fixed.
* Removed SSL patch because the old SSL implementation is removed from
  the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
  application was dropped by upstream.
* Documented dropping ${erlang-docbuilder:Depends} substvar in
  erlang-depends(1) manpage.
* Made erlang-base and erlang-base-hipe provide virtual package
  erlang-abi-15.b (the number means the first erlang version, which
  provides current ABI).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ssl/src/ssl_ssl3.erl
102
102
    %%      hash(MAC_write_secret + pad_1 + seq_num +
103
103
    %%           SSLCompressed.type + SSLCompressed.length +
104
104
    %%           SSLCompressed.fragment));
105
 
    case Method of
106
 
        ?NULL -> ok;
107
 
        _ ->
108
 
            ok
109
 
    end,
110
105
    Mac = mac_hash(Method, Mac_write_secret, 
111
106
                   [<<?UINT64(Seq_num), ?BYTE(Type), 
112
107
                     ?UINT16(Length)>>, Fragment]),