Track latest Zig 0.17-dev OptimizeMode API

.github/workflows/ci.yml

@@ -13,13 +13,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        zig-version: ['0.17.0-dev.1441+d5181a9c9']
+        zig-version: ['0.17.0-dev.1476+91a29d707']
       fail-fast: false
     steps:
       - uses: actions/checkout@v6
       - uses: mlugg/setup-zig@v2
         with:
-          version: '0.17.0-dev.1441+d5181a9c9'
+          version: '0.17.0-dev.1476+91a29d707'
       - run: zig build
       - run: zig build test
 
@@ -30,5 +30,5 @@ jobs:
       - uses: actions/checkout@v6
       - uses: mlugg/setup-zig@v2
         with:
-          version: '0.17.0-dev.1441+d5181a9c9'
+          version: '0.17.0-dev.1476+91a29d707'
       - run: zig fmt --check .

.github/workflows/interop.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: mlugg/setup-zig@v2
         with:
-          version: '0.17.0-dev.1441+d5181a9c9'
+          version: '0.17.0-dev.1476+91a29d707'
       - run: zig build bench -Doptimize=ReleaseFast -Dcpu=native
       - run: zig build test
       - name: Interop tests (in-process)
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: mlugg/setup-zig@v2
         with:
-          version: '0.17.0-dev.1441+d5181a9c9'
+          version: '0.17.0-dev.1476+91a29d707'
       - run: zig build bench -Doptimize=ReleaseFast -Dcpu=native
       - run: zig build test
 
@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: mlugg/setup-zig@v2
         with:
-          version: '0.17.0-dev.1441+d5181a9c9'
+          version: '0.17.0-dev.1476+91a29d707'
       - run: zig build -Dfuzz=true fuzz
 
   testssl:
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: mlugg/setup-zig@v2
         with:
-          version: '0.17.0-dev.1441+d5181a9c9'
+          version: '0.17.0-dev.1476+91a29d707'
       - name: Install testssl.sh
         run: |
           git clone --depth 1 https://github.com/drwetter/testssl.sh.git /tmp/testssl.sh

bench/crypto_bench.zig

@@ -5,7 +5,7 @@ const crypto = std.crypto;
 const tls = @import("tls");
 const ecdsa = tls.ecdsa_p256;
 
