Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update Android RS-256 logic (#2180)

Leendert de Borst968f35392bdb
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyFormFragment.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyFormFragment.kt
index 0fcf667b7..8aa5ffe98 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyFormFragment.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyFormFragment.kt
@@ -840,7 +840,7 @@ class PasskeyFormFragment : Fragment() {
if (params != null) {
for (i in 0 until params.length()) {
val entry = params.optJSONObject(i) ?: continue
- if (entry.has("alg")) {
+ if (entry.optString("type") == "public-key" && entry.has("alg")) {
algs.add(entry.getInt("alg"))
}
}
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/passkey/PasskeyAuthenticator.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/passkey/PasskeyAuthenticator.kt
index eac77e682..ed05ad1a0 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/passkey/PasskeyAuthenticator.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/passkey/PasskeyAuthenticator.kt
@@ -232,7 +232,7 @@ object PasskeyAuthenticator {
// 7. The signature is already in the form the RP expects:
// ECDSA output is DER-encoded, RSA output is raw PKCS#1 v1.5. Both are what WebAuthn expects.
- val derSignature = signature.sign()
+ val signatureBytes = signature.sign()
// 8. Evaluate PRF if requested
var prfResults: PrfResults? = null
@@ -245,7 +245,7 @@ object PasskeyAuthenticator {
return PasskeyAssertionResult(
credentialId = credentialId,
authenticatorData = authenticatorData,
- signature = derSignature,
+ signature = signatureBytes,
userHandle = userId,
prfResults = prfResults,
)