Skip to content

build: fixes for newer Rust #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build: fixes for newer Rust #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ git clone https://github.com/ARMmbed/mbedtls.git
pushd mbedtls
git checkout v3.0.0
./scripts/config.py crypto
SHARED=1 make
SHARED=1 make -j$(nproc)
popd

# Clean before to only build the interface
Expand Down
18 changes: 9 additions & 9 deletions psa-crypto-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,15 @@
) -> Result<()> {
let header = mbed_include_dir.clone() + "/psa/crypto.h";

println!("using mbedtls include directory of: {}", mbed_include_dir);
println!("cargo:rerun-if-changed={}", header);
println!("using mbedtls include directory of: {mbed_include_dir}");
println!("cargo:rerun-if-changed={header}");

let out_dir = env::var("OUT_DIR").unwrap();

// Common shim builder settings
let mut shim_builder = bindgen::Builder::default()
.clang_arg(format!("-I{}", out_dir))
.clang_arg(format!("-I{}", mbed_include_dir))
.clang_arg(format!("-I{out_dir}"))
.clang_arg(format!("-I{mbed_include_dir}"))
.header("src/c/shim.h")
.blocklist_type("max_align_t")
.generate_comments(false)
Expand All @@ -181,7 +181,7 @@

if !external_mbedtls {
shim_builder =
shim_builder.clang_arg(format!("-DMBEDTLS_CONFIG_FILE=\"{}\"", CONFIG_FILE));
shim_builder.clang_arg(format!("-DMBEDTLS_CONFIG_FILE=\"{CONFIG_FILE}\""));
}

// Build the bindings
Expand Down Expand Up @@ -219,7 +219,7 @@
.cargo_metadata(metadata);

if !external_mbedtls {
_ = cfg.flag(&format!("-DMBEDTLS_CONFIG_FILE=\"{}\"", CONFIG_FILE));
_ = cfg.flag(&format!("-DMBEDTLS_CONFIG_FILE=\"{CONFIG_FILE}\""));

Check failure on line 222 in psa-crypto-sys/build.rs

View workflow job for this annotation

GitHub Actions / All tests: rustc stable 

the borrowed expression implements the required traits
}

cfg.try_compile(shimlib_name)
Expand Down Expand Up @@ -319,7 +319,7 @@

// Build the MbedTLS libraries
let mbed_build_path = Config::new(&mbedtls_dir)
.cflag(format!("-I{}", out_dir))
.cflag(format!("-I{out_dir}"))
.cflag(format!(
"-DMBEDTLS_CONFIG_FILE='\"{}\"'",
common::CONFIG_FILE
Expand All @@ -336,8 +336,8 @@
let link_type = if link_statically { "static" } else { "dylib" };

// Request rustc to link the Mbed Crypto library
println!("cargo:rustc-link-search=native={}", lib_path,);
println!("cargo:rustc-link-lib={}=mbedcrypto", link_type);
println!("cargo:rustc-link-search=native={lib_path}",);
println!("cargo:rustc-link-lib={link_type}=mbedcrypto");
}

#[cfg(not(feature = "prefix"))]
Expand Down
2 changes: 2 additions & 0 deletions psa-crypto-sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
trivial_casts
)]
#[allow(clippy::all)]
#[allow(unknown_lints)] // unnecessary_transmutes is only present in 1.88+
#[allow(unnecessary_transmutes)]
#[cfg(feature = "interface")]
mod psa_crypto_binding {
#![allow(unused_imports)]
Expand Down
12 changes: 6 additions & 6 deletions psa-crypto/src/types/key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl Attributes {
/// }),
/// },
/// };

///
/// // Can not export because the export flag is set to false.
/// attributes.can_export().unwrap_err();
/// ```
Expand Down Expand Up @@ -237,7 +237,7 @@ impl Attributes {
/// permitted_algorithms: permitted_alg,
/// },
/// };

///
/// assert!(attributes.is_compatible_with_alg(alg));
/// attributes.key_type = Type::RsaPublicKey;
/// assert!(attributes.is_compatible_with_alg(alg));
Expand Down Expand Up @@ -562,15 +562,15 @@ impl fmt::Display for Type {
Type::Chacha20 => write!(f, "Key for an algorithm based on ChaCha20"),
Type::RsaPublicKey => write!(f, "RSA public key"),
Type::RsaKeyPair => write!(f, "RSA key pair"),
Type::EccKeyPair { curve_family } => write!(f, "ECC key pair (using {})", curve_family),
Type::EccKeyPair { curve_family } => write!(f, "ECC key pair (using {curve_family})"),
Type::EccPublicKey { curve_family } => {
write!(f, "ECC public key (using {})", curve_family)
write!(f, "ECC public key (using {curve_family})")
}
Type::DhKeyPair { group_family } => {
write!(f, "Diffie-Hellman key pair (using {})", group_family)
write!(f, "Diffie-Hellman key pair (using {group_family})")
}
Type::DhPublicKey { group_family } => {
write!(f, "Diffie-Hellman public key (using {})", group_family)
write!(f, "Diffie-Hellman public key (using {group_family})")
}
}
}
Expand Down
Loading