-const crypto_iterations: u32 = if (@import("builtin").mode == .Debug) 1_000 else 100_000;
+const crypto_iterations: u32 = if (@import("builtin").mode == .debug) 1_000 else 100_000;
 const handshake_record_len: usize = 2048;
 
 pub fn run(

bench/main.zig

@@ -6,12 +6,12 @@ const certs = @import("certs.zig");
 const crypto_bench = @import("crypto_bench.zig");
 
 pub const std_options: std.Options = .{
-    .log_level = if (builtin.mode == .Debug) .warn else .err,
+    .log_level = if (builtin.mode == .debug) .warn else .err,
 };
 
-const iterations: u32 = if (builtin.mode == .Debug) 100 else 10_000;
+const iterations: u32 = if (builtin.mode == .debug) 100 else 10_000;
 const transfer_bytes: usize = 16 * 1024;
-const transfer_iterations: u32 = if (builtin.mode == .Debug) 50 else 5_000;
+const transfer_iterations: u32 = if (builtin.mode == .debug) 50 else 5_000;
 
 const bench_groups = &[_]tls.config.NamedGroup{.x25519};
 

build.zig

@@ -90,7 +90,7 @@ pub fn build(b: *std.Build) void {
         const record_fuzz_mod = b.createModule(.{
             .root_source_file = b.path("fuzz/record_fuzz.zig"),
             .target = target,
-            .optimize = .ReleaseFast,
+            .optimize = .fast,
         });
         record_fuzz_mod.addImport("tls", tls_module);
         const record_fuzz = b.addExecutable(.{
@@ -103,7 +103,7 @@ pub fn build(b: *std.Build) void {
         const handshake_fuzz_mod = b.createModule(.{
             .root_source_file = b.path("fuzz/handshake_fuzz.zig"),
             .target = target,
-            .optimize = .ReleaseFast,
+            .optimize = .fast,
         });
         handshake_fuzz_mod.addImport("tls", tls_module);
         const handshake_fuzz = b.addExecutable(.{

build.zig.zon

@@ -1,7 +1,7 @@
 .{
     .name = .zig_tls,
     .version = "0.1.1",
-    .minimum_zig_version = "0.17.0-dev.1441+d5181a9c9",
+    .minimum_zig_version = "0.17.0-dev.1476+91a29d707",
     .fingerprint = 0x114f7e81e404070b,
     .paths = .{
         "README.md",

src/crypto/p256/p256_64.zig

@@ -110,7 +110,7 @@ fn subborrowxU64(out1: *u64, out2: *u1, arg1: u1, arg2: u64, arg3: u64) void {
 ///   out1: [0x0 ~> 0xffffffffffffffff]
 ///   out2: [0x0 ~> 0xffffffffffffffff]
 fn mulxU64(out1: *u64, out2: *u64, arg1: u64, arg2: u64) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     const x = @as(u128, arg1) * @as(u128, arg2);
     out1.* = @as(u64, @truncate(x));
@@ -129,7 +129,7 @@ fn mulxU64(out1: *u64, out2: *u64, arg1: u64, arg2: u64) void {
 /// Output Bounds:
 ///   out1: [0x0 ~> 0xffffffffffffffff]
 fn cmovznzU64(out1: *u64, arg1: u1, arg2: u64, arg3: u64) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     const mask = 0 -% @as(u64, arg1);
     out1.* = (mask & arg3) | ((~mask) & arg2);
@@ -145,7 +145,7 @@ fn cmovznzU64(out1: *u64, arg1: u1, arg2: u64, arg3: u64) void {
 ///   0 ≤ eval out1 < m
 ///
 pub fn mul(out1: *MontgomeryDomainFieldElement, arg1: MontgomeryDomainFieldElement, arg2: MontgomeryDomainFieldElement) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     const x1 = (arg1[1]);
     const x2 = (arg1[2]);
@@ -437,7 +437,7 @@ pub fn mul(out1: *MontgomeryDomainFieldElement, arg1: MontgomeryDomainFieldEleme
 ///   0 ≤ eval out1 < m
 ///
 pub fn square(out1: *MontgomeryDomainFieldElement, arg1: MontgomeryDomainFieldElement) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     const x1 = (arg1[1]);
     const x2 = (arg1[2]);
@@ -730,7 +730,7 @@ pub fn square(out1: *MontgomeryDomainFieldElement, arg1: MontgomeryDomainFieldEl
 ///   0 ≤ eval out1 < m
 ///
 pub fn add(out1: *MontgomeryDomainFieldElement, arg1: MontgomeryDomainFieldElement, arg2: MontgomeryDomainFieldElement) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     var x1: u64 = undefined;
     var x2: u1 = undefined;
@@ -783,7 +783,7 @@ pub fn add(out1: *MontgomeryDomainFieldElement, arg1: MontgomeryDomainFieldEleme
 ///   0 ≤ eval out1 < m
 ///
 pub fn sub(out1: *MontgomeryDomainFieldElement, arg1: MontgomeryDomainFieldElement, arg2: MontgomeryDomainFieldElement) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     var x1: u64 = undefined;
     var x2: u1 = undefined;
@@ -826,7 +826,7 @@ pub fn sub(out1: *MontgomeryDomainFieldElement, arg1: MontgomeryDomainFieldEleme
 ///   0 ≤ eval out1 < m
 ///
 pub fn opp(out1: *MontgomeryDomainFieldElement, arg1: MontgomeryDomainFieldElement) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     var x1: u64 = undefined;
     var x2: u1 = undefined;
@@ -869,7 +869,7 @@ pub fn opp(out1: *MontgomeryDomainFieldElement, arg1: MontgomeryDomainFieldEleme
 ///   0 ≤ eval out1 < m
 ///
 pub fn fromMontgomery(out1: *NonMontgomeryDomainFieldElement, arg1: MontgomeryDomainFieldElement) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     const x1 = (arg1[0]);
     var x2: u64 = undefined;
@@ -1022,7 +1022,7 @@ pub fn fromMontgomery(out1: *NonMontgomeryDomainFieldElement, arg1: MontgomeryDo
 ///   0 ≤ eval out1 < m
 ///
 pub fn toMontgomery(out1: *MontgomeryDomainFieldElement, arg1: NonMontgomeryDomainFieldElement) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     const x1 = (arg1[1]);
     const x2 = (arg1[2]);
@@ -1297,7 +1297,7 @@ pub fn toMontgomery(out1: *MontgomeryDomainFieldElement, arg1: NonMontgomeryDoma
 /// Output Bounds:
 ///   out1: [0x0 ~> 0xffffffffffffffff]
 pub fn nonzero(out1: *u64, arg1: [4]u64) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     const x1 = ((arg1[0]) | ((arg1[1]) | ((arg1[2]) | (arg1[3]))));
     out1.* = x1;
@@ -1315,7 +1315,7 @@ pub fn nonzero(out1: *u64, arg1: [4]u64) void {
 /// Output Bounds:
 ///   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
 pub fn selectznz(out1: *[4]u64, arg1: u1, arg2: [4]u64, arg3: [4]u64) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     var x1: u64 = undefined;
     cmovznzU64(&x1, arg1, (arg2[0]), (arg3[0]));
@@ -1343,7 +1343,7 @@ pub fn selectznz(out1: *[4]u64, arg1: u1, arg2: [4]u64, arg3: [4]u64) void {
 /// Output Bounds:
 ///   out1: [[0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff]]
 pub fn toBytes(out1: *[32]u8, arg1: [4]u64) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     const x1 = (arg1[3]);
     const x2 = (arg1[2]);
@@ -1452,7 +1452,7 @@ pub fn toBytes(out1: *[32]u8, arg1: [4]u64) void {
 /// Output Bounds:
 ///   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
 pub fn fromBytes(out1: *[4]u64, arg1: [32]u8) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     const x1 = (@as(u64, (arg1[31])) << 56);
     const x2 = (@as(u64, (arg1[30])) << 48);
@@ -1527,7 +1527,7 @@ pub fn fromBytes(out1: *[4]u64, arg1: [32]u8) void {
 ///   0 ≤ eval out1 < m
 ///
 pub fn setOne(out1: *MontgomeryDomainFieldElement) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     out1[0] = @as(u64, 0x1);
     out1[1] = 0xffffffff00000000;
@@ -1544,7 +1544,7 @@ pub fn setOne(out1: *MontgomeryDomainFieldElement) void {
 /// Output Bounds:
 ///   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
 pub fn msat(out1: *[5]u64) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     out1[0] = 0xffffffffffffffff;
     out1[1] = 0xffffffff;
@@ -1582,7 +1582,7 @@ pub fn msat(out1: *[5]u64) void {
 ///   out4: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
 ///   out5: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
 pub fn divstep(out1: *u64, out2: *[5]u64, out3: *[5]u64, out4: *[4]u64, out5: *[4]u64, arg1: u64, arg2: [5]u64, arg3: [5]u64, arg4: [4]u64, arg5: [4]u64) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     var x1: u64 = undefined;
     var x2: u1 = undefined;
@@ -1816,7 +1816,7 @@ pub fn divstep(out1: *u64, out2: *[5]u64, out3: *[5]u64, out4: *[4]u64, out5: *[
 /// Output Bounds:
 ///   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
 pub fn divstepPrecomp(out1: *[4]u64) void {
-    @setRuntimeSafety(mode == .Debug);
+    @setRuntimeSafety(mode == .debug);
 
     out1[0] = 0x67ffffffb8000000;
     out1[1] = 0xc000000038000000;