Fix #1388: Cancel queued key sessions on cleanup (#1396)

brave · Aug 20, 2019 · c2f744f · c2f744f
1 parent f44d41e
commit c2f744f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Client/U2FExtensions.swift b/Client/U2FExtensions.swift
@@ -477,6 +477,7 @@ class U2FExtensions: NSObject {
         }
         fido2RegHandles.remove(at: index)
         fido2RegisterRequest.removeValue(forKey: handle)
+        YubiKitManager.shared.keySession.cancelCommands()
     }
 
     // FIDO2 Authentication
@@ -728,6 +729,7 @@ class U2FExtensions: NSObject {
         }
         fido2AuthHandles.remove(at: index)
         fido2AuthRequest.removeValue(forKey: handle)
+        YubiKitManager.shared.keySession.cancelCommands()
     }
 
     // FIDO Registration
@@ -841,6 +843,7 @@ class U2FExtensions: NSObject {
         fidoRegHandles.remove(at: index)
         fidoRegisterRequest.removeValue(forKey: handle)
         requestId.removeValue(forKey: handle)
+        YubiKitManager.shared.keySession.cancelCommands()
     }
 
     // FIDO Authetication
@@ -972,6 +975,7 @@ class U2FExtensions: NSObject {
         fidoSignHandles.remove(at: index)
         fidoSignRequests.removeValue(forKey: handle)
         requestId.removeValue(forKey: handle)
+        YubiKitManager.shared.keySession.cancelCommands()
     }
 
     private func handleSessionStateChange() {