mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-22 16:20:52 +01:00
Replaced sha1 to hexadecimal transformation with sha:sha/1 call (thanks to Alexey Shchepin)
SVN Revision: 2317
This commit is contained in:
parent
3e3d01063d
commit
a1b84c6fa3
@ -4,7 +4,7 @@
|
|||||||
%%% Purpose : Implements XMPP over BOSH (XEP-0205) (formerly known as
|
%%% Purpose : Implements XMPP over BOSH (XEP-0205) (formerly known as
|
||||||
%%% HTTP Binding)
|
%%% HTTP Binding)
|
||||||
%%% Created : 21 Sep 2005 by Stefan Strigler <steve@zeank.in-berlin.de>
|
%%% Created : 21 Sep 2005 by Stefan Strigler <steve@zeank.in-berlin.de>
|
||||||
%%% Id : $Id: ejabberd_http_bind.erl 952 2009-05-06 17:29:39Z badlop $
|
%%% Id : $Id: ejabberd_http_bind.erl 953 2009-05-07 10:40:40Z alexey $
|
||||||
%%%----------------------------------------------------------------------
|
%%%----------------------------------------------------------------------
|
||||||
|
|
||||||
-module(ejabberd_http_bind).
|
-module(ejabberd_http_bind).
|
||||||
@ -589,9 +589,7 @@ process_http_put({http_put, Rid, Attrs, Payload, Hold, StreamTo, IP},
|
|||||||
"" ->
|
"" ->
|
||||||
true;
|
true;
|
||||||
OldKey ->
|
OldKey ->
|
||||||
NextKey = jlib:tolower(
|
NextKey = sha:sha(Key),
|
||||||
hex(binary_to_list(
|
|
||||||
crypto:sha(Key)))),
|
|
||||||
?DEBUG("Key/OldKey/NextKey: ~s/~s/~s", [Key, OldKey, NextKey]),
|
?DEBUG("Key/OldKey/NextKey: ~s/~s/~s", [Key, OldKey, NextKey]),
|
||||||
if
|
if
|
||||||
OldKey == NextKey ->
|
OldKey == NextKey ->
|
||||||
@ -1070,16 +1068,6 @@ cancel_timer(Timer) ->
|
|||||||
ok
|
ok
|
||||||
end.
|
end.
|
||||||
|
|
||||||
hex(Bin) when is_binary(Bin) -> hex(binary_to_list(Bin));
|
|
||||||
hex([]) -> "";
|
|
||||||
hex([H|T]) ->
|
|
||||||
[A,B] = if
|
|
||||||
H == 0 -> "00";
|
|
||||||
H < 16 -> [$0,element(H,{$1,$2,$3,$4,$5,$6,$7,$8,$9,$a,$b,$c,$d,$e,$f})];
|
|
||||||
true -> erlang:integer_to_list(H,16)
|
|
||||||
end,
|
|
||||||
[A,B|hex(T)].
|
|
||||||
|
|
||||||
elements_to_string([]) ->
|
elements_to_string([]) ->
|
||||||
[];
|
[];
|
||||||
elements_to_string([El | Els]) ->
|
elements_to_string([El | Els]) ->
|
||||||
|
Loading…
Reference in New Issue
Block a user