Skip to content

Commit 1b7072b

Browse files
authored
Merge pull request wolfSSL#9493 from holtrop/build-rust-wrappers-on-arm
Rust wrapper: run CI tests on ARM
2 parents fd58885 + 379ec8a commit 1b7072b

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.github/workflows/rust-wrapper.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build_wolfssl:
1717
name: Build wolfSSL Rust Wrapper
1818
if: github.repository_owner == 'wolfssl'
19-
runs-on: ubuntu-24.04
19+
runs-on: ${{ matrix.os }}
2020
# This should be a safe limit for the tests to run.
2121
timeout-minutes: 10
2222
steps:
@@ -33,6 +33,7 @@ jobs:
3333
run: make -C wrapper/rust test
3434
strategy:
3535
matrix:
36+
os: [ ubuntu-24.04, ubuntu-24.04-arm ]
3637
config: [
3738
# Add new configs here
3839
'',

wrapper/rust/wolfssl/src/wolfcrypt/ecc.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -842,10 +842,10 @@ impl ECC {
842842
return Err(rc);
843843
}
844844
let mut wc_ecc_key = unsafe { wc_ecc_key.assume_init() };
845-
let qx_ptr = qx.as_ptr() as *const i8;
846-
let qy_ptr = qy.as_ptr() as *const i8;
847-
let d_ptr = d.as_ptr() as *const i8;
848-
let curve_name_ptr = curve_name.as_ptr() as *const i8;
845+
let qx_ptr = qx.as_ptr() as *const core::ffi::c_char;
846+
let qy_ptr = qy.as_ptr() as *const core::ffi::c_char;
847+
let d_ptr = d.as_ptr() as *const core::ffi::c_char;
848+
let curve_name_ptr = curve_name.as_ptr() as *const core::ffi::c_char;
849849
let rc = unsafe {
850850
sys::wc_ecc_import_raw(&mut wc_ecc_key, qx_ptr, qy_ptr, d_ptr,
851851
curve_name_ptr)
@@ -902,9 +902,9 @@ impl ECC {
902902
return Err(rc);
903903
}
904904
let mut wc_ecc_key = unsafe { wc_ecc_key.assume_init() };
905-
let qx_ptr = qx.as_ptr() as *const i8;
906-
let qy_ptr = qy.as_ptr() as *const i8;
907-
let d_ptr = d.as_ptr() as *const i8;
905+
let qx_ptr = qx.as_ptr() as *const core::ffi::c_char;
906+
let qy_ptr = qy.as_ptr() as *const core::ffi::c_char;
907+
let d_ptr = d.as_ptr() as *const core::ffi::c_char;
908908
let rc = unsafe {
909909
sys::wc_ecc_import_raw_ex(&mut wc_ecc_key, qx_ptr, qy_ptr, d_ptr,
910910
curve_id)
@@ -1160,8 +1160,8 @@ impl ECC {
11601160
/// ```
11611161
pub fn rs_hex_to_sig(r: &[u8], s: &[u8], dout: &mut [u8]) -> Result<usize, i32> {
11621162
let mut dout_size = dout.len() as u32;
1163-
let r_ptr = r.as_ptr() as *const i8;
1164-
let s_ptr = s.as_ptr() as *const i8;
1163+
let r_ptr = r.as_ptr() as *const core::ffi::c_char;
1164+
let s_ptr = s.as_ptr() as *const core::ffi::c_char;
11651165
let rc = unsafe {
11661166
sys::wc_ecc_rs_to_sig(r_ptr, s_ptr, dout.as_mut_ptr(),
11671167
&mut dout_size)

0 commit comments

Comments
 (0)