diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-03-08 10:39:22 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-03-08 10:39:22 +0100 |
| commit | 70d003ddaecfc290cee565920b89579417c34f9a (patch) | |
| tree | a0bb6492a867bf61a8d43a3baec570aa29c08a06 /lib/ssl/src/dtls_handshake.erl | |
| parent | 0fe6927bf752226270b191282375a031768d8be3 (diff) | |
| parent | 000f557f87eb80d3f7c7b57adacd016986117f81 (diff) | |
| download | otp-70d003ddaecfc290cee565920b89579417c34f9a.tar.gz otp-70d003ddaecfc290cee565920b89579417c34f9a.tar.bz2 otp-70d003ddaecfc290cee565920b89579417c34f9a.zip | |
Merge branch 'ingela/ssl/dtls-cont' into maint
* ingela/ssl/dtls-cont:
dtls: Only test this for TLS for now
dtls: Avoid mixup of protocol to test
dtls: 'dtlsv1.2' corresponds to 'tlsv1.2'
dtls: Correct dialyzer spec and postpone inclusion of test
dtls: Erlang distribution over DTLS is not supported
dtls: Enable some DTLS tests in ssl_to_openssl_SUITE
dtls: Enable DTLS test in ssl_certificate_verify_SUITE
dtls: Hibernation and retransmit timers
dtls: Make sure retransmission timers are run
dtls: DTLS specific handling of socket and ciphers
Diffstat (limited to 'lib/ssl/src/dtls_handshake.erl')
| -rw-r--r-- | lib/ssl/src/dtls_handshake.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/dtls_handshake.erl b/lib/ssl/src/dtls_handshake.erl index af3708ddb7..fd1f9698fe 100644 --- a/lib/ssl/src/dtls_handshake.erl +++ b/lib/ssl/src/dtls_handshake.erl @@ -136,9 +136,11 @@ handshake_bin([Type, Length, Data], Seq) -> %%-------------------------------------------------------------------- -spec get_dtls_handshake(dtls_record:dtls_version(), binary(), #protocol_buffers{}) -> - {[{dtls_handshake(), binary()}], #protocol_buffers{}} | {more_data, #protocol_buffers{}}. + {[dtls_handshake()], #protocol_buffers{}}. %% -%% Description: ... +%% Description: Given buffered and new data from dtls_record, collects +%% and returns it as a list of handshake messages, also returns +%% possible leftover data in the new "protocol_buffers". %%-------------------------------------------------------------------- get_dtls_handshake(Version, Fragment, ProtocolBuffers) -> handle_fragments(Version, Fragment, ProtocolBuffers, []). @@ -288,8 +290,6 @@ do_handle_fragments(_, [], Buffers, Acc) -> {lists:reverse(Acc), Buffers}; do_handle_fragments(Version, [Fragment | Fragments], Buffers0, Acc) -> case reassemble(Version, Fragment, Buffers0) of - {more_data, _} = More when Acc == []-> - More; {more_data, Buffers} when Fragments == [] -> {lists:reverse(Acc), Buffers}; {more_data, Buffers} -> |