Bump aws-lc-rs (#15337)
Bump our dep. RUSTSEC-2026-0048 Advisory: https://rustsec.org/advisories/RUSTSEC-2026-0048
This commit is contained in:
parent
9e31aeadce
commit
a941d8439d
3 changed files with 35 additions and 7 deletions
4
MODULE.bazel.lock
generated
4
MODULE.bazel.lock
generated
File diff suppressed because one or more lines are too long
8
codex-rs/Cargo.lock
generated
8
codex-rs/Cargo.lock
generated
|
|
@ -800,9 +800,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
|
|||
|
||||
[[package]]
|
||||
name = "aws-lc-rs"
|
||||
version = "1.15.4"
|
||||
version = "1.16.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b7b6141e96a8c160799cc2d5adecd5cbbe5054cb8c7c4af53da0f83bb7ad256"
|
||||
checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc"
|
||||
dependencies = [
|
||||
"aws-lc-sys",
|
||||
"untrusted 0.7.1",
|
||||
|
|
@ -811,9 +811,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-lc-sys"
|
||||
version = "0.37.0"
|
||||
version = "0.39.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c34dda4df7017c8db52132f0f8a2e0f8161649d15723ed63fc00c82d0f2081a"
|
||||
checksum = "1fa7e52a4c5c547c741610a2c6f123f3881e409b714cd27e6798ef020c514f0a"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"cmake",
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ diff --git a/builder/cc_builder.rs b/builder/cc_builder.rs
|
|||
self.manifest_dir
|
||||
.join("aws-lc")
|
||||
@@ -742,6 +761,40 @@
|
||||
}
|
||||
);
|
||||
let _ = fs::remove_file(exec_path);
|
||||
}
|
||||
+
|
||||
|
|
@ -84,3 +84,31 @@ diff --git a/builder/cc_builder.rs b/builder/cc_builder.rs
|
|||
fn run_compiler_checks(&self, cc_build: &mut cc::Build) {
|
||||
if self.compiler_check("stdalign_check", Vec::<&'static str>::new()) {
|
||||
cc_build.define("AWS_LC_STDALIGN_AVAILABLE", Some("1"));
|
||||
diff --git a/builder/main.rs b/builder/main.rs
|
||||
--- a/builder/main.rs
|
||||
+++ b/builder/main.rs
|
||||
@@ -944,10 +944,12 @@
|
||||
// iterate over all the include paths and copy them into the final output
|
||||
for path in include_paths {
|
||||
for child in std::fs::read_dir(path).into_iter().flatten().flatten() {
|
||||
- if child.file_type().map_or(false, |t| t.is_file()) {
|
||||
+ let child_path = child.path();
|
||||
+
|
||||
+ if child_path.is_file() {
|
||||
std::fs::copy(
|
||||
- child.path(),
|
||||
- include_dir.join(child.path().file_name().unwrap()),
|
||||
+ &child_path,
|
||||
+ include_dir.join(child_path.file_name().unwrap()),
|
||||
)
|
||||
.expect("Failed to copy include file during build setup");
|
||||
continue;
|
||||
@@ -957,7 +959,7 @@
|
||||
let options = fs_extra::dir::CopyOptions::new()
|
||||
.skip_exist(true)
|
||||
.copy_inside(true);
|
||||
- fs_extra::dir::copy(child.path(), &include_dir, &options)
|
||||
+ fs_extra::dir::copy(child_path, &include_dir, &options)
|
||||
.expect("Failed to copy include directory during build setup");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue