Merge branch 'feature/trace' into develop

power4j · Apr 28, 2024 · fc59ac6 · fc59ac6
2 parents 40c9b2f + 8f14210
commit fc59ac6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/skf-rs/src/engine/app.rs b/skf-rs/src/engine/app.rs
@@ -91,7 +91,7 @@ impl AppSecurity for SkfAppImpl {
         }
     }
 
-    #[instrument]
+    #[instrument(skip(pin))]
     fn verify_pin(&self, pin_type: u8, pin: &str) -> crate::Result<()> {
         let func = self.symbols.pin_verify.as_ref().expect("Symbol not load");
         let pin = param::as_cstring("pin", pin)?;
@@ -147,7 +147,7 @@ impl AppSecurity for SkfAppImpl {
         }
     }
 
-    #[instrument]
+    #[instrument(skip(admin_pin, new_pin))]
     fn unblock_pin(&self, admin_pin: &str, new_pin: &str) -> crate::Result<()> {
         let func = self.symbols.pin_unblock.as_ref().expect("Symbol not load");
         let admin_pin = param::as_cstring("admin_pin", admin_pin)?;
@@ -282,7 +282,7 @@ impl FileManager for SkfAppImpl {
         Ok(buff)
     }
 
-    #[instrument]
+    #[instrument(skip(data))]
     fn write_file(&self, name: &str, offset: u32, data: &[u8]) -> crate::Result<()> {
         let func = self.symbols.file_write.as_ref().expect("Symbol not load");
         let name = param::as_cstring("name", name)?;

diff --git a/skf-rs/src/engine/crypto.rs b/skf-rs/src/engine/crypto.rs
@@ -80,7 +80,7 @@ impl SkfBlockCipher for SkfBlockCipherImpl {
         Ok(())
     }
 
-    #[instrument(skip(key))]
+    #[instrument(skip(key, data))]
     fn encrypt(&self, key: &dyn ManagedKey, data: &[u8], buffer_size: usize) -> Result<Vec<u8>> {
         let func = self.symbols.encrypt.as_ref().expect("Symbol not load");
         let mut len = buffer_size as ULONG;
@@ -103,7 +103,7 @@ impl SkfBlockCipher for SkfBlockCipherImpl {
         Ok(buffer)
     }
 
-    #[instrument(skip(key))]
+    #[instrument(skip(key, data))]
     fn encrypt_update(
         &self,
         key: &dyn ManagedKey,
@@ -166,7 +166,7 @@ impl SkfBlockCipher for SkfBlockCipherImpl {
         Ok(())
     }
 
-    #[instrument(skip(key))]
+    #[instrument(skip(key, data))]
     fn decrypt(&self, key: &dyn ManagedKey, data: &[u8], buffer_size: usize) -> Result<Vec<u8>> {
         let func = self.symbols.decrypt.as_ref().expect("Symbol not load");
         let mut len = buffer_size as ULONG;
@@ -189,7 +189,7 @@ impl SkfBlockCipher for SkfBlockCipherImpl {
         Ok(buffer)
     }
 
-    #[instrument(skip(key))]
+    #[instrument(skip(key, data))]
     fn decrypt_update(
         &self,
         key: &dyn ManagedKey,

diff --git a/skf-rs/src/engine/device.rs b/skf-rs/src/engine/device.rs
@@ -62,7 +62,7 @@ impl Debug for SkfDeviceImpl {
 }
 
 impl DeviceAuth for SkfDeviceImpl {
-    #[instrument]
+    #[instrument(skip(data))]
     fn device_auth(&self, data: &[u8]) -> Result<()> {
         let func = self.symbols.dev_auth.as_ref().expect("Symbol not load");
         let ret = unsafe {
@@ -79,7 +79,7 @@ impl DeviceAuth for SkfDeviceImpl {
         Ok(())
     }
 
-    #[instrument]
+    #[instrument(skip(key))]
     fn change_device_auth_key(&self, key: &[u8]) -> Result<()> {
         let func = self
             .symbols
@@ -186,7 +186,7 @@ impl DeviceCrypto for SkfDeviceImpl {
         Ok(buffer)
     }
 
-    #[instrument]
+    #[instrument(skip(key))]
     fn set_symmetric_key(&self, alg_id: u32, key: &[u8]) -> Result<Box<dyn ManagedKey>> {
         let func = self
             .symbols
@@ -210,7 +210,7 @@ impl DeviceCrypto for SkfDeviceImpl {
         Ok(Box::new(managed_key))
     }
 
-    #[instrument]
+    #[instrument(skip(key, data))]
     fn ext_ecc_encrypt(&self, key: &ECCPublicKeyBlob, data: &[u8]) -> Result<ECCEncryptedData> {
         let func = self
             .symbols
@@ -251,7 +251,7 @@ impl DeviceCrypto for SkfDeviceImpl {
         Ok(blob)
     }
 
-    #[instrument]
+    #[instrument(skip(key, cipher))]
     fn ext_ecc_decrypt(
         &self,
         key: &ECCPrivateKeyBlob,
@@ -286,7 +286,7 @@ impl DeviceCrypto for SkfDeviceImpl {
         Ok(buff)
     }
 
-    #[instrument]
+    #[instrument(skip(key, data))]
     fn ext_ecc_sign(&self, key: &ECCPrivateKeyBlob, data: &[u8]) -> Result<ECCSignatureBlob> {
         let func = self.symbols.ecc_ext_sign.as_ref().expect("Symbol not load");
 
@@ -308,7 +308,7 @@ impl DeviceCrypto for SkfDeviceImpl {
         Ok(sign)
     }
 
-    #[instrument]
+    #[instrument(skip(key, data, signature))]
     fn ext_ecc_verify(
         &self,
         key: &ECCPublicKeyBlob,
@@ -337,7 +337,7 @@ impl DeviceCrypto for SkfDeviceImpl {
         Ok(())
     }
 
-    #[instrument]
+    #[instrument(skip(key, hash, signature))]
     fn ecc_verify(
         &self,
         key: &ECCPublicKeyBlob,
@@ -362,7 +362,7 @@ impl DeviceCrypto for SkfDeviceImpl {
         Ok(())
     }
 
-    #[instrument(skip(agreement_key))]
+    #[instrument(skip(agreement_key, responder_key, responder_tmp_key, responder_id))]
     fn ecc_gen_session_key(
         &self,
         agreement_key: &dyn ManagedKey,