Fix enabled cap detection when applet is already selected.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>

src/fido/cbor.c

@@ -23,6 +23,7 @@
 #include "fido.h"
 #include "usb.h"
 #include "apdu.h"
+#include "management.h"
 
 const bool _btrue = true, _bfalse = false;
 
@@ -52,6 +53,7 @@ int cbor_parse(uint8_t cmd, const uint8_t *data, size_t len) {
     if (len > 0) {
         DEBUG_DATA(data + 1, len - 1);
     }
+    if (cap_supported(CAP_FIDO2)) {
         driver_prepare_response_hid();
         if (cmd == CTAPHID_CBOR) {
             if (data[0] == CTAP_MAKE_CREDENTIAL) {
@@ -88,6 +90,7 @@ int cbor_parse(uint8_t cmd, const uint8_t *data, size_t len) {
         else if (cmd == CTAP_VENDOR_CBOR) {
             return cbor_vendor(data, len);
         }
+    }
     return CTAP1_ERR_INVALID_CMD;
 }
 

src/fido/cmd_register.c

@@ -153,11 +153,13 @@ int u2f_process_apdu() {
     if (CLA(apdu) != 0x00) {
         return SW_CLA_NOT_SUPPORTED();
     }
+    if (cap_supported(CAP_U2F)) {
         for (const cmd_t *cmd = cmds; cmd->ins != 0x00; cmd++) {
             if (cmd->ins == INS(apdu)) {
                 int r = cmd->cmd_handler();
                 return r;
             }
         }
+    }
     return SW_INS_NOT_SUPPORTED();
 }

src/fido/fido.c

@@ -415,11 +415,13 @@ int fido_process_apdu() {
     if (CLA(apdu) != 0x00) {
         return SW_CLA_NOT_SUPPORTED();
     }
+    if (cap_supported(CAP_U2F)) {
         for (const cmd_t *cmd = cmds; cmd->ins != 0x00; cmd++) {
             if (cmd->ins == INS(apdu)) {
                 int r = cmd->cmd_handler();
                 return r;
             }
         }
+    }
     return SW_INS_NOT_SUPPORTED();
 }

src/fido/oath.c

@@ -645,11 +645,13 @@ int oath_process_apdu() {
     if (CLA(apdu) != 0x00) {
         return SW_CLA_NOT_SUPPORTED();
     }
+    if (cap_supported(CAP_OATH)) {
         for (const cmd_t *cmd = cmds; cmd->ins != 0x00; cmd++) {
             if (cmd->ins == INS(apdu)) {
                 int r = cmd->cmd_handler();
                 return r;
             }
         }
+    }
     return SW_INS_NOT_SUPPORTED();
 }

src/fido/otp.c

@@ -463,11 +463,13 @@ int otp_process_apdu() {
     if (CLA(apdu) != 0x00) {
         return SW_CLA_NOT_SUPPORTED();
     }
+    if (cap_supported(CAP_OTP)) {
         for (const cmd_t *cmd = cmds; cmd->ins != 0x00; cmd++) {
             if (cmd->ins == INS(apdu)) {
                 int r = cmd->cmd_handler();
                 return r;
             }
         }
+    }
     return SW_INS_NOT_SUPPORTED();
 }