Removed duplicate macros for sign output size and export pub key size.

Signed-off-by: Samuel Bailey <[email protected]>

Author: sbailey-arm

Cargo.toml

@@ -40,7 +40,7 @@ derivative = "2.1.1"
 version = "3.0.0"
 hex = "0.4.2"
 picky = "5.0.0"
-psa-crypto = { version = "0.2.0" , default-features = false, features = ["with-mbed-crypto"], optional = true }
+psa-crypto = { version = "0.2.1" , default-features = false, features = ["with-mbed-crypto"], optional = true }
 
 [dev-dependencies]
 ring = "0.16.12"

src/providers/mbed_provider/asym_sign.rs

@@ -1,6 +1,5 @@
 // Copyright 2020 Contributors to the Parsec project.
 // SPDX-License-Identifier: Apache-2.0
-use super::utils;
 use super::{key_management, MbedProvider};
 use crate::authenticators::ApplicationName;
 use crate::key_info_managers::KeyTriple;
@@ -32,7 +31,7 @@ impl MbedProvider {
 
         let id = key::Id::from_persistent_key_id(key_id);
         let key_attributes = key::Attributes::from_key_id(id)?;
-        let buffer_size = utils::psa_asymmetric_sign_output_size(&key_attributes)?;
+        let buffer_size = key_attributes.sign_output_size(alg)?;
         let mut signature = vec![0u8; buffer_size];
 
         match asym_signature::sign_hash(id, alg, &hash, &mut signature) {

src/providers/mbed_provider/key_management.rs

@@ -1,6 +1,5 @@
 // Copyright 2020 Contributors to the Parsec project.
 // SPDX-License-Identifier: Apache-2.0
-use super::utils;
 use super::{LocalIdStore, MbedProvider};
 use crate::authenticators::ApplicationName;
 use crate::key_info_managers;
@@ -206,7 +205,7 @@ impl MbedProvider {
 
         let id = key::Id::from_persistent_key_id(key_id);
         let key_attributes = key::Attributes::from_key_id(id)?;
-        let buffer_size = utils::psa_export_public_key_size(&key_attributes)?;
+        let buffer_size = key_attributes.export_key_output_size()?;
         let mut buffer = vec![0u8; buffer_size];
 
         let export_length = psa_crypto_key_management::export_public(id, &mut buffer)?;

src/providers/mbed_provider/mod.rs

@@ -21,7 +21,6 @@ use uuid::Uuid;
 mod asym_sign;
 #[allow(dead_code)]
 mod key_management;
-mod utils;
 
 type LocalIdStore = HashSet<key::psa_key_id_t>;
 const PSA_KEY_SLOT_COUNT: isize = 32;