diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-08-30 13:55:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-08-30 13:55:08 +0200 |
| commit | 45942fb2f521ae7e043987eedc0d6197ba7b55b0 (patch) | |
| tree | 2bbdbdc7b32a8d1da599b58c57eae33880a9968e /lib | |
| parent | 25543b7f0be1b87351d616143b5d149b1aed1cea (diff) | |
| parent | b0671d5e3382394d0b77a5ab40b3f667bef6f564 (diff) | |
| download | otp-45942fb2f521ae7e043987eedc0d6197ba7b55b0.tar.gz otp-45942fb2f521ae7e043987eedc0d6197ba7b55b0.tar.bz2 otp-45942fb2f521ae7e043987eedc0d6197ba7b55b0.zip | |
Merge branch 'ia/ssl/error_logger-info_report-args' into dev
* ia/ssl/error_logger-info_report-args:
Corrected input argument to error_logger:error_report/1
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 4e74aec4ac..dfda3e7bc4 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -383,8 +383,9 @@ master_secret(Version, #session{master_secret = Mastersecret}, ConnectionStates, Role) catch exit:Reason -> - error_logger:error_report("Key calculation failed due to ~p", - [Reason]), + Report = io_lib:format("Key calculation failed due to ~p", + [Reason]), + error_logger:error_report(Report), ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE) end; @@ -400,8 +401,9 @@ master_secret(Version, PremasterSecret, ConnectionStates, Role) -> SecParams, ConnectionStates, Role) catch exit:Reason -> - error_logger:error_report("Master secret calculation failed" - " due to ~p", [Reason]), + Report = io_lib:format("Master secret calculation failed" + " due to ~p", [Reason]), + error_logger:error_report(Report), ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE) end. |