diff options
| author | Raimo Niskanen <[email protected]> | 2019-02-21 14:42:07 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-02-21 14:42:07 +0100 |
| commit | 9e9884640b7d0ee69cd39909842ec5fc8826859f (patch) | |
| tree | 08afd3c1a804077457d164b63d1c70b56a139518 /lib/ssl/src/ssl_connection.hrl | |
| parent | f06f5bf23a3cd1f040c8ab6f059097d22161abc7 (diff) | |
| parent | c4fb3492f48d00214d509de5ec9336e4adf51c58 (diff) | |
| download | otp-9e9884640b7d0ee69cd39909842ec5fc8826859f.tar.gz otp-9e9884640b7d0ee69cd39909842ec5fc8826859f.tar.bz2 otp-9e9884640b7d0ee69cd39909842ec5fc8826859f.zip | |
Merge branch 'raimo/ssl/tls-optimization/OTP-15529' into maint
* raimo/ssl/tls-optimization/OTP-15529:
Inline local function
Optimize binary matching
Clean up module boundaries
Remove redundant return of CipherState
Use iovec() internally in send path
Small binary handling optimizations
Optimize read_application_data with Okasaki queue
Try to optimize decode_cipher_text/3
Optimize application data aggregation
Optimize TLS record parsing with Okasaki queue
Cache strong_random_bytes for IV
Optimize padding
Produce less garbage in encrypt loop
Reorganize #data{}
Tidy up state machine
Add server GC info to bench results
Diffstat (limited to 'lib/ssl/src/ssl_connection.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.hrl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl index 83013e7fba..b6b23701bb 100644 --- a/lib/ssl/src/ssl_connection.hrl +++ b/lib/ssl/src/ssl_connection.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2018. All Rights Reserved. +%% Copyright Ericsson AB 2013-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -83,7 +83,7 @@ downgrade, terminated = false ::boolean() | closed, negotiated_version :: ssl_record:ssl_version() | 'undefined', - erl_dist_handle = undefined :: erlang:dist_handle() | undefined, + erl_dist_handle = undefined :: erlang:dist_handle() | 'undefined', private_key :: public_key:private_key() | secret_printout() | 'undefined' }). @@ -109,7 +109,7 @@ %% Data shuffling %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% connection_states :: ssl_record:connection_states() | secret_printout(), protocol_buffers :: term() | secret_printout() , %% #protocol_buffers{} from tls_record.hrl or dtls_recor.hr - user_data_buffer :: undefined | binary() | secret_printout(), + user_data_buffer :: undefined | {[binary()],non_neg_integer(),[binary()]} | secret_printout(), bytes_to_read :: undefined | integer(), %% bytes to read in passive mode %% recv and start handling |