Skip to content

Fix the 'hashes' namespace according to XEP-0300 #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrzaszcz merged 1 commit into from
Mar 20, 2026
Merged

Fix the 'hashes' namespace according to XEP-0300 #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/escalus_xmlns.hrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,8 @@
-define(NS_FORWARD_0, <<"urn:xmpp:forward:0">>).

% Defined by XEP-0300: Use of Cryptographic Hash Functions in XMPP
-define(NS_HASH, <<"urn:xmpp:hashes">>).
-define(NS_HASH_2, <<"urn:xmpp:hashes:2">>).
-define(NS_HASH_FUNCTION(Alg), <<"urn:xmpp:hash-function-text-names:", Alg/binary>>).

% Defined by XEP-0313: Message Archive Management (MAM)
-define(NS_MAM, <<"urn:xmpp:mam:0">>).
Expand Down
4 changes: 2 additions & 2 deletions src/escalus_stanza.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,14 +975,14 @@ caps(HashAlg, HashValue, v2) ->
#xmlel{name = ~"c",
attrs = #{~"xmlns" => ?NS_CAPS_2},
children = [#xmlel{name = ~"hash",
attrs = #{~"xmlns" => ?NS_HASH, ~"algo" => HashAlg},
attrs = #{~"xmlns" => ?NS_HASH_2, ~"algo" => HashAlg},
children = [#xmlcdata{content = HashValue}]}]}.

-spec caps_to_node(exml:element()) -> binary().
caps_to_node(#xmlel{name = ~"c", attrs = #{~"xmlns" := ?NS_CAPS, ~"node" := Node, ~"ver" := Ver}}) ->
<<Node/binary, $#, Ver/binary>>;
caps_to_node(#xmlel{name = ~"c", attrs = #{~"xmlns" := ?NS_CAPS_2}} = Caps) ->
[HashEl | _] = exml_query:subelements_with_name_and_ns(Caps, ~"hash", ?NS_HASH),
[HashEl | _] = exml_query:subelements_with_name_and_ns(Caps, ~"hash", ?NS_HASH_2),
HashAlg = exml_query:attr(HashEl, ~"algo"),
HashVal = exml_query:cdata(HashEl),
<<(?NS_CAPS_2)/binary, $#, HashAlg/binary, $., HashVal/binary>>.
Expand Down
Loading