Merge pull request #9212 from holtrop/rust-wc-random

Rust wrapper: add wolfssl::wolfcrypt::random module

Author: JacobBarthelmeh

.github/workflows/rust-wrapper.yml

@@ -28,3 +28,6 @@ jobs:
     - name: Build Rust Wrapper
       working-directory: wolfssl
       run: make -C wrapper/rust
+    - name: Run Rust Wrapper Tests
+      working-directory: wolfssl
+      run: make -C wrapper/rust test

wrapper/rust/Makefile

@@ -3,6 +3,10 @@ all:
 	+$(MAKE) -C wolfssl-sys
 	+$(MAKE) -C wolfssl
 
+.PHONY: test
+test:
+	+$(MAKE) -C wolfssl test
+
 .PHONY: clean
 clean:
 	+$(MAKE) -C wolfssl-sys clean

wrapper/rust/README.md

@@ -8,6 +8,10 @@ Then build the wolfssl Rust wrapper with:
 
     make -C wrapper/rust
 
+Run tests with:
+
+    make -C wrapper/rust test
+
 ## Repository Directory Structure
 
 | Repository Directory | Description |

wrapper/rust/include.am

@@ -13,4 +13,8 @@ EXTRA_DIST += wrapper/rust/wolfssl-sys/src/lib.rs
 EXTRA_DIST += wrapper/rust/wolfssl/Cargo.lock
 EXTRA_DIST += wrapper/rust/wolfssl/Cargo.toml
 EXTRA_DIST += wrapper/rust/wolfssl/Makefile
+EXTRA_DIST += wrapper/rust/wolfssl/build.rs
 EXTRA_DIST += wrapper/rust/wolfssl/src/lib.rs
+EXTRA_DIST += wrapper/rust/wolfssl/src/wolfcrypt.rs
+EXTRA_DIST += wrapper/rust/wolfssl/src/wolfcrypt/random.rs
+EXTRA_DIST += wrapper/rust/wolfssl/tests/test_random.rs

wrapper/rust/wolfssl/Cargo.lock

@@ -4,3 +4,4 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+wolfssl-sys = { path = "../wolfssl-sys" }

wrapper/rust/wolfssl/Cargo.toml

@@ -1,6 +1,11 @@
 .PHONY: all
 all:
 	cargo build
+	cargo doc
+
+.PHONY: test
+test:
+	cargo test
 
 .PHONY: clean
 clean:

wrapper/rust/wolfssl/Makefile

@@ -0,0 +1,32 @@
+use std::io::Result;
+
+/// Perform crate build.
+fn main() {
+    if let Err(e) = run_build() {
+        eprintln!("Build failed: {}", e);
+        std::process::exit(1);
+    }
+}
+
+/// Perform all build steps.
+///
+/// Returns `Ok(())` if successful, or an error if any step fails.
+fn run_build() -> Result<()> {
+    setup_wolfssl_link()?;
+    Ok(())
+}
+
+/// Instruct cargo to link against wolfssl C library
+///
+/// Returns `Ok(())` if successful, or an error if any step fails.
+fn setup_wolfssl_link() -> Result<()> {
+    let wrapper_dir = std::env::current_dir()?.display().to_string();
+    let wolfssl_base_dir = format!("{}/../../..", wrapper_dir);
+    let wolfssl_lib_dir = format!("{}/src/.libs", wolfssl_base_dir);
+
+    println!("cargo:rustc-link-search={}", wolfssl_lib_dir);
+    println!("cargo:rustc-link-lib=wolfssl");
+    println!("cargo:rustc-link-arg=-Wl,-rpath,{}", wolfssl_lib_dir);
+
+    Ok(())
+}

wrapper/rust/wolfssl/build.rs

@@ -0,0 +1 @@
+pub mod wolfcrypt;

wrapper/rust/wolfssl/src/lib.rs

@@ -0,0 +1 @@
+pub mod random;