authz: configure logs

ead/lakers-ead-authz/Cargo.toml

@@ -9,6 +9,9 @@ repository.workspace = true
 
 [dependencies]
 lakers-shared.workspace = true
+defmt-or-log = { version = "0.2.1", default-features = false }
+log = { version = "0.4", optional = true }
+defmt = { version = "0.3", optional = true }
 
 [dev-dependencies]
 lakers-crypto.workspace = true

ead/lakers-ead-authz/src/authenticator.rs

@@ -1,5 +1,6 @@
 use crate::consts::*;
 use crate::shared::*;
+use defmt_or_log::trace;
 use lakers_shared::*;
 
 #[derive(Debug, Default)]
@@ -20,6 +21,7 @@ impl ZeroTouchAuthenticator {
         ),
         EDHOCError,
     > {
+        trace!("Enter process_ead_1");
         let opaque_state: Option<EdhocMessageBuffer> = None; // TODO: receive as parameter
 
         if ead_1.label != EAD_AUTHZ_LABEL || ead_1.value.is_none() {
@@ -42,6 +44,7 @@ impl ZeroTouchAuthenticatorWaitVoucherResp {
         &self,
         voucher_response: &EdhocMessageBuffer,
     ) -> Result<EADItem, EDHOCError> {
+        trace!("Enter prepare_ead_2");
         let (_message_1, voucher, _opaque_state) = parse_voucher_response(&voucher_response)?;
 
         Ok(EADItem {

ead/lakers-ead-authz/src/device.rs

@@ -1,6 +1,7 @@
 use crate::consts::*;
 use crate::shared::*;
 use crate::ZeroTouchError;
+use defmt_or_log::trace;
 use lakers_shared::{Crypto as CryptoTrait, *};
 
 #[derive(Default, Debug)]
@@ -26,6 +27,7 @@ pub struct ZeroTouchDeviceDone {
 
 impl ZeroTouchDevice {
     pub fn new(id_u: EdhocMessageBuffer, g_w: BytesP256ElemLen, loc_w: EdhocMessageBuffer) -> Self {
+        trace!("Initializing ZeroTouchDevice");
         ZeroTouchDevice { id_u, g_w, loc_w }
     }
 
@@ -35,6 +37,7 @@ impl ZeroTouchDevice {
         secret: BytesP256ElemLen,
         ss: u8,
     ) -> (ZeroTouchDeviceWaitEAD2, EADItem) {
+        trace!("Enter prepare_ead_1");
         // PRK = EDHOC-Extract(salt, IKM)
         let prk = compute_prk_from_secret(crypto, &secret);
 
@@ -61,6 +64,7 @@ impl ZeroTouchDevice {
 
 impl ZeroTouchDeviceWaitEAD2 {
     pub fn set_h_message_1(&mut self, h_message_1: BytesHashLen) {
+        trace!("Enter set_h_message_1");
         self.h_message_1 = h_message_1;
     }
 
@@ -70,6 +74,7 @@ impl ZeroTouchDeviceWaitEAD2 {
         ead_2: EADItem,
         cred_v: &[u8],
     ) -> Result<ZeroTouchDeviceDone, ZeroTouchError> {
+        trace!("Enter process_ead_2");
         if ead_2.label != EAD_AUTHZ_LABEL {
             return Err(ZeroTouchError::InvalidEADLabel);
         }

ead/lakers-ead-authz/src/server.rs

@@ -1,4 +1,5 @@
 use crate::shared::*;
+use defmt_or_log::trace;
 use lakers_shared::{Crypto as CryptoTrait, *};
 
 /// This server also stores an ACL
@@ -12,6 +13,7 @@ pub struct ZeroTouchServer {
 
 impl ZeroTouchServer {
     pub fn new(w: BytesP256ElemLen, cred_v: &[u8], acl: Option<EdhocMessageBuffer>) -> Self {
+        trace!("Initializing ZeroTouchServer");
         let cred_v: EdhocMessageBuffer = cred_v.try_into().unwrap();
         ZeroTouchServer { w, cred_v, acl }
     }
@@ -30,6 +32,7 @@ impl ZeroTouchServer {
         crypto: &mut Crypto,
         vreq: &EdhocMessageBuffer,
     ) -> Result<EdhocMessageBuffer, EDHOCError> {
+        trace!("Enter handle_voucher_request");
         let (message_1, opaque_state) = parse_voucher_request(vreq)?;
         let (_method, _suites_i, g_x, _c_i, ead_1) = parse_message_1(&message_1)?;
         let prk = compute_prk(crypto, &self.w, &g_x);
@@ -62,6 +65,7 @@ pub struct ZeroTouchServerUserAcl {
 
 impl ZeroTouchServerUserAcl {
     pub fn new(w: BytesP256ElemLen, cred_v: &[u8]) -> Self {
+        trace!("Initializing ZeroTouchServerUserAcl");
         let cred_v: EdhocMessageBuffer = cred_v.try_into().unwrap();
         Self { w, cred_v }
     }
@@ -71,6 +75,7 @@ impl ZeroTouchServerUserAcl {
         crypto: &mut Crypto,
         vreq: &EdhocMessageBuffer,
     ) -> Result<EdhocMessageBuffer, EDHOCError> {
+        trace!("Enter decode_voucher_request");
         let (message_1, _opaque_state) = parse_voucher_request(vreq)?;
         let (_method, _suites_i, g_x, _c_i, ead_1) = parse_message_1(&message_1)?;
         let prk = compute_prk(crypto, &self.w, &g_x);
@@ -86,6 +91,7 @@ impl ZeroTouchServerUserAcl {
         crypto: &mut Crypto,
         vreq: &EdhocMessageBuffer,
     ) -> Result<EdhocMessageBuffer, EDHOCError> {
+        trace!("Enter prepare_voucher");
         let (message_1, opaque_state) = parse_voucher_request(vreq)?;
         let (_method, _suites_i, g_x, _c_i, _ead_1) = parse_message_1(&message_1)?;
         let prk = compute_prk(crypto, &self.w, &g_x);