chore: update secure env and call set_env for jni

Signed-off-by: Berend Sliedrecht <sliedrecht@berend.io>
hyperledger · Jun 4, 2024 · add1389 · add1389
1 parent d14253b
commit add1389
Show file tree

Hide file tree

Showing 52 changed files with 3,963 additions and 3,387 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/askar-crypto/Cargo.toml b/askar-crypto/Cargo.toml
@@ -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.3.3", optional = true }
+secure-env = { package = "animo-secure-env", version = "0.4", 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/src/ffi/key.rs b/src/ffi/key.rs
@@ -33,12 +33,12 @@ pub extern "C" fn askar_key_generate(
         trace!("Generate key: {} for {} backend", alg, backend);
         check_useful_c_ptr!(out);
 
-        let alg = KeyAlg::from_str(alg)?;
+        let alg = KeyAlg::from_str(alg).unwrap();
 
         let key = match backend {
             KeyBackend::Software => LocalKey::generate_with_rng(alg, ephemeral != 0),
             KeyBackend::SecureElement => LocalKey::generate_for_hardware(alg, ephemeral != 0)
-        }?;
+        }.unwrap();
 
         unsafe { *out = LocalKeyHandle::create(key) };
         Ok(ErrorCode::Success)

diff --git a/src/ffi/macros.rs b/src/ffi/macros.rs
@@ -5,8 +5,9 @@ macro_rules! catch_err {
             Ok(Err(err)) => { // lib error
                 $crate::ffi::error::set_last_error(Some(err))
             }
-            Err(_) => { // panic error
-                let err: $crate::error::Error = err_msg!(Unexpected, "Panic during execution");
+            Err(e) => { // panic error
+                let panic_msg = e.downcast_ref::<&str>().unwrap_or(&"no message");
+                let err: $crate::error::Error = err_msg!(Unexpected, "Panic during execution: '{panic_msg}'");
                 $crate::ffi::error::set_last_error(Some(err))
             }
         }

diff --git a/wrappers/javascript/package.json b/wrappers/javascript/package.json
@@ -4,7 +4,7 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/hyperledger/aries-askar-rs",
+    "url": "https://github.com/hyperledger/aries-askar",
     "directory": "wrappers/javascript"
   },
   "engines": {

diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/.gitignore b/wrappers/javascript/packages/aries-askar-react-native-example/android/.gitignore
diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/build.gradle b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/build.gradle
diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/debug.keystore b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/debug.keystore
diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/proguard-rules.pro b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/proguard-rules.pro
diff --git a/...cript/packages/aries-askar-react-native-example/android/app/src/debug/AndroidManifest.xml b/...cript/packages/aries-askar-react-native-example/android/app/src/debug/AndroidManifest.xml
diff --git a/...script/packages/aries-askar-react-native-example/android/app/src/main/AndroidManifest.xml b/...script/packages/aries-askar-react-native-example/android/app/src/main/AndroidManifest.xml
diff --git a/...tive-example/android/app/src/main/java/org/hyperledger/ariesaskar/example/MainActivity.kt b/...tive-example/android/app/src/main/java/org/hyperledger/ariesaskar/example/MainActivity.kt