From a16a15e3a9e175c21d4b0d2a33878e63e5ec8a83 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Thu, 15 Jul 2021 18:34:27 +0800 Subject: [PATCH] fix(test): remove tlsv1.3 provisionally to make test pass --- apps/emqx/src/emqx_listeners.erl | 4 ---- apps/emqx/src/emqx_schema.erl | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/emqx/src/emqx_listeners.erl b/apps/emqx/src/emqx_listeners.erl index 973022af8..8cf3852e2 100644 --- a/apps/emqx/src/emqx_listeners.erl +++ b/apps/emqx/src/emqx_listeners.erl @@ -44,10 +44,6 @@ start_listener(ListenerId) -> -spec start_listener(atom(), atom(), map()) -> ok | {error, term()}. start_listener(ZoneName, ListenerName, #{type := Type, bind := Bind} = Conf) -> - dbg:tracer(), -dbg:p(all, c), -dbg:tpl(tls_record, sufficient_crypto_support, '_', cx), - case do_start_listener(ZoneName, ListenerName, Conf) of {ok, _} -> console_print("Start ~s listener ~s on ~s successfully.~n", diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl index b988f9dad..62b4c2a21 100644 --- a/apps/emqx/src/emqx_schema.erl +++ b/apps/emqx/src/emqx_schema.erl @@ -668,7 +668,8 @@ ssl(Defaults) -> , {"user_lookup_fun", t(any(), undefined, {fun emqx_psk:lookup/3, <<>>})} ]. -default_tls_vsns() -> [<<"tlsv1.3">>, <<"tlsv1.2">>, <<"tlsv1.1">>, <<"tlsv1">>]. +%% on erl23.2.7.2-emqx-2, sufficient_crypto_support('tlsv1.3') -> false +default_tls_vsns() -> [<<"tlsv1.2">>, <<"tlsv1.1">>, <<"tlsv1">>]. tls_vsn(<<"tlsv1.3">>) -> 'tlsv1.3'; tls_vsn(<<"tlsv1.2">>) -> 'tlsv1.2'; tls_vsn(<<"tlsv1.1">>) -> 'tlsv1.1';