diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-08-30 13:56:14 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-08-30 13:56:14 +0200 |
| commit | 20ec82caad1d8c3feee7246cf52837e6c4324f36 (patch) | |
| tree | 4bcce71928fc2bb66fa453e63b1e3a670d95802b /lib | |
| parent | db333803584b17b6f281c974f8f78034be60e010 (diff) | |
| parent | 45942fb2f521ae7e043987eedc0d6197ba7b55b0 (diff) | |
| download | otp-20ec82caad1d8c3feee7246cf52837e6c4324f36.tar.gz otp-20ec82caad1d8c3feee7246cf52837e6c4324f36.tar.bz2 otp-20ec82caad1d8c3feee7246cf52837e6c4324f36.zip | |
Merge branch 'dev' into major
* dev:
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. |