diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-09-02 09:49:18 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-09-02 09:49:18 +0200 |
| commit | 4b1b05ad4c5b5813ebb9e768b3fd2a3ebc0d4da0 (patch) | |
| tree | c129659efec88eaa1770bf908716cab36e0be835 /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | 63a3de06cfc02762ff933bf34ec2a4307f51749b (diff) | |
| parent | c7ce9238217a2d0ca5bfbdeb25922495ef1d584a (diff) | |
| download | otp-4b1b05ad4c5b5813ebb9e768b3fd2a3ebc0d4da0.tar.gz otp-4b1b05ad4c5b5813ebb9e768b3fd2a3ebc0d4da0.tar.bz2 otp-4b1b05ad4c5b5813ebb9e768b3fd2a3ebc0d4da0.zip | |
Merge branch 'ia/ssl/ecc-digitally_signed/OTP-11229' into maint
* ia/ssl/ecc-digitally_signed/OTP-11229:
ssl: Skip second length indicator in EC extensions
ssl: Handle signature_algorithm field in digitally_signed properly with proper defaults
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index b5cf6d1212..b8849d5cbd 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -212,21 +212,20 @@ end_per_suite(_Config) -> %%-------------------------------------------------------------------- init_per_group(GroupName, Config) -> - case ssl_test_lib:is_tls_version(GroupName) of + case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of true -> + ssl_test_lib:init_tls_version(GroupName), + Config; + _ -> case ssl_test_lib:sufficient_crypto_support(GroupName) of true -> - ssl_test_lib:init_tls_version(GroupName), + ssl:start(), Config; false -> {skip, "Missing crypto support"} - end; - _ -> - ssl:start(), - Config + end end. - end_per_group(_GroupName, Config) -> Config. |