authorgravatar for 35231115+Rocknest@users.noreply.github.comRocknest <35231115+Rocknest@users.noreply.github.com> 2020-09-13 23:59:36+03:00
committergravatar for 35231115+Rocknest@users.noreply.github.comRocknest <35231115+Rocknest@users.noreply.github.com> 2020-09-13 23:59:36+03:00
log73863cf72be02020886d9f8daf15754a8d3b2567
tree53aa4b400d9b317f381b1153ad2bb96afcfad878
parentf6195be99770e3f9cc4e8a89bcf451a640bb4b95

fix build


1 files changed, 2 insertions(+), 2 deletions(-)

lib/std/crypto/pbkdf2.zig+2-2
...@@ -86,7 +86,7 @@ pub fn pbkdf2(derivedKey: []u8, password: []const u8, salt: []const u8, rounds:...@@ -86,7 +86,7 @@ pub fn pbkdf2(derivedKey: []u8, password: []const u8, salt: []const u8, rounds:
86 // 3) -hLen <= -1 // multiply by -186 // 3) -hLen <= -1 // multiply by -1
87 // 4) hLen >= 187 // 4) hLen >= 1
88 const r_ = dkLen % hLen;88 const r_ = dkLen % hLen;
89 const l = @intCast(u32, (dkLen / hLen) + if (r_ == 0) 0 else 1); // original: (dkLen + hLen - 1) / hLen89 const l = @intCast(u32, (dkLen / hLen) + @as(u1, if (r_ == 0) 0 else 1)); // original: (dkLen + hLen - 1) / hLen
90 const r = if (r_ == 0) hLen else r_;90 const r = if (r_ == 0) hLen else r_;
9191
92 // FromSpec:92 // FromSpec:
...@@ -245,7 +245,7 @@ test "RFC 6070 embedded NUL" {...@@ -245,7 +245,7 @@ test "RFC 6070 embedded NUL" {
245245
246 var derivedKey: [dkLen]u8 = undefined;246 var derivedKey: [dkLen]u8 = undefined;
247247
248 try pbkdf2(&derivedKey, p, s, c, );248 try pbkdf2(&derivedKey, p, s, c, HmacSha1);
249249
250 const expected = "56fa6aa75548099dcc37d7f03425e0c3";250 const expected = "56fa6aa75548099dcc37d7f03425e0c3";
251251