diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-16 09:47:11 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-16 09:47:11 +0100 |
| commit | 70defe957f68f5ad4a4957af29c8713556074995 (patch) | |
| tree | f859c979f2f32015bdb56144fcac8720996da325 /lib/ssl/src/ssl_record.erl | |
| parent | 8c7b86083be0f86f62918b73117121617624ec48 (diff) | |
| parent | d23177bc6b609ea69a1caac6f04d9dbffc5c526c (diff) | |
| download | otp-70defe957f68f5ad4a4957af29c8713556074995.tar.gz otp-70defe957f68f5ad4a4957af29c8713556074995.tar.bz2 otp-70defe957f68f5ad4a4957af29c8713556074995.zip | |
Merge branch 'ingela/ssl/code-enhance' into maint
* ingela/ssl/code-enhance:
ssl: Align code of TLS/DTLS handshake handling
ssl: Align code of TLS/DTLS record handling
ssl: Align code of main modules implementing the gen_statem behaviour
dtls: Add state spec
Diffstat (limited to 'lib/ssl/src/ssl_record.erl')
| -rw-r--r-- | lib/ssl/src/ssl_record.erl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl index 003ad4994b..dd6a3e8521 100644 --- a/lib/ssl/src/ssl_record.erl +++ b/lib/ssl/src/ssl_record.erl @@ -53,11 +53,11 @@ -type ssl_atom_version() :: tls_record:tls_atom_version(). -type connection_states() :: term(). %% Map -type connection_state() :: term(). %% Map + %%==================================================================== -%% Internal application API +%% Connection state handling %%==================================================================== - %%-------------------------------------------------------------------- -spec current_connection_state(connection_states(), read | write) -> connection_state(). @@ -267,6 +267,9 @@ set_pending_cipher_state(#{pending_read := Read, pending_read => Read#{cipher_state => ServerState}, pending_write => Write#{cipher_state => ClientState}}. +%%==================================================================== +%% Compression +%%==================================================================== uncompress(?NULL, Data, CS) -> {Data, CS}. @@ -282,6 +285,11 @@ compress(?NULL, Data, CS) -> compressions() -> [?byte(?NULL)]. + +%%==================================================================== +%% Payload encryption/decryption +%%==================================================================== + %%-------------------------------------------------------------------- -spec cipher(ssl_version(), iodata(), connection_state(), MacHash::binary()) -> {CipherFragment::binary(), connection_state()}. |