From aeb86e70c13648235d7d73ed596b344da880685d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Thu, 11 Oct 2012 20:07:49 +0200
Subject: Add crypto into the required applications

As suggested by @prof3ta.
---
 src/cowboy.app.src       | 3 ++-
 src/cowboy_websocket.erl | 4 ----
 test/http_SUITE.erl      | 4 ++--
 test/ws_SUITE.erl        | 2 ++
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/cowboy.app.src b/src/cowboy.app.src
index e70a65f..b68ef14 100644
--- a/src/cowboy.app.src
+++ b/src/cowboy.app.src
@@ -20,7 +20,8 @@
 	{applications, [
 		kernel,
 		stdlib,
-		ranch
+		ranch,
+		crypto
 	]},
 	{mod, {cowboy_app, []}},
 	{env, []}
diff --git a/src/cowboy_websocket.erl b/src/cowboy_websocket.erl
index dcd3008..bc88011 100644
--- a/src/cowboy_websocket.erl
+++ b/src/cowboy_websocket.erl
@@ -13,10 +13,6 @@
 %% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 %% @doc WebSocket protocol implementation.
-%%
-%% When using websockets, make sure that the crypto application is
-%% included in your release. If you are not using releases then there
-%% is no need for concern as crypto is already included.
 -module(cowboy_websocket).
 
 %% API.
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl
index 2459d5e..4820f89 100644
--- a/test/http_SUITE.erl
+++ b/test/http_SUITE.erl
@@ -128,6 +128,7 @@ groups() ->
 
 init_per_suite(Config) ->
 	application:start(inets),
+	application:start(crypto),
 	application:start(ranch),
 	application:start(cowboy),
 	Config.
@@ -135,6 +136,7 @@ init_per_suite(Config) ->
 end_per_suite(_Config) ->
 	application:stop(cowboy),
 	application:stop(ranch),
+	application:stop(crypto),
 	application:stop(inets),
 	ok.
 
@@ -159,7 +161,6 @@ init_per_group(https, Config) ->
 		{password, "cowboy"}
 	],
 	Config1 = init_static_dir(Config),
-	application:start(crypto),
 	application:start(public_key),
 	application:start(ssl),
 	{ok, _} = cowboy:start_https(https, 100, Opts ++ [{port, Port}], [
@@ -199,7 +200,6 @@ end_per_group(https, Config) ->
 	cowboy:stop_listener(https),
 	application:stop(ssl),
 	application:stop(public_key),
-	application:stop(crypto),
 	end_static_dir(Config),
 	ok;
 end_per_group(http, Config) ->
diff --git a/test/ws_SUITE.erl b/test/ws_SUITE.erl
index b732eb8..0c98df0 100644
--- a/test/ws_SUITE.erl
+++ b/test/ws_SUITE.erl
@@ -33,6 +33,7 @@ groups() ->
 
 init_per_suite(Config) ->
 	application:start(inets),
+	application:start(crypto),
 	application:start(ranch),
 	application:start(cowboy),
 	Config.
@@ -40,6 +41,7 @@ init_per_suite(Config) ->
 end_per_suite(_Config) ->
 	application:stop(cowboy),
 	application:stop(ranch),
+	application:stop(crypto),
 	application:stop(inets),
 	ok.
 
-- 
cgit v1.2.3