Merge branch 'MFAshby-main'

Author: Parzival-3141

README.md

@@ -2,7 +2,7 @@
 This is [libgit2](https://libgit2.org/) packaged using Zig's build system.
 Currently only supports Windows and Linux targets.
 
-While libgit2 supports many different options for system dependencies, I've opted to use [MbedTLS](https://www.trustedfirmware.org/projects/mbed-tls/) on Linux for TLS, crypto, and certificate support. SSH support is optional, and is provided by [libssh2](https://libssh2.org/).
+While libgit2 supports many different options for system dependencies, I've opted to use [MbedTLS](https://www.trustedfirmware.org/projects/mbed-tls/) by default on Linux for TLS, crypto, and certificate support. You can replace MbedTLS with OpenSSL if you prefer. SSH support is optional, and is provided by [libssh2](https://libssh2.org/). 
 All other dependencies are bundled in the source tree and compiled statically.
 
 ## Usage
@@ -17,6 +17,7 @@ const libgit2_dep = b.dependency("libgit2", .{
     .target = target,
     .optimize = optimize,
     .@"enable-ssh" = true, // optional ssh support via libssh2
+    .@"enable-openssl" = true, // use openssl instead of mbedtls
 });
 your_compile_step.linkLibrary(libgit_dep.artifact("git2"));
 ```

build.zig

@@ -4,6 +4,11 @@ pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
+    const mbedtls_dep = b.dependency("mbedtls", .{
+        .target = target,
+        .optimize = optimize,
+    });
+
     const libgit_src = b.dependency("libgit2", .{});
     const libgit_root = libgit_src.path(".");
 
@@ -85,9 +90,7 @@ pub fn build(b: *std.Build) !void {
             });
         } else {
             // mbedTLS https and SHA backend
-            lib.linkSystemLibrary("mbedtls");
-            lib.linkSystemLibrary("mbedcrypto");
-            lib.linkSystemLibrary("mbedx509");
+            lib.linkLibrary(mbedtls_dep.artifact("mbedtls"));
             features.addValues(.{
                 .GIT_HTTPS = 1,
                 .GIT_MBEDTLS = 1,
@@ -109,7 +112,11 @@ pub fn build(b: *std.Build) !void {
                 .link_libc = true,
             });
             ntlm.addIncludePath(libgit_src.path("deps/ntlmclient"));
-            if (openssl) addOpenSSLHeaders(ntlm);
+            if (openssl) {
+                addOpenSSLHeaders(ntlm);
+            } else {
+                ntlm.linkLibrary(mbedtls_dep.artifact("mbedtls"));
+            }
 
             const ntlm_cflags = .{
                 "-Wno-implicit-fallthrough",
@@ -355,7 +362,7 @@ pub fn build(b: *std.Build) !void {
         examples_step.dependOn(&example_run.step);
     }
 
-    const tests_step = b.step("run-tests", "Tests");
+    const tests_step = b.step("test", "Run unit tests");
     {
         const tests = b.addTest(.{
             .root_source_file = b.path("tests/main.zig"),

build.zig.zon

@@ -11,6 +11,10 @@
             .url = "https://github.com/allyourcodebase/openssl/archive/refs/tags/3.3.1-1.tar.gz",
             .hash = "12207c40cefa38fe90e4230dfba2e5c76b37e1ee36602512cad8ff0501f892002a65",
         },
+        .mbedtls = .{
+            .url = "https://github.com/allyourcodebase/mbedtls/archive/40a2c1126b45f87d19b256229620bc2995637e5a.tar.gz",
+            .hash = "122034bd019496a4e20a775116c53ef05e3247e9a98436b3407d4c0503fa3a16cd42",
+        },
     },
     .paths = .{
         "build.zig",