Merge pull request #1279 from NickeZ/nickez/arm64-support

Nickez/arm64 support
BitBoxSwiss · Aug 19, 2024 · 96d5e49 · 96d5e49
2 parents c8f800e + 8c6646b
commit 96d5e49
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/rust/bitbox02/src/random.rs b/src/rust/bitbox02/src/random.rs
@@ -17,7 +17,7 @@ pub fn mcu_32_bytes(out: &mut [u8; 32]) {
     unsafe { bitbox02_sys::random_32_bytes_mcu(out.as_mut_ptr()) }
 }
 
-#[cfg(target_arch = "x86_64")]
+#[cfg(not(target_arch = "arm"))]
 pub fn mcu_32_bytes(out: &mut [u8; 32]) {
     extern "C" {
         fn rand() -> util::c_types::c_int;

diff --git a/src/rust/util/src/c_types.rs b/src/rust/util/src/c_types.rs
@@ -27,16 +27,22 @@ pub type c_int = i32;
 
 #[cfg(target_arch = "x86_64")]
 pub type c_uint = u64;
+#[cfg(target_arch = "aarch64")]
+pub type c_uint = u64;
 #[cfg(target_arch = "arm")]
 pub type c_uint = u32;
 
 #[cfg(target_arch = "x86_64")]
 pub type c_long = i64;
+#[cfg(target_arch = "aarch64")]
+pub type c_long = i64;
 #[cfg(target_arch = "arm")]
 pub type c_long = i32;
 
 #[cfg(target_arch = "x86_64")]
 pub type c_ulong = u64;
+#[cfg(target_arch = "aarch64")]
+pub type c_ulong = u64;
 #[cfg(target_arch = "arm")]
 pub type c_ulong = u32;
 

diff --git a/src/securechip/securechip.c b/src/securechip/securechip.c
@@ -220,7 +220,7 @@ static ATCA_STATUS _lock_slot(securechip_slot_t slot)
 static ATCA_STATUS _factory_setup(void)
 {
     if (_interface_functions == NULL) {
-        return SC_ERR_IFS;
+        return (ATCA_STATUS)SC_ERR_IFS;
     }
     bool is_config_locked = false;
     ATCA_STATUS result = atcab_is_locked(LOCK_ZONE_CONFIG, &is_config_locked);