diff options
| author | Gustav Simonsson <[email protected]> | 2012-03-26 15:54:03 +0200 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-03-26 15:54:03 +0200 |
| commit | 7f16b728cbd31de5e4a2a6a5955fd22fe312ea52 (patch) | |
| tree | de657654305e125b9a996c3b8c66d8ae0070c11f /lib/ssl/src/ssl_tls1.erl | |
| parent | a4b0acb38df8efb1c1cff8451f529dba81a3bbae (diff) | |
| parent | c1f3ffc3df15422bb60a24eb6417069feec9352f (diff) | |
| download | otp-7f16b728cbd31de5e4a2a6a5955fd22fe312ea52.tar.gz otp-7f16b728cbd31de5e4a2a6a5955fd22fe312ea52.tar.bz2 otp-7f16b728cbd31de5e4a2a6a5955fd22fe312ea52.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_tls1.erl')
| -rw-r--r-- | lib/ssl/src/ssl_tls1.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_tls1.erl b/lib/ssl/src/ssl_tls1.erl index 5f9850c386..7351f34b61 100644 --- a/lib/ssl/src/ssl_tls1.erl +++ b/lib/ssl/src/ssl_tls1.erl @@ -29,7 +29,7 @@ -include("ssl_record.hrl"). -export([master_secret/3, finished/3, certificate_verify/2, mac_hash/7, - setup_keys/6, suites/0]). + setup_keys/6, suites/0, prf/4]). %%==================================================================== %% Internal application API |