diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-04-07 13:07:02 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-07 13:07:02 +0000 |
| commit | 1303d1a82206773c85a8d5bc734f3659ff12c078 (patch) | |
| tree | e0a1d5b46bf582e6d31bf2caafd531c4ad3e6cbd /lib/ssl | |
| parent | c9a28867c74755a68c43ff8f683fbd8004d5c3ba (diff) | |
| download | otp-1303d1a82206773c85a8d5bc734f3659ff12c078.tar.gz otp-1303d1a82206773c85a8d5bc734f3659ff12c078.tar.bz2 otp-1303d1a82206773c85a8d5bc734f3659ff12c078.zip | |
** Empty commit message **
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 14 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index f985058cd7..ee799c50c8 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -448,9 +448,19 @@ trigger_renegotiate(Socket, _, 0, Id) -> test_server:sleep(1000), case ssl:session_info(Socket) of [{session_id, Id} | _ ] -> + %% If a warning alert is received + %% from openssl this may not be + %% an error! fail_session_not_renegotiated; - _ -> - ok + %% Tests that uses this function will no reuse + %% sessions so if we get a new session id the + %% renegotiation has seceded. + [{session_id, _} | _ ] -> + ok; + {error, closed} -> + fail_session_fatal_alert_during_renegotiation; + {error, timeout} -> + fail_timeout end; trigger_renegotiate(Socket, ErlData, N, Id) -> diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index adb5b9cd13..624404b556 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -327,7 +327,7 @@ erlang_client_openssl_server_no_wrap_sequence_number(Config) when is_list(Config {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config), - ErlData = "From erlang to openssl", + ErlData = "From erlang to openssl\n", N = 10, Port = ssl_test_lib:inet_port(node()), diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 6b76dffd86..0f3f8e95ec 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -19,7 +19,7 @@ SSL_VSN = 3.11 -TICKETS = OTP-8517 OTP-7046 +TICKETS = OTP-8517 OTP-7046 OTP-8557 #TICKETS_3.10.9 = OTP-8510 |