yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(test): remove tlsv1.3 provisionally to make test pass

This commit is contained in:
Shawn 2021-07-15 18:34:27 +08:00
parent d5756ecd52
commit a16a15e3a9
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx/src/emqx_listeners.erl
View File

@ -44,10 +44,6 @@ start_listener(ListenerId) ->
-spec start_listener(atom(), atom(), map()) -> ok | {error, term()}. -spec start_listener(atom(), atom(), map()) -> ok | {error, term()}.
start_listener(ZoneName, ListenerName, #{type := Type, bind := Bind} = Conf) -> 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 case do_start_listener(ZoneName, ListenerName, Conf) of
{ok, _} -> {ok, _} ->
console_print("Start ~s listener ~s on ~s successfully.~n", console_print("Start ~s listener ~s on ~s successfully.~n",

3
apps/emqx/src/emqx_schema.erl
View File

@ -668,7 +668,8 @@ ssl(Defaults) ->
, {"user_lookup_fun", t(any(), undefined, {fun emqx_psk:lookup/3, <<>>})} , {"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.3">>) -> 'tlsv1.3';
tls_vsn(<<"tlsv1.2">>) -> 'tlsv1.2'; tls_vsn(<<"tlsv1.2">>) -> 'tlsv1.2';
tls_vsn(<<"tlsv1.1">>) -> 'tlsv1.1'; tls_vsn(<<"tlsv1.1">>) -> 'tlsv1.1';