Merge pull request #4491 from esl/update_pbkdf

Update pbkdf

Author: jacekwegr

big_tests/rebar.config

@@ -15,6 +15,10 @@
         {gun, "2.1.0"},
         {fusco, "0.1.1"},
         {escalus, "4.3.0"},
+        %% We need to override `escalus` scram version, because 4.4 removes `fast_tls`, which is not
+        %% supported in master yet. When we can upgrade escalus, we can remove the explicit
+        %% `fast_scram` declaration from here.
+        {fast_scram, "0.7.0"},
         {cowboy, "2.12.0"},
         {csv, "3.0.3", {pkg, csve}},
         {amqp_client, "4.0.3"},

big_tests/rebar.lock

@@ -13,8 +13,8 @@
  {<<"escalus">>,{pkg,<<"escalus">>,<<"4.3.0">>},0},
  {<<"esip">>,{pkg,<<"esip">>,<<"1.0.56">>},0},
  {<<"exml">>,{pkg,<<"hexml">>,<<"4.1.1">>},0},
- {<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"1.0.6">>},2},
- {<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.6.1">>},1},
+ {<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"2.0.0">>},1},
+ {<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.7.0">>},0},
  {<<"fast_tls">>,{pkg,<<"fast_tls">>,<<"1.1.21">>},1},
  {<<"fusco">>,{pkg,<<"fusco">>,<<"0.1.1">>},0},
  {<<"gun">>,{pkg,<<"gun">>,<<"2.1.0">>},0},
@@ -45,8 +45,8 @@
  {<<"escalus">>, <<"80301D57F4C863FA95F09AE148524508F18D7389B5070E2A5FFB7A38B51527C5">>},
  {<<"esip">>, <<"63C0FDC667BE751714E1E5C14621A9334F21B60AC1BB68BE889454CA9CA021B7">>},
  {<<"exml">>, <<"D46272177F3B779D75058005C744997034823AB3A237F9B30B56A583B063FDE3">>},
- {<<"fast_pbkdf2">>, <<"199BCEC73A1A246941E9465D3DC41052953B638128841ED24B29ED03CF70AF27">>},
- {<<"fast_scram">>, <<"BEEADB03D774640F0671681759CE53B2FF33CB58C86FD9BF2A793E2FC1ED0F5D">>},
+ {<<"fast_pbkdf2">>, <<"72CDEE3C10C6B9B40E31194DE946A883CEEF6CF1F37D7FC9FD1A9D87502723F5">>},
+ {<<"fast_scram">>, <<"FAD4DD185E0DEFA34B0E30654AB0CC4048E9324BCF65BB261E0A86BF3C604F9F">>},
  {<<"fast_tls">>, <<"65D7D547A09EEFB37A1C0D04D8601FAC4F3E6E2C1EDE859A7787081670F9648D">>},
  {<<"fusco">>, <<"3DD6A90151DFEF30EA1937CC44E9A59177C0094918388D9BCAA2F2DC5E2AE4AA">>},
  {<<"gun">>, <<"B4E4CBBF3026D21981C447E9E7CA856766046EFF693720BA43114D7F5DE36E87">>},
@@ -76,8 +76,8 @@
  {<<"escalus">>, <<"8C4D39677D55C48B04EDE4EAC0FD0AD2A574BEDE7180761E6E3D3877900C7708">>},
  {<<"esip">>, <<"9EF3660CEF93B623F7368DCD5C79F4E704358631909E6DD464E335378815DA1F">>},
  {<<"exml">>, <<"86C154396A9B21EEB0EDB9636D0E2D493FE0F59EAAF40FCFE795210F31119D8F">>},
- {<<"fast_pbkdf2">>, <<"35EEC22629AAA739915843C7B7DE0D84657D1ECE972D8BBC86368747E9C14012">>},
- {<<"fast_scram">>, <<"FE0650A309FDF97C75E1EA812CCFB40EB464ECAFD3783E83AA17C7F572EDAB0B">>},
+ {<<"fast_pbkdf2">>, <<"74159FD09FB8BF5E97D25137C6C83C28E2CF7E97D7C127D83310DFD0904BD732">>},
+ {<<"fast_scram">>, <<"39CB1D4C91C99E637E000A3864D274D8A9CB43D86EEC2495FE9546798DBFA015">>},
  {<<"fast_tls">>, <<"131542913937025E48CD80AA81F00359686D5501B75621E72026A87B5229505B">>},
  {<<"fusco">>, <<"6343551BD1E824F2A6CA85E1158C5B37C320FD449FBFEC7450A73F192AAF9022">>},
  {<<"gun">>, <<"52FC7FC246BFC3B00E01AEA1C2854C70A366348574AB50C57DFE796D24A0101D">>},

rebar.config

@@ -66,7 +66,7 @@
   %%% Stateless libraries
   {opuntia, "1.1.0"},
   {fast_tls, "1.1.22"},
-  {fast_scram, "0.6.0"},
+  {fast_scram, "0.7.0"},
   {idna, "6.1.1"},
   {uuid, "2.0.7", {pkg, uuid_erl}},
   {gen_fsm_compat, "0.3.0"},

rebar.lock

@@ -39,8 +39,8 @@
   {git,"https://github.com/esl/exometer_report_statsd.git",
        {ref,"f1c369becb6e57871f1c7b0e491f6c3a302a65ee"}},
   0},
