Skip to content

Commit

Permalink
Merge pull request #102 from ionut-arm/bump-sys
Browse files Browse the repository at this point in the history
Fix a few lint issues and prepare for `-sys` release
  • Loading branch information
ionut-arm authored Feb 16, 2022
2 parents 6148335 + a5ef04b commit 00a2d70
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions psa-crypto-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "psa-crypto-sys"
version = "0.9.1"
version = "0.9.2"
authors = ["Parsec Project Contributors"]
edition = "2018"
description = "Wrapper around the PSA Cryptography API"
Expand All @@ -12,7 +12,7 @@ repository = "https://github.com/parallaxsecond/rust-psa-crypto"
links = "mbedcrypto"

[build-dependencies]
bindgen = { version = "0.57.0", optional = true }
bindgen = { version = "0.59.2", optional = true }
cc = "1.0.59"
cmake = "0.1.44"
walkdir = "2.3.1"
Expand Down
2 changes: 1 addition & 1 deletion psa-crypto-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ mod common {
.clang_arg(format!("-I{}", mbed_include_dir))
.rustfmt_bindings(true)
.header("src/c/shim.h")
.blacklist_type("max_align_t")
.blocklist_type("max_align_t")
.generate_comments(false)
.size_t_is_usize(true)
.generate()
Expand Down
2 changes: 0 additions & 2 deletions psa-crypto/src/types/algorithm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,6 @@ impl Mac {

/// Enumeration of symmetric encryption algorithms supported.
#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize, Zeroize)]
// StreamCipher contains "Cipher" to differentiate with the other ones that are block cipher modes.
#[allow(clippy::pub_enum_variant_names)]
pub enum Cipher {
/// The stream cipher mode of a stream cipher algorithm.
StreamCipher,
Expand Down
2 changes: 1 addition & 1 deletion psa-crypto/src/types/key_derivation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ impl Inputs<'_> {
) -> Result<()> {
match secret {
InputSecret::Input(input) => {
Inputs::apply_input_step_to_op(op, DerivationStep::Secret, &input)
Inputs::apply_input_step_to_op(op, DerivationStep::Secret, input)
}
InputSecret::KeyAgreement {
private_key,
Expand Down

0 comments on commit 00a2d70

Please sign in to comment.