Skip to content

Commit fa4d19c

Browse files
committed
Update psa_crypto and parsec-interface dependencies
Remove redundant comments Fix index MAX_ID for key ID gen Signed-off-by: Samuel Bailey <[email protected]>
1 parent c8631ee commit fa4d19c

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ name = "parsec"
1818
path = "src/bin/main.rs"
1919

2020
[dependencies]
21-
parsec-interface = { path = "../parsec-interface-rs" }
21+
parsec-interface = "0.16.0"
2222
rand = { version = "0.7.2", features = ["small_rng"] }
2323
base64 = "0.10.1"
2424
uuid = "0.7.4"
@@ -40,7 +40,7 @@ derivative = "2.1.1"
4040
version = "3.0.0"
4141
hex = "0.4.2"
4242
picky = "5.0.0"
43-
psa-crypto = { path = "../rust-psa-crypto/psa-crypto" , default-features = false, features = ["with-mbed-crypto"], optional = true }
43+
psa-crypto = { version = "0.2.0" , default-features = false, features = ["with-mbed-crypto"], optional = true }
4444

4545
[dev-dependencies]
4646
ring = "0.16.12"

src/providers/mbed_provider/key_management.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ fn create_key_id(
5050
local_ids_handle: &mut LocalIdStore,
5151
) -> Result<key::psa_key_id_t> {
5252
let mut rng = SmallRng::from_entropy();
53-
let mut key_id = rng.gen_range(key::PSA_KEY_ID_USER_MIN, key::PSA_KEY_ID_USER_MAX);
53+
let mut key_id = rng.gen_range(key::PSA_KEY_ID_USER_MIN, key::PSA_KEY_ID_USER_MAX + 1);
5454

5555
while local_ids_handle.contains(&key_id) {
56-
key_id = rng.gen_range(key::PSA_KEY_ID_USER_MIN, key::PSA_KEY_ID_USER_MAX);
56+
key_id = rng.gen_range(key::PSA_KEY_ID_USER_MIN, key::PSA_KEY_ID_USER_MAX + 1);
5757
}
5858
let key_info = KeyInfo {
5959
id: key_id.to_ne_bytes().to_vec(),
@@ -209,7 +209,6 @@ impl MbedProvider {
209209
let buffer_size = utils::psa_export_public_key_size(&key_attributes)?;
210210
let mut buffer = vec![0u8; buffer_size];
211211

212-
// Safety: same conditions than above.
213212
let export_length = psa_crypto_key_management::export_public(id, &mut buffer)?;
214213

215214
buffer.resize(export_length, 0);

src/providers/mbed_provider/mod.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ use std::sync::{Arc, Mutex, RwLock};
1818
use std_semaphore::Semaphore;
1919
use uuid::Uuid;
2020

21-
#[allow(
22-
non_snake_case,
23-
non_camel_case_types,
24-
non_upper_case_globals,
25-
dead_code,
26-
trivial_casts
27-
)]
2821
mod asym_sign;
2922
#[allow(dead_code)]
3023
mod key_management;
@@ -109,9 +102,6 @@ impl MbedProvider {
109102
}
110103
};
111104

112-
// Safety: safe because:
113-
// * the Mbed Crypto library has been initialized
114-
// * this code is executed only by the main thread
115105
let pc_key_id = key::Id::from_persistent_key_id(key_id);
116106
match key::Attributes::from_key_id(pc_key_id) {
117107
Ok(_) => {

0 commit comments

Comments
 (0)