diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-05-22 09:42:23 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-05-22 09:42:23 +0200 |
| commit | cfb049920057b7cf93582f6d222156c93ca07db7 (patch) | |
| tree | ee3085eab0553df90f4113c45159ea77a0b1f6c2 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 709390cb5426d12b0651f134dce7232006a7c3c8 (diff) | |
| parent | 718a7553c0f41971b1b6e5d7886851adb550b3b2 (diff) | |
| download | otp-cfb049920057b7cf93582f6d222156c93ca07db7.tar.gz otp-cfb049920057b7cf93582f6d222156c93ca07db7.tar.bz2 otp-cfb049920057b7cf93582f6d222156c93ca07db7.zip | |
Merge branch 'ia/ssl/SNI-cuddle'
* ia/ssl/SNI-cuddle:
ssl: Make test case timing independent
ssl: Use new API function connection_information in tests
ssl: Increase readability
ssl: Add cleanup to tests
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 8b98e6f16b..a3bfdf8893 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -949,7 +949,8 @@ der_to_pem(File, Entries) -> file:write_file(File, PemBin). cipher_result(Socket, Result) -> - Result = ssl:connection_info(Socket), + {ok, Info} = ssl:connection_information(Socket), + Result = {ok, {proplists:get_value(protocol, Info), proplists:get_value(cipher_suite, Info)}}, ct:log("~p:~p~nSuccessfull connect: ~p~n", [?MODULE,?LINE, Result]), %% Importante to send two packets here %% to properly test "cipher state" handling |