downgrade minimum rust version and update secure-env

Signed-off-by: Berend Sliedrecht <sliedrecht@berend.io>
openwallet-foundation · May 7, 2024 · bd315cc · bd315cc
1 parent 00a6339
commit bd315cc
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -429,7 +429,7 @@ jobs:
     needs: [checks]
 
     env:
-      RUST_VERSION: "1.68"
+      RUST_VERSION: "1.67"
       FEATURES: "mobile_secure_element"
 
     runs-on: ubuntu-latest

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 repository = "https://github.com/hyperledger/aries-askar/"
 categories = ["cryptography", "database"]
 keywords = ["hyperledger", "aries", "ssi", "verifiable", "credentials"]
-rust-version = "1.68"
+rust-version = "1.67"
 
 [package.metadata.docs.rs]
 features = ["all_backends"]

diff --git a/askar-crypto/Cargo.toml b/askar-crypto/Cargo.toml
@@ -9,7 +9,7 @@ readme = "README.md"
 repository = "https://github.com/hyperledger/aries-askar/"
 categories = ["cryptography", "no-std"]
 keywords = ["hyperledger", "aries", "didcomm", "ssi"]
-rust-version = "1.68"
+rust-version = "1.67"
 
 [package.metadata.docs.rs]
 features = ["argon2", "std"]
@@ -101,7 +101,7 @@ p384 = { version = "0.13", default-features = false, features = [
     "ecdh",
 ], optional = true }
 rand = { version = "0.8", default-features = false }
-secure-env = { package = "animo-secure-env", version = "0.2", optional = true }
+secure-env = { package = "animo-secure-env", version = "0.2.1", optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde-json-core = { version = "0.5", default-features = false }
 sha2 = { version = "0.10", default-features = false }

diff --git a/askar-crypto/src/alg/p256_hardware.rs b/askar-crypto/src/alg/p256_hardware.rs
@@ -32,7 +32,7 @@ impl From<SecureEnvError> for Error {
             #[cfg(target_os = "android")]
             SecureEnvError::UnableToCreateJavaValue(_) => ErrorKind::Custom,
             #[cfg(target_os = "android")]
-            SecureEnvError::UnableToAttachHJVMToThread(_) => ErrorKind::Custom,
+            SecureEnvError::UnableToAttachJVMToThread(_) => ErrorKind::Custom,
         };
 
         Self {
@@ -44,7 +44,7 @@ impl From<SecureEnvError> for Error {
 }
 
 /// A P-256 (secp256r1) public key and reference to secret key stored in hardware
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub struct P256HardwareKeyPair(P256HardwareKeyReference);
 
 impl P256HardwareKeyPair {

diff --git a/wrappers/python/aries_askar/bindings/__init__.py b/wrappers/python/aries_askar/bindings/__init__.py
@@ -868,7 +868,9 @@ def key_unwrap_key(
 
 def key_get_supported_backends() -> Sequence[str]:
     handle = StringListHandle()
-    invoke("askar_key_get_supported_backends", POINTER(StringListHandle), byref(handle))
+    invoke(
+        "askar_key_get_supported_backends", (POINTER(StringListHandle),), byref(handle)
+    )
     count = c_int32()
     invoke(
         "askar_string_list_count",