From 0fe300575e7c521deabaf1ab3133aeb1ce40c898 Mon Sep 17 00:00:00 2001 From: zhouzb Date: Wed, 15 Sep 2021 09:59:35 +0800 Subject: [PATCH] chore(authn): better function name --- apps/emqx/src/emqx_authentication.erl | 2 +- apps/emqx/src/emqx_misc.erl | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/emqx/src/emqx_authentication.erl b/apps/emqx/src/emqx_authentication.erl index d4ab4cdf3..483305aa4 100644 --- a/apps/emqx/src/emqx_authentication.erl +++ b/apps/emqx/src/emqx_authentication.erl @@ -666,7 +666,7 @@ generate_filename(Key) -> <<"certfile">> -> "cert-"; <<"cacertfile">> -> "cacert-" end, - to_bin(filename:join([emqx:get_config([node, data_dir]), "certs/authn", Prefix ++ emqx_misc:gen() ++ ".pem"])). + to_bin(filename:join([emqx:get_config([node, data_dir]), "certs/authn", Prefix ++ emqx_misc:gen_id() ++ ".pem"])). diff_certs(NewSSLOpts, OldSSLOpts) -> Keys = [<<"cacertfile">>, <<"certfile">>, <<"keyfile">>], diff --git a/apps/emqx/src/emqx_misc.erl b/apps/emqx/src/emqx_misc.erl index ce98a3066..446039778 100644 --- a/apps/emqx/src/emqx_misc.erl +++ b/apps/emqx/src/emqx_misc.erl @@ -45,8 +45,8 @@ , index_of/2 , maybe_parse_ip/1 , ipv6_probe/1 - , gen/0 - , gen/1 + , gen_id/0 + , gen_id/1 ]). -export([ bin2hexstr_A_F/1 @@ -302,12 +302,12 @@ hexchar2int(I) when I >= $0 andalso I =< $9 -> I - $0; hexchar2int(I) when I >= $A andalso I =< $F -> I - $A + 10; hexchar2int(I) when I >= $a andalso I =< $f -> I - $a + 10. --spec(gen() -> list()). -gen() -> - gen(?SHORT). +-spec(gen_id() -> list()). +gen_id() -> + gen_id(?SHORT). --spec(gen(integer()) -> list()). -gen(Len) -> +-spec(gen_id(integer()) -> list()). +gen_id(Len) -> BitLen = Len * 4, <> = crypto:strong_rand_bytes(Len div 2), int_to_hex(R, Len).