moew cleanup

.github/workflows/rust.yml

@@ -49,6 +49,16 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y gcc-multilib g++-multilib
 
+      - name: Setup Ubuntu x64
+        if: ${{ matrix.bits == 64 &&  matrix.os == 'ubuntu-latest' }}
+        run: |
+          rustup target add aarch64-unknown-linux-gnu
+
+      - name: Setup macOS
+        if: ${{  matrix.os == 'macos-latest' }}
+        run: |
+          rustup target add aarch64-apple-darwin
+
       # Set up 32 bit systems
 
       - name: Config Windows x86
@@ -84,6 +94,16 @@ jobs:
       - name: Build Release
         run: cargo build --verbose --release $RUST_TARGET_FLAG
 
+      # Cross compilation
+
+      - name: Build aarch64 macOS
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: cargo build --verbose --target aarch64-apple-darwin
+
+      - name: Build aarch64 Ubuntu
+        if: ${{ matrix.bits == 64 &&  matrix.os == 'ubuntu-latest' }}
+        run: cargo build --verbose --target aarch64-unknown-linux-gnu
+
       # Test ...
 
       - name: Test

Cargo.toml

@@ -24,11 +24,11 @@ exclude = ["/tests"]
 crate-type = ["staticlib", "cdylib", "lib"]
 
 [build-dependencies]
-libcrux_platform = { version = "=0.0.1", path = "sys/platform" }
+libcrux_platform = { version = "=0.0.2", path = "sys/platform" }
 
 [dependencies]
 libcrux_hacl = { version = "=0.0.2", path = "sys/hacl" }
-libcrux_platform = { version = "=0.0.1", path = "sys/platform" }
+libcrux_platform = { version = "=0.0.2", path = "sys/platform" }
 rand = { version = "0.8" }
 log = { version = "0.4", optional = true }
 # WASM API
@@ -61,7 +61,7 @@ wasm-bindgen-test = "0.3"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 criterion = "0.5"
-libcrux-pqclean = { version = "*", path = "sys/pqclean" }
+libcrux_pqclean = { version = "*", path = "sys/pqclean" }
 
 # Benchmarking "OpenSSL"
 # XXX: We don't do this for Windows or wasm right now.

sys/hacl/Cargo.toml

@@ -12,8 +12,8 @@ crate-type = ["cdylib", "rlib"]
 
 [build-dependencies]
 cc = { version = "1.0", features = ["parallel"] }
-libcrux_platform = { version = "=0.0.1", path = "../platform" }
-bindgen = { version = "0.66", optional = true }
+libcrux_platform = { version = "=0.0.2", path = "../platform" }
+bindgen = { version = "0.68", optional = true }
 
 [features]
 bindings = ["bindgen"] # generate fresh bindings

sys/libjade/Cargo.toml

@@ -11,10 +11,10 @@ readme = "Readme.md"
 
 [build-dependencies]
 cc = { version = "1.0", features = ["parallel"] }
-libcrux_platform = { version = "=0.0.1", path = "../platform" }
+libcrux_platform = { version = "=0.0.2", path = "../platform" }
 
 [target.'cfg(not(windows))'.build-dependencies]
-bindgen = { version = "0.66", optional = true }
+bindgen = { version = "0.68", optional = true }
 
 [dev-dependencies]
 pretty_env_logger = "0.5"

sys/platform/Cargo.toml

@@ -1,7 +1,9 @@
 [package]
 name = "libcrux_platform"
-version = "0.0.1"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+license.workspace = true
 
 [dependencies]
 libc = "0.2.147"

sys/pqclean/Cargo.toml

@@ -1,11 +1,13 @@
 [package]
-name = "libcrux-pqclean"
-version = "0.1.0"
-edition = "2021"
+name = "libcrux_pqclean"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+license.workspace = true
 
 [dependencies]
 
 [build-dependencies]
 cc = { version = "1.0", features = ["parallel"] }
-bindgen = "0.66"
+bindgen = "0.68"
 fs_extra = "1.2"

sys/pqclean/src/bindings.rs

@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.66.1 */
+/* automatically generated by rust-bindgen 0.68.1 */
 
 pub const SHAKE128_RATE: u32 = 168;
 pub const SHAKE256_RATE: u32 = 136;