diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-04-05 12:21:44 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-05 12:21:44 +0200 |
| commit | a1100c46c2ca2121d723edc03cb7885e3014af7c (patch) | |
| tree | 35fa69527d6e48d55efc911c783c77530c0196fa /lib/ssl/src/dtls_handshake.erl | |
| parent | c156873ec1a81ce1b2909488ddbf430922d5f8e9 (diff) | |
| parent | e594aad2f87aab39e99fccf9e021bc94e0bbf7d4 (diff) | |
| download | otp-a1100c46c2ca2121d723edc03cb7885e3014af7c.tar.gz otp-a1100c46c2ca2121d723edc03cb7885e3014af7c.tar.bz2 otp-a1100c46c2ca2121d723edc03cb7885e3014af7c.zip | |
Merge branch 'ingela/ssl/dtls-cookie/OTP-14076'
* ingela/ssl/dtls-cookie/OTP-14076:
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; |