Merge pull request #92 from Devolutions/use-android-pubkeycred

Use PublicKeyCredential Android for credential creation
Devolutions · Aug 23, 2024 · d0b6974 · d0b6974
2 parents ff6772e + cfb62ec
commit d0b6974
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "slauth"
-version = "0.7.9"
+version = "0.7.10"
 authors = ["richer <[email protected]>", "LucFauvel <[email protected]>"]
 edition = "2021"
 description = "oath HOTP and TOTP complient implementation"

diff --git a/Slauth.podspec b/Slauth.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Slauth'
-  s.version          = '0.7.9'
+  s.version          = '0.7.10'
   s.summary          = 'A Swift wrapper around Slauth Rust crate'
   s.description      = <<-DESC
 TODO: Add long description of the pod here.

diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@ properties.load(project.rootProject.file('local.properties').newDataInputStream(
 
 project('slauth') {
     ext {
-        libraryVersion = '0.7.9'
+        libraryVersion = '0.7.10'
     }
     publishing {
         repositories {

diff --git a/src/webauthn/authenticator/native.rs b/src/webauthn/authenticator/native.rs
@@ -186,7 +186,7 @@ pub mod android {
                 WebauthnAuthenticator,
             },
             proto::web_message::{
-                AuthenticatorAttestationResponse, PublicKeyCredential, PublicKeyCredentialCreationOptions, PublicKeyCredentialRaw,
+                AuthenticatorAttestationResponse, PublicKeyCredentialCreationOptions, PublicKeyCredentialRaw,
                 PublicKeyCredentialRequestOptions,
             },
         },
@@ -341,7 +341,7 @@ pub mod android {
             return null_mut();
         }
 
-        let public_key_credential = PublicKeyCredential::from((*res).credential_response.clone());
+        let public_key_credential = PublicKeyCredentialAndroid::from((*res).credential_response.clone());
         let json = serde_json::to_string(&public_key_credential);
 
         if json.is_err() {

diff --git a/wrappers/android/build.gradle b/wrappers/android/build.gradle
@@ -26,7 +26,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 28
         versionCode 1
-        versionName "0.7.9"
+        versionName "0.7.10"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/wrappers/android/src/main/jniLibs/arm64-v8a/libslauth.so b/wrappers/android/src/main/jniLibs/arm64-v8a/libslauth.so
diff --git a/wrappers/android/src/main/jniLibs/x86_64/libslauth.so b/wrappers/android/src/main/jniLibs/x86_64/libslauth.so