diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-03-24 14:25:37 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-03-30 11:15:40 +0200 |
| commit | e594aad2f87aab39e99fccf9e021bc94e0bbf7d4 (patch) | |
| tree | 3ab462378d305e3098c9be4cd8a9e95989fc9be7 /lib/ssl/src/dtls_handshake.erl | |
| parent | 84be7e0ec7c0c64f1beb418cdd09879822aca4b0 (diff) | |
| download | otp-e594aad2f87aab39e99fccf9e021bc94e0bbf7d4.tar.gz otp-e594aad2f87aab39e99fccf9e021bc94e0bbf7d4.tar.bz2 otp-e594aad2f87aab39e99fccf9e021bc94e0bbf7d4.zip | |
dtls: Implement DTLS cookie secret generation
Diffstat (limited to 'lib/ssl/src/dtls_handshake.erl')
| -rw-r--r-- | lib/ssl/src/dtls_handshake.erl | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/ssl/src/dtls_handshake.erl b/lib/ssl/src/dtls_handshake.erl index 4c525fae1b..d3ba90a226 100644 --- a/lib/ssl/src/dtls_handshake.erl +++ b/lib/ssl/src/dtls_handshake.erl @@ -474,14 +474,12 @@ merge_fragments(#handshake_fragment{ fragment = <<PreviousData/binary, Data/binary>>}; %% already fully contained fragment merge_fragments(#handshake_fragment{ - fragment_offset = PreviousOffSet, - fragment_length = PreviousLen, - fragment = PreviousData - } = Previous, - #handshake_fragment{ - fragment_offset = CurrentOffSet, - fragment_length = CurrentLen, - fragment = CurrentData}) + fragment_offset = PreviousOffSet, + fragment_length = PreviousLen + } = Previous, + #handshake_fragment{ + fragment_offset = CurrentOffSet, + fragment_length = CurrentLen}) when PreviousOffSet + PreviousLen >= CurrentOffSet andalso PreviousOffSet + PreviousLen >= CurrentOffSet + CurrentLen -> Previous; |