From e9cd75743271bc458f4aa8a2ee02873d0c1cef89 Mon Sep 17 00:00:00 2001
From: zhouzb <zhouzb@emqx.io>
Date: Thu, 23 Sep 2021 17:41:58 +0800
Subject: [PATCH] chore(psk): delete old module and update configuration

---
 apps/emqx/src/emqx_psk.erl    | 39 -----------------------------------
 apps/emqx/src/emqx_schema.erl |  2 +-
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 apps/emqx/src/emqx_psk.erl

diff --git a/apps/emqx/src/emqx_psk.erl b/apps/emqx/src/emqx_psk.erl
deleted file mode 100644
index 0c5ca2964..000000000
--- a/apps/emqx/src/emqx_psk.erl
+++ /dev/null
@@ -1,39 +0,0 @@
-%%--------------------------------------------------------------------
-%% Copyright (c) 2019-2021 EMQ Technologies Co., Ltd. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%--------------------------------------------------------------------
-
--module(emqx_psk).
-
--include("logger.hrl").
-
-
-%% SSL PSK Callbacks
--export([lookup/3]).
-
--type psk_identity() :: string().
--type psk_user_state() :: term().
-
--spec lookup(psk, psk_identity(), psk_user_state()) -> {ok, SharedSecret :: binary()} | error.
-lookup(psk, ClientPSKID, _UserState) ->
-    try emqx_hooks:run_fold('tls_handshake.psk_lookup', [ClientPSKID], not_found) of
-        SharedSecret when is_binary(SharedSecret) -> {ok, SharedSecret};
-        Error ->
-            ?LOG(error, "Look PSK for PSKID ~p error: ~p", [ClientPSKID, Error]),
-            error
-    catch
-        Except:Error:Stacktrace ->
-          ?LOG(error, "Lookup PSK failed, ~0p: ~0p", [{Except,Error}, Stacktrace]),
-          error
-    end.
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 27688a868..d42ef4358 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -999,7 +999,7 @@ In case PSK cipher suites are intended, make sure to configured
     , {"ciphers", ciphers_schema(D("ciphers"))}
     , {user_lookup_fun,
        sc(typerefl:alias("string", any()),
-          #{ default => "emqx_psk:lookup"
+          #{ default => "emqx_tls_psk:lookup"
            , converter => fun ?MODULE:parse_user_lookup_fun/1
            })
       }