aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-06-10 14:54:04 +0200
committerIngela Anderton Andin <[email protected]>2013-06-10 14:54:04 +0200
commita60a923d6ad01029494dfad34685983426b75093 (patch)
tree6b73a6f5f9ecaac82c784345daf1a11055bcbd78 /lib/ssh/src
parente6c7db595f50ae0606b3177451bcfcdc28f9d3c0 (diff)
parent56e08cb2d1faa279961413729e48ef1f3275a575 (diff)
downloadotp-a60a923d6ad01029494dfad34685983426b75093.tar.gz
otp-a60a923d6ad01029494dfad34685983426b75093.tar.bz2
otp-a60a923d6ad01029494dfad34685983426b75093.zip
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 3a7aa79d16..7d5478c3f6 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -41,11 +41,13 @@
%%--------------------------------------------------------------------
start() ->
application:start(crypto),
+ application:start(asn1),
application:start(public_key),
application:start(ssh).
start(Type) ->
application:start(crypto, Type),
+ application:start(asn1),
application:start(public_key, Type),
application:start(ssh, Type).