1 files changed, 14 insertions, 7 deletions

diff --git a/src/info.c b/src/info.c
index e896503..8e256fa 100644
--- a/src/info.c
+++ b/src/info.c
@@ -217,6 +217,8 @@ parse_reply_element(const cbor_item_t *key, const cbor_item_t *val, void *arg)
                 return (cbor_decode_uint64(val, &ci->maxmsgsiz));
         case 6: /* pinProtocols */
                 return (decode_protocols(val, &ci->protocols));
+        case 14: /* fwVersion */
+                return (cbor_decode_uint64(val, &ci->fwversion));
         default: /* ignore */
                 fido_log_debug("%s: cbor type", __func__);
                 return (0);
@@ -226,12 +228,11 @@ parse_reply_element(const cbor_item_t *key, const cbor_item_t *val, void *arg)
 static int
 fido_dev_get_cbor_info_tx(fido_dev_t *dev)
 {
-        const unsigned char     cbor[] = { CTAP_CBOR_GETINFO };
-        const uint8_t           cmd = CTAP_FRAME_INIT | CTAP_CMD_CBOR;
+        const unsigned char cbor[] = { CTAP_CBOR_GETINFO };
 
         fido_log_debug("%s: dev=%p", __func__, (void *)dev);
 
-        if (fido_tx(dev, cmd, cbor, sizeof(cbor)) < 0) {
+        if (fido_tx(dev, CTAP_CMD_CBOR, cbor, sizeof(cbor)) < 0) {
                 fido_log_debug("%s: fido_tx", __func__);
                 return (FIDO_ERR_TX);
         }
@@ -242,8 +243,7 @@ fido_dev_get_cbor_info_tx(fido_dev_t *dev)
 static int
 fido_dev_get_cbor_info_rx(fido_dev_t *dev, fido_cbor_info_t *ci, int ms)
 {
-        const uint8_t   cmd = CTAP_FRAME_INIT | CTAP_CMD_CBOR;
-        unsigned char   reply[512];
+        unsigned char   reply[FIDO_MAXMSG];
         int             reply_len;
 
         fido_log_debug("%s: dev=%p, ci=%p, ms=%d", __func__, (void *)dev,
@@ -251,7 +251,8 @@ fido_dev_get_cbor_info_rx(fido_dev_t *dev, fido_cbor_info_t *ci, int ms)
 
         memset(ci, 0, sizeof(*ci));
 
-        if ((reply_len = fido_rx(dev, cmd, &reply, sizeof(reply), ms)) < 0) {
+        if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+            ms)) < 0) {
                 fido_log_debug("%s: fido_rx", __func__);
                 return (FIDO_ERR_RX);
         }
@@ -260,7 +261,7 @@ fido_dev_get_cbor_info_rx(fido_dev_t *dev, fido_cbor_info_t *ci, int ms)
             parse_reply_element));
 }
 
-static int
+int
 fido_dev_get_cbor_info_wait(fido_dev_t *dev, fido_cbor_info_t *ci, int ms)
 {
         int r;
@@ -397,6 +398,12 @@ fido_cbor_info_maxmsgsiz(const fido_cbor_info_t *ci)
         return (ci->maxmsgsiz);
 }
 
+uint64_t
+fido_cbor_info_fwversion(const fido_cbor_info_t *ci)
+{
+        return (ci->fwversion);
+}
+
 const uint8_t *
 fido_cbor_info_protocols_ptr(const fido_cbor_info_t *ci)
 {