From a4ade52c83e1f7b42ab570400d0702d90d53750d Mon Sep 17 00:00:00 2001
From: Parzival-3141 <29632054+Parzival-3141@users.noreply.github.com>
Date: Wed, 5 Feb 2025 12:53:42 -0500
Subject: [PATCH 1/4] update to mbedtls v3.6.2 and zig 0.14.0

---
 .github/workflows/build.yml | 4 ++--
 build.zig                   | 2 +-
 build.zig.zon               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 912dd26..40cb2eb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Zig
         uses: mlugg/setup-zig@v1
         with:
-          version: 0.13.0
+          version: 0.14.0
 
       - name: Build
         run: zig build -Dtarget=${{ matrix.target }} -Doptimize=${{ matrix.optimize }}
@@ -54,7 +54,7 @@ jobs:
       - name: Setup Zig
         uses: mlugg/setup-zig@v1
         with:
-          version: 0.13.0
+          version: 0.14.0
 
       - name: Test
         run: zig build test
diff --git a/build.zig b/build.zig
index efbf22f..9753c66 100644
--- a/build.zig
+++ b/build.zig
@@ -33,7 +33,7 @@ pub fn build(b: *Build) void {
         .optimize = optimize,
         .link_libc = true,
     });
-    selftest.defineCMacro("MBEDTLS_SELF_TEST", null);
+    selftest.root_module.addCMacro("MBEDTLS_SELF_TEST", "");
     selftest.addCSourceFile(.{
         .file = mbedtls_dep.path("programs/test/selftest.c"),
         .flags = &.{},
diff --git a/build.zig.zon b/build.zig.zon
index e6a95ca..192d70a 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -1,10 +1,10 @@
 .{
     .name = "mbedtls",
-    .version = "3.6.1",
+    .version = "3.6.2",
     .dependencies = .{
         .mbedtls = .{
-            .url = "https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/mbedtls-3.6.1.tar.gz",
-            .hash = "1220b612b5a244c7b5ad5482cf2bb838e5d565abee98190220f3c568e847cd44306b",
+            .url = "https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/mbedtls-3.6.2.tar.gz",
+            .hash = "1220df23c1e89d301f43026518f90e75cbfd91d92f9e62e5243268eec1db1b425db1",
         },
     },
     .paths = .{

From f1551e6169a6e0d5c8303d99e2d4bde141f0e5be Mon Sep 17 00:00:00 2001
From: Parzival-3141 <29632054+Parzival-3141@users.noreply.github.com>
Date: Wed, 5 Feb 2025 13:24:21 -0500
Subject: [PATCH 2/4] ci: use latest version

The version can be pinned again when 0.14.0 is tagged.
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 40cb2eb..4bb0ebb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Zig
         uses: mlugg/setup-zig@v1
         with:
-          version: 0.14.0
+          version: master
 
       - name: Build
         run: zig build -Dtarget=${{ matrix.target }} -Doptimize=${{ matrix.optimize }}
@@ -54,7 +54,7 @@ jobs:
       - name: Setup Zig
         uses: mlugg/setup-zig@v1
         with:
-          version: 0.14.0
+          version: master
 
       - name: Test
         run: zig build test

From c67d4a142c3d652b94e8ba9ff2989b38e2126354 Mon Sep 17 00:00:00 2001
From: Parzival-3141 <29632054+Parzival-3141@users.noreply.github.com>
Date: Wed, 5 Mar 2025 13:06:01 -0500
Subject: [PATCH 3/4] Revert "ci: use latest version", use 0.14.0

This reverts commit f1551e6169a6e0d5c8303d99e2d4bde141f0e5be.
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4bb0ebb..40cb2eb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Zig
         uses: mlugg/setup-zig@v1
         with:
-          version: master
+          version: 0.14.0
 
       - name: Build
         run: zig build -Dtarget=${{ matrix.target }} -Doptimize=${{ matrix.optimize }}
@@ -54,7 +54,7 @@ jobs:
       - name: Setup Zig
         uses: mlugg/setup-zig@v1
         with:
-          version: master
+          version: 0.14.0
 
       - name: Test
         run: zig build test

From b9ec01cbaf29e19f8fc3b40e541bd86a6878027f Mon Sep 17 00:00:00 2001
From: Parzival-3141 <29632054+Parzival-3141@users.noreply.github.com>
Date: Wed, 5 Mar 2025 13:50:33 -0500
Subject: [PATCH 4/4] update zon, use addLibrary instead of addStaticLibrary

---
 build.zig     | 11 +++++++----
 build.zig.zon |  5 +++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build.zig b/build.zig
index 9753c66..5d41d35 100644
--- a/build.zig
+++ b/build.zig
@@ -7,11 +7,14 @@ pub fn build(b: *Build) void {
 
     const mbedtls_dep = b.dependency("mbedtls", .{});
 
-    const mbedtls = b.addStaticLibrary(.{
+    const mbedtls = b.addLibrary(.{
         .name = "mbedtls",
-        .target = target,
-        .optimize = optimize,
-        .link_libc = true,
+        .linkage = .static,
+        .root_module = b.createModule(.{
+            .target = target,
+            .optimize = optimize,
+            .link_libc = true,
+        }),
     });
     mbedtls.root_module.addIncludePath(mbedtls_dep.path("include"));
     mbedtls.root_module.addCSourceFiles(.{
diff --git a/build.zig.zon b/build.zig.zon
index 192d70a..c123ab6 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -1,10 +1,11 @@
 .{
-    .name = "mbedtls",
+    .name = .mbedtls,
+    .fingerprint = 0x841b00c247548313,
     .version = "3.6.2",
     .dependencies = .{
         .mbedtls = .{
             .url = "https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/mbedtls-3.6.2.tar.gz",
-            .hash = "1220df23c1e89d301f43026518f90e75cbfd91d92f9e62e5243268eec1db1b425db1",
+            .hash = "N-V-__8AAPnFhALfI8HonTAfQwJlGPkOdcv9kdkvnmLlJDJo",
         },
     },
     .paths = .{