mirror of
https://github.com/polhenarejos/pico-keys-sdk
synced 2026-06-11 04:48:15 +02:00
Fixes for FIDO with Pico SDK 1.5
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
@@ -3195,7 +3195,7 @@
|
|||||||
*
|
*
|
||||||
* This module is required for X.509 certificate request writing.
|
* This module is required for X.509 certificate request writing.
|
||||||
*/
|
*/
|
||||||
//#define MBEDTLS_X509_CSR_WRITE_C
|
#define MBEDTLS_X509_CSR_WRITE_C
|
||||||
|
|
||||||
/** \} name SECTION: mbed TLS modules */
|
/** \} name SECTION: mbed TLS modules */
|
||||||
|
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ void hid_task(void) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void tud_hid_report_complete_cb(uint8_t instance, uint8_t const *report, /*uint16_t*/ uint8_t len) {
|
void tud_hid_report_complete_cb(uint8_t instance, uint8_t const *report, uint16_t len) {
|
||||||
if (send_buffer_size > 0 && instance == ITF_HID) {
|
if (send_buffer_size > 0 && instance == ITF_HID) {
|
||||||
uint8_t seq = report[4] & TYPE_MASK ? 0 : report[4] + 1;
|
uint8_t seq = report[4] & TYPE_MASK ? 0 : report[4] + 1;
|
||||||
if (last_write_result == true) {
|
if (last_write_result == true) {
|
||||||
|
|||||||
@@ -158,36 +158,6 @@ static uint8_t desc_config_extended[sizeof(tusb_desc_configuration_t)
|
|||||||
];
|
];
|
||||||
|
|
||||||
#ifdef USB_ITF_HID
|
#ifdef USB_ITF_HID
|
||||||
#define HID_USAGE_PAGE_FIDO 0xF1D0
|
|
||||||
|
|
||||||
enum {
|
|
||||||
HID_USAGE_FIDO_U2FHID = 0x01,// U2FHID usage for top-level collection
|
|
||||||
HID_USAGE_FIDO_DATA_IN = 0x20,// Raw IN data report
|
|
||||||
HID_USAGE_FIDO_DATA_OUT = 0x21 // Raw OUT data report
|
|
||||||
};
|
|
||||||
|
|
||||||
#define TUD_HID_REPORT_DESC_FIDO_U2F(report_size, ...) \
|
|
||||||
HID_USAGE_PAGE_N(HID_USAGE_PAGE_FIDO, 2), \
|
|
||||||
HID_USAGE(HID_USAGE_FIDO_U2FHID), \
|
|
||||||
HID_COLLECTION(HID_COLLECTION_APPLICATION), \
|
|
||||||
/* Report ID if any */ \
|
|
||||||
__VA_ARGS__ \
|
|
||||||
/* Usage Data In */ \
|
|
||||||
HID_USAGE(HID_USAGE_FIDO_DATA_IN), \
|
|
||||||
HID_LOGICAL_MIN(0), \
|
|
||||||
HID_LOGICAL_MAX_N(0xff, 2), \
|
|
||||||
HID_REPORT_SIZE(8), \
|
|
||||||
HID_REPORT_COUNT(report_size), \
|
|
||||||
HID_INPUT(HID_DATA | HID_VARIABLE | HID_ABSOLUTE), \
|
|
||||||
/* Usage Data Out */ \
|
|
||||||
HID_USAGE(HID_USAGE_FIDO_DATA_OUT), \
|
|
||||||
HID_LOGICAL_MIN(0), \
|
|
||||||
HID_LOGICAL_MAX_N(0xff, 2), \
|
|
||||||
HID_REPORT_SIZE(8), \
|
|
||||||
HID_REPORT_COUNT(report_size), \
|
|
||||||
HID_OUTPUT(HID_DATA | HID_VARIABLE | HID_ABSOLUTE), \
|
|
||||||
HID_COLLECTION_END \
|
|
||||||
|
|
||||||
uint8_t const desc_hid_report[] = {
|
uint8_t const desc_hid_report[] = {
|
||||||
TUD_HID_REPORT_DESC_FIDO_U2F(CFG_TUD_HID_EP_BUFSIZE)
|
TUD_HID_REPORT_DESC_FIDO_U2F(CFG_TUD_HID_EP_BUFSIZE)
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user