diff options
| author | Gustav Simonsson <[email protected]> | 2012-03-26 15:50:31 +0200 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-03-26 15:51:03 +0200 |
| commit | c1f3ffc3df15422bb60a24eb6417069feec9352f (patch) | |
| tree | 4f7f95d95f33d6680ef09e5708b4db5bae7659dd /lib/ssl/src/ssl.erl | |
| parent | 49bd93a2bc608f84bc1bb849ee98e0677e34dd43 (diff) | |
| parent | 89ae746305215c5dd077441ba796ff37b03fdaa3 (diff) | |
| download | otp-c1f3ffc3df15422bb60a24eb6417069feec9352f.tar.gz otp-c1f3ffc3df15422bb60a24eb6417069feec9352f.tar.bz2 otp-c1f3ffc3df15422bb60a24eb6417069feec9352f.zip | |
Merge branch 'as/ssl-tls-prf-function' into maint
* as/ssl-tls-prf-function:
Some protocols (e.g. EAP-PEAP, EAP-TLS, EAP-TTLS)
that use TLS as transport layer need to generate
additional application specific key material
One way to generate such material is to use the
TLS PRF and key material from the TLS session itself
OTP-10024
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index d0693445e0..1048583eca 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -30,7 +30,7 @@ controlling_process/2, listen/2, pid/1, peername/1, peercert/1, recv/2, recv/3, send/2, getopts/2, setopts/2, sockname/1, versions/0, session_info/1, format_error/1, - renegotiate/1]). + renegotiate/1, prf/5]). -deprecated({pid, 1, next_major_release}). @@ -67,7 +67,7 @@ -type ssl_imp() :: new | old. -type transport_option() :: {cb_info, {CallbackModule::atom(), DataTag::atom(), ClosedTag::atom()}}. - +-type prf_random() :: client_random | server_random. %%-------------------------------------------------------------------- -spec start() -> ok | {error, reason()}. @@ -414,6 +414,17 @@ versions() -> renegotiate(#sslsocket{pid = Pid, fd = new_ssl}) -> ssl_connection:renegotiation(Pid). +%%-------------------------------------------------------------------- +-spec prf(#sslsocket{}, binary() | 'master_secret', binary(), + binary() | prf_random(), non_neg_integer()) -> + {ok, binary()} | {error, reason()}. +%% +%% Description: use a ssl sessions TLS PRF to generate key material +%%-------------------------------------------------------------------- +prf(#sslsocket{pid = Pid, fd = new_ssl}, + Secret, Label, Seed, WantedLength) -> + ssl_connection:prf(Pid, Secret, Label, Seed, WantedLength). + %%--------------------------------------------------------------- -spec format_error({error, term()}) -> list(). %% |