| ... | @@ -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 -1 | 86 | // 3) -hLen <= -1 // multiply by -1 |
| 87 | // 4) hLen >= 1 | 87 | // 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) / hLen | 89 | 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_; |
| 91 | | 91 | |
| 92 | // FromSpec: | 92 | // FromSpec: |
| ... | @@ -245,7 +245,7 @@ test "RFC 6070 embedded NUL" { | ... | @@ -245,7 +245,7 @@ test "RFC 6070 embedded NUL" { |
| 245 | | 245 | |
| 246 | var derivedKey: [dkLen]u8 = undefined; | 246 | var derivedKey: [dkLen]u8 = undefined; |
| 247 | | 247 | |
| 248 | try pbkdf2(&derivedKey, p, s, c, ); | 248 | try pbkdf2(&derivedKey, p, s, c, HmacSha1); |
| 249 | | 249 | |
| 250 | const expected = "56fa6aa75548099dcc37d7f03425e0c3"; | 250 | const expected = "56fa6aa75548099dcc37d7f03425e0c3"; |
| 251 | | 251 | |