Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
blueluna committed Dec 30, 2023
1 parent 26f119f commit 64e35ab
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 23 deletions.
4 changes: 2 additions & 2 deletions psila-crypto-rust-crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2018"

[dependencies]
psila-crypto = { path = "../psila-crypto" }
aes = { version = "0.7" }
ccm = { version = "0.4", default-features = false }
aes = { version = "0.8" }
ccm = { version = "0.5", default-features = false }

[dev-dependencies]
psila-data = { path = "../psila-data" }
7 changes: 2 additions & 5 deletions psila-crypto-rust-crypto/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

use psila_crypto::{CryptoBackend, Error, BLOCK_SIZE};

use aes::{
cipher::{BlockEncrypt, NewBlockCipher},
Aes128,
};
use aes::{cipher::BlockEncrypt, Aes128};
use ccm::{
aead::{generic_array::GenericArray, AeadInPlace, NewAead},
aead::{generic_array::GenericArray, AeadInPlace, KeyInit},
consts::{U13, U16, U4, U8},
Ccm,
};
Expand Down
4 changes: 2 additions & 2 deletions psila-data/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ default = []
core = ["heapless"]

[dependencies]
byte = "0.2.4"
byte = "0.2"
byteorder = { version = "1", default-features = false }
bitflags = "1.3"
bitflags = "2.4"
hash32 = "0.2"
hash32-derive = "0.1"
heapless = { version = "0.7.7", optional = true }
Expand Down
3 changes: 3 additions & 0 deletions psila-data/src/device_profile/node_descriptor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::Error;

bitflags! {
/// Flags that denotes which bands used
#[derive(Clone, Debug, PartialEq)]
pub struct BandFlags: u8 {
/// 868 MHz band
const BAND_868MHZ = 0b0000_0001;
Expand All @@ -22,6 +23,7 @@ bitflags! {

bitflags! {
/// Server functionality flags
#[derive(Clone, Debug, PartialEq)]
pub struct ServerFlags: u8 {
/// Primary trust center
const PRIMARY_TRUST_CENTER = 0b0000_0001;
Expand Down Expand Up @@ -80,6 +82,7 @@ impl Default for ServerMask {

bitflags! {
/// Descriptor capability
#[derive(Clone, Debug, PartialEq)]
pub struct DescriptorCapability: u8 {
/// Extended active endpoint list available
const EXTENDED_ACTIVE_END_POINT_LIST_AVAILABLE = 0b0000_0001;
Expand Down
4 changes: 2 additions & 2 deletions psila-host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Erik Svensson <[email protected]>"]
edition = "2018"

[dependencies]
byte = "0.2.4"
byte = "0.2"
byteorder = { version = "1", default-features = false }
clap = "2.32"
slice-deque = "0.3"
Expand All @@ -15,7 +15,7 @@ psila-data = { path = "../psila-data" }
psila-crypto-rust-crypto = { path = "../psila-crypto-rust-crypto" }
serde = "1.0"
serde_derive = "1.0"
toml = "0.5"
toml = "0.8"
chrono = "0.4"

[dependencies.serialport]
Expand Down
2 changes: 1 addition & 1 deletion psila-host/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ fn main() {
if let Some(config) = read_config(file_path) {
for (n, key) in config.keys.iter().enumerate() {
let name = format!("User {}", n);
if let Ok(k) = Key::from_str(&key) {
if let Ok(k) = Key::from_str(key) {
parser.security.add_key(k.into(), &name)
}
}
Expand Down
4 changes: 2 additions & 2 deletions psila-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ edition = "2018"

[dependencies]
bbqueue = "0.5"
byte = "0.2.4"
byte = "0.2"
ieee802154 = { git = "https://github.com/blueluna/ieee-802.15.4.git" }
psila-crypto = { path = "../psila-crypto" }
psila-data = { path = "../psila-data" }
heapless = "0.7.7"
heapless = "0.7"
defmt = { version = "0.3", optional = true }

[features]
Expand Down
1 change: 0 additions & 1 deletion psila-service/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#![no_std]

use core::convert::From;
use core::convert::TryFrom;

use bbqueue::Producer;
Expand Down
16 changes: 8 additions & 8 deletions psila-service/src/mac/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ pub(crate) fn unpack_header(data: &[u8]) -> Result<Header, Error> {
#[cfg(feature = "defmt")]
defmt::error!("Failed to unpack header, Incomplete, {}", data.len());
}
byte::Error::BadOffset(offset) => {
byte::Error::BadOffset(_offset) => {
#[cfg(feature = "defmt")]
defmt::error!("Failed to unpack header, Bad offset {}", offset);
defmt::error!("Failed to unpack header, Bad offset {}", _offset);
}
byte::Error::BadInput { err: message } => {
byte::Error::BadInput { err: _message } => {
#[cfg(feature = "defmt")]
defmt::error!("Failed to unpack header, Bad input {}", message);
defmt::error!("Failed to unpack header, Bad input {}", _message);
}
}
Err(error.into())
Expand All @@ -55,13 +55,13 @@ pub(crate) fn unpack_frame(data: &[u8]) -> Result<Frame, Error> {
#[cfg(feature = "defmt")]
defmt::error!("Failed to unpack frame, Incomplete, {}", data.len());
}
byte::Error::BadOffset(offset) => {
byte::Error::BadOffset(_offset) => {
#[cfg(feature = "defmt")]
defmt::error!("Failed to unpack frame, Bad offset {}", offset);
defmt::error!("Failed to unpack frame, Bad offset {}", _offset);
}
byte::Error::BadInput { err: message } => {
byte::Error::BadInput { err: _message } => {
#[cfg(feature = "defmt")]
defmt::error!("Failed to unpack frame, Bad input {}", message);
defmt::error!("Failed to unpack frame, Bad input {}", _message);
}
}
Err(error.into())
Expand Down

0 comments on commit 64e35ab

Please sign in to comment.