fix: Dereference o_len ptr correctly (#289)

* fix: Dereference o_len ptr correctly
* CI: Upgrade to rust 1.80 toolchain because rayon-core v1.13.0 requires it
* bump rust again

Signed-off-by: Bhargava Shastry <[email protected]>
Signed-off-by: garyschulte <[email protected]>

Author: bshastry

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
           tar -xzf go1.24.1.linux-amd64.tar.gz -C /usr/local && ln -s /usr/local/go/bin/go /usr/local/bin/go 
           # rust dependencies
           export CARGO_HOME="$HOME/.cargo"
-          curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.75.0
+          curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.89.0
           # nim dependencies
           export CHOOSENIM_CHOOSE_VERSION=2.2.2
           curl https://nim-lang.org/choosenim/init.sh -sSf | sh -s -- -y
@@ -166,7 +166,7 @@ jobs:
           brew install [email protected] || true
           # rust dependencies
           export CARGO_HOME="$HOME/.cargo"
-          curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.75.0
+          curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.89.0
           # install both x86 and arm64 toolchains
           export PATH="$HOME/.cargo/bin:$PATH"
           rustup target add x86_64-apple-darwin
@@ -237,7 +237,7 @@ jobs:
           brew install [email protected] || true 
           # rust dependencies
           export CARGO_HOME="$HOME/.cargo"
-          curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.75.0
+          curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.89.0
           # install both x86 and arm64 toolchains
           export PATH="$HOME/.cargo/bin:$PATH"
           rustup target add x86_64-apple-darwin

arithmetic/arithmetic/src/arith.rs

@@ -13,7 +13,7 @@
 use crate::{
     mpnat::{DoubleWord, MPNat, Word, BASE, WORD_BITS},
 };
-pub use std::{vec, vec::Vec};
+pub use std::vec;
 
 // Computes the "Montgomery Product" of two numbers.
 // See Coarsely Integrated Operand Scanning (CIOS) Method in

arithmetic/arithmetic/src/lib.rs

@@ -38,7 +38,7 @@ pub extern "C" fn modexp_precompiled(
     let input_i8: &[libc::c_char] = unsafe { std::slice::from_raw_parts(i, i_len as usize) };
     let input: &[u8] = unsafe { std::mem::transmute(input_i8) };
 
-    let raw_out_i8: &mut [libc::c_char] = unsafe { std::slice::from_raw_parts_mut(o, o_len as usize) };
+    let raw_out_i8: &mut [libc::c_char] = unsafe { std::slice::from_raw_parts_mut(o, *o_len as usize) };
     let mut raw_out: &mut [u8] = unsafe { std::mem::transmute(raw_out_i8) };
     let answer = modexp_precompiled_impl(input);
 
@@ -133,3 +133,36 @@ pub fn modexp(base: &[u8], exp: &[u8], modulus: &[u8]) -> Vec<u8> {
     let result = x.modpow(exp, &m);
     result.to_big_endian()
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_modexp_precompiled() {
+        let mut output_len: u32 = 32;
+        let o_len_ptr = &mut output_len as *mut u32;
+
+        let mut input = vec![0u8; 96];
+        input[31] = 1;  // base_len = 1
+        input[63] = 1;  // exp_len = 1
+        input[95] = 1;  // mod_len = 1
+        input.push(2);  // base = 2
+        input.push(3);  // exp = 3
+        input.push(5);  // mod = 5
+
+        let input_i8: Vec<i8> = input.iter().map(|&x| x as i8).collect();
+        let mut output = vec![0i8; output_len as usize];
+
+        let result = modexp_precompiled(
+            input_i8.as_ptr(),
+            input_i8.len() as u32,
+            output.as_mut_ptr(),
+            o_len_ptr,
+        );
+
+		assert_eq!(result, 0); // Expect success
+		assert_eq!(output_len, 1); // Expect output length to be 1
+		assert_eq!(output[0], 3); // Expect output to be 3 (2^3 % 5 = 3)
+    }
+}

native-build.sh

@@ -11,7 +11,7 @@ mkdir -p $GOPATH
 export GOROOT="$HOME/go"
 export PATH="$GOROOT/bin":$PATH
 export CARGO_HOME="$HOME/.cargo"
-curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.75.0
+curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.89.0
 export PATH=$PATH:$CARGO_HOME/bin
 git config --global --add safe.directory /home/ubuntu/secp256r1/besu-native-ec
 git config --global --add safe.directory /home/ubuntu/secp256r1/besu-native-ec/openssl