min
/
lanzaboote
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #287 from nix-community/small-fixes 

Small fixes & updates
This commit is contained in:
nikstur 2024-01-21 16:40:10 +00:00 committed by GitHub
parent 44b8881301 234e4da1f3
commit 7b91a7a352
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -232,7 +232,6 @@
# Convenience for test fixtures in nix/tests. # Convenience for test fixtures in nix/tests.
pkgs.openssl pkgs.openssl
(pkgs.sbctl.override { databasePath = "pki"; })
# Needed for `cargo test` in rust/tool. We also need # Needed for `cargo test` in rust/tool. We also need
# TEST_SYSTEMD below for that. # TEST_SYSTEMD below for that.

2
rust/uefi/linux-bootloader/src/pe_loader.rs
View File

@ -195,7 +195,7 @@ impl Image {
self.image.len().try_into().unwrap(), self.image.len().try_into().unwrap(),
); );
loaded_image.set_load_options( loaded_image.set_load_options(
load_options.as_ptr() as *const u8, load_options.as_ptr(),
u32::try_from(load_options.len()).unwrap(), u32::try_from(load_options.len()).unwrap(),
); );
} }

2
rust/uefi/rust-toolchain.toml
View File

@ -1,4 +1,4 @@
[toolchain] [toolchain]
channel = "1.70.0" channel = "1.75.0"
components = [ "rust-src" ] components = [ "rust-src" ]
targets = [ "x86_64-unknown-uefi", "aarch64-unknown-uefi" ] targets = [ "x86_64-unknown-uefi", "aarch64-unknown-uefi" ]

3
rust/uefi/stub/src/fat.rs
View File

@ -9,8 +9,7 @@ use linux_bootloader::uefi_helpers::booted_image_file;
pub fn extract_bytes(pe_data: &[u8], section: &str) -> Result<Vec<u8>> { pub fn extract_bytes(pe_data: &[u8], section: &str) -> Result<Vec<u8>> {
let bytes: Vec<u8> = pe_section(pe_data, section) let bytes: Vec<u8> = pe_section(pe_data, section)
.ok_or(Status::INVALID_PARAMETER)? .ok_or(Status::INVALID_PARAMETER)?
.try_into() .into();
.map_err(|_| Status::INVALID_PARAMETER)?;
Ok(bytes) Ok(bytes)
} }