Update SE driver struct element naming to match mbedtls 3.0.0

The mbedtls 3.0.0 has an updated naming for psa_drv_se_t, psa_drv_se_key_management_t, and psa_drv_se_asymmetric_t structure elements with "private_". This commit updates it. Signed-off-by: Gowtham Suresh Kumar <[email protected]>
parallaxsecond · Jan 17, 2023 · 58c12b6 · 58c12b6
1 parent 26701ee
commit 58c12b6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/src/asymmetric.rs b/src/asymmetric.rs
@@ -10,10 +10,10 @@ use psa_crypto::types::algorithm::AsymmetricSignature;
 use std::convert::TryFrom;
 
 pub(super) static METHODS: psa_drv_se_asymmetric_t = psa_drv_se_asymmetric_t {
-    p_sign: Some(p_sign),
-    p_verify: Some(p_verify),
-    p_encrypt: None,
-    p_decrypt: None,
+    private_p_sign: Some(p_sign),
+    private_p_verify: Some(p_verify),
+    private_p_encrypt: None,
+    private_p_decrypt: None,
 };
 
 unsafe extern "C" fn p_sign(

diff --git a/src/key_management.rs b/src/key_management.rs
@@ -10,13 +10,13 @@ use psa_crypto::types::key::Attributes;
 use std::convert::TryFrom;
 
 pub(super) static METHODS: psa_drv_se_key_management_t = psa_drv_se_key_management_t {
-    p_allocate: Some(p_allocate),
-    p_validate_slot_number: Some(p_validate_slot_number),
-    p_import: Some(p_import),
-    p_generate: Some(p_generate),
-    p_destroy: Some(p_destroy),
-    p_export: None,
-    p_export_public: Some(p_export_public),
+    private_p_allocate: Some(p_allocate),
+    private_p_validate_slot_number: Some(p_validate_slot_number),
+    private_p_import: Some(p_import),
+    private_p_generate: Some(p_generate),
+    private_p_destroy: Some(p_destroy),
+    private_p_export: None,
+    private_p_export_public: Some(p_export_public),
 };
 
 unsafe extern "C" fn p_allocate(

diff --git a/src/lib.rs b/src/lib.rs
@@ -67,15 +67,15 @@ lazy_static! {
 /// Parsec SE Driver structure
 #[no_mangle]
 pub static mut PARSEC_SE_DRIVER: psa_drv_se_t = psa_drv_se_t {
-    hal_version: 5,
-    persistent_data_size: 0,
-    p_init: Some(p_init),
-    key_management: &key_management::METHODS as *const psa_drv_se_key_management_t,
-    mac: ptr::null(),
-    cipher: ptr::null(),
-    aead: ptr::null(),
-    asymmetric: &asymmetric::METHODS as *const psa_drv_se_asymmetric_t,
-    derivation: ptr::null(),
+    private_hal_version: 5,
+    private_persistent_data_size: 0,
+    private_p_init: Some(p_init),
+    private_key_management: &key_management::METHODS as *const psa_drv_se_key_management_t,
+    private_mac: ptr::null(),
+    private_cipher: ptr::null(),
+    private_aead: ptr::null(),
+    private_asymmetric: &asymmetric::METHODS as *const psa_drv_se_asymmetric_t,
+    private_derivation: ptr::null(),
 };
 
 unsafe extern "C" fn p_init(