diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-23 16:50:10 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-23 16:50:10 +0100 |
| commit | a453532fe31eecd8c39b5035702ee20b402fd687 (patch) | |
| tree | 68ad1f9247963c5fb049315efeb0cad7fd3aaa13 /lib/ssl/src/ssl_connection.hrl | |
| parent | 8a2e432f92f621a8048ea8e92c2801f323c51280 (diff) | |
| parent | 2302ea8ca97b8a9075e9234d15430c47d3a115c8 (diff) | |
| download | otp-a453532fe31eecd8c39b5035702ee20b402fd687.tar.gz otp-a453532fe31eecd8c39b5035702ee20b402fd687.tar.bz2 otp-a453532fe31eecd8c39b5035702ee20b402fd687.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
public_key: verify ip (both v4 and v6)
public_key: Added IP4 address checks to hostname_verification tests
ssl: Fix test cases to work on all test platforms
public_key: Fix dialyzer spec
ssl: Sessions must be registered with SNI if exists
ssl: Extend hostname check to fallback to checking IP-address
public_key, ssl: Handles keys so that APIs are preserved correctly
ssl: Use ?FUNCTION_NAME
ssl: Prepare for release
ssl: Countermeasurements for Bleichenbacher attack
Conflicts:
lib/public_key/doc/src/public_key.xml
lib/public_key/test/public_key_SUITE.erl
lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName_IP.pem
lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf
lib/ssl/src/dtls_connection.erl
lib/ssl/src/ssl_connection.erl
lib/ssl/src/ssl_handshake.erl
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}, |