diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-12-17 10:04:29 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-12-17 10:04:29 +0100 |
| commit | bacfd415bfcd4476c4d146f712cb5e5f6059024a (patch) | |
| tree | eeeff9ae73e88b32c02a95a8e897bab5b4a8c942 | |
| parent | 059606a330e8e86305699f60de144102560cb57b (diff) | |
| parent | 9372111e120c23cd9048e8888c608846139e756d (diff) | |
| download | otp-bacfd415bfcd4476c4d146f712cb5e5f6059024a.tar.gz otp-bacfd415bfcd4476c4d146f712cb5e5f6059024a.tar.bz2 otp-bacfd415bfcd4476c4d146f712cb5e5f6059024a.zip | |
Merge branch 'ia/ssl/cover-clean' into dev
* ia/ssl/cover-clean:
Cleaned up meaningless code discovered thanks to cover
| -rw-r--r-- | lib/ssl/src/ssl_ssl3.erl | 5 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_tls1.erl | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/lib/ssl/src/ssl_ssl3.erl b/lib/ssl/src/ssl_ssl3.erl index c49f9f1e6d..f2926b2d2f 100644 --- a/lib/ssl/src/ssl_ssl3.erl +++ b/lib/ssl/src/ssl_ssl3.erl @@ -102,11 +102,6 @@ mac_hash(Method, Mac_write_secret, Seq_num, Type, Length, Fragment) -> %% hash(MAC_write_secret + pad_1 + seq_num + %% SSLCompressed.type + SSLCompressed.length + %% SSLCompressed.fragment)); - case Method of - ?NULL -> ok; - _ -> - ok - end, Mac = mac_hash(Method, Mac_write_secret, [<<?UINT64(Seq_num), ?BYTE(Type), ?UINT16(Length)>>, Fragment]), diff --git a/lib/ssl/src/ssl_tls1.erl b/lib/ssl/src/ssl_tls1.erl index 3784483e9c..5f9850c386 100644 --- a/lib/ssl/src/ssl_tls1.erl +++ b/lib/ssl/src/ssl_tls1.erl @@ -128,11 +128,6 @@ mac_hash(Method, Mac_write_secret, Seq_num, Type, {Major, Minor}, %% HMAC_hash(MAC_write_secret, seq_num + TLSCompressed.type + %% TLSCompressed.version + TLSCompressed.length + %% TLSCompressed.fragment)); - case Method of - ?NULL -> ok; - _ -> - ok - end, Mac = hmac_hash(Method, Mac_write_secret, [<<?UINT64(Seq_num), ?BYTE(Type), ?BYTE(Major), ?BYTE(Minor), ?UINT16(Length)>>, |