diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-08-27 12:31:32 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-08-27 12:31:32 +0200 |
| commit | 81a0882fa92746907e69dea2f920b6c43292b663 (patch) | |
| tree | a3b7a4c0d902d7b2c7a2ff6987c31f9f30b20019 /lib/ssl/src/ssl_tls1.erl | |
| parent | 4bde8f52990bdddbd312a428ef4d727faebf5773 (diff) | |
| parent | 352887007496f0dcd72fbb4a228d3e3565f16a5b (diff) | |
| download | otp-81a0882fa92746907e69dea2f920b6c43292b663.tar.gz otp-81a0882fa92746907e69dea2f920b6c43292b663.tar.bz2 otp-81a0882fa92746907e69dea2f920b6c43292b663.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
ssl: Fixed compilation warnings
Corrected decoding to encorse a proper error return is there is tag mismatch
Diffstat (limited to 'lib/ssl/src/ssl_tls1.erl')
| -rw-r--r-- | lib/ssl/src/ssl_tls1.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_tls1.erl b/lib/ssl/src/ssl_tls1.erl index 1daf9640ab..41dc1bf0dc 100644 --- a/lib/ssl/src/ssl_tls1.erl +++ b/lib/ssl/src/ssl_tls1.erl @@ -81,7 +81,7 @@ certificate_verify(md5sha, _Version, Handshake) -> <<MD5/binary, SHA/binary>>; certificate_verify(HashAlgo, _Version, Handshake) -> - Hash = crypto:hash(HashAlgo, Handshake). + crypto:hash(HashAlgo, Handshake). -spec setup_keys(integer(), integer(), binary(), binary(), binary(), integer(), integer(), integer()) -> {binary(), binary(), binary(), |