From 38a1222c875a3d767c77d4e98bc2293ebbfc0487 Mon Sep 17 00:00:00 2001
From: Veikka Tuominen <git@vexu.eu>
Date: Mon, 20 Jun 2022 15:11:22 +0300
Subject: [PATCH] std.crypto: fix invalid pass by value

---
 lib/std/crypto/argon2.zig       | 2 --
 lib/std/crypto/bcrypt.zig       | 1 -
 lib/std/crypto/phc_encoding.zig | 5 ++---
 lib/std/crypto/scrypt.zig       | 5 ++---
 src/codegen/c.zig               | 3 ---
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/std/crypto/argon2.zig b/lib/std/crypto/argon2.zig
index 16c20a4a78..7269470d5f 100644
--- a/lib/std/crypto/argon2.zig
+++ b/lib/std/crypto/argon2.zig
@@ -897,7 +897,6 @@ test "kdf" {
 }
 
 test "phc format hasher" {
-    if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
     const allocator = std.testing.allocator;
     const password = "testpass";
 
@@ -913,7 +912,6 @@ test "phc format hasher" {
 }
 
 test "password hash and password verify" {
-    if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
     const allocator = std.testing.allocator;
     const password = "testpass";
 
diff --git a/lib/std/crypto/bcrypt.zig b/lib/std/crypto/bcrypt.zig
index d5e9fddaf1..d7a0e0fb80 100644
--- a/lib/std/crypto/bcrypt.zig
+++ b/lib/std/crypto/bcrypt.zig
@@ -802,7 +802,6 @@ test "bcrypt crypt format" {
 }
 
 test "bcrypt phc format" {
-    if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
     const hash_options = HashOptions{
         .params = .{ .rounds_log = 5 },
         .encoding = .phc,
diff --git a/lib/std/crypto/phc_encoding.zig b/lib/std/crypto/phc_encoding.zig
index 40074b2c6e..69324dc5b3 100644
--- a/lib/std/crypto/phc_encoding.zig
+++ b/lib/std/crypto/phc_encoding.zig
@@ -41,7 +41,7 @@ pub fn BinValue(comptime max_len: usize) type {
         }
 
         /// Return the slice containing the actual value.
-        pub fn constSlice(self: Self) []const u8 {
+        pub fn constSlice(self: *const Self) []const u8 {
             return self.buf[0..self.len];
         }
 
@@ -52,7 +52,7 @@ pub fn BinValue(comptime max_len: usize) type {
             self.len = len;
         }
 
-        fn toB64(self: Self, buf: []u8) ![]const u8 {
+        fn toB64(self: *const Self, buf: []u8) ![]const u8 {
             const value = self.constSlice();
             const len = B64Encoder.calcSize(value.len);
             if (len > buf.len) return Error.NoSpaceLeft;
@@ -260,7 +260,6 @@ fn kvSplit(str: []const u8) !struct { key: []const u8, value: []const u8 } {
 }
 
 test "phc format - encoding/decoding" {
-    if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
     const Input = struct {
         str: []const u8,
         HashResult: type,
diff --git a/lib/std/crypto/scrypt.zig b/lib/std/crypto/scrypt.zig
index 11441df161..35049ebc51 100644
--- a/lib/std/crypto/scrypt.zig
+++ b/lib/std/crypto/scrypt.zig
@@ -248,7 +248,7 @@ const crypt_format = struct {
             }
 
             /// Return the slice containing the actual value.
-            pub fn constSlice(self: Self) []const u8 {
+            pub fn constSlice(self: *const Self) []const u8 {
                 return self.buf[0..self.len];
             }
 
@@ -259,7 +259,7 @@ const crypt_format = struct {
                 self.len = len;
             }
 
-            fn toB64(self: Self, buf: []u8) ![]const u8 {
+            fn toB64(self: *const Self, buf: []u8) ![]const u8 {
                 const value = self.constSlice();
                 const len = Codec.encodedLen(value.len);
                 if (len > buf.len) return EncodingError.NoSpaceLeft;
@@ -683,7 +683,6 @@ test "unix-scrypt" {
 }
 
 test "crypt format" {
-    if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
     const str = "$7$C6..../....SodiumChloride$kBGj9fHznVYFQMEn/qDCfrDevf9YDtcDdKvEqHJLV8D";
     const params = try crypt_format.deserialize(crypt_format.HashResult(32), str);
     var buf: [str.len]u8 = undefined;
diff --git a/src/codegen/c.zig b/src/codegen/c.zig
index 949e2a67f2..54c0dfb3c7 100644
--- a/src/codegen/c.zig
+++ b/src/codegen/c.zig
@@ -225,9 +225,6 @@ fn formatIdent(
 }
 
 pub fn fmtIdent(ident: []const u8) std.fmt.Formatter(formatIdent) {
-    if (builtin.zig_backend != .stage1) {
-        @panic("TODO");
-    }
     return .{ .data = ident };
 }