diff options
author | Ingela Anderton Andin <[email protected]> | 2019-02-18 11:30:46 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2019-02-18 15:29:38 +0100 |
commit | 9fa531fa5d901ec1fa9249b25ae301d94f2ef51e (patch) | |
tree | 726713e122a8bc3be2ec747082a2121434355d8a /lib/ssl/src/tls_handshake_1_3.erl | |
parent | d89ac6959f8f5c9f8d4960f84e23e34e9da25323 (diff) | |
parent | 3479136b0a14fc213dfb34c9d44b8350d9f50ff3 (diff) | |
download | otp-9fa531fa5d901ec1fa9249b25ae301d94f2ef51e.tar.gz otp-9fa531fa5d901ec1fa9249b25ae301d94f2ef51e.tar.bz2 otp-9fa531fa5d901ec1fa9249b25ae301d94f2ef51e.zip |
Merge branch 'maint'
Conflicts:
lib/ssl/src/dtls_connection.erl
lib/ssl/src/ssl_connection.erl
lib/ssl/src/ssl_connection.hrl
lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/ssl/src/tls_handshake_1_3.erl')
-rw-r--r-- | lib/ssl/src/tls_handshake_1_3.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/ssl/src/tls_handshake_1_3.erl b/lib/ssl/src/tls_handshake_1_3.erl index e009524f98..c099e3f276 100644 --- a/lib/ssl/src/tls_handshake_1_3.erl +++ b/lib/ssl/src/tls_handshake_1_3.erl @@ -452,7 +452,7 @@ do_negotiated(#{client_share := ClientKey, ssl_options = #ssl_options{} = _SslOpts, key_share = KeyShare, handshake_env = #handshake_env{tls_handshake_history = _HHistory0}, - private_key = CertPrivateKey, + connection_env = #connection_env{private_key = CertPrivateKey}, static_env = #static_env{ cert_db = CertDbHandle, cert_db_ref = CertDbRef, @@ -516,7 +516,6 @@ do_wait_finished(#change_cipher_spec{}, ssl_options = #ssl_options{} = _SslOpts, key_share = _KeyShare, handshake_env = #handshake_env{tls_handshake_history = _HHistory0}, - private_key = _CertPrivateKey, static_env = #static_env{ cert_db = _CertDbHandle, cert_db_ref = _CertDbRef, @@ -540,7 +539,6 @@ do_wait_finished(#finished{}, ssl_options = #ssl_options{} = _SslOpts, key_share = _KeyShare, handshake_env = #handshake_env{tls_handshake_history = _HHistory0}, - private_key = _CertPrivateKey, static_env = #static_env{ cert_db = _CertDbHandle, cert_db_ref = _CertDbRef, |