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_packet_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_packet_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_packet_SUITE.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl index 4b74f57a60..593b1fda5e 100644 --- a/lib/ssl/test/ssl_packet_SUITE.erl +++ b/lib/ssl/test/ssl_packet_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2011. All Rights Reserved. +%% Copyright Ericsson AB 2008-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -53,6 +53,7 @@ %% variable, but should NOT alter/remove any existing entries. %%-------------------------------------------------------------------- init_per_suite(Config) -> + catch crypto:stop(), try crypto:start() of ok -> application:start(public_key), |