- {<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"1.0.5">>},1},
- {<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.6.0">>},0},
+ {<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"2.0.0">>},1},
+ {<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.7.0">>},0},
  {<<"fast_tls">>,{pkg,<<"fast_tls">>,<<"1.1.22">>},0},
  {<<"flatlog">>,{pkg,<<"flatlog">>,<<"0.1.2">>},0},
  {<<"fusco">>,{pkg,<<"fusco">>,<<"0.1.1">>},0},
@@ -143,8 +143,8 @@
  {<<"erlang_doctor">>, <<"38DCCF531B0DCF01B327EF437C7422EA3123457CF664C75BA8219D6022A7DA4B">>},
  {<<"erlcloud">>, <<"E0EE55C4B11826E79737655A52282C5C62EB31F7FDFACF4E314C12422C64A95F">>},
  {<<"exml">>, <<"D46272177F3B779D75058005C744997034823AB3A237F9B30B56A583B063FDE3">>},
- {<<"fast_pbkdf2">>, <<"6045138C4C209FC8222A0B18B2CB1D7BD7407EF4ADAD0F14C5E0F7F4726E3E41">>},
- {<<"fast_scram">>, <<"70724F584A118DA147A51EE38DEE56203F217D58AD61E0BB2C2EF834C16B35B8">>},
+ {<<"fast_pbkdf2">>, <<"72CDEE3C10C6B9B40E31194DE946A883CEEF6CF1F37D7FC9FD1A9D87502723F5">>},
+ {<<"fast_scram">>, <<"FAD4DD185E0DEFA34B0E30654AB0CC4048E9324BCF65BB261E0A86BF3C604F9F">>},
  {<<"fast_tls">>, <<"44356B256AFAD4399C2FC5059A3066669DAFD8BD4E4E796C9C1CF8910DDD265E">>},
  {<<"flatlog">>, <<"8C4B81A4931A1396254DBD975B841F4A6350D6F128FF94FFE86799A4451E32B1">>},
  {<<"fusco">>, <<"3DD6A90151DFEF30EA1937CC44E9A59177C0094918388D9BCAA2F2DC5E2AE4AA">>},
@@ -214,8 +214,8 @@
  {<<"erlang_doctor">>, <<"5895F16E04666843895479D60624751330F87D8296411E03EC405F42F697796D">>},
  {<<"erlcloud">>, <<"36207854A37BF157B45A9A115A7EEE814430808ADB2CC713C72E0048DD6351A1">>},
  {<<"exml">>, <<"86C154396A9B21EEB0EDB9636D0E2D493FE0F59EAAF40FCFE795210F31119D8F">>},
- {<<"fast_pbkdf2">>, <<"BC3B5A3CAB47AD114FF8BB815FEDE62A6187ACD14D8B37412F2AF8236A089CEF">>},
- {<<"fast_scram">>, <<"771D034341599CFC6A6C5E56CF924B68D2C7478088CAF17419E3147B66914667">>},
+ {<<"fast_pbkdf2">>, <<"74159FD09FB8BF5E97D25137C6C83C28E2CF7E97D7C127D83310DFD0904BD732">>},
+ {<<"fast_scram">>, <<"39CB1D4C91C99E637E000A3864D274D8A9CB43D86EEC2495FE9546798DBFA015">>},
  {<<"fast_tls">>, <<"E65779AEFB7AB15C4755230FEF8077E687D20CC5A3984A5974F9F657E8E2485B">>},
  {<<"flatlog">>, <<"FDD2A311A67F63F9D0BC194FAD6BEAF9CCCDE8FFFEE2919DF1C4D86098E49984">>},
  {<<"fusco">>, <<"6343551BD1E824F2A6CA85E1158C5B37C320FD449FBFEC7450A73F192AAF9022">>},

src/sasl/cyrsasl_scram.erl

@@ -54,7 +54,7 @@ retrieve_mechanism_continue(#jid{luser = Username} = JID, Creds, Sha, St0) ->
             ExtraConfig = #{it_count => ItCount, salt => Salt,
                             auth_data => #{stored_key => StoredKey,
                                            server_key => ServerKey}},
-            {St1, ExtraConfig};
+            {ExtraConfig, St1};
         {error, Reason, User} ->
             {error, {Reason, User}}
     end.