diff options
author | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:53:12 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:53:12 +0200 |
commit | 56e08cb2d1faa279961413729e48ef1f3275a575 (patch) | |
tree | d3bea204f76c2202090f1b500c9d47c4fca661ed /lib/ssl/test/ssl_payload_SUITE.erl | |
parent | c095c23a9d0e07ecde8c1ca7ad24ffb9f2ca3182 (diff) | |
parent | 6166867da5cbfe97b09cddf2e079178a2e959c44 (diff) | |
download | otp-56e08cb2d1faa279961413729e48ef1f3275a575.tar.gz otp-56e08cb2d1faa279961413729e48ef1f3275a575.tar.bz2 otp-56e08cb2d1faa279961413729e48ef1f3275a575.zip |
Merge branch 'ia/public_key/crypto/prepare-for-release' into maint
* ia/public_key/crypto/prepare-for-release:
public_key & ssl: Add ASN-1 dependency
crypto & public_key: prepare for release
Diffstat (limited to 'lib/ssl/test/ssl_payload_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_payload_SUITE.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_payload_SUITE.erl b/lib/ssl/test/ssl_payload_SUITE.erl index 5f5166391f..f95eae51b7 100644 --- a/lib/ssl/test/ssl_payload_SUITE.erl +++ b/lib/ssl/test/ssl_payload_SUITE.erl @@ -71,7 +71,6 @@ init_per_suite(Config) -> catch crypto:stop(), try crypto:start() of ok -> - application:start(public_key), ssl:start(), make_certs:all(?config(data_dir, Config), ?config(priv_dir, Config)), ssl_test_lib:cert_options(Config) |