diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-12-02 09:35:24 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-12-02 09:35:24 +0100 |
| commit | c86fc9abbef7d2af2b7e69a5dfc3c1749a411948 (patch) | |
| tree | 1bb2822e07e4d37fe490f9d6ae3d97426b2706c4 /lib/ssl/src/ssl_connection.erl | |
| parent | f29c64d43654e7c484fdf3e456ebc3d3efd7792c (diff) | |
| parent | d9def0c852dfd5a3d10743cbed877cabe653d63a (diff) | |
| download | otp-c86fc9abbef7d2af2b7e69a5dfc3c1749a411948.tar.gz otp-c86fc9abbef7d2af2b7e69a5dfc3c1749a411948.tar.bz2 otp-c86fc9abbef7d2af2b7e69a5dfc3c1749a411948.zip | |
Merge branch 'ia/ssl/dialyzer/OTP-12341' into maint
* ia/ssl/dialyzer/OTP-12341:
ssl: Prepare for release
ssl: Change code to reflect that state data may be secret
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 8ff9913cee..b6059eac58 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -937,27 +937,27 @@ terminate(_Reason, _StateName, #state{transport_cb = Transport, Transport:close(Socket). format_status(normal, [_, State]) -> - [{data, [{"StateData", State}]}]; + [{data, [{"StateData", State}]}]; format_status(terminate, [_, State]) -> SslOptions = (State#state.ssl_options), - NewOptions = SslOptions#ssl_options{password = "***", - cert = "***", - cacerts = "***", - key = "***", - dh = "***", - psk_identity = "***", - srp_identity = "***"}, - [{data, [{"StateData", State#state{connection_states = "***", - protocol_buffers = "***", - user_data_buffer = "***", - tls_handshake_history = "***", - session = "***", - private_key = "***", - diffie_hellman_params = "***", - diffie_hellman_keys = "***", - srp_params = "***", - srp_keys = "***", - premaster_secret = "***", + NewOptions = SslOptions#ssl_options{password = ?SECRET_PRINTOUT, + cert = ?SECRET_PRINTOUT, + cacerts = ?SECRET_PRINTOUT, + key = ?SECRET_PRINTOUT, + dh = ?SECRET_PRINTOUT, + psk_identity = ?SECRET_PRINTOUT, + srp_identity = ?SECRET_PRINTOUT}, + [{data, [{"StateData", State#state{connection_states = ?SECRET_PRINTOUT, + protocol_buffers = ?SECRET_PRINTOUT, + user_data_buffer = ?SECRET_PRINTOUT, + tls_handshake_history = ?SECRET_PRINTOUT, + session = ?SECRET_PRINTOUT, + private_key = ?SECRET_PRINTOUT, + diffie_hellman_params = ?SECRET_PRINTOUT, + diffie_hellman_keys = ?SECRET_PRINTOUT, + srp_params = ?SECRET_PRINTOUT, + srp_keys = ?SECRET_PRINTOUT, + premaster_secret = ?SECRET_PRINTOUT, ssl_options = NewOptions }}]}]. %%-------------------------------------------------------------------- |