Merge pull request #221 from expressvpn/gha/rust-toolchain-update

[auto] Update Rust toolchain to 1.85.0

Author: kp-mariappan-ramasamy

Cargo.toml

@@ -6,3 +6,11 @@ members = [
 ]
 
 resolver = "2"
+
+[workspace.package]
+edition = "2021"
+authors = ["lightway-developers@expressvpn.com"]
+license = "GPL-2.0-or-later"
+repository = "https://github.com/expressvpn/wolfssl-rs"
+keywords = ["wolfssl", "vpn", "lightway", "post-quantum", "cryptography"]
+

Earthfile

@@ -2,7 +2,7 @@ VERSION 0.8
 # Importing https://github.com/earthly/lib/tree/3.0.1/rust via commit hash pinning because git tags can be changed
 IMPORT github.com/earthly/lib/rust:1a4a008e271c7a5583e7bd405da8fd3624c05610 AS lib-rust
 
-FROM rust:1.84.1
+FROM rust:1.85.0
 
 WORKDIR /wolfssl-rs
 

wolfssl-sys/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "wolfssl-sys"
 version = "2.0.0"
-edition = "2021"
-authors = ["lightway-developers@expressvpn.com"]
-license = "GPL-2.0-or-later"
-readme = "README.md"
 description = "System bindings for WolfSSL"
-repository = "https://github.com/expressvpn/wolfssl-rs"
-keywords = ["wolfssl", "vpn", "lightway", "post-quantum", "cryptography"]
+readme = "README.md"
+authors.workspace = true
+license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 links = "wolfssl"
 exclude = ["wolfssl-src/**/*.pdf"] # crates.io has a size limit for publishing. Exclude unused files to keep the size under the limit.
+edition.workspace = true
 
 [build-dependencies]
 bindgen = "0.71"

wolfssl-sys/examples/connect_pq.rs

@@ -33,7 +33,7 @@ fn main() {
     // Compile in the OQS CA at build time
     let pq_osa_ca = include_bytes!("test_certs/pq-osa-ca.crt");
     // Cast to what the ffi functions are looking for
-    let pq_osa_ca_size = pq_osa_ca.len() as i64;
+    let pq_osa_ca_size = pq_osa_ca.len() as std::os::raw::c_long;
     let pq_osa_ca = pq_osa_ca as *const u8;
 
     // We'll do everything else in an unsafe block as it's clearer than wrapping each function

wolfssl/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "wolfssl"
 version = "3.0.0"
-edition = "2021"
-authors = ["lightway-developers@expressvpn.com"]
-license = "GPL-2.0-or-later"
 description = "High-level bindings for WolfSSL"
-repository = "https://github.com/expressvpn/wolfssl-rs"
-keywords = ["wolfssl", "vpn", "lightway", "post-quantum", "cryptography"]
+authors.workspace = true
+license.workspace = true
+repository.workspace = true
+keywords.workspace = true
+edition.workspace = true
 
 [features]
 default = ["postquantum"]