diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:01:39 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:01:39 +0100 |
| commit | b91e7498e625b4e6419238f753c30b509fb958d2 (patch) | |
| tree | 13242c026475c2942ee3c998c8b12816f8b65646 /lib/ssl/src/dtls_v1.erl | |
| parent | f015c1ae35a94ca52e80ceae7a76806fe848a553 (diff) | |
| parent | 1e6942e97339ff39a0436834c260bf50c3d3a481 (diff) | |
| download | otp-b91e7498e625b4e6419238f753c30b509fb958d2.tar.gz otp-b91e7498e625b4e6419238f753c30b509fb958d2.tar.bz2 otp-b91e7498e625b4e6419238f753c30b509fb958d2.zip | |
Merge branch 'ingela/dtls/statem/OTP-12982' into maint
* ingela/dtls/statem/OTP-12982:
ssl: Implement DTLS state machine
Diffstat (limited to 'lib/ssl/src/dtls_v1.erl')
| -rw-r--r-- | lib/ssl/src/dtls_v1.erl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/ssl/src/dtls_v1.erl b/lib/ssl/src/dtls_v1.erl index 8c03bda513..ffd3e4b833 100644 --- a/lib/ssl/src/dtls_v1.erl +++ b/lib/ssl/src/dtls_v1.erl @@ -21,7 +21,7 @@ -include("ssl_cipher.hrl"). --export([suites/1, mac_hash/7, ecc_curves/1, corresponding_tls_version/1]). +-export([suites/1, mac_hash/7, ecc_curves/1, corresponding_tls_version/1, corresponding_dtls_version/1]). -spec suites(Minor:: 253|255) -> [ssl_cipher:cipher_suite()]. @@ -29,7 +29,7 @@ suites(Minor) -> tls_v1:suites(corresponding_minor_tls_version(Minor)). mac_hash(Version, MacAlg, MacSecret, SeqNo, Type, Length, Fragment) -> - tls_v1:mac_hash(MacAlg, MacSecret, SeqNo, Type, corresponding_tls_version(Version), + tls_v1:mac_hash(MacAlg, MacSecret, SeqNo, Type, Version, Length, Fragment). ecc_curves({_Major, Minor}) -> @@ -42,3 +42,11 @@ corresponding_minor_tls_version(255) -> 2; corresponding_minor_tls_version(253) -> 3. + +corresponding_dtls_version({3, Minor}) -> + {254, corresponding_minor_dtls_version(Minor)}. + +corresponding_minor_dtls_version(2) -> + 255; +corresponding_minor_dtls_version(3) -> + 253. |