Merge branch 'main' into dependabot/pip/wrappers/python/pytest-approx…

…-eq-8.2.2

.github/workflows/build.yml

@@ -340,6 +340,10 @@ jobs:
         with:
           node-version: 18.x
 
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 8
+
       - name: Fetch library artifacts
         uses: actions/download-artifact@v4
         with:
@@ -351,26 +355,26 @@ jobs:
           pip install setuptools wheel twine auditwheel
 
       - name: Install dependencies
-        run: yarn install
+        run: pnpm install
 
       - name: Build
-        run: yarn build
+        run: pnpm build
 
       - name: Lint
-        run: yarn lint
+        run: pnpm lint
 
       - name: Check format
-        run: yarn check-format
+        run: pnpm check-format
 
       - name: Check types
-        run: yarn check-types
+        run: pnpm check-types
 
       - name: Run tests
         if: ${{ matrix.architecture != 'linux-aarch64' }}
         env:
           # binary is downloaded to root of repository
-          LIB_ARIES_ASKAR_PATH: ../../../
-        run: yarn test
+          LIB_ARIES_ASKAR_PATH: ../../
+        run: pnpm test
 
       - name: Set NPM config
         if: |

.gitignore

@@ -8,3 +8,11 @@ target
 *.so
 .npmrc
 out
+
+# react Native Libraries
+wrappers/javascript/packages/aries-askar-react-native/native/mobile/
+
+# Example app
+wrappers/javascript/packages/aries-askar-react-native-example/android
+wrappers/javascript/packages/aries-askar-react-native-example/ios
+wrappers/javascript/packages/aries-askar-react-native-example/.expo

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", 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 }

askar-crypto/src/alg/aes/mod.rs

@@ -7,7 +7,7 @@ use aes_gcm::{Aes128Gcm, Aes256Gcm};
 use serde::{Deserialize, Serialize};
 use zeroize::Zeroize;
 
-use super::{AesTypes, HasKeyAlg, KeyAlg};
+use super::{AesTypes, HasKeyAlg, HasKeyBackend, KeyAlg};
 use crate::{
     buffer::{ArrayKey, ResizeBuffer, Writer},
     encrypt::{KeyAeadInPlace, KeyAeadMeta, KeyAeadParams},
@@ -80,6 +80,8 @@ impl<T: AesType> PartialEq for AesKey<T> {
 
 impl<T: AesType> Eq for AesKey<T> {}
 
+impl<T: AesType> HasKeyBackend for AesKey<T> {}
+
 impl<T: AesType> HasKeyAlg for AesKey<T> {
     fn algorithm(&self) -> KeyAlg {
         KeyAlg::Aes(T::ALG_TYPE)