diff options
author | Ingela Anderton Andin <[email protected]> | 2015-02-06 16:05:01 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-02-06 16:05:01 +0100 |
commit | bca4b9783e9f2d6845b970f23f1b2f9a0ded7121 (patch) | |
tree | 997bef1bc4b1bc67b4fc86b70af1ea851d036b21 /lib/ssl/test/ssl_basic_SUITE.erl | |
parent | 6cdbe4b9a3bb89d02f4d4f5cd513615d19191b5d (diff) | |
parent | fa9fda4a50ad92bb55f2a5707f0ec1dc7cf47d79 (diff) | |
download | otp-bca4b9783e9f2d6845b970f23f1b2f9a0ded7121.tar.gz otp-bca4b9783e9f2d6845b970f23f1b2f9a0ded7121.tar.bz2 otp-bca4b9783e9f2d6845b970f23f1b2f9a0ded7121.zip |
Merge branch 'ia/ssl/pem-cache/OTP-12464' into maint
* ia/ssl/pem-cache/OTP-12464:
ssl: Improve PEM cache by validating entries
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 1da4e88077..2d4d2452e3 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2014. All Rights Reserved. +%% Copyright Ericsson AB 2007-2015. 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 @@ -256,11 +256,6 @@ init_per_testcase(Case, Config) when Case == unordered_protocol_versions_client _ -> {skip, "TLS 1.2 need but not supported on this platform"} end; -init_per_testcase(no_authority_key_identifier, Config) -> - %% Clear cach so that root cert will not - %% be found. - ssl:clear_pem_cache(), - Config; init_per_testcase(protocol_versions, Config) -> ssl:stop(), |