From c50f7862f55a08a86660ff9260d339a432376041 Mon Sep 17 00:00:00 2001
From: Dain Nilsson <dain@yubico.com>
Date: Thu, 19 Aug 2021 11:41:50 +0200
Subject: [PATCH] Better handling of YK Edge stuck in CCID mode.

---
 ykman/cli/config.py   | 4 +++-
 ykman/device.py       | 8 +++++---
 yubikit/management.py | 6 +++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ykman/cli/config.py b/ykman/cli/config.py
index 02cd1c26..4c48f972 100644
--- a/ykman/cli/config.py
+++ b/ykman/cli/config.py
@@ -540,7 +540,9 @@ def _mode_from_usb_enabled(usb_enabled):
         interfaces |= USB_INTERFACE.OTP
     if (CAPABILITY.U2F | CAPABILITY.FIDO2) & usb_enabled:
         interfaces |= USB_INTERFACE.FIDO
-    if (CAPABILITY.OPENPGP | CAPABILITY.PIV | CAPABILITY.OATH) & usb_enabled:
+    if (
+        USB_INTERFACE.CCID | CAPABILITY.OPENPGP | CAPABILITY.PIV | CAPABILITY.OATH
+    ) & usb_enabled:
         interfaces |= USB_INTERFACE.CCID
     return Mode(interfaces)
 
diff --git a/ykman/device.py b/ykman/device.py
index 149a8591..bf93378c 100644
--- a/ykman/device.py
+++ b/ykman/device.py
@@ -459,9 +459,11 @@ def read_info(pid: Optional[PID], conn: Connection) -> DeviceInfo:
     ):
         usb_enabled = info.supported_capabilities[TRANSPORT.USB]
         if usb_enabled == (CAPABILITY.OTP | CAPABILITY.U2F | USB_INTERFACE.CCID):
-            # YubiKey Edge, hide unusable CCID interface
-            usb_enabled = CAPABILITY.OTP | CAPABILITY.U2F
-            info.supported_capabilities = {TRANSPORT.USB: usb_enabled}
+            # YubiKey Edge, hide unusable CCID interface from supported
+            # usb_enabled = CAPABILITY.OTP | CAPABILITY.U2F
+            info.supported_capabilities = {
+                TRANSPORT.USB: CAPABILITY.OTP | CAPABILITY.U2F
+            }
 
         if USB_INTERFACE.OTP not in interfaces:
             usb_enabled &= ~CAPABILITY.OTP
diff --git a/yubikit/management.py b/yubikit/management.py
index cee04ddd..66f7eb2a 100644
--- a/yubikit/management.py
+++ b/yubikit/management.py
@@ -354,7 +354,11 @@ def write_config(self, config):
 class _ManagementSmartCardBackend(_Backend):
     def __init__(self, smartcard_connection):
         self.protocol = SmartCardProtocol(smartcard_connection)
-        select_str = self.protocol.select(AID.MANAGEMENT).decode()
+        select_bytes = self.protocol.select(AID.MANAGEMENT)
+        if select_bytes[-2:] == b"\x90\x00":
+            # YubiKey Edge incorrectly appends SW twice.
+            select_bytes = select_bytes[:-2]
+        select_str = select_bytes.decode()
         self.version = Version.from_string(select_str)
         # For YubiKey NEO, we use the OTP application for further commands
         if self.version[0] == 3: