diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-23 17:07:08 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-23 17:07:08 +0100 |
| commit | 6a51514556328dcc56de8f2b75eae01b18b96637 (patch) | |
| tree | e22dac4c9e289a29646838b1406d144d915ea31a /lib/ssl/src/ssl_connection.hrl | |
| parent | 754afa1d10e32d2e50d0a8b5ddf316037ba9d6fc (diff) | |
| parent | a453532fe31eecd8c39b5035702ee20b402fd687 (diff) | |
| download | otp-6a51514556328dcc56de8f2b75eae01b18b96637.tar.gz otp-6a51514556328dcc56de8f2b75eae01b18b96637.tar.bz2 otp-6a51514556328dcc56de8f2b75eae01b18b96637.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssl/src/ssl_connection.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.hrl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl index 3e26f67de1..f9d2149170 100644 --- a/lib/ssl/src/ssl_connection.hrl +++ b/lib/ssl/src/ssl_connection.hrl @@ -57,6 +57,7 @@ session_cache_cb :: atom(), crl_db :: term(), negotiated_version :: ssl_record:ssl_version() | 'undefined', + client_hello_version :: ssl_record:ssl_version() | 'undefined', client_certificate_requested = false :: boolean(), key_algorithm :: ssl_cipher:key_algo(), hashsign_algorithm = {undefined, undefined}, |