diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-06-13 09:45:02 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-06-13 09:45:02 +0200 |
| commit | ea31957b8c32dda844ecf690878687996830bb84 (patch) | |
| tree | 9a269428d49354ec10e810c02a75a36832a8f0a6 /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | b1f82aa8aa1f930d3125068c33198aefa93abdcd (diff) | |
| parent | 67d2e30e77db74d0852421c21362d1a9374780e1 (diff) | |
| download | otp-ea31957b8c32dda844ecf690878687996830bb84.tar.gz otp-ea31957b8c32dda844ecf690878687996830bb84.tar.bz2 otp-ea31957b8c32dda844ecf690878687996830bb84.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
ssl: Test case fixes
ssl: Avoid second bottleneck in supervisor
ssl: File handling optimization
ssl: Simpler PEM cache
ssl: Refactored for readability
ssl: Use md5 as file ref id instead of filenames
ssl: Move ets:select bottleneck in server
ssl: Renegotiate updates session id in gen_fsm state
ssl: Use ordered_set in cache
ssl: Move and avoid ets:select bottleneck in client
ssl: Reuse session check optimization
ssl: Avoid supervior bottleneck
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 590ecf33ca..2eaab02665 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -50,6 +50,7 @@ %%-------------------------------------------------------------------- init_per_suite(Config0) -> Dog = ssl_test_lib:timetrap(?LONG_TIMEOUT *2), + catch crypto:stop(), try crypto:start() of ok -> application:start(public_key), @@ -3649,6 +3650,8 @@ no_reuses_session_server_restart_new_cert_file(Config) when is_list(Config) -> ssl_test_lib:close(Server), ssl_test_lib:close(Client0), + ssl:clear_pem_cache(), + NewServerOpts = new_config(PrivDir, DsaServerOpts), Server1 = |