Compare commits
2 Commits
ccid
...
fixb_build
| Author | SHA1 | Date | |
|---|---|---|---|
| ea6e9ab550 | |||
| 31c5b26eb5 |
@ -168,16 +168,6 @@
|
|||||||
"infra",
|
"infra",
|
||||||
"tool"
|
"tool"
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"login": "kimusan",
|
|
||||||
"name": "Kim Schulz",
|
|
||||||
"avatar_url": "https://avatars1.githubusercontent.com/u/1150049?v=4",
|
|
||||||
"profile": "http://www.schulz.dk",
|
|
||||||
"contributions": [
|
|
||||||
"business",
|
|
||||||
"ideas"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"contributorsPerLine": 7,
|
"contributorsPerLine": 7,
|
||||||
|
|||||||
@ -134,7 +134,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
|
|||||||
<td align="center"><a href="http://1bitsquared.com"><img src="https://avatars3.githubusercontent.com/u/17334?v=4" width="100px;" alt="Piotr Esden-Tempski"/><br /><sub><b>Piotr Esden-Tempski</b></sub></a><br /><a href="#business-esden" title="Business development">💼</a></td>
|
<td align="center"><a href="http://1bitsquared.com"><img src="https://avatars3.githubusercontent.com/u/17334?v=4" width="100px;" alt="Piotr Esden-Tempski"/><br /><sub><b>Piotr Esden-Tempski</b></sub></a><br /><a href="#business-esden" title="Business development">💼</a></td>
|
||||||
<td align="center"><a href="https://github.com/m3hm00d"><img src="https://avatars1.githubusercontent.com/u/42179593?v=4" width="100px;" alt="f.m3hm00d"/><br /><sub><b>f.m3hm00d</b></sub></a><br /><a href="https://github.com/solokeys/solo/commits?author=m3hm00d" title="Documentation">📖</a></td>
|
<td align="center"><a href="https://github.com/m3hm00d"><img src="https://avatars1.githubusercontent.com/u/42179593?v=4" width="100px;" alt="f.m3hm00d"/><br /><sub><b>f.m3hm00d</b></sub></a><br /><a href="https://github.com/solokeys/solo/commits?author=m3hm00d" title="Documentation">📖</a></td>
|
||||||
<td align="center"><a href="http://blogs.gnome.org/hughsie/"><img src="https://avatars0.githubusercontent.com/u/151380?v=4" width="100px;" alt="Richard Hughes"/><br /><sub><b>Richard Hughes</b></sub></a><br /><a href="#ideas-hughsie" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/solokeys/solo/commits?author=hughsie" title="Code">💻</a> <a href="#infra-hughsie" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#tool-hughsie" title="Tools">🔧</a></td>
|
<td align="center"><a href="http://blogs.gnome.org/hughsie/"><img src="https://avatars0.githubusercontent.com/u/151380?v=4" width="100px;" alt="Richard Hughes"/><br /><sub><b>Richard Hughes</b></sub></a><br /><a href="#ideas-hughsie" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/solokeys/solo/commits?author=hughsie" title="Code">💻</a> <a href="#infra-hughsie" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#tool-hughsie" title="Tools">🔧</a></td>
|
||||||
<td align="center"><a href="http://www.schulz.dk"><img src="https://avatars1.githubusercontent.com/u/1150049?v=4" width="100px;" alt="Kim Schulz"/><br /><sub><b>Kim Schulz</b></sub></a><br /><a href="#business-kimusan" title="Business development">💼</a> <a href="#ideas-kimusan" title="Ideas, Planning, & Feedback">🤔</a></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
@ -168,7 +167,7 @@ You can buy Solo, Solo Tap, and Solo for Hackers at [solokeys.com](https://solok
|
|||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
[](https://github.com/solokeys/solo/blob/master/LICENSE)
|
[](https://github.com/solokeys/solo/blob/master/LICENSE)
|
||||||
[](#contributors)
|
[](#contributors)
|
||||||
[](https://travis-ci.com/solokeys/solo)
|
[](https://travis-ci.com/solokeys/solo)
|
||||||
[](https://discourse.solokeys.com)
|
[](https://discourse.solokeys.com)
|
||||||
[](https://keybase.io/team/solokeys.public)
|
[](https://keybase.io/team/solokeys.public)
|
||||||
|
|||||||
@ -42,10 +42,6 @@ extern int apdu_decode(uint8_t *data, size_t len, APDU_STRUCT *apdu);
|
|||||||
#define APDU_FIDO_U2F_AUTHENTICATE 0x02
|
#define APDU_FIDO_U2F_AUTHENTICATE 0x02
|
||||||
#define APDU_FIDO_U2F_VERSION 0x03
|
#define APDU_FIDO_U2F_VERSION 0x03
|
||||||
#define APDU_FIDO_NFCCTAP_MSG 0x10
|
#define APDU_FIDO_NFCCTAP_MSG 0x10
|
||||||
#define APDU_FIDO_U2F_VENDOR_FIRST 0xc0 // First vendor defined command
|
|
||||||
#define APDU_FIDO_U2F_VENDOR_LAST 0xff // Last vendor defined command
|
|
||||||
#define APDU_SOLO_RESET 0xee
|
|
||||||
|
|
||||||
#define APDU_INS_SELECT 0xA4
|
#define APDU_INS_SELECT 0xA4
|
||||||
#define APDU_INS_READ_BINARY 0xB0
|
#define APDU_INS_READ_BINARY 0xB0
|
||||||
#define APDU_GET_RESPONSE 0xC0
|
#define APDU_GET_RESPONSE 0xC0
|
||||||
|
|||||||
43
fido2/ctap.c
43
fido2/ctap.c
@ -437,19 +437,7 @@ static unsigned int get_credential_id_size(CTAP_credentialDescriptor * cred)
|
|||||||
static int ctap2_user_presence_test()
|
static int ctap2_user_presence_test()
|
||||||
{
|
{
|
||||||
device_set_status(CTAPHID_STATUS_UPNEEDED);
|
device_set_status(CTAPHID_STATUS_UPNEEDED);
|
||||||
int ret = ctap_user_presence_test(CTAP2_UP_DELAY_MS);
|
return ctap_user_presence_test(CTAP2_UP_DELAY_MS);
|
||||||
if ( ret > 0 )
|
|
||||||
{
|
|
||||||
return CTAP1_ERR_SUCCESS;
|
|
||||||
}
|
|
||||||
else if (ret < 0)
|
|
||||||
{
|
|
||||||
return CTAP2_ERR_KEEPALIVE_CANCEL;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return CTAP2_ERR_ACTION_TIMEOUT;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * auth_data_buf, uint32_t * len, CTAP_credInfo * credInfo)
|
static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * auth_data_buf, uint32_t * len, CTAP_credInfo * credInfo)
|
||||||
@ -482,11 +470,19 @@ static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * au
|
|||||||
int but;
|
int but;
|
||||||
|
|
||||||
but = ctap2_user_presence_test(CTAP2_UP_DELAY_MS);
|
but = ctap2_user_presence_test(CTAP2_UP_DELAY_MS);
|
||||||
check_retr(but);
|
|
||||||
|
if (!but)
|
||||||
|
{
|
||||||
|
return CTAP2_ERR_OPERATION_DENIED;
|
||||||
|
}
|
||||||
|
else if (but < 0) // Cancel
|
||||||
|
{
|
||||||
|
return CTAP2_ERR_KEEPALIVE_CANCEL;
|
||||||
|
}
|
||||||
|
|
||||||
device_set_status(CTAPHID_STATUS_PROCESSING);
|
device_set_status(CTAPHID_STATUS_PROCESSING);
|
||||||
|
|
||||||
authData->head.flags = (1 << 0); // User presence
|
authData->head.flags = (but << 0);
|
||||||
authData->head.flags |= (ctap_is_pin_set() << 2);
|
authData->head.flags |= (ctap_is_pin_set() << 2);
|
||||||
|
|
||||||
|
|
||||||
@ -711,7 +707,10 @@ uint8_t ctap_make_credential(CborEncoder * encoder, uint8_t * request, int lengt
|
|||||||
}
|
}
|
||||||
if (MC.pinAuthEmpty)
|
if (MC.pinAuthEmpty)
|
||||||
{
|
{
|
||||||
check_retr( ctap2_user_presence_test(CTAP2_UP_DELAY_MS) );
|
if (!ctap2_user_presence_test(CTAP2_UP_DELAY_MS))
|
||||||
|
{
|
||||||
|
return CTAP2_ERR_OPERATION_DENIED;
|
||||||
|
}
|
||||||
return ctap_is_pin_set() == 1 ? CTAP2_ERR_PIN_AUTH_INVALID : CTAP2_ERR_PIN_NOT_SET;
|
return ctap_is_pin_set() == 1 ? CTAP2_ERR_PIN_AUTH_INVALID : CTAP2_ERR_PIN_NOT_SET;
|
||||||
}
|
}
|
||||||
if ((MC.paramsParsed & MC_requiredMask) != MC_requiredMask)
|
if ((MC.paramsParsed & MC_requiredMask) != MC_requiredMask)
|
||||||
@ -1144,7 +1143,10 @@ uint8_t ctap_get_assertion(CborEncoder * encoder, uint8_t * request, int length)
|
|||||||
|
|
||||||
if (GA.pinAuthEmpty)
|
if (GA.pinAuthEmpty)
|
||||||
{
|
{
|
||||||
check_retr( ctap2_user_presence_test(CTAP2_UP_DELAY_MS) );
|
if (!ctap2_user_presence_test(CTAP2_UP_DELAY_MS))
|
||||||
|
{
|
||||||
|
return CTAP2_ERR_OPERATION_DENIED;
|
||||||
|
}
|
||||||
return ctap_is_pin_set() == 1 ? CTAP2_ERR_PIN_AUTH_INVALID : CTAP2_ERR_PIN_NOT_SET;
|
return ctap_is_pin_set() == 1 ? CTAP2_ERR_PIN_AUTH_INVALID : CTAP2_ERR_PIN_NOT_SET;
|
||||||
}
|
}
|
||||||
if (GA.pinAuthPresent)
|
if (GA.pinAuthPresent)
|
||||||
@ -1654,11 +1656,14 @@ uint8_t ctap_request(uint8_t * pkt_raw, int length, CTAP_RESPONSE * resp)
|
|||||||
break;
|
break;
|
||||||
case CTAP_RESET:
|
case CTAP_RESET:
|
||||||
printf1(TAG_CTAP,"CTAP_RESET\n");
|
printf1(TAG_CTAP,"CTAP_RESET\n");
|
||||||
status = ctap2_user_presence_test(CTAP2_UP_DELAY_MS);
|
if (ctap2_user_presence_test(CTAP2_UP_DELAY_MS))
|
||||||
if (status == CTAP1_ERR_SUCCESS)
|
|
||||||
{
|
{
|
||||||
ctap_reset();
|
ctap_reset();
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
status = CTAP2_ERR_OPERATION_DENIED;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case GET_NEXT_ASSERTION:
|
case GET_NEXT_ASSERTION:
|
||||||
printf1(TAG_CTAP,"CTAP_NEXT_ASSERTION\n");
|
printf1(TAG_CTAP,"CTAP_NEXT_ASSERTION\n");
|
||||||
|
|||||||
@ -131,7 +131,7 @@
|
|||||||
#define PIN_LOCKOUT_ATTEMPTS 8 // Number of attempts total
|
#define PIN_LOCKOUT_ATTEMPTS 8 // Number of attempts total
|
||||||
#define PIN_BOOT_ATTEMPTS 3 // number of attempts per boot
|
#define PIN_BOOT_ATTEMPTS 3 // number of attempts per boot
|
||||||
|
|
||||||
#define CTAP2_UP_DELAY_MS 29000
|
#define CTAP2_UP_DELAY_MS 5000
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
|||||||
@ -49,7 +49,6 @@
|
|||||||
#define CTAP2_ERR_PIN_POLICY_VIOLATION 0x37
|
#define CTAP2_ERR_PIN_POLICY_VIOLATION 0x37
|
||||||
#define CTAP2_ERR_PIN_TOKEN_EXPIRED 0x38
|
#define CTAP2_ERR_PIN_TOKEN_EXPIRED 0x38
|
||||||
#define CTAP2_ERR_REQUEST_TOO_LARGE 0x39
|
#define CTAP2_ERR_REQUEST_TOO_LARGE 0x39
|
||||||
#define CTAP2_ERR_ACTION_TIMEOUT 0x3A
|
|
||||||
#define CTAP1_ERR_OTHER 0x7F
|
#define CTAP1_ERR_OTHER 0x7F
|
||||||
#define CTAP2_ERR_SPEC_LAST 0xDF
|
#define CTAP2_ERR_SPEC_LAST 0xDF
|
||||||
#define CTAP2_ERR_EXTENSION_FIRST 0xE0
|
#define CTAP2_ERR_EXTENSION_FIRST 0xE0
|
||||||
|
|||||||
@ -30,7 +30,6 @@ void main_loop_delay();
|
|||||||
|
|
||||||
void heartbeat();
|
void heartbeat();
|
||||||
|
|
||||||
void device_reboot();
|
|
||||||
|
|
||||||
void authenticator_read_state(AuthenticatorState * );
|
void authenticator_read_state(AuthenticatorState * );
|
||||||
|
|
||||||
|
|||||||
@ -50,7 +50,6 @@ struct logtag tagtable[] = {
|
|||||||
{TAG_EXT,"[1;37mEXT[0m"},
|
{TAG_EXT,"[1;37mEXT[0m"},
|
||||||
{TAG_NFC,"[1;38mNFC[0m"},
|
{TAG_NFC,"[1;38mNFC[0m"},
|
||||||
{TAG_NFC_APDU, "NAPDU"},
|
{TAG_NFC_APDU, "NAPDU"},
|
||||||
{TAG_CCID, "CCID"},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -44,7 +44,6 @@ typedef enum
|
|||||||
TAG_EXT = (1 << 18),
|
TAG_EXT = (1 << 18),
|
||||||
TAG_NFC = (1 << 19),
|
TAG_NFC = (1 << 19),
|
||||||
TAG_NFC_APDU = (1 << 20),
|
TAG_NFC_APDU = (1 << 20),
|
||||||
TAG_CCID = (1 << 21),
|
|
||||||
|
|
||||||
TAG_NO_TAG = (1UL << 30),
|
TAG_NO_TAG = (1UL << 30),
|
||||||
TAG_FILENO = (1UL << 31)
|
TAG_FILENO = (1UL << 31)
|
||||||
|
|||||||
@ -46,7 +46,6 @@ int main(int argc, char *argv[])
|
|||||||
TAG_GREEN|
|
TAG_GREEN|
|
||||||
TAG_RED|
|
TAG_RED|
|
||||||
TAG_EXT|
|
TAG_EXT|
|
||||||
TAG_CCID|
|
|
||||||
TAG_ERR
|
TAG_ERR
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -43,11 +43,7 @@ void device_set_status(uint32_t status)
|
|||||||
__device_status = status;
|
__device_status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
void device_reboot()
|
|
||||||
{
|
|
||||||
printf1(TAG_RED, "REBOOT command recieved!\r\n");
|
|
||||||
exit(100);
|
|
||||||
}
|
|
||||||
|
|
||||||
int udp_server()
|
int udp_server()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -10,8 +10,7 @@ DRIVER_LIBS := lib/stm32l4xx_hal_pcd.c lib/stm32l4xx_hal_pcd_ex.c lib/stm32l4xx_
|
|||||||
|
|
||||||
USB_LIB := lib/usbd/usbd_cdc.c lib/usbd/usbd_cdc_if.c lib/usbd/usbd_composite.c \
|
USB_LIB := lib/usbd/usbd_cdc.c lib/usbd/usbd_cdc_if.c lib/usbd/usbd_composite.c \
|
||||||
lib/usbd/usbd_conf.c lib/usbd/usbd_core.c lib/usbd/usbd_ioreq.c \
|
lib/usbd/usbd_conf.c lib/usbd/usbd_core.c lib/usbd/usbd_ioreq.c \
|
||||||
lib/usbd/usbd_ctlreq.c lib/usbd/usbd_desc.c lib/usbd/usbd_hid.c \
|
lib/usbd/usbd_ctlreq.c lib/usbd/usbd_desc.c lib/usbd/usbd_hid.c
|
||||||
lib/usbd/usbd_ccid.c
|
|
||||||
|
|
||||||
VERSION:=$(shell git describe --abbrev=0 )
|
VERSION:=$(shell git describe --abbrev=0 )
|
||||||
VERSION_FULL:=$(shell git describe)
|
VERSION_FULL:=$(shell git describe)
|
||||||
|
|||||||
@ -1,319 +0,0 @@
|
|||||||
#include <stdint.h>
|
|
||||||
#include "usbd_ccid.h"
|
|
||||||
#include "usbd_ctlreq.h"
|
|
||||||
#include "usbd_conf.h"
|
|
||||||
#include "usbd_core.h"
|
|
||||||
|
|
||||||
#include "log.h"
|
|
||||||
|
|
||||||
static uint8_t USBD_CCID_Init (USBD_HandleTypeDef *pdev,
|
|
||||||
uint8_t cfgidx);
|
|
||||||
|
|
||||||
static uint8_t USBD_CCID_DeInit (USBD_HandleTypeDef *pdev,
|
|
||||||
uint8_t cfgidx);
|
|
||||||
|
|
||||||
static uint8_t USBD_CCID_Setup (USBD_HandleTypeDef *pdev,
|
|
||||||
USBD_SetupReqTypedef *req);
|
|
||||||
|
|
||||||
static uint8_t USBD_CCID_DataIn (USBD_HandleTypeDef *pdev,
|
|
||||||
uint8_t epnum);
|
|
||||||
|
|
||||||
static uint8_t USBD_CCID_DataOut (USBD_HandleTypeDef *pdev,
|
|
||||||
uint8_t epnum);
|
|
||||||
|
|
||||||
static uint8_t USBD_CCID_EP0_RxReady (USBD_HandleTypeDef *pdev);
|
|
||||||
|
|
||||||
|
|
||||||
USBD_ClassTypeDef USBD_CCID =
|
|
||||||
{
|
|
||||||
USBD_CCID_Init,
|
|
||||||
USBD_CCID_DeInit,
|
|
||||||
USBD_CCID_Setup,
|
|
||||||
NULL, /* EP0_TxSent, */
|
|
||||||
USBD_CCID_EP0_RxReady,
|
|
||||||
USBD_CCID_DataIn,
|
|
||||||
USBD_CCID_DataOut,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
static uint8_t ccidmsg_buf[CCID_DATA_PACKET_SIZE];
|
|
||||||
|
|
||||||
static uint8_t USBD_CCID_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
|
|
||||||
{
|
|
||||||
uint8_t ret = 0U;
|
|
||||||
USBD_CCID_HandleTypeDef *hcdc;
|
|
||||||
|
|
||||||
//Y
|
|
||||||
USBD_LL_OpenEP(pdev, CCID_IN_EP, USBD_EP_TYPE_BULK,
|
|
||||||
CCID_DATA_PACKET_SIZE);
|
|
||||||
|
|
||||||
USBD_LL_OpenEP(pdev, CCID_OUT_EP, USBD_EP_TYPE_BULK,
|
|
||||||
CCID_DATA_PACKET_SIZE);
|
|
||||||
|
|
||||||
pdev->ep_in[CCID_IN_EP & 0xFU].is_used = 1U;
|
|
||||||
pdev->ep_out[CCID_OUT_EP & 0xFU].is_used = 1U;
|
|
||||||
|
|
||||||
|
|
||||||
USBD_LL_OpenEP(pdev, CCID_CMD_EP, USBD_EP_TYPE_INTR, CCID_DATA_PACKET_SIZE);
|
|
||||||
pdev->ep_in[CCID_CMD_EP & 0xFU].is_used = 1U;
|
|
||||||
|
|
||||||
// dump_pma_header("ccid.c");
|
|
||||||
|
|
||||||
static USBD_CCID_HandleTypeDef mem;
|
|
||||||
pdev->pClassData = &mem;
|
|
||||||
|
|
||||||
hcdc = (USBD_CCID_HandleTypeDef*) pdev->pClassData;
|
|
||||||
|
|
||||||
// init transfer states
|
|
||||||
hcdc->TxState = 0U;
|
|
||||||
hcdc->RxState = 0U;
|
|
||||||
|
|
||||||
USBD_LL_PrepareReceive(&Solo_USBD_Device, CCID_OUT_EP, ccidmsg_buf,
|
|
||||||
CCID_DATA_PACKET_SIZE);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static uint8_t USBD_CCID_DeInit (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
|
|
||||||
{
|
|
||||||
uint8_t ret = 0U;
|
|
||||||
//N
|
|
||||||
|
|
||||||
USBD_LL_CloseEP(pdev, CCID_IN_EP);
|
|
||||||
pdev->ep_in[CCID_IN_EP & 0xFU].is_used = 0U;
|
|
||||||
|
|
||||||
USBD_LL_CloseEP(pdev, CCID_OUT_EP);
|
|
||||||
pdev->ep_out[CCID_OUT_EP & 0xFU].is_used = 0U;
|
|
||||||
|
|
||||||
USBD_LL_CloseEP(pdev, CCID_CMD_EP);
|
|
||||||
pdev->ep_in[CCID_CMD_EP & 0xFU].is_used = 0U;
|
|
||||||
|
|
||||||
/* DeInit physical Interface components */
|
|
||||||
if(pdev->pClassData != NULL)
|
|
||||||
{
|
|
||||||
pdev->pClassData = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief USBD_CDC_Setup
|
|
||||||
* Handle the CDC specific requests
|
|
||||||
* @param pdev: instance
|
|
||||||
* @param req: usb requests
|
|
||||||
* @retval status
|
|
||||||
*/
|
|
||||||
static uint8_t USBD_CCID_Setup (USBD_HandleTypeDef *pdev,
|
|
||||||
USBD_SetupReqTypedef *req)
|
|
||||||
{
|
|
||||||
USBD_CCID_HandleTypeDef *hcdc = (USBD_CCID_HandleTypeDef*) pdev->pClassData;
|
|
||||||
uint8_t ifalt = 0U;
|
|
||||||
uint16_t status_info = 0U;
|
|
||||||
uint8_t ret = USBD_OK;
|
|
||||||
//N
|
|
||||||
|
|
||||||
switch (req->bmRequest & USB_REQ_TYPE_MASK)
|
|
||||||
{
|
|
||||||
case USB_REQ_TYPE_CLASS :
|
|
||||||
if (req->wLength)
|
|
||||||
{
|
|
||||||
if (req->bmRequest & 0x80U)
|
|
||||||
{
|
|
||||||
USBD_CtlSendData (pdev, (uint8_t *)(void *)hcdc->data, req->wLength);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
hcdc->CmdOpCode = req->bRequest;
|
|
||||||
hcdc->CmdLength = (uint8_t)req->wLength;
|
|
||||||
|
|
||||||
USBD_CtlPrepareRx (pdev, (uint8_t *)(void *)hcdc->data, req->wLength);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case USB_REQ_TYPE_STANDARD:
|
|
||||||
switch (req->bRequest)
|
|
||||||
{
|
|
||||||
case USB_REQ_GET_STATUS:
|
|
||||||
if (pdev->dev_state == USBD_STATE_CONFIGURED)
|
|
||||||
{
|
|
||||||
USBD_CtlSendData (pdev, (uint8_t *)(void *)&status_info, 2U);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
USBD_CtlError (pdev, req);
|
|
||||||
ret = USBD_FAIL;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case USB_REQ_GET_INTERFACE:
|
|
||||||
if (pdev->dev_state == USBD_STATE_CONFIGURED)
|
|
||||||
{
|
|
||||||
USBD_CtlSendData (pdev, &ifalt, 1U);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
USBD_CtlError (pdev, req);
|
|
||||||
ret = USBD_FAIL;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case USB_REQ_SET_INTERFACE:
|
|
||||||
if (pdev->dev_state != USBD_STATE_CONFIGURED)
|
|
||||||
{
|
|
||||||
USBD_CtlError (pdev, req);
|
|
||||||
ret = USBD_FAIL;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case USB_REQ_GET_DESCRIPTOR:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
USBD_CtlError (pdev, req);
|
|
||||||
ret = USBD_FAIL;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
USBD_CtlError (pdev, req);
|
|
||||||
ret = USBD_FAIL;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief USBD_CDC_DataIn
|
|
||||||
* Data sent on non-control IN endpoint
|
|
||||||
* @param pdev: device instance
|
|
||||||
* @param epnum: endpoint number
|
|
||||||
* @retval status
|
|
||||||
*/
|
|
||||||
static uint8_t USBD_CCID_DataOut (USBD_HandleTypeDef *pdev, uint8_t epnum)
|
|
||||||
{
|
|
||||||
return USBD_OK;
|
|
||||||
}
|
|
||||||
static uint8_t USBD_CCID_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum)
|
|
||||||
{
|
|
||||||
USBD_CCID_HandleTypeDef *hcdc = (USBD_CCID_HandleTypeDef*)pdev->pClassData;
|
|
||||||
|
|
||||||
hcdc->TxState = 0U;
|
|
||||||
return USBD_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t USBD_CCID_TransmitPacket(uint8_t * msg, int len)
|
|
||||||
{
|
|
||||||
/* Update the packet total length */
|
|
||||||
Solo_USBD_Device.ep_in[CCID_IN_EP & 0xFU].total_length = len;
|
|
||||||
|
|
||||||
while (PCD_GET_EP_TX_STATUS(USB, CCID_IN_EP & 0x0f) == USB_EP_TX_VALID)
|
|
||||||
;
|
|
||||||
/* Transmit next packet */
|
|
||||||
USBD_LL_Transmit(&Solo_USBD_Device, CCID_IN_EP, msg,
|
|
||||||
len);
|
|
||||||
|
|
||||||
printf1(TAG_CCID,"<< ");
|
|
||||||
dump_hex1(TAG_CCID, msg, len);
|
|
||||||
|
|
||||||
return USBD_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void ccid_send_status(CCID_HEADER * c, uint8_t status)
|
|
||||||
{
|
|
||||||
uint8_t msg[CCID_HEADER_SIZE];
|
|
||||||
memset(msg,0,sizeof(msg));
|
|
||||||
|
|
||||||
msg[0] = CCID_SLOT_STATUS_RES;
|
|
||||||
msg[6] = c->seq;
|
|
||||||
msg[7] = status;
|
|
||||||
|
|
||||||
USBD_CCID_TransmitPacket(msg, sizeof(msg));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void ccid_send_data_block(CCID_HEADER * c, uint8_t status)
|
|
||||||
{
|
|
||||||
uint8_t msg[CCID_HEADER_SIZE];
|
|
||||||
memset(msg,0,sizeof(msg));
|
|
||||||
|
|
||||||
msg[0] = CCID_DATA_BLOCK_RES;
|
|
||||||
msg[6] = c->seq;
|
|
||||||
msg[7] = status;
|
|
||||||
|
|
||||||
USBD_CCID_TransmitPacket(msg, sizeof(msg));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void handle_ccid(uint8_t * msg, int len)
|
|
||||||
{
|
|
||||||
CCID_HEADER * h = (CCID_HEADER *) msg;
|
|
||||||
switch(h->type)
|
|
||||||
{
|
|
||||||
case CCID_SLOT_STATUS:
|
|
||||||
ccid_send_status(h, CCID_STATUS_ON);
|
|
||||||
break;
|
|
||||||
case CCID_POWER_ON:
|
|
||||||
ccid_send_data_block(h, CCID_STATUS_ON);
|
|
||||||
break;
|
|
||||||
case CCID_POWER_OFF:
|
|
||||||
ccid_send_status(h, CCID_STATUS_OFF);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
ccid_send_status(h, CCID_STATUS_ON);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief USBD_CDC_DataOut
|
|
||||||
* Data received on non-control Out endpoint
|
|
||||||
* @param pdev: device instance
|
|
||||||
* @param epnum: endpoint number
|
|
||||||
* @retval status
|
|
||||||
*/
|
|
||||||
uint8_t usb_ccid_recieve_callback(USBD_HandleTypeDef *pdev, uint8_t epnum)
|
|
||||||
{
|
|
||||||
|
|
||||||
USBD_CCID_HandleTypeDef *hcdc = (USBD_CCID_HandleTypeDef*) pdev->pClassData;
|
|
||||||
|
|
||||||
/* Get the received data length */
|
|
||||||
hcdc->RxLength = USBD_LL_GetRxDataSize (pdev, epnum);
|
|
||||||
|
|
||||||
printf1(TAG_CCID, ">> ");
|
|
||||||
dump_hex1(TAG_CCID, ccidmsg_buf, hcdc->RxLength);
|
|
||||||
|
|
||||||
handle_ccid(ccidmsg_buf, hcdc->RxLength);
|
|
||||||
|
|
||||||
USBD_LL_PrepareReceive(&Solo_USBD_Device, CCID_OUT_EP, ccidmsg_buf,
|
|
||||||
CCID_DATA_PACKET_SIZE);
|
|
||||||
|
|
||||||
return USBD_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief USBD_CDC_EP0_RxReady
|
|
||||||
* Handle EP0 Rx Ready event
|
|
||||||
* @param pdev: device instance
|
|
||||||
* @retval status
|
|
||||||
*/
|
|
||||||
static uint8_t USBD_CCID_EP0_RxReady (USBD_HandleTypeDef *pdev)
|
|
||||||
{
|
|
||||||
return USBD_OK;
|
|
||||||
}
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
#ifndef _USBD_H_
|
|
||||||
#define _USBD_H_
|
|
||||||
|
|
||||||
#include "usbd_ioreq.h"
|
|
||||||
|
|
||||||
#define CCID_HEADER_SIZE 10
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
uint8_t type;
|
|
||||||
uint32_t len;
|
|
||||||
uint8_t slot;
|
|
||||||
uint8_t seq;
|
|
||||||
uint8_t rsvd;
|
|
||||||
uint16_t param;
|
|
||||||
} __attribute__((packed)) CCID_HEADER;
|
|
||||||
|
|
||||||
#define CCID_IN_EP 0x86U /* EP1 for data IN */
|
|
||||||
#define CCID_OUT_EP 0x04U /* EP1 for data OUT */
|
|
||||||
#define CCID_CMD_EP 0x85U /* EP2 for CDC commands */
|
|
||||||
|
|
||||||
#define CCID_DATA_PACKET_SIZE 64
|
|
||||||
|
|
||||||
#define CCID_SET_PARAMS 0x61
|
|
||||||
#define CCID_POWER_ON 0x62
|
|
||||||
#define CCID_POWER_OFF 0x63
|
|
||||||
#define CCID_SLOT_STATUS 0x65
|
|
||||||
#define CCID_SECURE 0x69
|
|
||||||
#define CCID_GET_PARAMS 0x6C
|
|
||||||
#define CCID_RESET_PARAMS 0x6D
|
|
||||||
#define CCID_XFR_BLOCK 0x6F
|
|
||||||
|
|
||||||
#define CCID_STATUS_ON 0x00
|
|
||||||
#define CCID_STATUS_OFF 0x02
|
|
||||||
|
|
||||||
#define CCID_DATA_BLOCK_RES 0x80
|
|
||||||
#define CCID_SLOT_STATUS_RES 0x81
|
|
||||||
#define CCID_PARAMS_RES 0x82
|
|
||||||
|
|
||||||
extern USBD_ClassTypeDef USBD_CCID;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
uint32_t data[CCID_DATA_PACKET_SIZE / 4U];
|
|
||||||
uint8_t CmdOpCode;
|
|
||||||
uint8_t CmdLength;
|
|
||||||
uint8_t *RxBuffer;
|
|
||||||
uint8_t *TxBuffer;
|
|
||||||
uint32_t RxLength;
|
|
||||||
uint32_t TxLength;
|
|
||||||
|
|
||||||
__IO uint32_t TxState;
|
|
||||||
__IO uint32_t RxState;
|
|
||||||
}
|
|
||||||
USBD_CCID_HandleTypeDef;
|
|
||||||
|
|
||||||
uint8_t usb_ccid_recieve_callback(USBD_HandleTypeDef *pdev, uint8_t epnum);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -195,9 +195,302 @@ USBD_ClassTypeDef USBD_CDC =
|
|||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
|
// USBD_CDC_GetHSCfgDesc,
|
||||||
|
// USBD_CDC_GetFSCfgDesc,
|
||||||
|
// USBD_CDC_GetOtherSpeedCfgDesc,
|
||||||
|
// USBD_CDC_GetDeviceQualifierDescriptor,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* USB CDC device Configuration Descriptor */
|
||||||
|
__ALIGN_BEGIN uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
|
||||||
|
{
|
||||||
|
/*Configuration Descriptor*/
|
||||||
|
0x09, /* bLength: Configuration Descriptor size */
|
||||||
|
USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
|
||||||
|
USB_CDC_CONFIG_DESC_SIZ, /* wTotalLength:no of returned bytes */
|
||||||
|
0x00,
|
||||||
|
0x02, /* bNumInterfaces: 2 interface */
|
||||||
|
0x01, /* bConfigurationValue: Configuration value */
|
||||||
|
0x00, /* iConfiguration: Index of string descriptor describing the configuration */
|
||||||
|
0xC0, /* bmAttributes: self powered */
|
||||||
|
0x32, /* MaxPower 0 mA */
|
||||||
|
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/*Interface Descriptor */
|
||||||
|
0x09, /* bLength: Interface Descriptor size */
|
||||||
|
USB_DESC_TYPE_INTERFACE, /* bDescriptorType: Interface */
|
||||||
|
/* Interface descriptor type */
|
||||||
|
0x00, /* bInterfaceNumber: Number of Interface */
|
||||||
|
0x00, /* bAlternateSetting: Alternate setting */
|
||||||
|
0x01, /* bNumEndpoints: One endpoints used */
|
||||||
|
0x02, /* bInterfaceClass: Communication Interface Class */
|
||||||
|
0x02, /* bInterfaceSubClass: Abstract Control Model */
|
||||||
|
0x01, /* bInterfaceProtocol: Common AT commands */
|
||||||
|
0x00, /* iInterface: */
|
||||||
|
|
||||||
|
/*Header Functional Descriptor*/
|
||||||
|
0x05, /* bLength: Endpoint Descriptor size */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x00, /* bDescriptorSubtype: Header Func Desc */
|
||||||
|
0x10, /* bcdCDC: spec release number */
|
||||||
|
0x01,
|
||||||
|
|
||||||
|
/*Call Management Functional Descriptor*/
|
||||||
|
0x05, /* bFunctionLength */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x01, /* bDescriptorSubtype: Call Management Func Desc */
|
||||||
|
0x00, /* bmCapabilities: D0+D1 */
|
||||||
|
0x01, /* bDataInterface: 1 */
|
||||||
|
|
||||||
|
/*ACM Functional Descriptor*/
|
||||||
|
0x04, /* bFunctionLength */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x02, /* bDescriptorSubtype: Abstract Control Management desc */
|
||||||
|
0x02, /* bmCapabilities */
|
||||||
|
|
||||||
|
/*Union Functional Descriptor*/
|
||||||
|
0x05, /* bFunctionLength */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x06, /* bDescriptorSubtype: Union func desc */
|
||||||
|
0x00, /* bMasterInterface: Communication class interface */
|
||||||
|
0x01, /* bSlaveInterface0: Data Class Interface */
|
||||||
|
|
||||||
|
/*Endpoint 2 Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: Endpoint */
|
||||||
|
CDC_CMD_EP, /* bEndpointAddress */
|
||||||
|
0x03, /* bmAttributes: Interrupt */
|
||||||
|
LOBYTE(CDC_CMD_PACKET_SIZE), /* wMaxPacketSize: */
|
||||||
|
HIBYTE(CDC_CMD_PACKET_SIZE),
|
||||||
|
CDC_HS_BINTERVAL, /* bInterval: */
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/*Data class interface descriptor*/
|
||||||
|
0x09, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_INTERFACE, /* bDescriptorType: */
|
||||||
|
0x01, /* bInterfaceNumber: Number of Interface */
|
||||||
|
0x00, /* bAlternateSetting: Alternate setting */
|
||||||
|
0x02, /* bNumEndpoints: Two endpoints used */
|
||||||
|
0x0A, /* bInterfaceClass: CDC */
|
||||||
|
0x00, /* bInterfaceSubClass: */
|
||||||
|
0x00, /* bInterfaceProtocol: */
|
||||||
|
0x00, /* iInterface: */
|
||||||
|
|
||||||
|
/*Endpoint OUT Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: Endpoint */
|
||||||
|
CDC_OUT_EP, /* bEndpointAddress */
|
||||||
|
0x02, /* bmAttributes: Bulk */
|
||||||
|
LOBYTE(CDC_DATA_HS_MAX_PACKET_SIZE), /* wMaxPacketSize: */
|
||||||
|
HIBYTE(CDC_DATA_HS_MAX_PACKET_SIZE),
|
||||||
|
0x00, /* bInterval: ignore for Bulk transfer */
|
||||||
|
|
||||||
|
/*Endpoint IN Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: Endpoint */
|
||||||
|
CDC_IN_EP, /* bEndpointAddress */
|
||||||
|
0x02, /* bmAttributes: Bulk */
|
||||||
|
LOBYTE(CDC_DATA_HS_MAX_PACKET_SIZE), /* wMaxPacketSize: */
|
||||||
|
HIBYTE(CDC_DATA_HS_MAX_PACKET_SIZE),
|
||||||
|
0x00 /* bInterval: ignore for Bulk transfer */
|
||||||
|
} ;
|
||||||
|
|
||||||
|
|
||||||
|
/* USB CDC device Configuration Descriptor */
|
||||||
|
__ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
|
||||||
|
{
|
||||||
|
/*Configuration Descriptor*/
|
||||||
|
0x09, /* bLength: Configuration Descriptor size */
|
||||||
|
USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
|
||||||
|
USB_CDC_CONFIG_DESC_SIZ, /* wTotalLength:no of returned bytes */
|
||||||
|
0x00,
|
||||||
|
0x02, /* bNumInterfaces: 2 interface */
|
||||||
|
0x01, /* bConfigurationValue: Configuration value */
|
||||||
|
0x00, /* iConfiguration: Index of string descriptor describing the configuration */
|
||||||
|
0xC0, /* bmAttributes: self powered */
|
||||||
|
0x32, /* MaxPower 0 mA */
|
||||||
|
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/*Interface Descriptor */
|
||||||
|
0x09, /* bLength: Interface Descriptor size */
|
||||||
|
USB_DESC_TYPE_INTERFACE, /* bDescriptorType: Interface */
|
||||||
|
/* Interface descriptor type */
|
||||||
|
0x00, /* bInterfaceNumber: Number of Interface */
|
||||||
|
0x00, /* bAlternateSetting: Alternate setting */
|
||||||
|
0x01, /* bNumEndpoints: One endpoints used */
|
||||||
|
0x02, /* bInterfaceClass: Communication Interface Class */
|
||||||
|
0x02, /* bInterfaceSubClass: Abstract Control Model */
|
||||||
|
0x01, /* bInterfaceProtocol: Common AT commands */
|
||||||
|
0x00, /* iInterface: */
|
||||||
|
|
||||||
|
/*Header Functional Descriptor*/
|
||||||
|
0x05, /* bLength: Endpoint Descriptor size */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x00, /* bDescriptorSubtype: Header Func Desc */
|
||||||
|
0x10, /* bcdCDC: spec release number */
|
||||||
|
0x01,
|
||||||
|
|
||||||
|
/*Call Management Functional Descriptor*/
|
||||||
|
0x05, /* bFunctionLength */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x01, /* bDescriptorSubtype: Call Management Func Desc */
|
||||||
|
0x00, /* bmCapabilities: D0+D1 */
|
||||||
|
0x01, /* bDataInterface: 1 */
|
||||||
|
|
||||||
|
/*ACM Functional Descriptor*/
|
||||||
|
0x04, /* bFunctionLength */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x02, /* bDescriptorSubtype: Abstract Control Management desc */
|
||||||
|
0x02, /* bmCapabilities */
|
||||||
|
|
||||||
|
/*Union Functional Descriptor*/
|
||||||
|
0x05, /* bFunctionLength */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x06, /* bDescriptorSubtype: Union func desc */
|
||||||
|
0x00, /* bMasterInterface: Communication class interface */
|
||||||
|
0x01, /* bSlaveInterface0: Data Class Interface */
|
||||||
|
|
||||||
|
/*Endpoint 2 Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: Endpoint */
|
||||||
|
CDC_CMD_EP, /* bEndpointAddress */
|
||||||
|
0x03, /* bmAttributes: Interrupt */
|
||||||
|
LOBYTE(CDC_CMD_PACKET_SIZE), /* wMaxPacketSize: */
|
||||||
|
HIBYTE(CDC_CMD_PACKET_SIZE),
|
||||||
|
CDC_FS_BINTERVAL, /* bInterval: */
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/*Data class interface descriptor*/
|
||||||
|
0x09, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_INTERFACE, /* bDescriptorType: */
|
||||||
|
0x01, /* bInterfaceNumber: Number of Interface */
|
||||||
|
0x00, /* bAlternateSetting: Alternate setting */
|
||||||
|
0x02, /* bNumEndpoints: Two endpoints used */
|
||||||
|
0x0A, /* bInterfaceClass: CDC */
|
||||||
|
0x00, /* bInterfaceSubClass: */
|
||||||
|
0x00, /* bInterfaceProtocol: */
|
||||||
|
0x00, /* iInterface: */
|
||||||
|
|
||||||
|
/*Endpoint OUT Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: Endpoint */
|
||||||
|
CDC_OUT_EP, /* bEndpointAddress */
|
||||||
|
0x02, /* bmAttributes: Bulk */
|
||||||
|
LOBYTE(CDC_DATA_FS_MAX_PACKET_SIZE), /* wMaxPacketSize: */
|
||||||
|
HIBYTE(CDC_DATA_FS_MAX_PACKET_SIZE),
|
||||||
|
0x00, /* bInterval: ignore for Bulk transfer */
|
||||||
|
|
||||||
|
/*Endpoint IN Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: Endpoint */
|
||||||
|
CDC_IN_EP, /* bEndpointAddress */
|
||||||
|
0x02, /* bmAttributes: Bulk */
|
||||||
|
LOBYTE(CDC_DATA_FS_MAX_PACKET_SIZE), /* wMaxPacketSize: */
|
||||||
|
HIBYTE(CDC_DATA_FS_MAX_PACKET_SIZE),
|
||||||
|
0x00 /* bInterval: ignore for Bulk transfer */
|
||||||
|
} ;
|
||||||
|
|
||||||
|
__ALIGN_BEGIN uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
|
||||||
|
{
|
||||||
|
0x09, /* bLength: Configuation Descriptor size */
|
||||||
|
USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION,
|
||||||
|
USB_CDC_CONFIG_DESC_SIZ,
|
||||||
|
0x00,
|
||||||
|
0x02, /* bNumInterfaces: 2 interfaces */
|
||||||
|
0x01, /* bConfigurationValue: */
|
||||||
|
0x04, /* iConfiguration: */
|
||||||
|
0xC0, /* bmAttributes: */
|
||||||
|
0x32, /* MaxPower 100 mA */
|
||||||
|
|
||||||
|
/*Interface Descriptor */
|
||||||
|
0x09, /* bLength: Interface Descriptor size */
|
||||||
|
USB_DESC_TYPE_INTERFACE, /* bDescriptorType: Interface */
|
||||||
|
/* Interface descriptor type */
|
||||||
|
0x00, /* bInterfaceNumber: Number of Interface */
|
||||||
|
0x00, /* bAlternateSetting: Alternate setting */
|
||||||
|
0x01, /* bNumEndpoints: One endpoints used */
|
||||||
|
0x02, /* bInterfaceClass: Communication Interface Class */
|
||||||
|
0x02, /* bInterfaceSubClass: Abstract Control Model */
|
||||||
|
0x01, /* bInterfaceProtocol: Common AT commands */
|
||||||
|
0x00, /* iInterface: */
|
||||||
|
|
||||||
|
/*Header Functional Descriptor*/
|
||||||
|
0x05, /* bLength: Endpoint Descriptor size */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x00, /* bDescriptorSubtype: Header Func Desc */
|
||||||
|
0x10, /* bcdCDC: spec release number */
|
||||||
|
0x01,
|
||||||
|
|
||||||
|
/*Call Management Functional Descriptor*/
|
||||||
|
0x05, /* bFunctionLength */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x01, /* bDescriptorSubtype: Call Management Func Desc */
|
||||||
|
0x00, /* bmCapabilities: D0+D1 */
|
||||||
|
0x01, /* bDataInterface: 1 */
|
||||||
|
|
||||||
|
/*ACM Functional Descriptor*/
|
||||||
|
0x04, /* bFunctionLength */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x02, /* bDescriptorSubtype: Abstract Control Management desc */
|
||||||
|
0x02, /* bmCapabilities */
|
||||||
|
|
||||||
|
/*Union Functional Descriptor*/
|
||||||
|
0x05, /* bFunctionLength */
|
||||||
|
0x24, /* bDescriptorType: CS_INTERFACE */
|
||||||
|
0x06, /* bDescriptorSubtype: Union func desc */
|
||||||
|
0x00, /* bMasterInterface: Communication class interface */
|
||||||
|
0x01, /* bSlaveInterface0: Data Class Interface */
|
||||||
|
|
||||||
|
/*Endpoint 2 Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_ENDPOINT , /* bDescriptorType: Endpoint */
|
||||||
|
CDC_CMD_EP, /* bEndpointAddress */
|
||||||
|
0x03, /* bmAttributes: Interrupt */
|
||||||
|
LOBYTE(CDC_CMD_PACKET_SIZE), /* wMaxPacketSize: */
|
||||||
|
HIBYTE(CDC_CMD_PACKET_SIZE),
|
||||||
|
CDC_FS_BINTERVAL, /* bInterval: */
|
||||||
|
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/*Data class interface descriptor*/
|
||||||
|
0x09, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_INTERFACE, /* bDescriptorType: */
|
||||||
|
0x01, /* bInterfaceNumber: Number of Interface */
|
||||||
|
0x00, /* bAlternateSetting: Alternate setting */
|
||||||
|
0x02, /* bNumEndpoints: Two endpoints used */
|
||||||
|
0x0A, /* bInterfaceClass: CDC */
|
||||||
|
0x00, /* bInterfaceSubClass: */
|
||||||
|
0x00, /* bInterfaceProtocol: */
|
||||||
|
0x00, /* iInterface: */
|
||||||
|
|
||||||
|
/*Endpoint OUT Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: Endpoint */
|
||||||
|
CDC_OUT_EP, /* bEndpointAddress */
|
||||||
|
0x02, /* bmAttributes: Bulk */
|
||||||
|
0x40, /* wMaxPacketSize: */
|
||||||
|
0x00,
|
||||||
|
0x00, /* bInterval: ignore for Bulk transfer */
|
||||||
|
|
||||||
|
/*Endpoint IN Descriptor*/
|
||||||
|
0x07, /* bLength: Endpoint Descriptor size */
|
||||||
|
USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: Endpoint */
|
||||||
|
CDC_IN_EP, /* bEndpointAddress */
|
||||||
|
0x02, /* bmAttributes: Bulk */
|
||||||
|
0x40, /* wMaxPacketSize: */
|
||||||
|
0x00,
|
||||||
|
0x00 /* bInterval */
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @}
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** @defgroup USBD_CDC_Private_Functions
|
||||||
|
* @{
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief USBD_CDC_Init
|
* @brief USBD_CDC_Init
|
||||||
@ -489,7 +782,45 @@ static uint8_t USBD_CDC_EP0_RxReady (USBD_HandleTypeDef *pdev)
|
|||||||
return USBD_OK;
|
return USBD_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief USBD_CDC_GetFSCfgDesc
|
||||||
|
* Return configuration descriptor
|
||||||
|
* @param speed : current device speed
|
||||||
|
* @param length : pointer data length
|
||||||
|
* @retval pointer to descriptor buffer
|
||||||
|
*/
|
||||||
|
/*static uint8_t *USBD_CDC_GetFSCfgDesc (uint16_t *length)
|
||||||
|
{
|
||||||
|
*length = sizeof (USBD_CDC_CfgFSDesc);
|
||||||
|
return USBD_CDC_CfgFSDesc;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* @brief USBD_CDC_GetHSCfgDesc
|
||||||
|
* Return configuration descriptor
|
||||||
|
* @param speed : current device speed
|
||||||
|
* @param length : pointer data length
|
||||||
|
* @retval pointer to descriptor buffer
|
||||||
|
*/
|
||||||
|
/*static uint8_t *USBD_CDC_GetHSCfgDesc (uint16_t *length)
|
||||||
|
{
|
||||||
|
*length = sizeof (USBD_CDC_CfgHSDesc);
|
||||||
|
return USBD_CDC_CfgHSDesc;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* @brief USBD_CDC_GetCfgDesc
|
||||||
|
* Return configuration descriptor
|
||||||
|
* @param speed : current device speed
|
||||||
|
* @param length : pointer data length
|
||||||
|
* @retval pointer to descriptor buffer
|
||||||
|
*/
|
||||||
|
/*static uint8_t *USBD_CDC_GetOtherSpeedCfgDesc (uint16_t *length)
|
||||||
|
{
|
||||||
|
*length = sizeof (USBD_CDC_OtherSpeedCfgDesc);
|
||||||
|
return USBD_CDC_OtherSpeedCfgDesc;
|
||||||
|
}
|
||||||
|
*/
|
||||||
/**
|
/**
|
||||||
* @brief DeviceQualifierDescriptor
|
* @brief DeviceQualifierDescriptor
|
||||||
* return Device Qualifier descriptor
|
* return Device Qualifier descriptor
|
||||||
@ -608,10 +939,22 @@ uint8_t USBD_CDC_ReceivePacket(USBD_HandleTypeDef *pdev)
|
|||||||
/* Suspend or Resume USB Out process */
|
/* Suspend or Resume USB Out process */
|
||||||
if(pdev->pClassData != NULL)
|
if(pdev->pClassData != NULL)
|
||||||
{
|
{
|
||||||
|
if(pdev->dev_speed == USBD_SPEED_HIGH )
|
||||||
|
{
|
||||||
|
/* Prepare Out endpoint to receive next packet */
|
||||||
|
USBD_LL_PrepareReceive(pdev,
|
||||||
|
CDC_OUT_EP,
|
||||||
|
hcdc->RxBuffer,
|
||||||
|
CDC_DATA_HS_OUT_PACKET_SIZE);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* Prepare Out endpoint to receive next packet */
|
||||||
USBD_LL_PrepareReceive(pdev,
|
USBD_LL_PrepareReceive(pdev,
|
||||||
CDC_OUT_EP,
|
CDC_OUT_EP,
|
||||||
hcdc->RxBuffer,
|
hcdc->RxBuffer,
|
||||||
CDC_DATA_FS_OUT_PACKET_SIZE);
|
CDC_DATA_FS_OUT_PACKET_SIZE);
|
||||||
|
}
|
||||||
return USBD_OK;
|
return USBD_OK;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@ -2,9 +2,7 @@
|
|||||||
#include "usbd_desc.h"
|
#include "usbd_desc.h"
|
||||||
#include "usbd_hid.h"
|
#include "usbd_hid.h"
|
||||||
#include "usbd_cdc.h"
|
#include "usbd_cdc.h"
|
||||||
#include "usbd_ccid.h"
|
|
||||||
#include "usbd_ctlreq.h"
|
#include "usbd_ctlreq.h"
|
||||||
#include "app.h"
|
|
||||||
|
|
||||||
static uint8_t USBD_Composite_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx);
|
static uint8_t USBD_Composite_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx);
|
||||||
|
|
||||||
@ -28,33 +26,18 @@ static uint8_t *USBD_Composite_GetOtherSpeedCfgDesc (uint16_t *length);
|
|||||||
|
|
||||||
static uint8_t *USBD_Composite_GetDeviceQualifierDescriptor (uint16_t *length);
|
static uint8_t *USBD_Composite_GetDeviceQualifierDescriptor (uint16_t *length);
|
||||||
|
|
||||||
#ifdef ENABLE_CCID
|
#define NUM_CLASSES 2
|
||||||
#define CCID_SIZE 84
|
#define NUM_INTERFACES 3
|
||||||
#define CCID_NUM_INTERFACE 1
|
|
||||||
|
#if NUM_INTERFACES>1
|
||||||
|
#define COMPOSITE_CDC_HID_DESCRIPTOR_SIZE (90 + 8+9 + 4)
|
||||||
#else
|
#else
|
||||||
#define CCID_NUM_INTERFACE 0
|
#define COMPOSITE_CDC_HID_DESCRIPTOR_SIZE (41)
|
||||||
#define CCID_SIZE 0
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if DEBUG_LEVEL > 0
|
|
||||||
#define CDC_SIZE (49 + 8 + 9 + 4)
|
|
||||||
#define CDC_NUM_INTERFACE 2
|
|
||||||
#else
|
|
||||||
#define CDC_SIZE 0
|
|
||||||
#define CDC_NUM_INTERFACE 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define HID_SIZE 41
|
|
||||||
|
|
||||||
#define COMPOSITE_CDC_HID_DESCRIPTOR_SIZE (HID_SIZE + CDC_SIZE + CCID_SIZE)
|
|
||||||
#define NUM_INTERFACES (1 + CDC_NUM_INTERFACE + CCID_NUM_INTERFACE)
|
|
||||||
#define NUM_CLASSES 3
|
|
||||||
|
|
||||||
|
|
||||||
#define HID_INTF_NUM 0
|
#define HID_INTF_NUM 0
|
||||||
#define CDC_MASTER_INTF_NUM 1
|
#define CDC_MASTER_INTF_NUM 1
|
||||||
#define CDC_SLAVE_INTF_NUM 2
|
#define CDC_SLAVE_INTF_NUM 2
|
||||||
#define CCID_INTF_NUM 3
|
|
||||||
__ALIGN_BEGIN uint8_t COMPOSITE_CDC_HID_DESCRIPTOR[COMPOSITE_CDC_HID_DESCRIPTOR_SIZE] __ALIGN_END =
|
__ALIGN_BEGIN uint8_t COMPOSITE_CDC_HID_DESCRIPTOR[COMPOSITE_CDC_HID_DESCRIPTOR_SIZE] __ALIGN_END =
|
||||||
{
|
{
|
||||||
/*Configuration Descriptor*/
|
/*Configuration Descriptor*/
|
||||||
@ -111,7 +94,7 @@ __ALIGN_BEGIN uint8_t COMPOSITE_CDC_HID_DESCRIPTOR[COMPOSITE_CDC_HID_DESCRIPTOR_
|
|||||||
0x00,
|
0x00,
|
||||||
HID_BINTERVAL, /*bInterval: Polling Interval */
|
HID_BINTERVAL, /*bInterval: Polling Interval */
|
||||||
|
|
||||||
#if DEBUG_LEVEL > 0
|
#if NUM_INTERFACES > 1
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
/* CDC */
|
/* CDC */
|
||||||
@ -208,83 +191,6 @@ __ALIGN_BEGIN uint8_t COMPOSITE_CDC_HID_DESCRIPTOR[COMPOSITE_CDC_HID_DESCRIPTOR_
|
|||||||
0x09,
|
0x09,
|
||||||
0x04,
|
0x04,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ENABLE_CCID
|
|
||||||
|
|
||||||
/* CCID Interface Descriptor */
|
|
||||||
9, /* bLength: Interface Descriptor size */
|
|
||||||
USB_DESC_TYPE_INTERFACE, /* bDescriptorType: Interface */
|
|
||||||
CCID_INTF_NUM, /* bInterfaceNumber: CCID Interface */
|
|
||||||
0, /* Alternate setting for this interface */
|
|
||||||
3, /* bNumEndpoints: Bulk-IN, Bulk-OUT, Intr-IN */
|
|
||||||
0x0B, /* CCID class */
|
|
||||||
0x00, /* CCID subclass */
|
|
||||||
0x00, /* CCID protocol */
|
|
||||||
0, /* string index for interface */
|
|
||||||
|
|
||||||
/* ICC Descriptor */
|
|
||||||
54, /* bLength: */
|
|
||||||
0x21, /* bDescriptorType: USBDESCR_ICC */
|
|
||||||
0x10, 0x01, /* bcdCCID: revision 1.1 (of CCID) */
|
|
||||||
0, /* bMaxSlotIndex: */
|
|
||||||
1, /* bVoltageSupport: 5V-only */
|
|
||||||
0x02, 0, 0, 0, /* dwProtocols: T=1 */
|
|
||||||
0xa0, 0x0f, 0, 0, /* dwDefaultClock: 4000 */
|
|
||||||
0xa0, 0x0f, 0, 0, /* dwMaximumClock: 4000 */
|
|
||||||
0, /* bNumClockSupported: 0x00 */
|
|
||||||
0x80, 0x25, 0, 0, /* dwDataRate: 9600 */
|
|
||||||
0x80, 0x25, 0, 0, /* dwMaxDataRate: 9600 */
|
|
||||||
0, /* bNumDataRateSupported: 0x00 */
|
|
||||||
0xfe, 0, 0, 0, /* dwMaxIFSD: 254 */
|
|
||||||
0, 0, 0, 0, /* dwSynchProtocols: 0 */
|
|
||||||
0, 0, 0, 0, /* dwMechanical: 0 */
|
|
||||||
0x7a, 0x04, 0x02, 0x00, /* dwFeatures:
|
|
||||||
* Short and extended APDU level: 0x40000 ----
|
|
||||||
* Short APDU level : 0x20000 *
|
|
||||||
* (ICCD?) : 0x00800 ----
|
|
||||||
* Automatic IFSD : 0x00400 *
|
|
||||||
* NAD value other than 0x00 : 0x00200
|
|
||||||
* Can set ICC in clock stop : 0x00100
|
|
||||||
* Automatic PPS CUR : 0x00080
|
|
||||||
* Automatic PPS PROP : 0x00040 *
|
|
||||||
* Auto baud rate change : 0x00020 *
|
|
||||||
* Auto clock change : 0x00010 *
|
|
||||||
* Auto voltage selection : 0x00008 *
|
|
||||||
* Auto activaction of ICC : 0x00004
|
|
||||||
* Automatic conf. based on ATR : 0x00002 *
|
|
||||||
*/
|
|
||||||
0x0f, 0x01, 0, 0, /* dwMaxCCIDMessageLength: 271 */
|
|
||||||
0xff, /* bClassGetResponse: 0xff */
|
|
||||||
0x00, /* bClassEnvelope: 0 */
|
|
||||||
0, 0, /* wLCDLayout: 0 */
|
|
||||||
0, /* bPinSupport: No PIN pad */
|
|
||||||
|
|
||||||
1, /* bMaxCCIDBusySlots: 1 */
|
|
||||||
/*Endpoint IN1 Descriptor*/
|
|
||||||
7, /* bLength: Endpoint Descriptor size */
|
|
||||||
USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: Endpoint */
|
|
||||||
CCID_IN_EP, /* bEndpointAddress: (IN1) */
|
|
||||||
0x02, /* bmAttributes: Bulk */
|
|
||||||
CCID_DATA_PACKET_SIZE, 0x00, /* wMaxPacketSize: */
|
|
||||||
0x00, /* bInterval */
|
|
||||||
/*Endpoint OUT1 Descriptor*/
|
|
||||||
7, /* bLength: Endpoint Descriptor size */
|
|
||||||
USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: Endpoint */
|
|
||||||
CCID_OUT_EP, /* bEndpointAddress: (OUT1) */
|
|
||||||
0x02, /* bmAttributes: Bulk */
|
|
||||||
CCID_DATA_PACKET_SIZE, 0x00, /* wMaxPacketSize: */
|
|
||||||
0x00, /* bInterval */
|
|
||||||
/*Endpoint IN2 Descriptor*/
|
|
||||||
7, /* bLength: Endpoint Descriptor size */
|
|
||||||
USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: Endpoint */
|
|
||||||
CCID_CMD_EP, /* bEndpointAddress: (IN2) */
|
|
||||||
0x03, /* bmAttributes: Interrupt */
|
|
||||||
CCID_DATA_PACKET_SIZE, 0x00, /* wMaxPacketSize: 4 */
|
|
||||||
0xFF, /* bInterval (255ms) */
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
USBD_ClassTypeDef USBD_Composite =
|
USBD_ClassTypeDef USBD_Composite =
|
||||||
@ -305,21 +211,15 @@ USBD_ClassTypeDef USBD_Composite =
|
|||||||
USBD_Composite_GetDeviceQualifierDescriptor,
|
USBD_Composite_GetDeviceQualifierDescriptor,
|
||||||
};
|
};
|
||||||
|
|
||||||
static USBD_ClassTypeDef * USBD_Classes[MAX_CLASSES];
|
static USBD_ClassTypeDef *USBD_Classes[MAX_CLASSES];
|
||||||
|
|
||||||
int in_endpoint_to_class[MAX_ENDPOINTS];
|
int in_endpoint_to_class[MAX_ENDPOINTS];
|
||||||
|
|
||||||
int out_endpoint_to_class[MAX_ENDPOINTS];
|
int out_endpoint_to_class[MAX_ENDPOINTS];
|
||||||
|
|
||||||
void USBD_Composite_Set_Classes(USBD_ClassTypeDef *hid_class, USBD_ClassTypeDef *ccid_class, USBD_ClassTypeDef *cdc_class) {
|
void USBD_Composite_Set_Classes(USBD_ClassTypeDef *hid_class, USBD_ClassTypeDef *cdc_class) {
|
||||||
memset(USBD_Classes, 0 , sizeof(USBD_Classes));
|
|
||||||
USBD_Classes[0] = hid_class;
|
USBD_Classes[0] = hid_class;
|
||||||
#ifdef ENABLE_CCID
|
USBD_Classes[1] = cdc_class;
|
||||||
USBD_Classes[1] = ccid_class;
|
|
||||||
#endif
|
|
||||||
#if DEBUG_LEVEL > 0
|
|
||||||
USBD_Classes[2] = cdc_class;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static USBD_ClassTypeDef * getClass(uint8_t index)
|
static USBD_ClassTypeDef * getClass(uint8_t index)
|
||||||
@ -328,15 +228,9 @@ static USBD_ClassTypeDef * getClass(uint8_t index)
|
|||||||
{
|
{
|
||||||
case HID_INTF_NUM:
|
case HID_INTF_NUM:
|
||||||
return USBD_Classes[0];
|
return USBD_Classes[0];
|
||||||
#ifdef ENABLE_CCID
|
|
||||||
case CCID_INTF_NUM:
|
|
||||||
return USBD_Classes[1];
|
|
||||||
#endif
|
|
||||||
#if DEBUG_LEVEL > 0
|
|
||||||
case CDC_MASTER_INTF_NUM:
|
case CDC_MASTER_INTF_NUM:
|
||||||
case CDC_SLAVE_INTF_NUM:
|
case CDC_SLAVE_INTF_NUM:
|
||||||
return USBD_Classes[2];
|
return USBD_Classes[1];
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -344,18 +238,18 @@ static USBD_ClassTypeDef * getClass(uint8_t index)
|
|||||||
static uint8_t USBD_Composite_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx) {
|
static uint8_t USBD_Composite_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx) {
|
||||||
int i;
|
int i;
|
||||||
for(i = 0; i < NUM_CLASSES; i++) {
|
for(i = 0; i < NUM_CLASSES; i++) {
|
||||||
if (USBD_Classes[i] != NULL && USBD_Classes[i]->Init(pdev, cfgidx) != USBD_OK) {
|
if (USBD_Classes[i]->Init(pdev, cfgidx) != USBD_OK) {
|
||||||
return USBD_FAIL;
|
return USBD_FAIL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//N
|
|
||||||
return USBD_OK;
|
return USBD_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint8_t USBD_Composite_DeInit (USBD_HandleTypeDef *pdev, uint8_t cfgidx) {
|
static uint8_t USBD_Composite_DeInit (USBD_HandleTypeDef *pdev, uint8_t cfgidx) {
|
||||||
int i;
|
int i;
|
||||||
for(i = 0; i < NUM_CLASSES; i++) {
|
for(i = 0; i < NUM_CLASSES; i++) {
|
||||||
if (USBD_Classes[i] != NULL && USBD_Classes[i]->DeInit(pdev, cfgidx) != USBD_OK) {
|
if (USBD_Classes[i]->DeInit(pdev, cfgidx) != USBD_OK) {
|
||||||
return USBD_FAIL;
|
return USBD_FAIL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -381,7 +275,7 @@ static uint8_t USBD_Composite_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqType
|
|||||||
|
|
||||||
case USB_REQ_GET_DESCRIPTOR :
|
case USB_REQ_GET_DESCRIPTOR :
|
||||||
for(i = 0; i < NUM_CLASSES; i++) {
|
for(i = 0; i < NUM_CLASSES; i++) {
|
||||||
if (USBD_Classes[i] != NULL && USBD_Classes[i]->Setup(pdev, req) != USBD_OK) {
|
if (USBD_Classes[i]->Setup(pdev, req) != USBD_OK) {
|
||||||
return USBD_FAIL;
|
return USBD_FAIL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -404,8 +298,6 @@ static uint8_t USBD_Composite_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum) {
|
|||||||
|
|
||||||
i = in_endpoint_to_class[epnum];
|
i = in_endpoint_to_class[epnum];
|
||||||
|
|
||||||
if (USBD_Classes[i] == NULL) return USBD_FAIL;
|
|
||||||
|
|
||||||
return USBD_Classes[i]->DataIn(pdev, epnum);
|
return USBD_Classes[i]->DataIn(pdev, epnum);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -414,8 +306,6 @@ static uint8_t USBD_Composite_DataOut (USBD_HandleTypeDef *pdev, uint8_t epnum)
|
|||||||
|
|
||||||
i = out_endpoint_to_class[epnum];
|
i = out_endpoint_to_class[epnum];
|
||||||
|
|
||||||
if (USBD_Classes[i] == NULL) return USBD_FAIL;
|
|
||||||
|
|
||||||
return USBD_Classes[i]->DataOut(pdev, epnum);
|
return USBD_Classes[i]->DataOut(pdev, epnum);
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -423,7 +313,7 @@ static uint8_t USBD_Composite_DataOut (USBD_HandleTypeDef *pdev, uint8_t epnum)
|
|||||||
static uint8_t USBD_Composite_EP0_RxReady (USBD_HandleTypeDef *pdev) {
|
static uint8_t USBD_Composite_EP0_RxReady (USBD_HandleTypeDef *pdev) {
|
||||||
int i;
|
int i;
|
||||||
for(i = 0; i < NUM_CLASSES; i++) {
|
for(i = 0; i < NUM_CLASSES; i++) {
|
||||||
if (USBD_Classes[i] != NULL && USBD_Classes[i]->EP0_RxReady != NULL) {
|
if (USBD_Classes[i]->EP0_RxReady != NULL) {
|
||||||
if (USBD_Classes[i]->EP0_RxReady(pdev) != USBD_OK) {
|
if (USBD_Classes[i]->EP0_RxReady(pdev) != USBD_OK) {
|
||||||
return USBD_FAIL;
|
return USBD_FAIL;
|
||||||
}
|
}
|
||||||
@ -433,19 +323,16 @@ static uint8_t USBD_Composite_EP0_RxReady (USBD_HandleTypeDef *pdev) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static uint8_t *USBD_Composite_GetFSCfgDesc (uint16_t *length) {
|
static uint8_t *USBD_Composite_GetFSCfgDesc (uint16_t *length) {
|
||||||
//Y
|
|
||||||
*length = COMPOSITE_CDC_HID_DESCRIPTOR_SIZE;
|
*length = COMPOSITE_CDC_HID_DESCRIPTOR_SIZE;
|
||||||
return COMPOSITE_CDC_HID_DESCRIPTOR;
|
return COMPOSITE_CDC_HID_DESCRIPTOR;
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint8_t *USBD_Composite_GetHSCfgDesc (uint16_t *length) {
|
static uint8_t *USBD_Composite_GetHSCfgDesc (uint16_t *length) {
|
||||||
//N
|
|
||||||
*length = COMPOSITE_CDC_HID_DESCRIPTOR_SIZE;
|
*length = COMPOSITE_CDC_HID_DESCRIPTOR_SIZE;
|
||||||
return COMPOSITE_CDC_HID_DESCRIPTOR;
|
return COMPOSITE_CDC_HID_DESCRIPTOR;
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint8_t *USBD_Composite_GetOtherSpeedCfgDesc (uint16_t *length) {
|
static uint8_t *USBD_Composite_GetOtherSpeedCfgDesc (uint16_t *length) {
|
||||||
|
|
||||||
*length = COMPOSITE_CDC_HID_DESCRIPTOR_SIZE;
|
*length = COMPOSITE_CDC_HID_DESCRIPTOR_SIZE;
|
||||||
return COMPOSITE_CDC_HID_DESCRIPTOR;
|
return COMPOSITE_CDC_HID_DESCRIPTOR;
|
||||||
}
|
}
|
||||||
@ -466,7 +353,6 @@ __ALIGN_BEGIN static uint8_t USBD_Composite_DeviceQualifierDesc[USB_LEN_DEV_QUAL
|
|||||||
};
|
};
|
||||||
|
|
||||||
uint8_t *USBD_Composite_GetDeviceQualifierDescriptor (uint16_t *length) {
|
uint8_t *USBD_Composite_GetDeviceQualifierDescriptor (uint16_t *length) {
|
||||||
//N
|
*length = sizeof (USBD_Composite_DeviceQualifierDesc);
|
||||||
*length = sizeof (USBD_Composite_DeviceQualifierDesc);
|
return USBD_Composite_DeviceQualifierDesc;
|
||||||
return USBD_Composite_DeviceQualifierDesc;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,7 +17,7 @@ extern int in_endpoint_to_class[MAX_ENDPOINTS];
|
|||||||
|
|
||||||
extern int out_endpoint_to_class[MAX_ENDPOINTS];
|
extern int out_endpoint_to_class[MAX_ENDPOINTS];
|
||||||
|
|
||||||
void USBD_Composite_Set_Classes(USBD_ClassTypeDef *class0, USBD_ClassTypeDef *class1, USBD_ClassTypeDef *class2);
|
void USBD_Composite_Set_Classes(USBD_ClassTypeDef *class0, USBD_ClassTypeDef *class1);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|||||||
@ -50,9 +50,6 @@
|
|||||||
#include "stm32l4xx_hal.h"
|
#include "stm32l4xx_hal.h"
|
||||||
#include "usbd_core.h"
|
#include "usbd_core.h"
|
||||||
#include "usbd_hid.h"
|
#include "usbd_hid.h"
|
||||||
#include "usbd_cdc.h"
|
|
||||||
#include "usbd_ccid.h"
|
|
||||||
#include "log.h"
|
|
||||||
|
|
||||||
void SystemClock_Config(void);
|
void SystemClock_Config(void);
|
||||||
|
|
||||||
@ -120,14 +117,9 @@ void HAL_PCD_DataOutStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
|
|||||||
USBD_LL_DataOutStage((USBD_HandleTypeDef*)hpcd->pData, epnum, hpcd->OUT_ep[epnum].xfer_buff);
|
USBD_LL_DataOutStage((USBD_HandleTypeDef*)hpcd->pData, epnum, hpcd->OUT_ep[epnum].xfer_buff);
|
||||||
switch(epnum)
|
switch(epnum)
|
||||||
{
|
{
|
||||||
case HID_EPOUT_ADDR:
|
case HID_ENDPOINT:
|
||||||
usb_hid_recieve_callback(epnum);
|
usb_hid_recieve_callback(epnum);
|
||||||
break;
|
break;
|
||||||
#ifdef ENABLE_CCID
|
|
||||||
case CCID_OUT_EP:
|
|
||||||
usb_ccid_recieve_callback((USBD_HandleTypeDef*)hpcd->pData, epnum);
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -226,6 +218,7 @@ void HAL_PCD_DisconnectCallback(PCD_HandleTypeDef *hpcd)
|
|||||||
{
|
{
|
||||||
USBD_LL_DevDisconnected((USBD_HandleTypeDef*)hpcd->pData);
|
USBD_LL_DevDisconnected((USBD_HandleTypeDef*)hpcd->pData);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Initializes the low level portion of the device driver.
|
* @brief Initializes the low level portion of the device driver.
|
||||||
* @param pdev: Device handle
|
* @param pdev: Device handle
|
||||||
@ -259,20 +252,14 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
|
|||||||
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , 0x80 , PCD_SNG_BUF, 0x58);
|
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , 0x80 , PCD_SNG_BUF, 0x58);
|
||||||
|
|
||||||
// HID
|
// HID
|
||||||
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , HID_EPOUT_ADDR , PCD_SNG_BUF, 0x98);
|
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , 0x01 , PCD_SNG_BUF, 0x98);
|
||||||
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , HID_EPIN_ADDR , PCD_SNG_BUF, 0xd8);
|
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , 0x81 , PCD_SNG_BUF, 0xd8);
|
||||||
|
|
||||||
// CCID
|
|
||||||
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , CCID_OUT_EP , PCD_SNG_BUF, 0xd8 + 64); // data OUT
|
|
||||||
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , CCID_IN_EP , PCD_SNG_BUF, 0xd8 + 64*2); // data IN
|
|
||||||
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , CCID_CMD_EP , PCD_SNG_BUF, 0xd8 + 64*3); // commands
|
|
||||||
|
|
||||||
// CDC / uart
|
// CDC / uart
|
||||||
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , CDC_CMD_EP , PCD_SNG_BUF, 0xd8 + 64*4); // commands
|
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , 0x02 , PCD_SNG_BUF, 0xd8 + 64); // data OUT
|
||||||
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , CDC_OUT_EP , PCD_SNG_BUF, 0xd8 + 64*5); // data OUT
|
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , 0x82 , PCD_SNG_BUF, 0xd8 + 64*2); // data IN
|
||||||
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , CDC_IN_EP , PCD_SNG_BUF, 0xd8 + 64*6); // data IN
|
HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , 0x83 , PCD_SNG_BUF, 0xd8 + 64*3); // commands
|
||||||
|
|
||||||
// dump_pma_header("usbd_conf");
|
|
||||||
|
|
||||||
return USBD_OK;
|
return USBD_OK;
|
||||||
}
|
}
|
||||||
@ -323,7 +310,6 @@ USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev,
|
|||||||
uint8_t ep_type,
|
uint8_t ep_type,
|
||||||
uint16_t ep_mps)
|
uint16_t ep_mps)
|
||||||
{
|
{
|
||||||
// printf1(TAG_RED,"LL_Open. ep: %x, %x\r\n", ep_addr, ep_type);
|
|
||||||
HAL_PCD_EP_Open((PCD_HandleTypeDef*) pdev->pData,
|
HAL_PCD_EP_Open((PCD_HandleTypeDef*) pdev->pData,
|
||||||
ep_addr,
|
ep_addr,
|
||||||
ep_mps,
|
ep_mps,
|
||||||
|
|||||||
@ -12,13 +12,9 @@
|
|||||||
#define DEBUG_UART USART1
|
#define DEBUG_UART USART1
|
||||||
|
|
||||||
#ifndef DEBUG_LEVEL
|
#ifndef DEBUG_LEVEL
|
||||||
// Enable the CDC ACM USB interface & debug logs (DEBUG_LEVEL > 0)
|
|
||||||
#define DEBUG_LEVEL 0
|
#define DEBUG_LEVEL 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Enable the CCID USB interface
|
|
||||||
// #define ENABLE_CCID
|
|
||||||
|
|
||||||
#define NON_BLOCK_PRINTING 0
|
#define NON_BLOCK_PRINTING 0
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -55,43 +55,11 @@ static int is_physical_button_pressed()
|
|||||||
|
|
||||||
static int is_touch_button_pressed()
|
static int is_touch_button_pressed()
|
||||||
{
|
{
|
||||||
int is_pressed = (tsc_read_button(0) || tsc_read_button(1));
|
return tsc_read_button(0) || tsc_read_button(1);
|
||||||
#ifndef IS_BOOTLOADER
|
|
||||||
if (is_pressed)
|
|
||||||
{
|
|
||||||
// delay for debounce, and longer than polling timer period.
|
|
||||||
delay(95);
|
|
||||||
return (tsc_read_button(0) || tsc_read_button(1));
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
return is_pressed;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int (*IS_BUTTON_PRESSED)() = is_physical_button_pressed;
|
int (*IS_BUTTON_PRESSED)() = is_physical_button_pressed;
|
||||||
|
|
||||||
static void edge_detect_touch_button()
|
|
||||||
{
|
|
||||||
static uint8_t last_touch = 0;
|
|
||||||
uint8_t current_touch = 0;
|
|
||||||
if (is_touch_button_pressed == IS_BUTTON_PRESSED)
|
|
||||||
{
|
|
||||||
current_touch = (tsc_read_button(0) || tsc_read_button(1));
|
|
||||||
|
|
||||||
// 1 sample per 25 ms
|
|
||||||
if ((millis() - __last_button_bounce_time) > 25)
|
|
||||||
{
|
|
||||||
// Detect "touch / rising edge"
|
|
||||||
if (!last_touch && current_touch)
|
|
||||||
{
|
|
||||||
__last_button_press_time = millis();
|
|
||||||
}
|
|
||||||
__last_button_bounce_time = millis();
|
|
||||||
last_touch = current_touch;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void request_from_nfc(bool request_active) {
|
void request_from_nfc(bool request_active) {
|
||||||
_RequestComeFromNFC = request_active;
|
_RequestComeFromNFC = request_active;
|
||||||
}
|
}
|
||||||
@ -110,7 +78,19 @@ void TIM6_DAC_IRQHandler()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
edge_detect_touch_button();
|
|
||||||
|
if (is_touch_button_pressed == IS_BUTTON_PRESSED)
|
||||||
|
{
|
||||||
|
if (IS_BUTTON_PRESSED())
|
||||||
|
{
|
||||||
|
// Only allow 1 press per 25 ms.
|
||||||
|
if ((millis() - __last_button_bounce_time) > 25)
|
||||||
|
{
|
||||||
|
__last_button_press_time = millis();
|
||||||
|
}
|
||||||
|
__last_button_bounce_time = millis();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#ifndef IS_BOOTLOADER
|
#ifndef IS_BOOTLOADER
|
||||||
// NFC sending WTX if needs
|
// NFC sending WTX if needs
|
||||||
@ -162,6 +142,7 @@ void device_set_status(uint32_t status)
|
|||||||
|
|
||||||
int device_is_button_pressed()
|
int device_is_button_pressed()
|
||||||
{
|
{
|
||||||
|
|
||||||
return IS_BUTTON_PRESSED();
|
return IS_BUTTON_PRESSED();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,6 @@
|
|||||||
#include "usbd_desc.h"
|
#include "usbd_desc.h"
|
||||||
#include "usbd_hid.h"
|
#include "usbd_hid.h"
|
||||||
#include "usbd_cdc.h"
|
#include "usbd_cdc.h"
|
||||||
#include "usbd_ccid.h"
|
|
||||||
#include "usbd_composite.h"
|
#include "usbd_composite.h"
|
||||||
#include "usbd_cdc_if.h"
|
#include "usbd_cdc_if.h"
|
||||||
#include "device.h"
|
#include "device.h"
|
||||||
@ -706,26 +705,26 @@ void init_usb()
|
|||||||
|
|
||||||
// Enable USB Clock
|
// Enable USB Clock
|
||||||
SET_BIT(RCC->APB1ENR1, RCC_APB1ENR1_USBFSEN);
|
SET_BIT(RCC->APB1ENR1, RCC_APB1ENR1_USBFSEN);
|
||||||
#ifndef IS_BOOTLOADER
|
|
||||||
USBD_Composite_Set_Classes(&USBD_HID, &USBD_CCID, &USBD_CDC);
|
#if DEBUG_LEVEL > 0
|
||||||
|
USBD_Composite_Set_Classes(&USBD_HID, &USBD_CDC);
|
||||||
in_endpoint_to_class[HID_EPIN_ADDR & 0x7F] = 0;
|
in_endpoint_to_class[HID_EPIN_ADDR & 0x7F] = 0;
|
||||||
out_endpoint_to_class[HID_EPOUT_ADDR & 0x7F] = 0;
|
out_endpoint_to_class[HID_EPOUT_ADDR & 0x7F] = 0;
|
||||||
|
|
||||||
in_endpoint_to_class[CCID_IN_EP & 0x7F] = 1;
|
in_endpoint_to_class[CDC_IN_EP & 0x7F] = 1;
|
||||||
out_endpoint_to_class[CCID_OUT_EP & 0x7F] = 1;
|
out_endpoint_to_class[CDC_OUT_EP & 0x7F] = 1;
|
||||||
|
|
||||||
in_endpoint_to_class[CDC_IN_EP & 0x7F] = 2;
|
|
||||||
out_endpoint_to_class[CDC_OUT_EP & 0x7F] = 2;
|
|
||||||
|
|
||||||
USBD_Init(&Solo_USBD_Device, &Solo_Desc, 0);
|
USBD_Init(&Solo_USBD_Device, &Solo_Desc, 0);
|
||||||
USBD_RegisterClass(&Solo_USBD_Device, &USBD_Composite);
|
USBD_RegisterClass(&Solo_USBD_Device, &USBD_Composite);
|
||||||
#if DEBUG_LEVEL > 0
|
// USBD_RegisterClass(&Solo_USBD_Device, &USBD_HID);
|
||||||
|
//
|
||||||
|
// USBD_RegisterClass(&Solo_USBD_Device, &USBD_CDC);
|
||||||
USBD_CDC_RegisterInterface(&Solo_USBD_Device, &USBD_Interface_fops_FS);
|
USBD_CDC_RegisterInterface(&Solo_USBD_Device, &USBD_Interface_fops_FS);
|
||||||
#endif
|
|
||||||
#else
|
#else
|
||||||
USBD_Init(&Solo_USBD_Device, &Solo_Desc, 0);
|
USBD_Init(&Solo_USBD_Device, &Solo_Desc, 0);
|
||||||
USBD_RegisterClass(&Solo_USBD_Device, &USBD_HID);
|
USBD_RegisterClass(&Solo_USBD_Device, &USBD_HID);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
USBD_Start(&Solo_USBD_Device);
|
USBD_Start(&Solo_USBD_Device);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -520,261 +520,13 @@ int select_applet(uint8_t * aid, int len)
|
|||||||
return APP_NOTHING;
|
return APP_NOTHING;
|
||||||
}
|
}
|
||||||
|
|
||||||
void apdu_process(uint8_t buf0, uint8_t *apduptr, APDU_STRUCT *apdu)
|
void nfc_process_iblock(uint8_t * buf, int len)
|
||||||
{
|
{
|
||||||
int selected;
|
int selected;
|
||||||
CTAP_RESPONSE ctap_resp;
|
CTAP_RESPONSE ctap_resp;
|
||||||
int status;
|
int status;
|
||||||
uint16_t reslen;
|
uint16_t reslen;
|
||||||
|
|
||||||
// check CLA
|
|
||||||
if (apdu->cla != 0x00 && apdu->cla != 0x80) {
|
|
||||||
printf1(TAG_NFC, "Unknown CLA %02x\r\n", apdu->cla);
|
|
||||||
nfc_write_response(buf0, SW_CLA_INVALID);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO this needs to be organized better
|
|
||||||
switch(apdu->ins)
|
|
||||||
{
|
|
||||||
// ISO 7816. 7.1 GET RESPONSE command
|
|
||||||
case APDU_GET_RESPONSE:
|
|
||||||
if (apdu->p1 != 0x00 || apdu->p2 != 0x00)
|
|
||||||
{
|
|
||||||
nfc_write_response(buf0, SW_INCORRECT_P1P2);
|
|
||||||
printf1(TAG_NFC, "P1 or P2 error\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// too many bytes needs. 0x00 and 0x100 - any length
|
|
||||||
if (apdu->le != 0 && apdu->le != 0x100 && apdu->le > chain_buffer_len)
|
|
||||||
{
|
|
||||||
uint16_t wlresp = SW_WRONG_LENGTH; // here can be 6700, 6C00, 6FXX. but the most standard way - 67XX or 6700
|
|
||||||
if (chain_buffer_len <= 0xff)
|
|
||||||
wlresp += chain_buffer_len & 0xff;
|
|
||||||
nfc_write_response(buf0, wlresp);
|
|
||||||
printf1(TAG_NFC, "buffer length less than requesteds\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// create temporary packet
|
|
||||||
uint8_t pck[255] = {0};
|
|
||||||
size_t pcklen = 253;
|
|
||||||
if (apdu->le)
|
|
||||||
pcklen = apdu->le;
|
|
||||||
if (pcklen > chain_buffer_len)
|
|
||||||
pcklen = chain_buffer_len;
|
|
||||||
|
|
||||||
printf1(TAG_NFC, "GET RESPONSE. pck len: %d buffer len: %d\r\n", pcklen, chain_buffer_len);
|
|
||||||
|
|
||||||
// create packet and add 61XX there if we have another portion(s) of data
|
|
||||||
memmove(pck, chain_buffer, pcklen);
|
|
||||||
size_t dlen = 0;
|
|
||||||
if (chain_buffer_len - pcklen)
|
|
||||||
{
|
|
||||||
append_get_response(&pck[pcklen], chain_buffer_len - pcklen);
|
|
||||||
dlen = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
// send
|
|
||||||
nfc_write_response_chaining_plain(buf0, pck, pcklen + dlen); // dlen for 61XX
|
|
||||||
|
|
||||||
// shift the buffer
|
|
||||||
chain_buffer_len -= pcklen;
|
|
||||||
memmove(chain_buffer, &chain_buffer[pcklen], chain_buffer_len);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case APDU_INS_SELECT:
|
|
||||||
// if (apdu->p1 == 0 && apdu->p2 == 0x0c)
|
|
||||||
// {
|
|
||||||
// printf1(TAG_NFC,"Select NDEF\r\n");
|
|
||||||
//
|
|
||||||
// NFC_STATE.selected_applet = APP_NDEF_TAG;
|
|
||||||
// // Select NDEF file!
|
|
||||||
// res[0] = NFC_CMD_IBLOCK | (buf[0] & 1);
|
|
||||||
// res[1] = SW_SUCCESS>>8;
|
|
||||||
// res[2] = SW_SUCCESS & 0xff;
|
|
||||||
// nfc_write_frame(res, 3);
|
|
||||||
// printf1(TAG_NFC,"<< "); dump_hex1(TAG_NFC,res, 3);
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
{
|
|
||||||
selected = select_applet(apdu->data, apdu->lc);
|
|
||||||
if (selected == APP_FIDO)
|
|
||||||
{
|
|
||||||
nfc_write_response_ex(buf0, (uint8_t *)"U2F_V2", 6, SW_SUCCESS);
|
|
||||||
printf1(TAG_NFC, "FIDO applet selected.\r\n");
|
|
||||||
}
|
|
||||||
else if (selected != APP_NOTHING)
|
|
||||||
{
|
|
||||||
nfc_write_response(buf0, SW_SUCCESS);
|
|
||||||
printf1(TAG_NFC, "SELECTED %d\r\n", selected);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
nfc_write_response(buf0, SW_FILE_NOT_FOUND);
|
|
||||||
printf1(TAG_NFC, "NOT selected "); dump_hex1(TAG_NFC, apdu->data, apdu->lc);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case APDU_FIDO_U2F_VERSION:
|
|
||||||
if (NFC_STATE.selected_applet != APP_FIDO) {
|
|
||||||
nfc_write_response(buf0, SW_INS_INVALID);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
printf1(TAG_NFC, "U2F GetVersion command.\r\n");
|
|
||||||
|
|
||||||
u2f_request_nfc(apduptr, apdu->data, apdu->lc, &ctap_resp);
|
|
||||||
nfc_write_response_chaining(buf0, ctap_resp.data, ctap_resp.length, apdu->extended_apdu);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case APDU_FIDO_U2F_REGISTER:
|
|
||||||
if (NFC_STATE.selected_applet != APP_FIDO) {
|
|
||||||
nfc_write_response(buf0, SW_INS_INVALID);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
printf1(TAG_NFC, "U2F Register command.\r\n");
|
|
||||||
|
|
||||||
if (apdu->lc != 64)
|
|
||||||
{
|
|
||||||
printf1(TAG_NFC, "U2F Register request length error. len=%d.\r\n", apdu->lc);
|
|
||||||
nfc_write_response(buf0, SW_WRONG_LENGTH);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
timestamp();
|
|
||||||
|
|
||||||
|
|
||||||
// WTX_on(WTX_TIME_DEFAULT);
|
|
||||||
// SystemClock_Config_LF32();
|
|
||||||
// delay(300);
|
|
||||||
if (device_is_nfc() == NFC_IS_ACTIVE) device_set_clock_rate(DEVICE_LOW_POWER_FAST);
|
|
||||||
u2f_request_nfc(apduptr, apdu->data, apdu->lc, &ctap_resp);
|
|
||||||
if (device_is_nfc() == NFC_IS_ACTIVE) device_set_clock_rate(DEVICE_LOW_POWER_IDLE);
|
|
||||||
// if (!WTX_off())
|
|
||||||
// return;
|
|
||||||
|
|
||||||
printf1(TAG_NFC, "U2F resp len: %d\r\n", ctap_resp.length);
|
|
||||||
printf1(TAG_NFC,"U2F Register P2 took %d\r\n", timestamp());
|
|
||||||
nfc_write_response_chaining(buf0, ctap_resp.data, ctap_resp.length, apdu->extended_apdu);
|
|
||||||
|
|
||||||
printf1(TAG_NFC,"U2F Register answered %d (took %d)\r\n", millis(), timestamp());
|
|
||||||
break;
|
|
||||||
|
|
||||||
case APDU_FIDO_U2F_AUTHENTICATE:
|
|
||||||
if (NFC_STATE.selected_applet != APP_FIDO) {
|
|
||||||
nfc_write_response(buf0, SW_INS_INVALID);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
printf1(TAG_NFC, "U2F Authenticate command.\r\n");
|
|
||||||
|
|
||||||
if (apdu->lc != 64 + 1 + apdu->data[64])
|
|
||||||
{
|
|
||||||
delay(5);
|
|
||||||
printf1(TAG_NFC, "U2F Authenticate request length error. len=%d keyhlen=%d.\r\n", apdu->lc, apdu->data[64]);
|
|
||||||
nfc_write_response(buf0, SW_WRONG_LENGTH);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
timestamp();
|
|
||||||
// WTX_on(WTX_TIME_DEFAULT);
|
|
||||||
u2f_request_nfc(apduptr, apdu->data, apdu->lc, &ctap_resp);
|
|
||||||
// if (!WTX_off())
|
|
||||||
// return;
|
|
||||||
|
|
||||||
printf1(TAG_NFC, "U2F resp len: %d\r\n", ctap_resp.length);
|
|
||||||
printf1(TAG_NFC,"U2F Authenticate processing %d (took %d)\r\n", millis(), timestamp());
|
|
||||||
nfc_write_response_chaining(buf0, ctap_resp.data, ctap_resp.length, apdu->extended_apdu);
|
|
||||||
printf1(TAG_NFC,"U2F Authenticate answered %d (took %d)\r\n", millis(), timestamp);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case APDU_FIDO_NFCCTAP_MSG:
|
|
||||||
if (NFC_STATE.selected_applet != APP_FIDO) {
|
|
||||||
nfc_write_response(buf0, SW_INS_INVALID);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
printf1(TAG_NFC, "FIDO2 CTAP message. %d\r\n", timestamp());
|
|
||||||
|
|
||||||
// WTX_on(WTX_TIME_DEFAULT);
|
|
||||||
request_from_nfc(true);
|
|
||||||
ctap_response_init(&ctap_resp);
|
|
||||||
status = ctap_request(apdu->data, apdu->lc, &ctap_resp);
|
|
||||||
request_from_nfc(false);
|
|
||||||
// if (!WTX_off())
|
|
||||||
// return;
|
|
||||||
|
|
||||||
printf1(TAG_NFC, "CTAP resp: 0x%02x len: %d\r\n", status, ctap_resp.length);
|
|
||||||
|
|
||||||
if (status == CTAP1_ERR_SUCCESS)
|
|
||||||
{
|
|
||||||
memmove(&ctap_resp.data[1], &ctap_resp.data[0], ctap_resp.length);
|
|
||||||
ctap_resp.length += 3;
|
|
||||||
} else {
|
|
||||||
ctap_resp.length = 3;
|
|
||||||
}
|
|
||||||
ctap_resp.data[0] = status;
|
|
||||||
ctap_resp.data[ctap_resp.length - 2] = SW_SUCCESS >> 8;
|
|
||||||
ctap_resp.data[ctap_resp.length - 1] = SW_SUCCESS & 0xff;
|
|
||||||
|
|
||||||
printf1(TAG_NFC,"CTAP processing %d (took %d)\r\n", millis(), timestamp());
|
|
||||||
nfc_write_response_chaining(buf0, ctap_resp.data, ctap_resp.length, apdu->extended_apdu);
|
|
||||||
printf1(TAG_NFC,"CTAP answered %d (took %d)\r\n", millis(), timestamp());
|
|
||||||
break;
|
|
||||||
|
|
||||||
case APDU_INS_READ_BINARY:
|
|
||||||
// response length
|
|
||||||
reslen = apdu->le & 0xffff;
|
|
||||||
switch(NFC_STATE.selected_applet)
|
|
||||||
{
|
|
||||||
case APP_CAPABILITY_CONTAINER:
|
|
||||||
printf1(TAG_NFC,"APP_CAPABILITY_CONTAINER\r\n");
|
|
||||||
if (reslen == 0 || reslen > sizeof(NFC_CC))
|
|
||||||
reslen = sizeof(NFC_CC);
|
|
||||||
nfc_write_response_ex(buf0, (uint8_t *)&NFC_CC, reslen, SW_SUCCESS);
|
|
||||||
ams_wait_for_tx(10);
|
|
||||||
break;
|
|
||||||
case APP_NDEF_TAG:
|
|
||||||
printf1(TAG_NFC,"APP_NDEF_TAG\r\n");
|
|
||||||
if (reslen == 0 || reslen > sizeof(NDEF_SAMPLE) - 1)
|
|
||||||
reslen = sizeof(NDEF_SAMPLE) - 1;
|
|
||||||
nfc_write_response_ex(buf0, NDEF_SAMPLE, reslen, SW_SUCCESS);
|
|
||||||
ams_wait_for_tx(10);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
nfc_write_response(buf0, SW_FILE_NOT_FOUND);
|
|
||||||
printf1(TAG_ERR, "No binary applet selected!\r\n");
|
|
||||||
return;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case APDU_SOLO_RESET:
|
|
||||||
if (apdu->lc == 4 && !memcmp(apdu->data, "\x12\x56\xab\xf0", 4)) {
|
|
||||||
printf1(TAG_NFC, "Reset...\r\n");
|
|
||||||
nfc_write_response(buf0, SW_SUCCESS);
|
|
||||||
delay(20);
|
|
||||||
device_reboot();
|
|
||||||
while(1);
|
|
||||||
} else {
|
|
||||||
printf1(TAG_NFC, "Reset FAIL\r\n");
|
|
||||||
nfc_write_response(buf0, SW_INS_INVALID);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
printf1(TAG_NFC, "Unknown INS %02x\r\n", apdu->ins);
|
|
||||||
nfc_write_response(buf0, SW_INS_INVALID);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void nfc_process_iblock(uint8_t * buf, int len)
|
|
||||||
{
|
|
||||||
uint8_t block_offset = p14443_block_offset(buf[0]);
|
uint8_t block_offset = p14443_block_offset(buf[0]);
|
||||||
|
|
||||||
// clear tx chain buffer if we have some other command than GET RESPONSE
|
// clear tx chain buffer if we have some other command than GET RESPONSE
|
||||||
@ -802,6 +554,7 @@ void nfc_process_iblock(uint8_t * buf, int len)
|
|||||||
|
|
||||||
memmove(&chain_buffer[chain_buffer_len], apdu.data, apdu.lc);
|
memmove(&chain_buffer[chain_buffer_len], apdu.data, apdu.lc);
|
||||||
chain_buffer_len += apdu.lc;
|
chain_buffer_len += apdu.lc;
|
||||||
|
delay(1);
|
||||||
nfc_write_response(buf[0], SW_SUCCESS);
|
nfc_write_response(buf[0], SW_SUCCESS);
|
||||||
printf1(TAG_NFC, "APDU chaining ok. %d/%d\r\n", apdu.lc, chain_buffer_len);
|
printf1(TAG_NFC, "APDU chaining ok. %d/%d\r\n", apdu.lc, chain_buffer_len);
|
||||||
return;
|
return;
|
||||||
@ -809,14 +562,247 @@ void nfc_process_iblock(uint8_t * buf, int len)
|
|||||||
|
|
||||||
// if we have ISO 7816 APDU chain - move there all the data
|
// if we have ISO 7816 APDU chain - move there all the data
|
||||||
if (!chain_buffer_tx && chain_buffer_len > 0) {
|
if (!chain_buffer_tx && chain_buffer_len > 0) {
|
||||||
|
delay(1);
|
||||||
memmove(&apdu.data[chain_buffer_len], apdu.data, apdu.lc);
|
memmove(&apdu.data[chain_buffer_len], apdu.data, apdu.lc);
|
||||||
memmove(apdu.data, chain_buffer, chain_buffer_len);
|
memmove(apdu.data, chain_buffer, chain_buffer_len);
|
||||||
apdu.lc += chain_buffer_len; // here apdu struct does not match with memory!
|
apdu.lc += chain_buffer_len; // here apdu struct does not match with memory!
|
||||||
printf1(TAG_NFC, "APDU chaining merge. %d/%d\r\n", chain_buffer_len, apdu.lc);
|
printf1(TAG_NFC, "APDU chaining merge. %d/%d\r\n", chain_buffer_len, apdu.lc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check CLA
|
||||||
|
if (apdu.cla != 0x00 && apdu.cla != 0x80) {
|
||||||
|
printf1(TAG_NFC, "Unknown CLA %02x\r\n", apdu.cla);
|
||||||
|
nfc_write_response(buf[0], SW_CLA_INVALID);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
apdu_process(buf[0], &buf[block_offset], &apdu);
|
// TODO this needs to be organized better
|
||||||
|
switch(apdu.ins)
|
||||||
|
{
|
||||||
|
// ISO 7816. 7.1 GET RESPONSE command
|
||||||
|
case APDU_GET_RESPONSE:
|
||||||
|
if (apdu.p1 != 0x00 || apdu.p2 != 0x00)
|
||||||
|
{
|
||||||
|
nfc_write_response(buf[0], SW_INCORRECT_P1P2);
|
||||||
|
printf1(TAG_NFC, "P1 or P2 error\r\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// too many bytes needs. 0x00 and 0x100 - any length
|
||||||
|
if (apdu.le != 0 && apdu.le != 0x100 && apdu.le > chain_buffer_len)
|
||||||
|
{
|
||||||
|
uint16_t wlresp = SW_WRONG_LENGTH; // here can be 6700, 6C00, 6FXX. but the most standard way - 67XX or 6700
|
||||||
|
if (chain_buffer_len <= 0xff)
|
||||||
|
wlresp += chain_buffer_len & 0xff;
|
||||||
|
nfc_write_response(buf[0], wlresp);
|
||||||
|
printf1(TAG_NFC, "buffer length less than requesteds\r\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// create temporary packet
|
||||||
|
uint8_t pck[255] = {0};
|
||||||
|
size_t pcklen = 253;
|
||||||
|
if (apdu.le)
|
||||||
|
pcklen = apdu.le;
|
||||||
|
if (pcklen > chain_buffer_len)
|
||||||
|
pcklen = chain_buffer_len;
|
||||||
|
|
||||||
|
printf1(TAG_NFC, "GET RESPONSE. pck len: %d buffer len: %d\r\n", pcklen, chain_buffer_len);
|
||||||
|
|
||||||
|
// create packet and add 61XX there if we have another portion(s) of data
|
||||||
|
memmove(pck, chain_buffer, pcklen);
|
||||||
|
size_t dlen = 0;
|
||||||
|
if (chain_buffer_len - pcklen)
|
||||||
|
{
|
||||||
|
append_get_response(&pck[pcklen], chain_buffer_len - pcklen);
|
||||||
|
dlen = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// send
|
||||||
|
nfc_write_response_chaining_plain(buf[0], pck, pcklen + dlen); // dlen for 61XX
|
||||||
|
|
||||||
|
// shift the buffer
|
||||||
|
chain_buffer_len -= pcklen;
|
||||||
|
memmove(chain_buffer, &chain_buffer[pcklen], chain_buffer_len);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case APDU_INS_SELECT:
|
||||||
|
// if (apdu->p1 == 0 && apdu->p2 == 0x0c)
|
||||||
|
// {
|
||||||
|
// printf1(TAG_NFC,"Select NDEF\r\n");
|
||||||
|
//
|
||||||
|
// NFC_STATE.selected_applet = APP_NDEF_TAG;
|
||||||
|
// // Select NDEF file!
|
||||||
|
// res[0] = NFC_CMD_IBLOCK | (buf[0] & 1);
|
||||||
|
// res[1] = SW_SUCCESS>>8;
|
||||||
|
// res[2] = SW_SUCCESS & 0xff;
|
||||||
|
// nfc_write_frame(res, 3);
|
||||||
|
// printf1(TAG_NFC,"<< "); dump_hex1(TAG_NFC,res, 3);
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
{
|
||||||
|
selected = select_applet(apdu.data, apdu.lc);
|
||||||
|
if (selected == APP_FIDO)
|
||||||
|
{
|
||||||
|
nfc_write_response_ex(buf[0], (uint8_t *)"U2F_V2", 6, SW_SUCCESS);
|
||||||
|
printf1(TAG_NFC, "FIDO applet selected.\r\n");
|
||||||
|
}
|
||||||
|
else if (selected != APP_NOTHING)
|
||||||
|
{
|
||||||
|
nfc_write_response(buf[0], SW_SUCCESS);
|
||||||
|
printf1(TAG_NFC, "SELECTED %d\r\n", selected);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
nfc_write_response(buf[0], SW_FILE_NOT_FOUND);
|
||||||
|
printf1(TAG_NFC, "NOT selected "); dump_hex1(TAG_NFC, apdu.data, apdu.lc);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case APDU_FIDO_U2F_VERSION:
|
||||||
|
if (NFC_STATE.selected_applet != APP_FIDO) {
|
||||||
|
nfc_write_response(buf[0], SW_INS_INVALID);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf1(TAG_NFC, "U2F GetVersion command.\r\n");
|
||||||
|
|
||||||
|
u2f_request_nfc(&buf[block_offset], apdu.data, apdu.lc, &ctap_resp);
|
||||||
|
nfc_write_response_chaining(buf[0], ctap_resp.data, ctap_resp.length, apdu.extended_apdu);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case APDU_FIDO_U2F_REGISTER:
|
||||||
|
if (NFC_STATE.selected_applet != APP_FIDO) {
|
||||||
|
nfc_write_response(buf[0], SW_INS_INVALID);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf1(TAG_NFC, "U2F Register command.\r\n");
|
||||||
|
|
||||||
|
if (apdu.lc != 64)
|
||||||
|
{
|
||||||
|
printf1(TAG_NFC, "U2F Register request length error. len=%d.\r\n", apdu.lc);
|
||||||
|
nfc_write_response(buf[0], SW_WRONG_LENGTH);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
timestamp();
|
||||||
|
|
||||||
|
|
||||||
|
// WTX_on(WTX_TIME_DEFAULT);
|
||||||
|
// SystemClock_Config_LF32();
|
||||||
|
// delay(300);
|
||||||
|
if (device_is_nfc() == NFC_IS_ACTIVE) device_set_clock_rate(DEVICE_LOW_POWER_FAST);
|
||||||
|
u2f_request_nfc(&buf[block_offset], apdu.data, apdu.lc, &ctap_resp);
|
||||||
|
if (device_is_nfc() == NFC_IS_ACTIVE) device_set_clock_rate(DEVICE_LOW_POWER_IDLE);
|
||||||
|
// if (!WTX_off())
|
||||||
|
// return;
|
||||||
|
|
||||||
|
printf1(TAG_NFC, "U2F resp len: %d\r\n", ctap_resp.length);
|
||||||
|
printf1(TAG_NFC,"U2F Register P2 took %d\r\n", timestamp());
|
||||||
|
nfc_write_response_chaining(buf[0], ctap_resp.data, ctap_resp.length, apdu.extended_apdu);
|
||||||
|
|
||||||
|
printf1(TAG_NFC,"U2F Register answered %d (took %d)\r\n", millis(), timestamp());
|
||||||
|
break;
|
||||||
|
|
||||||
|
case APDU_FIDO_U2F_AUTHENTICATE:
|
||||||
|
if (NFC_STATE.selected_applet != APP_FIDO) {
|
||||||
|
nfc_write_response(buf[0], SW_INS_INVALID);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf1(TAG_NFC, "U2F Authenticate command.\r\n");
|
||||||
|
|
||||||
|
if (apdu.lc != 64 + 1 + apdu.data[64])
|
||||||
|
{
|
||||||
|
delay(5);
|
||||||
|
printf1(TAG_NFC, "U2F Authenticate request length error. len=%d keyhlen=%d.\r\n", apdu.lc, apdu.data[64]);
|
||||||
|
nfc_write_response(buf[0], SW_WRONG_LENGTH);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
timestamp();
|
||||||
|
// WTX_on(WTX_TIME_DEFAULT);
|
||||||
|
u2f_request_nfc(&buf[block_offset], apdu.data, apdu.lc, &ctap_resp);
|
||||||
|
// if (!WTX_off())
|
||||||
|
// return;
|
||||||
|
|
||||||
|
printf1(TAG_NFC, "U2F resp len: %d\r\n", ctap_resp.length);
|
||||||
|
printf1(TAG_NFC,"U2F Authenticate processing %d (took %d)\r\n", millis(), timestamp());
|
||||||
|
nfc_write_response_chaining(buf[0], ctap_resp.data, ctap_resp.length, apdu.extended_apdu);
|
||||||
|
printf1(TAG_NFC,"U2F Authenticate answered %d (took %d)\r\n", millis(), timestamp);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case APDU_FIDO_NFCCTAP_MSG:
|
||||||
|
if (NFC_STATE.selected_applet != APP_FIDO) {
|
||||||
|
nfc_write_response(buf[0], SW_INS_INVALID);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf1(TAG_NFC, "FIDO2 CTAP message. %d\r\n", timestamp());
|
||||||
|
|
||||||
|
// WTX_on(WTX_TIME_DEFAULT);
|
||||||
|
request_from_nfc(true);
|
||||||
|
ctap_response_init(&ctap_resp);
|
||||||
|
delay(1);
|
||||||
|
printf1(TAG_NFC,"[%d] ", apdu.lc);
|
||||||
|
dump_hex1(TAG_NFC,apdu.data, apdu.lc);
|
||||||
|
status = ctap_request(apdu.data, apdu.lc, &ctap_resp);
|
||||||
|
request_from_nfc(false);
|
||||||
|
// if (!WTX_off())
|
||||||
|
// return;
|
||||||
|
|
||||||
|
printf1(TAG_NFC, "CTAP resp: 0x%02x len: %d\r\n", status, ctap_resp.length);
|
||||||
|
|
||||||
|
if (status == CTAP1_ERR_SUCCESS)
|
||||||
|
{
|
||||||
|
memmove(&ctap_resp.data[1], &ctap_resp.data[0], ctap_resp.length);
|
||||||
|
ctap_resp.length += 3;
|
||||||
|
} else {
|
||||||
|
ctap_resp.length = 3;
|
||||||
|
}
|
||||||
|
ctap_resp.data[0] = status;
|
||||||
|
ctap_resp.data[ctap_resp.length - 2] = SW_SUCCESS >> 8;
|
||||||
|
ctap_resp.data[ctap_resp.length - 1] = SW_SUCCESS & 0xff;
|
||||||
|
|
||||||
|
printf1(TAG_NFC,"CTAP processing %d (took %d)\r\n", millis(), timestamp());
|
||||||
|
nfc_write_response_chaining(buf[0], ctap_resp.data, ctap_resp.length, apdu.extended_apdu);
|
||||||
|
printf1(TAG_NFC,"CTAP answered %d (took %d)\r\n", millis(), timestamp());
|
||||||
|
break;
|
||||||
|
|
||||||
|
case APDU_INS_READ_BINARY:
|
||||||
|
// response length
|
||||||
|
reslen = apdu.le & 0xffff;
|
||||||
|
switch(NFC_STATE.selected_applet)
|
||||||
|
{
|
||||||
|
case APP_CAPABILITY_CONTAINER:
|
||||||
|
printf1(TAG_NFC,"APP_CAPABILITY_CONTAINER\r\n");
|
||||||
|
if (reslen == 0 || reslen > sizeof(NFC_CC))
|
||||||
|
reslen = sizeof(NFC_CC);
|
||||||
|
nfc_write_response_ex(buf[0], (uint8_t *)&NFC_CC, reslen, SW_SUCCESS);
|
||||||
|
ams_wait_for_tx(10);
|
||||||
|
break;
|
||||||
|
case APP_NDEF_TAG:
|
||||||
|
printf1(TAG_NFC,"APP_NDEF_TAG\r\n");
|
||||||
|
if (reslen == 0 || reslen > sizeof(NDEF_SAMPLE) - 1)
|
||||||
|
reslen = sizeof(NDEF_SAMPLE) - 1;
|
||||||
|
nfc_write_response_ex(buf[0], NDEF_SAMPLE, reslen, SW_SUCCESS);
|
||||||
|
ams_wait_for_tx(10);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
nfc_write_response(buf[0], SW_FILE_NOT_FOUND);
|
||||||
|
printf1(TAG_ERR, "No binary applet selected!\r\n");
|
||||||
|
return;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
printf1(TAG_NFC, "Unknown INS %02x\r\n", apdu.ins);
|
||||||
|
nfc_write_response(buf[0], SW_INS_INVALID);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
printf1(TAG_NFC,"prev.Iblock: ");
|
printf1(TAG_NFC,"prev.Iblock: ");
|
||||||
dump_hex1(TAG_NFC, buf, len);
|
dump_hex1(TAG_NFC, buf, len);
|
||||||
|
|||||||
Reference in New Issue
Block a user