diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2017-02-14 11:38:05 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-14 11:38:05 +0400 |
| commit | a1e45ab56c5405fe2d5ea6a0b9eabc4e3450190d (patch) | |
| tree | 502d43545dd01c498bb448ee021ea830e287f865 | |
| parent | Improve modules start/stop procedures (diff) | |
| parent | Use crypto:hash/2 function (diff) | |
Merge pull request #1539 from lemenkov/use_crypto_sha
RFE: Use crypto:hash/2 function
| -rw-r--r-- | src/ejabberd_websocket.erl | 2 | ||||
| -rw-r--r-- | src/mod_admin_extra.erl | 2 | ||||
| -rw-r--r-- | src/mod_caps.erl | 10 | ||||
| -rw-r--r-- | src/scram.erl | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl index d87bf9bb1..61d314089 100644 --- a/src/ejabberd_websocket.erl +++ b/src/ejabberd_websocket.erl @@ -153,7 +153,7 @@ handshake(#ws{headers = Headers} = State) -> [<<"Sec-Websocket-Protocol:">>, V, <<"\r\n">>] end, Hash = jlib:encode_base64( - p1_sha:sha1(<<Key/binary, "258EAFA5-E914-47DA-95CA-C5AB0DC85B11">>)), + crypto:hash(sha, <<Key/binary, "258EAFA5-E914-47DA-95CA-C5AB0DC85B11">>)), {State, [<<"HTTP/1.1 101 Switching Protocols\r\n">>, <<"Upgrade: websocket\r\n">>, <<"Connection: Upgrade\r\n">>, diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl index 472e9fbe3..9139f1e47 100644 --- a/src/mod_admin_extra.erl +++ b/src/mod_admin_extra.erl @@ -734,7 +734,7 @@ get_md5(AccountPass) -> || X <- binary_to_list(erlang:md5(AccountPass))]). get_sha(AccountPass) -> iolist_to_binary([io_lib:format("~2.16.0B", [X]) - || X <- binary_to_list(p1_sha:sha1(AccountPass))]). + || X <- binary_to_list(crypto:hash(sha, AccountPass))]). num_active_users(Host, Days) -> DB_Type = gen_mod:db_type(Host, mod_last), diff --git a/src/mod_caps.erl b/src/mod_caps.erl index ae7998108..c001a696c 100644 --- a/src/mod_caps.erl +++ b/src/mod_caps.erl @@ -409,11 +409,11 @@ make_disco_hash(DiscoInfo, Algo) -> concat_features(DiscoInfo), concat_info(DiscoInfo)]), jlib:encode_base64(case Algo of md5 -> erlang:md5(Concat); - sha -> p1_sha:sha1(Concat); - sha224 -> p1_sha:sha224(Concat); - sha256 -> p1_sha:sha256(Concat); - sha384 -> p1_sha:sha384(Concat); - sha512 -> p1_sha:sha512(Concat) + sha -> crypto:hash(sha, Concat); + sha224 -> crypto:hash(sha224, Concat); + sha256 -> crypto:hash(sha256, Concat); + sha384 -> crypto:hash(sha384, Concat); + sha512 -> crypto:hash(sha512, Concat) end). -spec check_hash(caps(), disco_info()) -> boolean(). diff --git a/src/scram.erl b/src/scram.erl index ee7960475..f2875e4ab 100644 --- a/src/scram.erl +++ b/src/scram.erl @@ -45,7 +45,7 @@ client_key(SaltedPassword) -> -spec stored_key(binary()) -> binary(). -stored_key(ClientKey) -> p1_sha:sha1(ClientKey). +stored_key(ClientKey) -> crypto:hash(sha, ClientKey). -spec server_key(binary()) -> binary(). |