Merge pull request #9 from Devolutions/jwt-api-update

JWT API update

Cargo.toml

@@ -4,4 +4,8 @@ members = [
     "picky-server",
     "picky-asn1",
     "picky-asn1-der",
-]
+]
+
+[patch.crates-io]
+backtrace = { git = "https://github.com/Devolutions/backtrace-rs", branch = "wayk" }
+libz-sys = { git = "https://github.com/Devolutions/libz-sys", branch = "wayk" }

ci/azure-pipelines.yaml

@@ -53,9 +53,9 @@ jobs:
       - powershell: |
           conan install openssl/$(OPENSSL_VERSION)@devolutions/stable -g virtualenv -pr windows-x86_64
           .\activate.ps1
-          cargo build --release
+          cargo build --release --target=x86_64-pc-windows-msvc
           mkdir $(Build.ArtifactStagingDirectory)/windows/x86_64
-          cp $(Build.Repository.LocalPath)/target/release/picky-server.exe $(Build.ArtifactStagingDirectory)/windows/x86_64/
+          cp $(Build.Repository.LocalPath)/target/x86_64-pc-windows-msvc/release/picky-server.exe $(Build.ArtifactStagingDirectory)/windows/x86_64/
         displayName: Building picky-rs
         env:
           RUSTFLAGS: '-C target-feature=+crt-static'

picky/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "picky"
-version = "4.2.1"
+version = "4.4.2"
 authors = [
     "jtrepanier-devolutions <[email protected]>",
     "Benoît CORTIER <[email protected]>",

picky/src/jose/jwk.rs

@@ -1,5 +1,5 @@
 use crate::{
-    key::{OwnedPublicKey, PublicKey},
+    key::PublicKey,
     private::SubjectPublicKeyInfo,
     signature::SignatureHashType,
 };
@@ -177,7 +177,7 @@ impl Jwk {
         Ok(serde_json::to_string_pretty(self)?)
     }
 
-    pub fn to_public_key(&self) -> Result<OwnedPublicKey, JwkError> {
+    pub fn to_public_key(&self) -> Result<PublicKey, JwkError> {
         match &self.key {
             JwkKeyType::Rsa(rsa) => {
                 let spki = SubjectPublicKeyInfo::new_rsa_key(rsa.modulus()?.into(), rsa.public_exponent()?.into());