authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-06-20 15:11:22+03:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-06-20 15:11:22+03:00
log38a1222c875a3d767c77d4e98bc2293ebbfc0487
tree8305fb1fb21ca149f85c9ea563c14d7d5e65d7d0
parent8f9b31af926e0635a82c30d0eb7b2942f78932e5

std.crypto: fix invalid pass by value


5 files changed, 4 insertions(+), 12 deletions(-)

lib/std/crypto/argon2.zig-2
......@@ -897,7 +897,6 @@ test "kdf" {
897897}
898898
899899test "phc format hasher" {
900 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
901900 const allocator = std.testing.allocator;
902901 const password = "testpass";
903902
......@@ -913,7 +912,6 @@ test "phc format hasher" {
913912}
914913
915914test "password hash and password verify" {
916 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
917915 const allocator = std.testing.allocator;
918916 const password = "testpass";
919917
lib/std/crypto/bcrypt.zig-1
......@@ -802,7 +802,6 @@ test "bcrypt crypt format" {
802802}
803803
804804test "bcrypt phc format" {
805 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
806805 const hash_options = HashOptions{
807806 .params = .{ .rounds_log = 5 },
808807 .encoding = .phc,
lib/std/crypto/phc_encoding.zig+2-3
......@@ -41,7 +41,7 @@ pub fn BinValue(comptime max_len: usize) type {
4141 }
4242
4343 /// Return the slice containing the actual value.
44 pub fn constSlice(self: Self) []const u8 {
44 pub fn constSlice(self: *const Self) []const u8 {
4545 return self.buf[0..self.len];
4646 }
4747
......@@ -52,7 +52,7 @@ pub fn BinValue(comptime max_len: usize) type {
5252 self.len = len;
5353 }
5454
55 fn toB64(self: Self, buf: []u8) ![]const u8 {
55 fn toB64(self: *const Self, buf: []u8) ![]const u8 {
5656 const value = self.constSlice();
5757 const len = B64Encoder.calcSize(value.len);
5858 if (len > buf.len) return Error.NoSpaceLeft;
......@@ -260,7 +260,6 @@ fn kvSplit(str: []const u8) !struct { key: []const u8, value: []const u8 } {
260260}
261261
262262test "phc format - encoding/decoding" {
263 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
264263 const Input = struct {
265264 str: []const u8,
266265 HashResult: type,
lib/std/crypto/scrypt.zig+2-3
......@@ -248,7 +248,7 @@ const crypt_format = struct {
248248 }
249249
250250 /// Return the slice containing the actual value.
251 pub fn constSlice(self: Self) []const u8 {
251 pub fn constSlice(self: *const Self) []const u8 {
252252 return self.buf[0..self.len];
253253 }
254254
......@@ -259,7 +259,7 @@ const crypt_format = struct {
259259 self.len = len;
260260 }
261261
262 fn toB64(self: Self, buf: []u8) ![]const u8 {
262 fn toB64(self: *const Self, buf: []u8) ![]const u8 {
263263 const value = self.constSlice();
264264 const len = Codec.encodedLen(value.len);
265265 if (len > buf.len) return EncodingError.NoSpaceLeft;
......@@ -683,7 +683,6 @@ test "unix-scrypt" {
683683}
684684
685685test "crypt format" {
686 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
687686 const str = "$7$C6..../....SodiumChloride$kBGj9fHznVYFQMEn/qDCfrDevf9YDtcDdKvEqHJLV8D";
688687 const params = try crypt_format.deserialize(crypt_format.HashResult(32), str);
689688 var buf: [str.len]u8 = undefined;
src/codegen/c.zig-3
......@@ -225,9 +225,6 @@ fn formatIdent(
225225}
226226
227227pub fn fmtIdent(ident: []const u8) std.fmt.Formatter(formatIdent) {
228 if (builtin.zig_backend != .stage1) {
229 @panic("TODO");
230 }
231228 return .{ .data = ident };
232229}
233230