From bd315ccf33df99d042babc7dea654227cb21cf44 Mon Sep 17 00:00:00 2001 From: Berend Sliedrecht Date: Tue, 7 May 2024 13:51:49 +0200 Subject: [PATCH] downgrade minimum rust version and update secure-env Signed-off-by: Berend Sliedrecht --- .github/workflows/build.yml | 2 +- Cargo.lock | 75 ++++++++++++------- Cargo.toml | 2 +- askar-crypto/Cargo.toml | 4 +- askar-crypto/src/alg/p256_hardware.rs | 4 +- .../python/aries_askar/bindings/__init__.py | 4 +- 6 files changed, 59 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7cf43aad..2bf448cb 100644 --- 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 index f6ff8e16..73ac9006 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,23 +82,20 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" dependencies = [ "android-properties", - "bitflags 2.4.1", + "bitflags 1.3.2", "cc", - "cesu8", - "jni", "jni-sys", "libc", "log", "ndk", "ndk-context", "ndk-sys", - "num_enum", - "thiserror", + "num_enum 0.6.1", ] [[package]] @@ -130,9 +127,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "animo-secure-env" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffb22e30d615a3600f3ff83c3baeefe955d5f648574d85f723347919668b8e8" +checksum = "8697722c88d3678fc9f6adc7dc9e0da8b29fb9a900f8f72125ecdb3dbe2ef459" dependencies = [ "android-activity", "jni", @@ -1646,15 +1643,15 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags 2.4.1", + "bitflags 1.3.2", "jni-sys", - "log", "ndk-sys", - "num_enum", + "num_enum 0.5.11", + "raw-window-handle", "thiserror", ] @@ -1666,9 +1663,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.5.0+25.2.9519653" +version = "0.4.1+23.1.7779620" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" dependencies = [ "jni-sys", ] @@ -1771,18 +1768,39 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.6.1", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2030,10 +2048,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ + "once_cell", "toml_edit", ] @@ -2085,6 +2104,12 @@ dependencies = [ "getrandom", ] +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + [[package]] name = "rayon" version = "1.8.0" @@ -2891,9 +2916,9 @@ checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "toml_datetime", diff --git a/Cargo.toml b/Cargo.toml index 079ed4e0..b56da2bc 100644 --- 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 index 3e491669..c2480905 100644 --- 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 index ec3be007..2f59909c 100644 --- a/askar-crypto/src/alg/p256_hardware.rs +++ b/askar-crypto/src/alg/p256_hardware.rs @@ -32,7 +32,7 @@ impl From 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 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 index 0f181686..065a8273 100644 --- 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",