diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-08-23 16:11:54 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-08-23 16:11:54 +0200 |
| commit | 2ce155ca0de6890cd5750d97a6593d67d4d940f7 (patch) | |
| tree | 25abf8777c196deaad73aea8be5c72a32e9217ef /lib/ssl/src/ssl_connection.hrl | |
| parent | c30530b3b3512668d9851cd8b88a7d4ad6aeafc3 (diff) | |
| parent | 487f0c12e8700d31161a3bbb9c36e360aff484ac (diff) | |
| download | otp-2ce155ca0de6890cd5750d97a6593d67d4d940f7.tar.gz otp-2ce155ca0de6890cd5750d97a6593d67d4d940f7.tar.bz2 otp-2ce155ca0de6890cd5750d97a6593d67d4d940f7.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/tls_v1.erl
Diffstat (limited to 'lib/ssl/src/ssl_connection.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.hrl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl index 811aa779d5..9cef0c9605 100644 --- a/lib/ssl/src/ssl_connection.hrl +++ b/lib/ssl/src/ssl_connection.hrl @@ -59,7 +59,7 @@ 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(), + key_algorithm :: ssl_cipher_format:key_algo(), hashsign_algorithm = {undefined, undefined}, cert_hashsign_algorithm = {undefined, undefined}, public_key_info :: ssl_handshake:public_key_info() | 'undefined', |