diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-05-28 08:01:01 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-05-28 11:02:06 +0200 |
| commit | 7f676f3e983d3d9c5fd645a6a6707d7a35dad524 (patch) | |
| tree | a14593fcfe46a3069506a9ac324550604a7bf1c3 /lib | |
| parent | 780d667b792aad9e57a8c62ea2a555a0cd57f7b7 (diff) | |
| download | otp-7f676f3e983d3d9c5fd645a6a6707d7a35dad524.tar.gz otp-7f676f3e983d3d9c5fd645a6a6707d7a35dad524.tar.bz2 otp-7f676f3e983d3d9c5fd645a6a6707d7a35dad524.zip | |
Cleaned code
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 1 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 20 |
2 files changed, 4 insertions, 17 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 2285f3b461..644c2772b2 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1286,7 +1286,6 @@ server_hello(ServerHello, #state{transport_cb = Transport, tls_handshake_hashes = Hashes0} = State) -> CipherSuite = ServerHello#server_hello.cipher_suite, {KeyAlgorithm, _, _} = ssl_cipher:suite_definition(CipherSuite), - %% Version = ServerHello#server_hello.server_version, TODO ska kontrolleras {BinMsg, ConnectionStates1, Hashes1} = encode_handshake(ServerHello, Version, ConnectionStates0, Hashes0), Transport:send(Socket, BinMsg), diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index dc110e2940..522eda54d6 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -2129,9 +2129,7 @@ server_require_peer_cert_fail(Config) when is_list(Config) -> {options, [{active, false} | BadClientOpts]}]), ssl_test_lib:check_result(Server, {error, esslaccept}, - Client, {error, esslconnect}), - ssl_test_lib:close(Server), - ssl_test_lib:close(Client). + Client, {error, esslconnect}). %%-------------------------------------------------------------------- @@ -2648,11 +2646,8 @@ invalid_signature_server(Config) when is_list(Config) -> {options, [{verify, verify_peer} | ClientOpts]}]), ssl_test_lib:check_result(Server, {error, "bad certificate"}, - Client, {error,"bad certificate"}), + Client, {error,"bad certificate"}). - ssl_test_lib:close(Server), - ssl_test_lib:close(Client). - %%-------------------------------------------------------------------- invalid_signature_client(doc) -> @@ -2691,10 +2686,7 @@ invalid_signature_client(Config) when is_list(Config) -> {options, NewClientOpts}]), ssl_test_lib:check_result(Server, {error, "bad certificate"}, - Client, {error,"bad certificate"}), - - ssl_test_lib:close(Server), - ssl_test_lib:close(Client). + Client, {error,"bad certificate"}). %%-------------------------------------------------------------------- cert_expired(doc) -> @@ -2754,11 +2746,7 @@ cert_expired(Config) when is_list(Config) -> {options, [{verify, verify_peer} | ClientOpts]}]), ssl_test_lib:check_result(Server, {error, "certificate expired"}, - Client, {error, "certificate expired"}), - - ssl_test_lib:close(Server), - ssl_test_lib:close(Client). - + Client, {error, "certificate expired"}). two_digits_str(N) when N < 10 -> lists:flatten(io_lib:format("0~p", [N])); |