Add driver name when on macOS 12.0

This commit is contained in:
Max Goedjen 2021-06-26 15:03:52 -07:00
parent c5bd4c2189
commit 341b6d9405
No known key found for this signature in database
GPG Key ID: E58C21DD77B9B8E8
1 changed files with 15 additions and 5 deletions

View File

@ -103,12 +103,22 @@ extension SmartCard.Store {
private func loadSecrets() {
guard let tokenID = tokenID else { return }
// Hack to read name if there's only one smart card
let slotNames = TKSmartCardSlotManager().slotNames
if watcher.nonSecureEnclaveTokens.count == 1 && slotNames.count == 1 {
name = slotNames.first!
let fallbackName = NSLocalizedString("Smart Card", comment: "Smart Card")
if #available(macOS 12.0, *) {
if let driverName = watcher.tokenInfo(forTokenID: tokenID)?.driverName {
name = driverName
} else {
name = fallbackName
}
} else {
name = NSLocalizedString("Smart Card", comment: "Smart Card")
// Hack to read name if there's only one smart card
let slotNames = TKSmartCardSlotManager().slotNames
if watcher.nonSecureEnclaveTokens.count == 1 && slotNames.count == 1 {
name = slotNames.first!
} else {
name = fallbackName
}
}
let attributes = [