diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-04-28 11:04:51 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-28 11:04:51 +0200 |
| commit | 9f7cd3093a1698c9bf2da569362d8071ec5a7ca6 (patch) | |
| tree | a65c071c49f7372b7f81d56f41e202904ea2d11b /lib/ssl/src/tls_v1.erl | |
| parent | 0ca63ae3fa7bee0920d7a9f77a8a79f265d899a4 (diff) | |
| parent | b65187abe4c18b05bd2391f56a8309ca1e78750d (diff) | |
| download | otp-9f7cd3093a1698c9bf2da569362d8071ec5a7ca6.tar.gz otp-9f7cd3093a1698c9bf2da569362d8071ec5a7ca6.tar.bz2 otp-9f7cd3093a1698c9bf2da569362d8071ec5a7ca6.zip | |
Merge branch 'ingela/dtls/mac'
* ingela/dtls/mac:
ssl: Correct DTLS mac handling
Diffstat (limited to 'lib/ssl/src/tls_v1.erl')
| -rw-r--r-- | lib/ssl/src/tls_v1.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index f52ee06e71..5a46b1770d 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -29,7 +29,7 @@ -include("ssl_internal.hrl"). -include("ssl_record.hrl"). --export([master_secret/4, finished/5, certificate_verify/3, mac_hash/7, +-export([master_secret/4, finished/5, certificate_verify/3, mac_hash/7, hmac_hash/3, setup_keys/8, suites/1, prf/5, ecc_curves/1, ecc_curves/2, oid_to_enum/1, enum_to_oid/1, default_signature_algs/1, signature_algs/2]). |