Added support for pkcs8 private keys in signature generation (#105)

* Added support for pkcs8 private keys in signature generation

* Bumped version

Author: LucFauvel

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "slauth"
-version = "0.7.13"
+version = "0.7.14"
 authors = [
     "richer <richer.arc@gmail.com>",
     "LucFauvel <luc.fauvel@hotmail.com>",

Slauth.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Slauth'
-  s.version          = '0.7.13'
+  s.version          = '0.7.14'
   s.summary          = 'A Swift wrapper around Slauth Rust crate'
   s.description      = <<-DESC
 TODO: Add long description of the pod here.

build.gradle

@@ -26,7 +26,7 @@ properties.load(project.rootProject.file('local.properties').newDataInputStream(
 
 project('slauth') {
     ext {
-        libraryVersion = '0.7.13'
+        libraryVersion = '0.7.14'
     }
     publishing {
         repositories {

src/webauthn/authenticator/mod.rs

@@ -22,6 +22,7 @@ use p256::ecdsa::VerifyingKey;
 use rand::rngs::OsRng;
 use rsa::{
     pkcs1::{DecodeRsaPrivateKey, EncodeRsaPrivateKey},
+    pkcs8::DecodePrivateKey,
     signature::SignatureEncoding,
     traits::PublicKeyParts,
 };
@@ -61,6 +62,7 @@ pub enum WebauthnCredentialRequestError {
     Base64Error(base64::DecodeError),
     Ed25519Error(ed25519_dalek::SignatureError),
     Ed25519SPKIError(ed25519_dalek::pkcs8::spki::Error),
+    Ed25519PKCS8Error(ed25519_dalek::pkcs8::Error),
 }
 
 impl From<serde_json::Error> for WebauthnCredentialRequestError {
@@ -105,6 +107,12 @@ impl From<ed25519_dalek::pkcs8::spki::Error> for WebauthnCredentialRequestError
     }
 }
 
+impl From<ed25519_dalek::pkcs8::Error> for WebauthnCredentialRequestError {
+    fn from(e: ed25519_dalek::pkcs8::Error) -> Self {
+        WebauthnCredentialRequestError::Ed25519PKCS8Error(e)
+    }
+}
+
 pub struct WebauthnAuthenticator;
 
 impl WebauthnAuthenticator {
@@ -368,16 +376,20 @@ impl WebauthnAuthenticator {
 
         match private_key_response.key_alg {
             CoseAlgorithmIdentifier::Ed25519 => {
-                let key = ed25519_dalek::SigningKey::try_from(private_key_response.private_key.as_slice())?;
+                let key = ed25519_dalek::SigningKey::try_from(private_key_response.private_key.as_slice()).or(
+                    ed25519_dalek::SigningKey::from_pkcs8_der(private_key_response.private_key.as_slice()),
+                )?;
                 Ok(key.sign([auth_data_bytes, client_data_hash].concat().as_slice()).to_vec())
             }
             CoseAlgorithmIdentifier::ES256 => {
-                let key = p256::ecdsa::SigningKey::try_from(private_key_response.private_key.as_slice())?;
+                let key = p256::ecdsa::SigningKey::from_pkcs8_der(private_key_response.private_key.as_slice())
+                    .or(p256::ecdsa::SigningKey::try_from(private_key_response.private_key.as_slice()))?;
                 let (sig, _) = key.sign([auth_data_bytes, client_data_hash].concat().as_slice());
                 Ok(sig.to_der().to_vec())
             }
             CoseAlgorithmIdentifier::RSA => {
-                let key = rsa::RsaPrivateKey::from_pkcs1_der(&private_key_response.private_key)?;
+                let key = rsa::RsaPrivateKey::from_pkcs1_der(&private_key_response.private_key)
+                    .or(rsa::RsaPrivateKey::from_pkcs8_der(&private_key_response.private_key))?;
                 let signing_key = rsa::pkcs1v15::SigningKey::<Sha256>::new(key);
                 Ok(signing_key.sign([auth_data_bytes, client_data_hash].concat().as_slice()).to_vec())
             }

wrappers/android/build.gradle

@@ -26,7 +26,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 28
         versionCode 1
-        versionName "0.7.13"
+        versionName "0.7.14"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"