Switch to fast_tls and update app names

diff --git a/include/ejabberd_http.hrl b/include/ejabberd_http.hrl
index 8b8fab2b0868e77bc28f620d69bac8e7319ce1d7..b8cbe37087b6af33bc40229fc32f77eba75049d0 100644 (file)
--- a/include/ejabberd_http.hrl
+++ b/include/ejabberd_http.hrl
@@ -35,8 +35,8 @@
         headers = []      :: [{atom() | binary(), binary()}]}).
 
 -record(ws,
-       {socket                  :: inet:socket() | p1_tls:tls_socket(),
-        sockmod = gen_tcp       :: gen_tcp | p1_tls,
+       {socket                  :: inet:socket() | fast_tls:tls_socket(),
+        sockmod = gen_tcp       :: gen_tcp | fast_tls,
         ip                      :: {inet:ip_address(), inet:port_number()},
         host = <<"">>           :: binary(),
         port = 5280             :: inet:port_number(),

diff --git a/mix.exs b/mix.exs
index 51787e744506552690bb105278bfae3da8d61c8c..e9545b1786e01a79f7494277aca6bf2cf675d439 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -25,9 +25,9 @@ defmodule Ejabberd.Mixfile do
     [mod: {:ejabberd_app, []},
      applications: [:ssl],
      included_applications: [:lager, :mnesia, :p1_utils, :cache_tab,
-                             :p1_tls, :stringprep, :p1_xml,
-                             :stun, :yaml, :ezlib, :iconv,
-                             :esip, :jiffy, :oauth2, :xmlrpc, :eredis,
+                             :fast_tls, :stringprep, :p1_xml,
+                             :stun, :fast_yaml, :ezlib, :iconv,
+                             :esip, :jiffy, :p1_oauth2, :p1_xmlrpc, :eredis,
                              :p1_mysql, :p1_pgsql, :sqlite3]]
   end
 
@@ -43,7 +43,7 @@ defmodule Ejabberd.Mixfile do
      {:cache_tab, "~> 1.0"},
      {:stringprep, "~> 1.0"},
      {:fast_yaml, "~> 1.0"},
-     {:p1_tls, git: "https://github.com/processone/tls", tag: "1.0.0"},
+     {:fast_tls, "~> 1.0"},
      {:p1_xml, git: "https://github.com/processone/xml", tag: "1.1.2"},
      {:stun, "~> 1.0"},
      {:esip, "~> 1.0"},

diff --git a/mix.lock b/mix.lock
index a91a94c59d27721170d34546ee6dfa9eb3e14c0c..d905ac77e8a1ca69ebef4431d98106472824d67a 100644 (file)
--- a/mix.lock
+++ b/mix.lock
@@ -15,7 +15,6 @@
   "p1_mysql": {:hex, :p1_mysql, "1.0.1"},
   "p1_oauth2": {:hex, :p1_oauth2, "0.6.1"},
   "p1_pgsql": {:hex, :p1_pgsql, "1.0.1"},
-  "p1_tls": {:git, "https://github.com/processone/tls", "f19e1f701e0a3980ffc70b3917c4aa85e68d8520", [tag: "1.0.0"]},
   "p1_utils": {:hex, :p1_utils, "1.0.3"},
   "p1_xml": {:git, "https://github.com/processone/xml", "79c6d54e56bf991f1ec70ceb5e255afcb8dbf53f", [tag: "1.1.2"]},
   "p1_xmlrpc": {:hex, :p1_xmlrpc, "1.15.1"},

diff --git a/rebar.config b/rebar.config
index f0559f5ee1b701417b3b4b0d8b16b1ebcbd19e28..f3d52f9e40b67a15c683b1fda376061b32ef3ee6 100644 (file)
--- a/rebar.config
+++ b/rebar.config
@@ -10,7 +10,7 @@
 {deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}},
         {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.3"}}},
         {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.2"}}},
-        {p1_tls, ".*", {git, "https://github.com/processone/tls", {tag, "1.0.0"}}},
+        {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.1"}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.2"}}},
         {p1_xml, ".*", {git, "https://github.com/processone/xml", {tag, "1.1.2"}}},
         {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.1"}}},
@@ -37,12 +37,12 @@
 {if_var_true, latest_deps,
  {floating_deps, [p1_logger,
                   cache_tab,
-                  p1_tls,
+                  fast_tls,
                   stringprep,
                   p1_xml,
                   esip,
                  luerl,
-                  p1_stun,
+                  stun,
                   fast_yaml,
                   p1_utils,
                   p1_mysql,
@@ -94,7 +94,7 @@
 
 {eunit_compile_opts, [{i, "tools"}]}.
 
-{post_hook_configure, [{"p1_tls", []},
+{post_hook_configure, [{"fast_tls", []},
                        {"stringprep", []},
                        {"fast_yaml", []},
                        {"esip", []},

diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
index 78d67f2d6ec86bd834ba04ea78a40597224ddf18..bc68a98849ff7d8b3b15bb0f7fa74cf1816f40ab 100644 (file)
--- a/src/ejabberd_app.erl
+++ b/src/ejabberd_app.erl
@@ -253,7 +253,7 @@ start_apps() ->
     ejabberd:start_app(sasl),
     ejabberd:start_app(ssl),
     ejabberd:start_app(fast_yaml),
-    ejabberd:start_app(p1_tls),
+    ejabberd:start_app(fast_tls),
     ejabberd:start_app(p1_xml),
     ejabberd:start_app(stringprep),
     ejabberd:start_app(ezlib),

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 04e41f468f9c3cef116aa9da6658ebb19411aa20..a1a25aa116d5a1a77377982125699ef59fc30af0 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -408,7 +408,7 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
                                        (StateData#state.sockmod):get_sockmod(StateData#state.socket),
                                    Zlib = StateData#state.zlib,
                                    CompressFeature = case Zlib andalso
-                                       ((SockMod == gen_tcp) orelse (SockMod == p1_tls)) of
+                                       ((SockMod == gen_tcp) orelse (SockMod == fast_tls)) of
                                        true ->
                                            [#xmlel{name = <<"compression">>,
                                                    attrs = [{<<"xmlns">>, ?NS_FEATURE_COMPRESS}],
@@ -813,7 +813,7 @@ wait_for_feature_request({xmlstreamelement, El},
                                         tls_enabled = true});
       {?NS_COMPRESS, <<"compress">>}
          when Zlib == true,
-              (SockMod == gen_tcp) or (SockMod == p1_tls) ->
+              (SockMod == gen_tcp) or (SockMod == fast_tls) ->
          case xml:get_subtag(El, <<"method">>) of
            false ->
                send_element(StateData,
@@ -1955,11 +1955,11 @@ get_auth_tags([], U, P, D, R) ->
 get_conn_type(StateData) ->
     case (StateData#state.sockmod):get_sockmod(StateData#state.socket) of
     gen_tcp -> c2s;
-    p1_tls -> c2s_tls;
+    fast_tls -> c2s_tls;
     ezlib ->
        case ezlib:get_sockmod((StateData#state.socket)#socket_state.socket) of
            gen_tcp -> c2s_compressed;
-           p1_tls -> c2s_compressed_tls
+           fast_tls -> c2s_compressed_tls
        end;
     ejabberd_http_bind -> http_bind;
     ejabberd_http_ws -> websocket;

diff --git a/src/ejabberd_frontend_socket.erl b/src/ejabberd_frontend_socket.erl
index 09eeded9c354fdda829a496ef08f9987a351223b..b8e706f239da236b0f21b4a8ef6f20943270d13e 100644 (file)
--- a/src/ejabberd_frontend_socket.erl
+++ b/src/ejabberd_frontend_socket.erl
@@ -148,20 +148,20 @@ init([Module, SockMod, Socket, Opts, Receiver]) ->
                receiver = Receiver}}.
 
 handle_call({starttls, TLSOpts}, _From, State) ->
-    {ok, TLSSocket} = p1_tls:tcp_to_tls(State#state.socket, TLSOpts),
+    {ok, TLSSocket} = fast_tls:tcp_to_tls(State#state.socket, TLSOpts),
     ejabberd_receiver:starttls(State#state.receiver, TLSSocket),
     Reply = ok,
-    {reply, Reply, State#state{socket = TLSSocket, sockmod = p1_tls},
+    {reply, Reply, State#state{socket = TLSSocket, sockmod = fast_tls},
      ?HIBERNATE_TIMEOUT};
 
 handle_call({starttls, TLSOpts, Data}, _From, State) ->
-    {ok, TLSSocket} = p1_tls:tcp_to_tls(State#state.socket, TLSOpts),
+    {ok, TLSSocket} = fast_tls:tcp_to_tls(State#state.socket, TLSOpts),
     ejabberd_receiver:starttls(State#state.receiver, TLSSocket),
     catch (State#state.sockmod):send(
            State#state.socket, Data),
     Reply = ok,
     {reply, Reply,
-     State#state{socket = TLSSocket, sockmod = p1_tls},
+     State#state{socket = TLSSocket, sockmod = fast_tls},
      ?HIBERNATE_TIMEOUT};
 handle_call({compress, Data}, _From, State) ->
     {ok, ZlibSocket} =
@@ -187,10 +187,10 @@ handle_call(get_sockmod, _From, State) ->
     Reply = State#state.sockmod,
     {reply, Reply, State, ?HIBERNATE_TIMEOUT};
 handle_call(get_peer_certificate, _From, State) ->
-    Reply = p1_tls:get_peer_certificate(State#state.socket),
+    Reply = fast_tls:get_peer_certificate(State#state.socket),
     {reply, Reply, State, ?HIBERNATE_TIMEOUT};
 handle_call(get_verify_result, _From, State) ->
-    Reply = p1_tls:get_verify_result(State#state.socket),
+    Reply = fast_tls:get_verify_result(State#state.socket),
     {reply, Reply, State, ?HIBERNATE_TIMEOUT};
 handle_call(close, _From, State) ->
     ejabberd_receiver:close(State#state.receiver),
@@ -236,9 +236,9 @@ check_starttls(SockMod, Socket, Receiver, Opts) ->
                              (_) -> false
                           end, Opts),
     if TLSEnabled ->
-           {ok, TLSSocket} = p1_tls:tcp_to_tls(Socket, TLSOpts),
+           {ok, TLSSocket} = fast_tls:tcp_to_tls(Socket, TLSOpts),
            ejabberd_receiver:starttls(Receiver, TLSSocket),
-           {p1_tls, TLSSocket};
+           {fast_tls, TLSSocket};
        true ->
            {SockMod, Socket}
     end.

diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl
index b95f982078fd591ace939919ae24838752a86390..6c5a37212ed80297bb600ebffea2b423cdcdfa6b 100644 (file)
--- a/src/ejabberd_http.erl
+++ b/src/ejabberd_http.erl
@@ -117,9 +117,9 @@ init({SockMod, Socket}, Opts) ->
     TLSOpts = [verify_none | TLSOpts3],
     {SockMod1, Socket1} = if TLSEnabled ->
                                 inet:setopts(Socket, [{recbuf, 8192}]),
-                                {ok, TLSSocket} = p1_tls:tcp_to_tls(Socket,
+                                {ok, TLSSocket} = fast_tls:tcp_to_tls(Socket,
                                                                  TLSOpts),
-                                {p1_tls, TLSSocket};
+                                {fast_tls, TLSSocket};
                             true -> {SockMod, Socket}
                          end,
     Captcha = case proplists:get_bool(captcha, Opts) of
@@ -328,8 +328,8 @@ get_transfer_protocol(SockMod, HostPort) ->
       {gen_tcp, []} -> {Host, 80, http};
       {gen_tcp, [Port]} ->
          {Host, jlib:binary_to_integer(Port), http};
-      {p1_tls, []} -> {Host, 443, https};
-      {p1_tls, [Port]} ->
+      {fast_tls, []} -> {Host, 443, https};
+      {fast_tls, [Port]} ->
          {Host, jlib:binary_to_integer(Port), https}
     end.
 

diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl
index 785855294a4003f05257700cc76c2ab39c9a48b6..fa85805d5e326bd0219176e2ec298a2dd01a8d06 100644 (file)
--- a/src/ejabberd_receiver.erl
+++ b/src/ejabberd_receiver.erl
@@ -48,8 +48,8 @@
 -include("logger.hrl").
 
 -record(state,
-       {socket :: inet:socket() | p1_tls:tls_socket() | ezlib:zlib_socket(),
-         sock_mod = gen_tcp :: gen_tcp | p1_tls | ezlib,
+       {socket :: inet:socket() | fast_tls:tls_socket() | ezlib:zlib_socket(),
+         sock_mod = gen_tcp :: gen_tcp | fast_tls | ezlib,
          shaper_state = none :: shaper:shaper(),
          c2s_pid :: pid(),
         max_stanza_size = infinity :: non_neg_integer() | infinity,
@@ -89,7 +89,7 @@ change_shaper(Pid, Shaper) ->
 
 reset_stream(Pid) -> do_call(Pid, reset_stream).
 
--spec starttls(pid(), p1_tls:tls_socket()) -> ok.
+-spec starttls(pid(), fast_tls:tls_socket()) -> ok.
 
 starttls(Pid, TLSSocket) ->
     do_call(Pid, {starttls, TLSSocket}).
@@ -129,8 +129,8 @@ init([Socket, SockMod, Shaper, MaxStanzaSize]) ->
 handle_call({starttls, TLSSocket}, _From, State) ->
     State1 = reset_parser(State),
     NewState = State1#state{socket = TLSSocket,
-                            sock_mod = p1_tls},
-    case p1_tls:recv_data(TLSSocket, <<"">>) of
+                            sock_mod = fast_tls},
+    case fast_tls:recv_data(TLSSocket, <<"">>) of
        {ok, TLSData} ->
            {reply, ok,
                process_data(TLSData, NewState), ?HIBERNATE_TIMEOUT};
@@ -182,8 +182,8 @@ handle_info({Tag, _TCPSocket, Data},
     when (Tag == tcp) or (Tag == ssl) or
           (Tag == ejabberd_xml) ->
     case SockMod of
-      p1_tls ->
-         case p1_tls:recv_data(Socket, Data) of
+      fast_tls ->
+         case fast_tls:recv_data(Socket, Data) of
            {ok, TLSData} ->
                {noreply, process_data(TLSData, State),
                 ?HIBERNATE_TIMEOUT};

diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index 2f026b32adce429e52dd6b3874769bab1d37b4d5..3d0c4730765e0db53b9c1f8ffb89dc4ff6a236ea 100644 (file)
--- a/src/ejabberd_s2s.erl
+++ b/src/ejabberd_s2s.erl
@@ -214,7 +214,7 @@ check_peer_certificate(SockMod, Sock, Peer) ->
                      end
                end;
            VerifyRes ->
-               {error, p1_tls:get_cert_verify_string(VerifyRes, Cert)}
+               {error, fast_tls:get_cert_verify_string(VerifyRes, Cert)}
          end;
       {error, _Reason} ->
            {error, <<"Cannot get peer certificate">>};

diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl
index 16ffd192ee384e554bae0036f2329c8f1f0cf857..887b4a0f33d13e39b95862eb83b2ec4fc8a3c2cb 100644 (file)
--- a/src/ejabberd_socket.erl
+++ b/src/ejabberd_socket.erl
@@ -52,10 +52,10 @@
 
 -type sockmod() :: ejabberd_http_bind |
                    ejabberd_http_ws |
-                   gen_tcp | p1_tls | ezlib.
+                   gen_tcp | fast_tls | ezlib.
 -type receiver() :: pid () | atom().
 -type socket() :: pid() | inet:socket() |
-                  p1_tls:tls_socket() |
+                  fast_tls:tls_socket() |
                   ezlib:zlib_socket() |
                   ejabberd_http_bind:bind_socket().
 
@@ -145,15 +145,15 @@ connect(Addr, Port, Opts, Timeout) ->
     end.
 
 starttls(SocketData, TLSOpts) ->
-    {ok, TLSSocket} = p1_tls:tcp_to_tls(SocketData#socket_state.socket, TLSOpts),
+    {ok, TLSSocket} = fast_tls:tcp_to_tls(SocketData#socket_state.socket, TLSOpts),
     ejabberd_receiver:starttls(SocketData#socket_state.receiver, TLSSocket),
-    SocketData#socket_state{socket = TLSSocket, sockmod = p1_tls}.
+    SocketData#socket_state{socket = TLSSocket, sockmod = fast_tls}.
 
 starttls(SocketData, TLSOpts, Data) ->
-    {ok, TLSSocket} = p1_tls:tcp_to_tls(SocketData#socket_state.socket, TLSOpts),
+    {ok, TLSSocket} = fast_tls:tcp_to_tls(SocketData#socket_state.socket, TLSOpts),
     ejabberd_receiver:starttls(SocketData#socket_state.receiver, TLSSocket),
     send(SocketData, Data),
-    SocketData#socket_state{socket = TLSSocket, sockmod = p1_tls}.
+    SocketData#socket_state{socket = TLSSocket, sockmod = fast_tls}.
 
 compress(SocketData) -> compress(SocketData, undefined).
 
@@ -216,10 +216,10 @@ get_sockmod(SocketData) ->
     SocketData#socket_state.sockmod.
 
 get_peer_certificate(SocketData) ->
-    p1_tls:get_peer_certificate(SocketData#socket_state.socket).
+    fast_tls:get_peer_certificate(SocketData#socket_state.socket).
 
 get_verify_result(SocketData) ->
-    p1_tls:get_verify_result(SocketData#socket_state.socket).
+    fast_tls:get_verify_result(SocketData#socket_state.socket).
 
 close(SocketData) ->
     ejabberd_receiver:close(SocketData#socket_state.receiver).

diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl
index d9a1bafc7ed10b4fe09b67b1f6bbdf5f6535cbfd..0cdd9bac5934a1e15a805d3fdc979cef23f058f1 100644 (file)
--- a/src/ejabberd_websocket.erl
+++ b/src/ejabberd_websocket.erl
@@ -373,10 +373,10 @@ process_frame(#frame_info{unprocessed =
     process_frame(FrameInfo#frame_info{unprocessed = <<>>},
                   <<UnprocessedPre/binary, Data/binary>>).
 
-handle_data(tcp, FrameInfo, Data, Socket, WsHandleLoopPid, p1_tls) ->
-    case p1_tls:recv_data(Socket, Data) of
+handle_data(tcp, FrameInfo, Data, Socket, WsHandleLoopPid, fast_tls) ->
+    case fast_tls:recv_data(Socket, Data) of
         {ok, NewData} ->
-            handle_data_int(FrameInfo, NewData, Socket, WsHandleLoopPid, p1_tls);
+            handle_data_int(FrameInfo, NewData, Socket, WsHandleLoopPid, fast_tls);
         {error, Error} ->
             {error, Error}
     end;