From 8e5d33c4ba46eb6c023fadb399215f04ab4feb77 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Fri, 19 Aug 2022 01:44:03 +0200 Subject: [PATCH] Removing trailing spaces. Signed-off-by: Pol Henarejos --- CMakeLists.txt | 18 ++++++++-------- src/ccid/asn1.c | 18 ++++++++-------- src/ccid/asn1.h | 16 +++++++------- src/ccid/ccid2040.c | 44 +++++++++++++++++++-------------------- src/ccid/ccid2040.h | 24 ++++++++++----------- src/ccid/ccid_version.h | 16 +++++++------- src/ccid/crypto_utils.c | 26 +++++++++++------------ src/ccid/crypto_utils.h | 16 +++++++------- src/ccid/eac.c | 22 ++++++++++---------- src/ccid/eac.h | 16 +++++++------- src/fs/file.c | 34 +++++++++++++++--------------- src/fs/file.h | 16 +++++++------- src/fs/flash.c | 20 +++++++++--------- src/fs/low_flash.c | 30 +++++++++++++------------- src/rng/neug.c | 28 ++++++++++++------------- src/rng/neug.h | 16 +++++++------- src/rng/random.c | 16 +++++++------- src/rng/random.h | 18 ++++++++-------- src/usb/tusb_config.h | 2 +- src/usb/usb.c | 18 ++++++++-------- src/usb/usb_descriptors.c | 30 +++++++++++++------------- src/usb/usb_descriptors.h | 16 +++++++------- 22 files changed, 230 insertions(+), 230 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c56ebc..0f089e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,17 @@ - # + # # This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). # Copyright (c) 2022 Pol Henarejos. - # - # This program is free software: you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by + # + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by # the Free Software Foundation, version 3. # - # This program is distributed in the hope that it will be useful, but - # WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + # This program is distributed in the hope that it will be useful, but + # WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # - # You should have received a copy of the GNU General Public License + # You should have received a copy of the GNU General Public License # along with this program. If not, see . # @@ -65,7 +65,7 @@ target_compile_options(pico_ccid PUBLIC -Wall -Werror ) - + pico_add_extra_outputs(pico_ccid) target_link_libraries(pico_ccid PRIVATE pico_stdlib pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id hardware_rtc tinyusb_device tinyusb_board) diff --git a/src/ccid/asn1.c b/src/ccid/asn1.c index d0b5f7f..25aa3ca 100644 --- a/src/ccid/asn1.c +++ b/src/ccid/asn1.c @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico HSM distribution (https://github.com/polhenarejos/pico-hsm). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -61,7 +61,7 @@ int walk_tlv(const uint8_t *cdata, size_t cdata_len, uint8_t **p, uint16_t *tag, if ((tg & 0x1f) == 0x1f) { tg <<= 8; tg |= *(*p)++; - } + } tgl = *(*p)++; if (tgl == 0x82) { tgl = *(*p)++ << 8; diff --git a/src/ccid/asn1.h b/src/ccid/asn1.h index f22d754..89ca2ec 100644 --- a/src/ccid/asn1.h +++ b/src/ccid/asn1.h @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico HSM distribution (https://github.com/polhenarejos/pico-hsm). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/src/ccid/ccid2040.c b/src/ccid/ccid2040.c index 15f25d9..6ce5baf 100644 --- a/src/ccid/ccid2040.c +++ b/src/ccid/ccid2040.c @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -122,7 +122,7 @@ static bool wait_button() { uint32_t start_button = board_millis(); bool timeout = false; led_set_blink((1000 << 16) | 100); - + while (board_button_read() == false) { execute_tasks(); //sleep_ms(10); @@ -359,10 +359,10 @@ static void card_init(void) { void card_thread() { card_init (); - while (1) { + while (1) { uint32_t m; queue_remove_blocking(&ccid_to_card_q, &m); - + if (m == EV_VERIFY_CMD_AVAILABLE || m == EV_MODIFY_CMD_AVAILABLE) { set_res_sw (0x6f, 0x00); @@ -376,7 +376,7 @@ void card_thread() { } process_apdu(); - + done:; uint32_t flag = EV_EXEC_FINISHED; queue_add_blocking(&card_to_ccid_q, &flag); @@ -389,7 +389,7 @@ void card_thread() { void ccid_task(void) { if (tud_vendor_mounted()) { if (usb_event_handle() != 0) { - + } usb_write_flush(); uint32_t m = 0x0; @@ -513,7 +513,7 @@ void led_blinking_task() { #else uint32_t interval = led_state ? blink_interval_ms & 0xffff : blink_interval_ms >> 16; #endif - + // Blink every interval ms if (board_millis() - start_ms < interval) @@ -538,7 +538,7 @@ void led_off_all() { } void init_rtc() { - + rtc_init(); datetime_t dt = { .year = 2020, @@ -566,11 +566,11 @@ int main(void) { ccid_header = (struct ccid_header *)usb_get_rx(); ccid_header->apdu = usb_get_rx()+10; apdu.header = ccid_header->apdu; - + ccid_response = (struct ccid_header *)usb_get_tx(); ccid_response->apdu = usb_get_tx()+10; apdu.rdata = ccid_response->apdu; - + queue_init(&card_to_ccid_q, sizeof(uint32_t), 64); queue_init(&ccid_to_card_q, sizeof(uint32_t), 64); @@ -596,15 +596,15 @@ int main(void) { tusb_init(); //prepare_ccid(); - + random_init(); - + low_flash_init(); - + init_rtc(); - + //ccid_prepare_receive(&ccid); - + while (1) { execute_tasks(); neug_task(); diff --git a/src/ccid/ccid2040.h b/src/ccid/ccid2040.h index b980de3..28cdd07 100644 --- a/src/ccid/ccid2040.h +++ b/src/ccid/ccid2040.h @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -21,7 +21,7 @@ #include "file.h" #include "pico/unique_id.h" #include "pico/util/queue.h" -#include +#include #define USB_REQ_CCID 0xA1 @@ -55,7 +55,7 @@ extern const uint8_t historical_bytes[]; } #else #define DEBUG_PAYLOAD(_p,_s) -#endif +#endif struct apdu { uint8_t *header; @@ -92,11 +92,11 @@ enum ccid_state { CCID_STATE_NOCARD, /* No card available */ CCID_STATE_START, /* Initial */ CCID_STATE_WAIT, /* Waiting APDU */ - + CCID_STATE_EXECUTE, /* Executing command */ CCID_STATE_ACK_REQUIRED_0, /* Ack required (executing)*/ CCID_STATE_ACK_REQUIRED_1, /* Waiting user's ACK (execution finished) */ - + CCID_STATE_EXITED, /* CCID Thread Terminated */ CCID_STATE_EXEC_REQUESTED, /* Exec requested */ }; diff --git a/src/ccid/ccid_version.h b/src/ccid/ccid_version.h index f869078..14e986f 100644 --- a/src/ccid/ccid_version.h +++ b/src/ccid/ccid_version.h @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/src/ccid/crypto_utils.c b/src/ccid/crypto_utils.c index 354bb58..44a8b49 100644 --- a/src/ccid/crypto_utils.c +++ b/src/ccid/crypto_utils.c @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -35,12 +35,12 @@ void hash_multi(const uint8_t *input, size_t len, uint8_t output[32]) { mbedtls_sha256_init(&ctx); int iters = 256; pico_unique_board_id_t unique_id; - + pico_get_unique_board_id(&unique_id); - + mbedtls_sha256_starts (&ctx, 0); mbedtls_sha256_update (&ctx, unique_id.id, sizeof(unique_id.id)); - + while (iters > len) { mbedtls_sha256_update (&ctx, input, len); @@ -55,7 +55,7 @@ void hash_multi(const uint8_t *input, size_t len, uint8_t output[32]) { void hash256(const uint8_t *input, size_t len, uint8_t output[32]) { mbedtls_sha256_context ctx; mbedtls_sha256_init(&ctx); - + mbedtls_sha256_starts (&ctx, 0); mbedtls_sha256_update (&ctx, input, len); @@ -64,7 +64,7 @@ void hash256(const uint8_t *input, size_t len, uint8_t output[32]) { } void generic_hash(mbedtls_md_type_t md, const uint8_t *input, size_t len, uint8_t *output) { - mbedtls_md(mbedtls_md_info_from_type(md), input, len, output); + mbedtls_md(mbedtls_md_info_from_type(md), input, len, output); } int aes_encrypt(const uint8_t *key, const uint8_t *iv, int key_size, int mode, uint8_t *data, int len) { diff --git a/src/ccid/crypto_utils.h b/src/ccid/crypto_utils.h index 8bccf11..b1e3b60 100644 --- a/src/ccid/crypto_utils.h +++ b/src/ccid/crypto_utils.h @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/src/ccid/eac.c b/src/ccid/eac.c index f1115f7..78c3331 100644 --- a/src/ccid/eac.c +++ b/src/ccid/eac.c @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -94,7 +94,7 @@ int sm_unwrap() { bool is87 = false; uint16_t tag = 0x0; uint8_t *tag_data = NULL, *p = NULL; - size_t tag_len = 0; + size_t tag_len = 0; while (walk_tlv(apdu.data, apdu.nc, &p, &tag, &tag_len, &tag_data)) { if (tag == 0x87 || tag == 0x85) { body = tag_data; @@ -184,7 +184,7 @@ int sm_wrap() { int sm_get_le() { uint16_t tag = 0x0; uint8_t *tag_data = NULL, *p = NULL; - size_t tag_len = 0; + size_t tag_len = 0; while (walk_tlv(apdu.data, apdu.nc, &p, &tag, &tag_len, &tag_data)) { if (tag == 0x97) { uint32_t le = 0; @@ -236,7 +236,7 @@ int sm_verify() { size_t mac_len = 0; uint16_t tag = 0x0; uint8_t *tag_data = NULL, *p = NULL; - size_t tag_len = 0; + size_t tag_len = 0; while (walk_tlv(apdu.data, apdu.nc, &p, &tag, &tag_len, &tag_data)) { if (tag & 0x1) { input[input_len++] = tag; diff --git a/src/ccid/eac.h b/src/ccid/eac.h index e7d4f94..babca93 100644 --- a/src/ccid/eac.h +++ b/src/ccid/eac.h @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/src/fs/file.c b/src/fs/file.c index b69c180..4de7abb 100644 --- a/src/fs/file.c +++ b/src/fs/file.c @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -44,10 +44,10 @@ void process_fci(const file_t *pe, int fmd) { res_APDU[res_APDU_size++] = 0x6f; res_APDU[res_APDU_size++] = 0x00; //computed later } - + res_APDU[res_APDU_size++] = 0x62; res_APDU[res_APDU_size++] = 0x00; //computed later - + res_APDU[res_APDU_size++] = 0x81; res_APDU[res_APDU_size++] = 2; if (pe->data) { @@ -65,7 +65,7 @@ void process_fci(const file_t *pe, int fmd) { memset(res_APDU+res_APDU_size, 0, 2); res_APDU_size += 2; } - + res_APDU[res_APDU_size++] = 0x82; res_APDU[res_APDU_size++] = 1; res_APDU[res_APDU_size] = 0; @@ -75,7 +75,7 @@ void process_fci(const file_t *pe, int fmd) { res_APDU[res_APDU_size++] |= pe->ef_structure & 0x7; else if (pe->type == FILE_TYPE_DF) res_APDU[res_APDU_size++] |= 0x38; - + res_APDU[res_APDU_size++] = 0x83; res_APDU[res_APDU_size++] = 2; put_uint16_t(pe->fid, res_APDU+res_APDU_size); @@ -130,7 +130,7 @@ file_t *search_by_name(uint8_t *name, uint16_t namelen) { } file_t *search_by_fid(const uint16_t fid, const file_t *parent, const uint8_t sp) { - + for (file_t *p = file_entries; p != file_last; p++) { if (p->fid != 0x0000 && p->fid == fid) { if (!parent || (parent && is_parent(p, parent))) { @@ -190,7 +190,7 @@ bool authenticate_action(const file_t *ef, uint8_t op) { // PIN required. if (isUserAuthenticated) { return true; - } + } else { return false; } @@ -220,14 +220,14 @@ void scan_region(bool persistent) { for (uintptr_t base = flash_read_uintptr(endp); base >= startp; base = flash_read_uintptr(base)) { if (base == 0x0) //all is empty break; - + uint16_t fid = flash_read_uint16(base+sizeof(uintptr_t)+sizeof(uintptr_t)); printf("[%x] scan fid %x, len %d\r\n",base,fid,flash_read_uint16(base+sizeof(uintptr_t)+sizeof(uintptr_t)+sizeof(uint16_t))); file_t *file = (file_t *)search_by_fid(fid, NULL, SPECIFY_EF); if (!file) { file = file_new(fid); } - if (file) + if (file) file->data = (uint8_t *)(base+sizeof(uintptr_t)+sizeof(uintptr_t)+sizeof(uint16_t)); if (flash_read_uintptr(base) == 0x0) { break; @@ -237,7 +237,7 @@ void scan_region(bool persistent) { void scan_flash() { initialize_flash(false); //soft initialization - if (*(uintptr_t *)end_data_pool == 0xffffffff && *(uintptr_t *)(end_data_pool+sizeof(uintptr_t)) == 0xffffffff) + if (*(uintptr_t *)end_data_pool == 0xffffffff && *(uintptr_t *)(end_data_pool+sizeof(uintptr_t)) == 0xffffffff) { printf("First initialization (or corrupted!)\r\n"); uint8_t empty[sizeof(uintptr_t)*2+sizeof(uint32_t)]; diff --git a/src/fs/file.h b/src/fs/file.h index ab47d99..4f1a45d 100644 --- a/src/fs/file.h +++ b/src/fs/file.h @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/src/fs/flash.c b/src/fs/flash.c index 1aa8629..8a9c968 100644 --- a/src/fs/flash.c +++ b/src/fs/flash.c @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -132,10 +132,10 @@ int flash_write_data_to_file_offset(file_t *file, const uint8_t *data, uint16_t } } } - + uintptr_t new_addr = allocate_free_addr(len, (file->type & FILE_PERSISTENT) == FILE_PERSISTENT); //printf("na %x\r\n",new_addr); - if (new_addr == 0x0) + if (new_addr == 0x0) return CCID_ERR_NO_MEMORY; file->data = (uint8_t *)new_addr+sizeof(uintptr_t)+sizeof(uint16_t)+sizeof(uintptr_t); //next addr+fid+prev addr flash_program_halfword(new_addr+sizeof(uintptr_t)+sizeof(uintptr_t), file->fid); diff --git a/src/fs/low_flash.c b/src/fs/low_flash.c index 9eae346..76bf9fe 100644 --- a/src/fs/low_flash.c +++ b/src/fs/low_flash.c @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -66,8 +66,8 @@ void do_flash() flash_range_program(flash_pages[r].address-XIP_BASE, flash_pages[r].page, FLASH_SECTOR_SIZE); restore_interrupts (ints); while (multicore_lockout_end_timeout_us(1000) == false); - //printf("WRITEN %X !\r\n",flash_pages[r].address); - + //printf("WRITEN %X !\r\n",flash_pages[r].address); + flash_pages[r].ready = false; ready_pages--; } @@ -139,10 +139,10 @@ page_flash_t *find_free_page(uintptr_t addr) { int flash_program_block(uintptr_t addr, const uint8_t *data, size_t len) { page_flash_t *p = NULL; - + if (!data || len == 0) return CCID_ERR_NULL_PARAM; - + mutex_enter_blocking(&mtx_flash); if (ready_pages == TOTAL_FLASH_PAGES) { mutex_exit(&mtx_flash); @@ -174,7 +174,7 @@ int flash_program_uintptr (uintptr_t addr, uintptr_t data) { } uint8_t *flash_read(uintptr_t addr) { - uintptr_t addr_alg = addr & -FLASH_SECTOR_SIZE; + uintptr_t addr_alg = addr & -FLASH_SECTOR_SIZE; mutex_enter_blocking(&mtx_flash); if (ready_pages > 0) { for (int r = 0; r < TOTAL_FLASH_PAGES; r++) @@ -213,7 +213,7 @@ uint8_t flash_read_uint8(uintptr_t addr) { int flash_erase_page (uintptr_t addr, size_t page_size) { page_flash_t *p = NULL; - + mutex_enter_blocking(&mtx_flash); if (ready_pages == TOTAL_FLASH_PAGES) { mutex_exit(&mtx_flash); @@ -229,7 +229,7 @@ int flash_erase_page (uintptr_t addr, size_t page_size) { p->ready = false; p->page_size = page_size; mutex_exit(&mtx_flash); - + return CCID_OK; } diff --git a/src/rng/neug.c b/src/rng/neug.c index f471d67..c9fbeef 100644 --- a/src/rng/neug.c +++ b/src/rng/neug.c @@ -1,20 +1,20 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - + //Part of the code is taken from GnuK (GPLv3) @@ -72,7 +72,7 @@ static int ep_process () { random_word *= 0x00000100000001B3; if (++ep_round == 8) { ep_round = 0; - return 2; //2 words + return 2; //2 words } return 0; } @@ -122,7 +122,7 @@ static struct rng_rb the_ring_buffer; void *neug_task() { struct rng_rb *rb = &the_ring_buffer; - + int n; if ((n = ep_process())) { @@ -147,15 +147,15 @@ void neug_init(uint32_t *buf, uint8_t size) { struct rng_rb *rb = &the_ring_buffer; rb_init(rb, buf, size); - + adc_start(); - + ep_init(); } void neug_flush(void) { struct rng_rb *rb = &the_ring_buffer; - + while (!rb->empty) rb_del (rb); } diff --git a/src/rng/neug.h b/src/rng/neug.h index 2ced6e3..f023ba6 100644 --- a/src/rng/neug.h +++ b/src/rng/neug.h @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/src/rng/random.c b/src/rng/random.c index 62531b5..b04af1f 100644 --- a/src/rng/random.c +++ b/src/rng/random.c @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/src/rng/random.h b/src/rng/random.h index 446edbf..7652514 100644 --- a/src/rng/random.h +++ b/src/rng/random.h @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -35,4 +35,4 @@ void random_get_salt (uint8_t *p); /* iterator returning a byta at a time */ int random_gen (void *arg, unsigned char *output, size_t output_len); -#endif \ No newline at end of file +#endif \ No newline at end of file diff --git a/src/usb/tusb_config.h b/src/usb/tusb_config.h index 87ec6bd..88d5868 100644 --- a/src/usb/tusb_config.h +++ b/src/usb/tusb_config.h @@ -106,7 +106,7 @@ #define CFG_TUD_VENDOR_RX_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64) #define CFG_TUD_VENDOR_TX_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64) - + #include "pico/types.h" static inline uint16_t tu_u32_high16(uint32_t ui32) { return (uint16_t) (ui32 >> 16); } static inline uint16_t tu_u32_low16 (uint32_t ui32) { return (uint16_t) (ui32 & 0x0000ffffu); } diff --git a/src/usb/usb.c b/src/usb/usb.c index 7d7bc90..5076a55 100644 --- a/src/usb/usb.c +++ b/src/usb/usb.c @@ -1,18 +1,18 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -89,7 +89,7 @@ uint16_t usb_read(uint8_t *buffer, size_t buffer_size) { r_offset += size; if (r_offset == w_offset) { r_offset = w_offset = 0; - } + } return size; } return 0; diff --git a/src/usb/usb_descriptors.c b/src/usb/usb_descriptors.c index 98dc728..7c2d517 100644 --- a/src/usb/usb_descriptors.c +++ b/src/usb/usb_descriptors.c @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -90,7 +90,7 @@ uint8_t const * tud_descriptor_device_cb(void) return (uint8_t const *) &desc_device; } -tusb_desc_interface_t const desc_interface = +tusb_desc_interface_t const desc_interface = { .bLength = sizeof(tusb_desc_interface_t), .bDescriptorType = TUSB_DESC_INTERFACE, @@ -107,7 +107,7 @@ tusb_desc_interface_t const desc_interface = // Configuration Descriptor //--------------------------------------------------------------------+ -tusb_desc_configuration_t const desc_config = +tusb_desc_configuration_t const desc_config = { .bLength = sizeof(tusb_desc_configuration_t), .bDescriptorType = TUSB_DESC_CONFIGURATION, @@ -119,7 +119,7 @@ tusb_desc_configuration_t const desc_config = .bMaxPower = TUSB_DESC_CONFIG_POWER_MA(MAX_USB_POWER+1), }; -tusb_desc_endpoint_t const desc_ep1 = +tusb_desc_endpoint_t const desc_ep1 = { .bLength = sizeof(tusb_desc_endpoint_t), .bDescriptorType = TUSB_DESC_ENDPOINT, @@ -129,7 +129,7 @@ tusb_desc_endpoint_t const desc_ep1 = .bInterval = 0 }; -tusb_desc_endpoint_t const desc_ep2 = +tusb_desc_endpoint_t const desc_ep2 = { .bLength = sizeof(tusb_desc_endpoint_t), .bDescriptorType = TUSB_DESC_ENDPOINT, @@ -144,7 +144,7 @@ static uint8_t desc_config_extended[sizeof(tusb_desc_configuration_t) + sizeof(t uint8_t const * tud_descriptor_configuration_cb(uint8_t index) { (void) index; // for multiple configurations - + static uint8_t initd = 0; if (initd == 0) { @@ -205,7 +205,7 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) // Note: the 0xEE index string is a Microsoft OS 1.0 Descriptors. // https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/microsoft-defined-usb-descriptors - if ( !(index < sizeof(string_desc_arr)/sizeof(string_desc_arr[0])) ) + if ( !(index < sizeof(string_desc_arr)/sizeof(string_desc_arr[0])) ) return NULL; const char* str = string_desc_arr[index]; @@ -218,7 +218,7 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) } chr_count = strlen(str); - if ( chr_count > 31 ) + if ( chr_count > 31 ) chr_count = 31; // Convert ASCII string into UTF-16 diff --git a/src/usb/usb_descriptors.h b/src/usb/usb_descriptors.h index ac36e06..c9d482a 100644 --- a/src/usb/usb_descriptors.h +++ b/src/usb/usb_descriptors.h @@ -1,17 +1,17 @@ -/* +/* * This file is part of the Pico CCID distribution (https://github.com/polhenarejos/pico-ccid). * Copyright (c) 2022 Pol Henarejos. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see . */