aboutsummaryrefslogtreecommitdiff
path: root/lib/std
diff options
context:
space:
mode:
authorRocknest <35231115+Rocknest@users.noreply.github.com>2020-09-13 23:59:36 +0300
committerRocknest <35231115+Rocknest@users.noreply.github.com>2020-09-13 23:59:36 +0300
commit73863cf72be02020886d9f8daf15754a8d3b2567 (patch)
tree53aa4b400d9b317f381b1153ad2bb96afcfad878 /lib/std
parentf6195be99770e3f9cc4e8a89bcf451a640bb4b95 (diff)
downloadzig-73863cf72be02020886d9f8daf15754a8d3b2567.tar.gz
zig-73863cf72be02020886d9f8daf15754a8d3b2567.zip
fix build
Diffstat (limited to 'lib/std')
-rw-r--r--lib/std/crypto/pbkdf2.zig4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/crypto/pbkdf2.zig b/lib/std/crypto/pbkdf2.zig
index 813535f3ff..8ff2b4f640 100644
--- a/lib/std/crypto/pbkdf2.zig
+++ b/lib/std/crypto/pbkdf2.zig
@@ -86,7 +86,7 @@ pub fn pbkdf2(derivedKey: []u8, password: []const u8, salt: []const u8, rounds:
// 3) -hLen <= -1 // multiply by -1
// 4) hLen >= 1
const r_ = dkLen % hLen;
- const l = @intCast(u32, (dkLen / hLen) + if (r_ == 0) 0 else 1); // original: (dkLen + hLen - 1) / hLen
+ const l = @intCast(u32, (dkLen / hLen) + @as(u1, if (r_ == 0) 0 else 1)); // original: (dkLen + hLen - 1) / hLen
const r = if (r_ == 0) hLen else r_;
// FromSpec:
@@ -245,7 +245,7 @@ test "RFC 6070 embedded NUL" {
var derivedKey: [dkLen]u8 = undefined;
- try pbkdf2(&derivedKey, p, s, c, );
+ try pbkdf2(&derivedKey, p, s, c, HmacSha1);
const expected = "56fa6aa75548099dcc37d7f03425e0c3";