Merge pull request #29 from dmulder/dmulder/msextensions_build_fix

Fix the msextensions build
kanidm · Apr 10, 2024 · 180962b · 180962b
2 parents bcee118 + 16de546
commit 180962b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/rust_test.yml b/.github/workflows/rust_test.yml
@@ -22,4 +22,5 @@ jobs:
     - name: Cargo test
       run: cargo test
 
-
+    - name: Cargo test with MS Extensions
+      run: cargo test --features msextensions
diff --git a/src/crypto/ms_oapxbc.rs b/src/crypto/ms_oapxbc.rs
@@ -330,6 +330,10 @@ impl JwsSigner for MsOapxbcSessionKeyHs256 {
         JwsSigner::get_kid(&self.hmac_key)
     }
 
+    fn get_legacy_kid(&self) -> &str {
+        JwsSigner::get_kid(&self.hmac_key)
+    }
+
     fn update_header(&self, header: &mut ProtectedHeader) -> Result<(), JwtError> {
         let ctx = general_purpose::STANDARD.encode(self.nonce);
         header.ctx = Some(ctx);

diff --git a/src/jws.rs b/src/jws.rs
@@ -54,7 +54,7 @@ impl JwsBuilder {
         self
     }
 
-    #[cfg(test)]
+    /// Set the kid (required for Windows Hello/MS Extensions)
     pub fn set_kid(mut self, kid: Option<&str>) -> Self {
         self.header.kid = kid.map(|s| s.to_string());
         self