Skip to content

Commit d53ebeb

Browse files
salis0x330aPaul Salisburytlttnz2018
authored
Merging Feat/ios feature parity into Main (#3)
* feat: add shared secret hkdf from p256 pubkey using secure element * feat: add shared pubkey retrieval command * fix: enable digests for ECDSA signature * feat: multiple shared secret inputs and forcing the salt to be provided, alongside optional extra info * feat: start guest js functions for shared secret keys * feat: add unencrypted prefs storage and depends on config now * feat: router config for proper builds, trying rpid * refactor: index js updates to use latest rust and mobile * feat: add contains key / plaintext * refactor: package deps * refactor: match naming convention from p256 signer * fix: add key to readCipherData * feat: add hmac_sha256 function backed by android keystore * feat: add guest-js function for hmacSha256 * chore: update build version * chore: update cargo version * feat: try without biometric if running in debug build mode * feat: build new versions and align cargo and package json * refactor: encrypt should also perform biometric only in release mode * refactor: resolve correctly * wip: functional equivalence on iOS17+ * chore: SwiftRs and C declaration in shim * fix: test * fix: initPlugin return KeystorePlugin * fix: flag iOS 17 using available * chore: cleanup package.swift * fix: resolve tauri-api dep path * fix: proper parsing of args when invoked * test without parse args guard * chore: set static service and account todo: use config args * test without parse args guard * test without parse args guard * chore: move back to 15 * chore: matched up the response specification * chore: fixed error on passing args between js and swift * chore: switch to keychain for securePrefs * chore: added debugging and fixed error * chore: simplified implementation version * chore: added back hmac * chore: bump to `2.2.0` for release package ver --------- Co-authored-by: 0x330a <92654767+0x330a@users.noreply.github.com> Co-authored-by: Paul Salisbury <paul@blockchainlabs.nz> Co-authored-by: Thomas Le <letanthanhtai@gmail.com>
1 parent 7f1c99d commit d53ebeb

30 files changed

Lines changed: 1632 additions & 344 deletions

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tauri-plugin-keystore"
3-
version = "2.1.0-alpha.1"
3+
version = "2.1.0-alpha.6"
44
authors = ["daniel-mader"]
55
description = "Interact with the device-native key storage (Android Keystore, iOS Keychain)."
66
edition = "2021"
@@ -14,6 +14,9 @@ license = "Apache-2.0"
1414
tauri = { version = "2" }
1515
serde = "1.0"
1616
thiserror = "2"
17+
hkdf = { version = "0.12" }
18+
sha2 = "0.10.8"
19+
hex = "0.4.3"
1720

1821
[build-dependencies]
1922
tauri-plugin = { version = "2.0.3", features = ["build"] }

android/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
compileSdk = 34
99

1010
defaultConfig {
11-
minSdk = 28 // currently supported: 31+ (Android 12: 'Snow Cone', Oct 2021)
11+
minSdk = 31 // currently supported: 31+ (Android 12: 'Snow Cone', Oct 2021)
1212

1313
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1414
consumerProguardFiles("consumer-rules.pro")
@@ -37,6 +37,7 @@ dependencies {
3737
implementation("androidx.core:core-ktx:1.9.0")
3838
implementation("androidx.appcompat:appcompat:1.6.0")
3939
implementation("com.google.android.material:material:1.7.0")
40+
implementation("com.github.komputing.khex:core:1.1.3")
4041
testImplementation("junit:junit:4.13.2")
4142
androidTestImplementation("androidx.test.ext:junit:1.1.5")
4243
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencyResolutionManagement {
2323
repositories {
2424
mavenCentral()
2525
google()
26-
26+
maven { url 'https://jitpack.io' }
2727
}
2828
}
2929

android/src/main/java/Example.kt

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)