types: Make it work on 32-bit platforms

This adds explicit conversion from platform dependent integer types generated with bindgen to make it compile on both 32-bit and 64-bit platforms. Signed-off-by: Daiki Ueno <[email protected]>
latchset · Apr 11, 2024 · 7947a15 · 7947a15
1 parent 3afcafa
commit 7947a15
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/crypto-auditing/src/types.rs b/crypto-auditing/src/types.rs
@@ -114,13 +114,13 @@ impl EventGroup {
     /// Deserializes an event group from bytes
     pub fn from_bytes(bytes: &[u8]) -> Result<Self, Box<dyn std::error::Error>> {
         let header = bytes.as_ptr() as *mut audit_event_header_st;
-        let context = unsafe { format_context((*header).pid_tgid, (*header).context) };
-        let ktime = unsafe { Duration::from_nanos((*header).ktime) };
+        let context = unsafe { format_context((*header).pid_tgid.into(), (*header).context.into()) };
+        let ktime = unsafe { Duration::from_nanos((*header).ktime.into()) };
         let event = match unsafe { (*header).type_ } {
             audit_event_type_t::AUDIT_EVENT_NEW_CONTEXT => {
                 let raw_new_context = bytes.as_ptr() as *mut audit_new_context_event_st;
                 let parent =
-                    unsafe { format_context((*header).pid_tgid, (*raw_new_context).parent) };
+                    unsafe { format_context((*header).pid_tgid.into(), (*raw_new_context).parent.into()) };
                 let origin = unsafe {
                     (*raw_new_context).origin[..(*raw_new_context).origin_size as usize].to_vec()
                 };
@@ -143,7 +143,7 @@ impl EventGroup {
                             end: ktime,
                             events: vec![Event::Data {
                                 key: key.to_str()?.to_string(),
-                                value: EventData::Word((*raw_word_data).value),
+                                value: EventData::Word((*raw_word_data).value.into()),
                             }],
                         }
                     }