diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:54:04 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:54:04 +0200 |
| commit | a60a923d6ad01029494dfad34685983426b75093 (patch) | |
| tree | 6b73a6f5f9ecaac82c784345daf1a11055bcbd78 /lib/ssl/src/tls.erl | |
| parent | e6c7db595f50ae0606b3177451bcfcdc28f9d3c0 (diff) | |
| parent | 56e08cb2d1faa279961413729e48ef1f3275a575 (diff) | |
| download | otp-a60a923d6ad01029494dfad34685983426b75093.tar.gz otp-a60a923d6ad01029494dfad34685983426b75093.tar.bz2 otp-a60a923d6ad01029494dfad34685983426b75093.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssl/src/tls.erl')
| -rw-r--r-- | lib/ssl/src/tls.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/tls.erl b/lib/ssl/src/tls.erl index fcecf8196f..bb02695c12 100644 --- a/lib/ssl/src/tls.erl +++ b/lib/ssl/src/tls.erl @@ -94,11 +94,13 @@ %%-------------------------------------------------------------------- start() -> application:start(crypto), + application:start(asn1), application:start(public_key), application:start(ssl). start(Type) -> application:start(crypto, Type), + application:start(asn1), application:start(public_key, Type), application:start(ssl, Type). |