authorgravatar for rob@neverwood.orgRob Napier <rob@neverwood.org> 2020-09-13 12:36:32-04:00
committergravatar for rob@neverwood.orgRob Napier <rob@neverwood.org> 2020-09-13 12:36:32-04:00
log85366771ea21a0dcd93e58b35738489d773590fc
tree46e707a52dbc5cb41f7f8093a967f539c3f56641
parent2f9c9662ba0bdc306c1b80534187251491ffdb17

pbkdf2 offset into dk should be usize, not u64.

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

lib/std/crypto/pbkdf2.zig+1-1
...@@ -130,7 +130,7 @@ pub fn pbkdf2(derivedKey: []u8, password: []const u8, salt: []const u8, rounds:...@@ -130,7 +130,7 @@ pub fn pbkdf2(derivedKey: []u8, password: []const u8, salt: []const u8, rounds:
130 ctx.final(prevBlock[0..]);130 ctx.final(prevBlock[0..]);
131131
132 // Choose portion of DK to write into (T_n) and initialize132 // Choose portion of DK to write into (T_n) and initialize
133 const offset: u64 = @as(u64, block) * hLen;133 const offset: usize = @as(usize, block) * hLen;
134 const blockLen = if (block != l - 1) hLen else r;134 const blockLen = if (block != l - 1) hLen else r;
135 var dkBlock = derivedKey[offset..(offset + blockLen)];135 var dkBlock = derivedKey[offset..(offset + blockLen)];
136 mem.copy(u8, dkBlock, prevBlock[0..dkBlock.len]);136 mem.copy(u8, dkBlock, prevBlock[0..dkBlock.len]);