public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2025-12-14 15:28:57 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

wipe Mbed TLS

Browse Source
This commit is contained in:
Halil Durak
2025-11-26 16:06:57 +03:00
parent a124f5caa9
commit 5c71e0f93b
4 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -22,9 +22,6 @@
[submodule "vendor/nghttp2"] [submodule "vendor/nghttp2"]
path = vendor/nghttp2 path = vendor/nghttp2
url = https://github.com/nghttp2/nghttp2.git url = https://github.com/nghttp2/nghttp2.git
[submodule "vendor/mbedtls"]
path = vendor/mbedtls
url = https://github.com/Mbed-TLS/mbedtls.git
[submodule "vendor/zlib"] [submodule "vendor/zlib"]
path = vendor/zlib path = vendor/zlib
url = https://github.com/madler/zlib.git url = https://github.com/madler/zlib.git

62
build.zig
View File

@@ -46,8 +46,6 @@ pub fn build(b: *Build) !void {
b.option([]const u8, "git_commit", "Current git commit") orelse "dev", b.option([]const u8, "git_commit", "Current git commit") orelse "dev",
); );
const use_boringssl = b.option(bool, "use-boringssl", "Whether use BoringSSL (default:true)") orelse true;
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{}); const optimize = b.standardOptimizeOption(.{});
@@ -61,7 +59,7 @@ pub fn build(b: *Build) !void {
.link_libc = true, .link_libc = true,
.link_libcpp = true, .link_libcpp = true,
}); });
try addDependencies(b, lightpanda_module, opts, use_boringssl); try addDependencies(b, lightpanda_module, opts);
{ {
// browser // browser
@@ -115,7 +113,7 @@ pub fn build(b: *Build) !void {
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
}); });
try addDependencies(b, wpt_module, opts, use_boringssl); try addDependencies(b, wpt_module, opts);
// compile and install // compile and install
const wpt = b.addExecutable(.{ const wpt = b.addExecutable(.{
@@ -153,7 +151,7 @@ pub fn build(b: *Build) !void {
} }
} }
fn addDependencies(b: *Build, mod: *Build.Module, opts: *Build.Step.Options, use_boringssl: bool) !void { fn addDependencies(b: *Build, mod: *Build.Module, opts: *Build.Step.Options) !void {
try moduleNetSurf(b, mod); try moduleNetSurf(b, mod);
mod.addImport("build_config", opts.createModule()); mod.addImport("build_config", opts.createModule());
@@ -376,39 +374,29 @@ fn addDependencies(b: *Build, mod: *Build.Module, opts: *Build.Step.Options, use
mod.addCMacro("STDC_HEADERS", "1"); mod.addCMacro("STDC_HEADERS", "1");
mod.addCMacro("TIME_WITH_SYS_TIME", "1"); mod.addCMacro("TIME_WITH_SYS_TIME", "1");
mod.addCMacro("USE_NGHTTP2", "1"); mod.addCMacro("USE_NGHTTP2", "1");
if (use_boringssl) { mod.addCMacro("USE_OPENSSL", "1");
mod.addCMacro("USE_OPENSSL", "1"); mod.addCMacro("OPENSSL_IS_BORINGSSL", "1");
mod.addCMacro("OPENSSL_IS_BORINGSSL", "1");
} else {
mod.addCMacro("USE_MBEDTLS", "1");
}
mod.addCMacro("USE_THREADS_POSIX", "1"); mod.addCMacro("USE_THREADS_POSIX", "1");
mod.addCMacro("USE_UNIX_SOCKETS", "1"); mod.addCMacro("USE_UNIX_SOCKETS", "1");
} }
try buildZlib(b, mod); try buildZlib(b, mod);
try buildBrotli(b, mod); try buildBrotli(b, mod);
if (use_boringssl) { const boringssl_dep = b.dependency("boringssl-zig", .{
const maybe_boringssl_dep = b.lazyDependency("boringssl-zig", .{ .target = target,
.target = target, .optimize = mod.optimize.?,
.optimize = mod.optimize.?, .force_pic = true,
.force_pic = true, });
});
if (maybe_boringssl_dep) |boringssl_dep| { const ssl = boringssl_dep.artifact("ssl");
const ssl = boringssl_dep.artifact("ssl"); ssl.bundle_ubsan_rt = false;
ssl.bundle_ubsan_rt = false; const crypto = boringssl_dep.artifact("crypto");
const crypto = boringssl_dep.artifact("crypto"); crypto.bundle_ubsan_rt = false;
crypto.bundle_ubsan_rt = false;
mod.linkLibrary(ssl); mod.linkLibrary(ssl);
mod.linkLibrary(crypto); mod.linkLibrary(crypto);
}
} else {
try buildMbedtls(b, mod);
}
try buildNghttp2(b, mod); try buildNghttp2(b, mod);
try buildCurl(b, mod, use_boringssl); try buildCurl(b, mod);
try buildAda(b, mod); try buildAda(b, mod);
switch (target.result.os.tag) { switch (target.result.os.tag) {
@@ -699,7 +687,7 @@ fn buildNghttp2(b: *Build, m: *Build.Module) !void {
} }); } });
} }
fn buildCurl(b: *Build, m: *Build.Module, use_boringssl: bool) !void { fn buildCurl(b: *Build, m: *Build.Module) !void {
const curl = b.addLibrary(.{ const curl = b.addLibrary(.{
.name = "curl", .name = "curl",
.root_module = m, .root_module = m,
@@ -867,20 +855,12 @@ fn buildCurl(b: *Build, m: *Build.Module, use_boringssl: bool) !void {
root ++ "lib/vauth/spnego_sspi.c", root ++ "lib/vauth/spnego_sspi.c",
root ++ "lib/vauth/vauth.c", root ++ "lib/vauth/vauth.c",
root ++ "lib/vtls/cipher_suite.c", root ++ "lib/vtls/cipher_suite.c",
root ++ "lib/vtls/vtls.c",
root ++ "lib/vtls/vtls_scache.c",
root ++ "lib/vtls/x509asn1.c",
},
});
curl.addCSourceFiles(.{
.files = if (use_boringssl) &.{
root ++ "lib/vtls/openssl.c", root ++ "lib/vtls/openssl.c",
root ++ "lib/vtls/hostcheck.c", root ++ "lib/vtls/hostcheck.c",
root ++ "lib/vtls/keylog.c", root ++ "lib/vtls/keylog.c",
} else &.{ root ++ "lib/vtls/vtls.c",
root ++ "lib/vtls/mbedtls.c", root ++ "lib/vtls/vtls_scache.c",
root ++ "lib/vtls/mbedtls_threadlock.c", root ++ "lib/vtls/x509asn1.c",
}, },
}); });
} }

3
build.zig.zon
View File

@@ -14,9 +14,8 @@
.hash = "N-V-__8AAPmhFAAw64ALjlzd5YMtzpSrmZ6KymsT84BKfB4s", .hash = "N-V-__8AAPmhFAAw64ALjlzd5YMtzpSrmZ6KymsT84BKfB4s",
}, },
.@"boringssl-zig" = .{ .@"boringssl-zig" = .{
.url = "git+https://github.com/Syndica/boringssl-zig.git#01b27c04e42cbb50173348bf2f225b2e223ef87a", .url = "git+https://github.com/Syndica/boringssl-zig.git#c53df00d06b02b755ad88bbf4d1202ed9687b096",
.hash = "boringssl-0.1.0-VtJeWehMAAA4RNnwRnzEvKcS9rjsR1QVRw1uJrwXxmVK", .hash = "boringssl-0.1.0-VtJeWehMAAA4RNnwRnzEvKcS9rjsR1QVRw1uJrwXxmVK",
.lazy = true,
}, },
}, },
} }

1
vendor/mbedtls vendored

Submodule vendor/mbedtls deleted from c765c831e5