From e74f4e050377eec27536d4b9a69609f784498317 Mon Sep 17 00:00:00 2001
From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Sun, 1 Dec 2024 18:04:42 +0100
Subject: [PATCH] Re-generate 0480

---
 src/xep0480.erl | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/xep0480.erl b/src/xep0480.erl
index d90b44a..10e786f 100644
--- a/src/xep0480.erl
+++ b/src/xep0480.erl
@@ -103,7 +103,8 @@ encode_scram_upgrade_hash({scram_upgrade_hash, Data},
     {xmlel, <<"hash">>, _attrs, _els}.
 
 decode_scram_upgrade_hash_cdata(__TopXMLNS, <<>>) ->
-    <<>>;
+    erlang:error({xmpp_codec,
+                  {missing_cdata, <<>>, <<"hash">>, __TopXMLNS}});
 decode_scram_upgrade_hash_cdata(__TopXMLNS, _val) ->
     case catch base64:decode(_val) of
         {'EXIT', _} ->
@@ -112,7 +113,6 @@ decode_scram_upgrade_hash_cdata(__TopXMLNS, _val) ->
         _res -> _res
     end.
 
-encode_scram_upgrade_hash_cdata(<<>>, _acc) -> _acc;
 encode_scram_upgrade_hash_cdata(_val, _acc) ->
     [{xmlcdata, base64:encode(_val)} | _acc].
 
@@ -197,13 +197,18 @@ encode_scram_upgrade_salt_attr_iterations(_val, _acc) ->
     [{<<"iterations">>, enc_int(_val)} | _acc].
 
 decode_scram_upgrade_salt_cdata(__TopXMLNS, <<>>) ->
-    <<>>;
+    erlang:error({xmpp_codec,
+                  {missing_cdata, <<>>, <<"salt">>, __TopXMLNS}});
 decode_scram_upgrade_salt_cdata(__TopXMLNS, _val) ->
-    _val.
+    case catch base64:decode(_val) of
+        {'EXIT', _} ->
+            erlang:error({xmpp_codec,
+                          {bad_cdata_value, <<>>, <<"salt">>, __TopXMLNS}});
+        _res -> _res
+    end.
 
-encode_scram_upgrade_salt_cdata(<<>>, _acc) -> _acc;
 encode_scram_upgrade_salt_cdata(_val, _acc) ->
-    [{xmlcdata, _val} | _acc].
+    [{xmlcdata, base64:encode(_val)} | _acc].
 
 decode_sasl_upgrade(__TopXMLNS, __Opts,
                     {xmlel, <<"upgrade">>, _attrs, _els}) ->
@@ -240,9 +245,10 @@ encode_sasl_upgrade({sasl_upgrade, Cdata},
                                         __TopXMLNS),
     {xmlel, <<"upgrade">>, _attrs, _els}.
 
-decode_sasl_upgrade_cdata(__TopXMLNS, <<>>) -> <<>>;
+decode_sasl_upgrade_cdata(__TopXMLNS, <<>>) ->
+    erlang:error({xmpp_codec,
+                  {missing_cdata, <<>>, <<"upgrade">>, __TopXMLNS}});
 decode_sasl_upgrade_cdata(__TopXMLNS, _val) -> _val.
 
-encode_sasl_upgrade_cdata(<<>>, _acc) -> _acc;
 encode_sasl_upgrade_cdata(_val, _acc) ->
     [{xmlcdata, _val} | _acc].