From f2874ae3ef33aba01c54bae82a3a0c620086a748 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 6 Dec 2022 20:00:19 +0100 Subject: [PATCH 01/84] Fix when ping is provided during the initialization. Signed-off-by: Pol Henarejos --- tools/pico-hsm-tool.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/pico-hsm-tool.py b/tools/pico-hsm-tool.py index bbad3b8..4ddbbe6 100644 --- a/tools/pico-hsm-tool.py +++ b/tools/pico-hsm-tool.py @@ -241,7 +241,13 @@ def initialize(card, args): _ = input('[Press enter to confirm]') send_apdu(card, 0xA4, 0x04, 0x00, [0xE8, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x81, 0xC3, 0x1F, 0x02, 0x01]) - if (not args.pin): + if (args.pin): + pin = args.pin.encode() + try: + response = send_apdu(card, 0x20, 0x00, 0x81, list(pin)) + except APDUResponse: + pass + else: pin = b'648219' if (args.so_pin): From 202c8a4b22a84a9676190e9dfb1f386a7846519f Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 6 Dec 2022 20:00:32 +0100 Subject: [PATCH 02/84] Credentials are not necessary when importing DKEK. Signed-off-by: Pol Henarejos --- src/hsm/cmd_key_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hsm/cmd_key_domain.c b/src/hsm/cmd_key_domain.c index ce273be..58be42c 100644 --- a/src/hsm/cmd_key_domain.c +++ b/src/hsm/cmd_key_domain.c @@ -33,7 +33,7 @@ int cmd_key_domain() { //if (dkeks == 0) // return SW_COMMAND_NOT_ALLOWED(); uint8_t p1 = P1(apdu), p2 = P2(apdu); - if ((has_session_pin == false || isUserAuthenticated == false) && apdu.nc > 0) + if ((has_session_pin == false || isUserAuthenticated == false) && apdu.nc > 0 && !(p1 == 0x0 && p2 == 0x0)) return SW_CONDITIONS_NOT_SATISFIED(); if (p2 >= MAX_KEY_DOMAINS) return SW_WRONG_P1P2(); From 6a57e676299d76f0f0189b0792b603abd74be01e Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 6 Dec 2022 20:04:18 +0100 Subject: [PATCH 03/84] Fix importing dkek twice. It is not allowed anymore. Signed-off-by: Pol Henarejos --- src/hsm/cmd_key_domain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/hsm/cmd_key_domain.c b/src/hsm/cmd_key_domain.c index 58be42c..d06eb73 100644 --- a/src/hsm/cmd_key_domain.c +++ b/src/hsm/cmd_key_domain.c @@ -51,6 +51,9 @@ int cmd_key_domain() { return SW_MEMORY_FAILURE(); if (apdu.nc < 32) return SW_WRONG_LENGTH(); + if (current_dkeks == dkeks) { + return SW_COMMAND_NOT_ALLOWED(); + } import_dkek_share(p2, apdu.data); if (++current_dkeks >= dkeks) { if (save_dkek_key(p2, NULL) != CCID_OK) From 691aa3308cbee3746bd88d096328425d561b0457 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 6 Dec 2022 20:11:26 +0100 Subject: [PATCH 04/84] Fix when importing a dkek and it fails. Now the dkek state is returned to the previous one. Signed-off-by: Pol Henarejos --- src/hsm/cmd_key_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/hsm/cmd_key_domain.c b/src/hsm/cmd_key_domain.c index d06eb73..3ae114b 100644 --- a/src/hsm/cmd_key_domain.c +++ b/src/hsm/cmd_key_domain.c @@ -56,8 +56,11 @@ int cmd_key_domain() { } import_dkek_share(p2, apdu.data); if (++current_dkeks >= dkeks) { - if (save_dkek_key(p2, NULL) != CCID_OK) + if (save_dkek_key(p2, NULL) != CCID_OK) { + /* On fail, it will return to previous dkek state. */ + import_dkek_share(p2, apdu.data); return SW_FILE_NOT_FOUND(); + } } uint8_t t[MAX_KEY_DOMAINS*2]; memcpy(t, kdata, tf_kd_size); From 7d906851ddcb36ea077a3866f94e9779ebda35ae Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 20 Dec 2022 23:51:49 +0100 Subject: [PATCH 05/84] Updating to newer version of Pico HSM SDK. Signed-off-by: Pol Henarejos --- CMakeLists.txt | 2 +- pico-hsm-sdk | 2 +- tools/pico-hsm-patch-vidpid.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d5a809..335baa8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ target_sources(pico_hsm PUBLIC ${CMAKE_CURRENT_LIST_DIR}/src/hsm/oid.c ) -set(HSM_DRIVER "ccid") +set(USB_ITF_CCID 1) include(pico-hsm-sdk/pico_hsm_sdk_import.cmake) target_include_directories(pico_hsm PUBLIC diff --git a/pico-hsm-sdk b/pico-hsm-sdk index fa54da9..e99757e 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit fa54da973caa6ca2f861cf59634d529af8bc5894 +Subproject commit e99757ed52132a55ca6b1711ccf503b2a2708e91 diff --git a/tools/pico-hsm-patch-vidpid.sh b/tools/pico-hsm-patch-vidpid.sh index 79bb0a8..c2881db 100755 --- a/tools/pico-hsm-patch-vidpid.sh +++ b/tools/pico-hsm-patch-vidpid.sh @@ -17,8 +17,8 @@ # along with this program. If not, see . # -VERSION_MAJOR="3" #Version of Pico CCID Core -VERSION_MINOR="4" +VERSION_MAJOR="4" #Version of Pico CCID Core +VERSION_MINOR="0" echo "----------------------------" echo "VID/PID patcher for Pico HSM" From 9ff3254a4ce9ee60a4ccd68617c9539352521a5f Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 22 Dec 2022 22:50:54 +0100 Subject: [PATCH 06/84] Update to latest HSM SDK. Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- src/hsm/sc_hsm.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index e99757e..88b2978 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit e99757ed52132a55ca6b1711ccf503b2a2708e91 +Subproject commit 88b2978ae5cf3f1de95ebaec0aec0acd3a24878e diff --git a/src/hsm/sc_hsm.c b/src/hsm/sc_hsm.c index ab45c41..c036059 100644 --- a/src/hsm/sc_hsm.c +++ b/src/hsm/sc_hsm.c @@ -75,8 +75,8 @@ extern int cmd_session_pin(); extern int cmd_puk_auth(); extern int cmd_pso(); -app_t *sc_hsm_select_aid(app_t *a) { - if (!memcmp(apdu.data, sc_hsm_aid+1, MIN(apdu.nc,sc_hsm_aid[0]))) { +app_t *sc_hsm_select_aid(app_t *a, const uint8_t *aid, uint8_t aid_len) { + if (!memcmp(aid, sc_hsm_aid+1, MIN(aid_len,sc_hsm_aid[0]))) { a->aid = sc_hsm_aid; a->process_apdu = sc_hsm_process_apdu; a->unload = sc_hsm_unload; @@ -581,12 +581,6 @@ int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey) { return CCID_OK; } -typedef struct cmd -{ - uint8_t ins; - int (*cmd_handler)(); -} cmd_t; - #define INS_VERIFY 0x20 #define INS_MSE 0x22 #define INS_CHANGE_PIN 0x24 From 6c85772fff9326a18ece2ea7a8cb61c63b66970c Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 12 Jan 2023 20:03:42 +0100 Subject: [PATCH 07/84] Added emulated build capability. Signed-off-by: Pol Henarejos --- CMakeLists.txt | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 335baa8..2305997 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,18 +17,24 @@ cmake_minimum_required(VERSION 3.13) +if(ENABLE_EMULATION) +else() include(pico_sdk_import.cmake) +endif() project(pico_hsm C CXX ASM) set(CMAKE_C_STANDARD 11) set(CMAKE_CXX_STANDARD 17) +if(ENABLE_EMULATION) +else() pico_sdk_init() +endif() add_executable(pico_hsm) -target_sources(pico_hsm PUBLIC +set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/src/hsm/sc_hsm.c ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_select.c ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_list_keys.c @@ -65,36 +71,29 @@ target_sources(pico_hsm PUBLIC set(USB_ITF_CCID 1) include(pico-hsm-sdk/pico_hsm_sdk_import.cmake) -target_include_directories(pico_hsm PUBLIC +set(INCLUDES ${INCLUDES} ${CMAKE_CURRENT_LIST_DIR}/src/hsm ) +target_sources(pico_hsm PUBLIC ${SOURCES}) +target_include_directories(pico_hsm PUBLIC ${INCLUDES}) + target_compile_options(pico_hsm PUBLIC -Wall -Werror ) +if(ENABLE_EMULATION) + +target_compile_options(pico_hsm PUBLIC + -fdata-sections + -ffunction-sections + ) + target_link_options(pico_hsm PUBLIC + -Wl,-dead_strip + ) +else() pico_add_extra_outputs(pico_hsm) target_link_libraries(pico_hsm PRIVATE pico_hsm_sdk pico_stdlib pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id hardware_rtc tinyusb_device tinyusb_board) - -# -#project(flash_nuke C CXX ASM) -#add_executable(flash_nuke nuke.c) -#target_link_libraries(flash_nuke -# pico_stdlib -# hardware_flash -# ) -#pico_set_binary_type(flash_nuke no_flash) -# -#pico_add_extra_outputs(flash_nuke) - -#project(memory C CXX ASM) -#add_executable(memory memory.c) -#target_link_libraries(memory -# pico_stdlib -# hardware_flash -# ) -#pico_set_binary_type(memory no_flash) -# -#pico_add_extra_outputs(memory) +endif() From 9793977ffc9118c4828db509c0b09705ec4c537d Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 12 Jan 2023 20:04:05 +0100 Subject: [PATCH 08/84] Fixed double counter increment. Signed-off-by: Pol Henarejos --- src/hsm/cmd_cipher_sym.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/hsm/cmd_cipher_sym.c b/src/hsm/cmd_cipher_sym.c index 474e294..13e03d3 100644 --- a/src/hsm/cmd_cipher_sym.c +++ b/src/hsm/cmd_cipher_sym.c @@ -138,7 +138,6 @@ int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, size_t input_len, uint8_t * mbedtls_md_finish(&md_ctx, tmp_output); memcpy(&output[i], tmp_output, (output_len - i < hashlen) ? output_len - i : hashlen); i += hashlen; - counter++; } mbedtls_md_free(&md_ctx); return 0; From 742c3f3e3cd46b4ef82fb57efccb7220d0df217c Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 12 Jan 2023 20:04:23 +0100 Subject: [PATCH 09/84] RTC command is not available in emulation. Signed-off-by: Pol Henarejos --- src/hsm/cmd_extras.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/hsm/cmd_extras.c b/src/hsm/cmd_extras.c index c215274..c46a520 100644 --- a/src/hsm/cmd_extras.c +++ b/src/hsm/cmd_extras.c @@ -18,7 +18,9 @@ #include "common.h" #include "mbedtls/ecdh.h" #include "sc_hsm.h" +#ifndef ENABLE_EMULATION #include "hardware/rtc.h" +#endif #include "files.h" #include "random.h" #include "kek.h" @@ -30,6 +32,7 @@ int cmd_extras() { if (P2(apdu) != 0x0) return SW_INCORRECT_P1P2(); if (apdu.nc == 0) { +#ifndef ENABLE_EMULATION datetime_t dt; if (!rtc_get_datetime(&dt)) return SW_EXEC_ERROR(); @@ -41,10 +44,12 @@ int cmd_extras() { res_APDU[res_APDU_size++] = dt.hour; res_APDU[res_APDU_size++] = dt.min; res_APDU[res_APDU_size++] = dt.sec; +#endif } else { if (apdu.nc != 8) return SW_WRONG_LENGTH(); +#ifndef ENABLE_EMULATION datetime_t dt; dt.year = (apdu.data[0] << 8) | (apdu.data[1]); dt.month = apdu.data[2]; @@ -55,6 +60,7 @@ int cmd_extras() { dt.sec = apdu.data[7]; if (!rtc_set_datetime(&dt)) return SW_WRONG_DATA(); +#endif } } else if (P1(apdu) == 0x6) { //dynamic options From bc20f98b44655831a41048efa20f8bd607a43f0a Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 12 Jan 2023 20:04:44 +0100 Subject: [PATCH 10/84] In emulation, return always 1mb of memory. Signed-off-by: Pol Henarejos --- src/hsm/cmd_initialize.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/hsm/cmd_initialize.c b/src/hsm/cmd_initialize.c index dff883b..d1b4b29 100644 --- a/src/hsm/cmd_initialize.c +++ b/src/hsm/cmd_initialize.c @@ -28,9 +28,13 @@ extern void scan_all(); extern char __StackLimit; int heapLeft() { +#ifndef ENABLE_EMULATION char *p = malloc(256); // try to avoid undue fragmentation int left = &__StackLimit - p; free(p); +#else + int left = 1024*1024; +#endif return left; } From e05c526b4dfb0cdbcb0bf9390aef3d80199bf590 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 12 Jan 2023 20:04:55 +0100 Subject: [PATCH 11/84] Fix printf format. Signed-off-by: Pol Henarejos --- src/hsm/cmd_keypair_gen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hsm/cmd_keypair_gen.c b/src/hsm/cmd_keypair_gen.c index 7497f13..ba497ac 100644 --- a/src/hsm/cmd_keypair_gen.c +++ b/src/hsm/cmd_keypair_gen.c @@ -55,7 +55,7 @@ int cmd_keypair_gen() { key_size = (key_size << 8) | *dt++; } } - printf("KEYPAIR RSA %ld (%lx)\r\n",key_size,exponent); + printf("KEYPAIR RSA %lu (%lx)\r\n",(unsigned long)key_size,(unsigned long)exponent); mbedtls_rsa_context rsa; mbedtls_rsa_init(&rsa); uint8_t index = 0; From 7764de4e10dd111546063dc95043f88e448633f1 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 12 Jan 2023 20:05:16 +0100 Subject: [PATCH 12/84] Unused headers. Signed-off-by: Pol Henarejos --- src/hsm/oid.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/hsm/oid.h b/src/hsm/oid.h index 9a5aeda..0a58de7 100644 --- a/src/hsm/oid.h +++ b/src/hsm/oid.h @@ -18,9 +18,6 @@ #ifndef _OID_H_ #define _OID_H_ -#include -#include "pico/stdlib.h" - #define OID_BSI_DE "\x04\x00\x7F\x00\x07" #define OID_ECKA OID_BSI_DE "\x01\x01\x05" From 7195a8f3eca07d693ea5c08f9d12a499e3cbaa49 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 12 Jan 2023 20:05:46 +0100 Subject: [PATCH 13/84] Fix headers in emulation mode. Signed-off-by: Pol Henarejos --- src/hsm/cvc.h | 4 ++++ src/hsm/kek.h | 3 +++ src/hsm/sc_hsm.h | 2 ++ 3 files changed, 9 insertions(+) diff --git a/src/hsm/cvc.h b/src/hsm/cvc.h index c5babfe..3b0135b 100644 --- a/src/hsm/cvc.h +++ b/src/hsm/cvc.h @@ -19,7 +19,11 @@ #define _CVC_H_ #include +#ifndef ENABLE_EMULATION #include "pico/stdlib.h" +#else +#include +#endif #include "mbedtls/ecp.h" typedef struct PUK { diff --git a/src/hsm/kek.h b/src/hsm/kek.h index 479aeb4..f7b48e0 100644 --- a/src/hsm/kek.h +++ b/src/hsm/kek.h @@ -19,6 +19,9 @@ #define _DKEK_H_ #include "crypto_utils.h" +#ifdef ENABLE_EMULATION +#include +#endif extern int load_mkek(uint8_t *); extern int store_mkek(const uint8_t *); diff --git a/src/hsm/sc_hsm.h b/src/hsm/sc_hsm.h index 129ad02..93ce9f8 100644 --- a/src/hsm/sc_hsm.h +++ b/src/hsm/sc_hsm.h @@ -22,7 +22,9 @@ #include "common.h" #include "mbedtls/rsa.h" #include "mbedtls/ecdsa.h" +#ifndef ENABLE_EMULATION #include "pico/stdlib.h" +#endif #include "file.h" #include "apdu.h" #include "hsm.h" From c01940b62be77117e67f685494e573dae3b08a8a Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 12 Jan 2023 20:05:59 +0100 Subject: [PATCH 14/84] Fix accessing way to data. Signed-off-by: Pol Henarejos --- src/hsm/kek.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hsm/kek.c b/src/hsm/kek.c index f1f1317..f7a46cf 100644 --- a/src/hsm/kek.c +++ b/src/hsm/kek.c @@ -18,7 +18,9 @@ #include #include "common.h" #include "stdlib.h" +#ifndef ENABLE_EMULATION #include "pico/stdlib.h" +#endif #include "kek.h" #include "crypto_utils.h" #include "random.h" @@ -54,14 +56,14 @@ int load_mkek(uint8_t *mkek) { const uint8_t *pin = NULL; if (pin == NULL && has_session_pin == true) { file_t *tf = search_by_fid(EF_MKEK, NULL, SPECIFY_EF); - if (tf) { + if (file_has_data(tf)) { memcpy(mkek, file_get_data(tf), MKEK_SIZE); pin = session_pin; } } if (pin == NULL && has_session_sopin == true) { file_t *tf = search_by_fid(EF_MKEK_SO, NULL, SPECIFY_EF); - if (tf) { + if (file_has_data(tf)) { memcpy(mkek, file_get_data(tf), MKEK_SIZE); pin = session_sopin; } From fe7c0333abbde0f8e5a86d5d4329090154ab5d6e Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 12 Jan 2023 20:06:11 +0100 Subject: [PATCH 15/84] Some emulation fixes. Signed-off-by: Pol Henarejos --- src/hsm/sc_hsm.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/hsm/sc_hsm.c b/src/hsm/sc_hsm.c index c036059..bc46711 100644 --- a/src/hsm/sc_hsm.c +++ b/src/hsm/sc_hsm.c @@ -24,7 +24,7 @@ #include "eac.h" #include "cvc.h" #include "asn1.h" -#include "ccid.h" +#include "hsm.h" #include "usb.h" const uint8_t sc_hsm_aid[] = { @@ -75,6 +75,8 @@ extern int cmd_session_pin(); extern int cmd_puk_auth(); extern int cmd_pso(); +extern const uint8_t *ccid_atr; + app_t *sc_hsm_select_aid(app_t *a, const uint8_t *aid, uint8_t aid_len) { if (!memcmp(aid, sc_hsm_aid+1, MIN(aid_len,sc_hsm_aid[0]))) { a->aid = sc_hsm_aid; @@ -240,7 +242,7 @@ int sc_hsm_unload() { uint16_t get_device_options() { file_t *ef = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF); - if (ef && ef->data && file_get_size(ef)) + if (file_has_data(ef)) return (file_read_uint8(file_get_data(ef)) << 8) | file_read_uint8(file_get_data(ef)+1); return 0x0; } @@ -248,8 +250,9 @@ uint16_t get_device_options() { extern uint32_t board_button_read(void); bool wait_button_pressed() { - uint16_t opts = get_device_options(); uint32_t val = EV_PRESS_BUTTON; +#ifndef ENABLE_EMULATION + uint16_t opts = get_device_options(); if (opts & HSM_OPT_BOOTSEL_BUTTON) { queue_try_add(&card_to_usb_q, &val); do { @@ -257,6 +260,7 @@ bool wait_button_pressed() { } while (val != EV_BUTTON_PRESSED && val != EV_BUTTON_TIMEOUT); } +#endif return val == EV_BUTTON_TIMEOUT; } @@ -268,7 +272,11 @@ int parse_token_info(const file_t *f, int mode) { *p++ = 0x30; *p++ = 0; //set later *p++ = 0x2; *p++ = 1; *p++ = HSM_VERSION_MAJOR; +#ifndef ENABLE_EMULATION *p++ = 0x4; *p++ = 8; pico_get_unique_board_id((pico_unique_board_id_t *)p); p += 8; +#else + *p++ = 0x4; *p++ = 8; memset(p, 0, 8); p += 8; +#endif *p++ = 0xC; *p++ = strlen(manu); strcpy((char *)p, manu); p += strlen(manu); *p++ = 0x80; *p++ = strlen(label); strcpy((char *)p, label); p += strlen(label); *p++ = 0x3; *p++ = 2; *p++ = 4; *p++ = 0x30; @@ -316,11 +324,11 @@ int pin_wrong_retry(const file_t *pin) { bool pka_enabled() { file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF); - return ef_puk && ef_puk->data && file_get_size(ef_puk) > 0 && file_read_uint8(file_get_data(ef_puk)) > 0; + return file_has_data(ef_puk) && file_read_uint8(file_get_data(ef_puk)) > 0; } int check_pin(const file_t *pin, const uint8_t *data, size_t len) { - if (!pin || !pin->data || file_get_size(pin) == 0) { + if (!file_has_data((file_t *)pin)) { return SW_REFERENCE_NOT_FOUND(); } if (pka_enabled() == false) From 723011078c7ba6dc4e51a8a39ef8297d39c26d38 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 12 Jan 2023 20:06:31 +0100 Subject: [PATCH 16/84] Using file_has_data() instead of data directly. Signed-off-by: Pol Henarejos --- src/hsm/cmd_update_ef.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hsm/cmd_update_ef.c b/src/hsm/cmd_update_ef.c index 55aff01..8514457 100644 --- a/src/hsm/cmd_update_ef.c +++ b/src/hsm/cmd_update_ef.c @@ -69,7 +69,7 @@ int cmd_update_ef() { return SW_MEMORY_FAILURE(); } else { - if (!ef->data) + if (!file_has_data(ef)) return SW_DATA_INVALID(); uint8_t *data_merge = (uint8_t *)calloc(1, offset+data_len); From 5419ff74eeb43298ca234ee7ba65925fba6e5d2a Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Fri, 13 Jan 2023 18:07:50 +0100 Subject: [PATCH 17/84] Using file_has_data() to check contents. Signed-off-by: Pol Henarejos --- src/hsm/cmd_derive_asym.c | 2 +- src/hsm/cmd_external_authenticate.c | 2 +- src/hsm/cmd_initialize.c | 2 +- src/hsm/cmd_mse.c | 2 +- src/hsm/cmd_puk_auth.c | 6 +++--- src/hsm/cmd_reset_retry.c | 2 +- src/hsm/cmd_signature.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/hsm/cmd_derive_asym.c b/src/hsm/cmd_derive_asym.c index 34d30b7..3eb2121 100644 --- a/src/hsm/cmd_derive_asym.c +++ b/src/hsm/cmd_derive_asym.c @@ -43,7 +43,7 @@ int cmd_derive_asym() { file_t *fkey; if (!isUserAuthenticated) return SW_SECURITY_STATUS_NOT_SATISFIED(); - if (!(fkey = search_dynamic_file((KEY_PREFIX << 8) | key_id)) || !fkey->data || file_get_size(fkey) == 0) + if (!(fkey = search_dynamic_file((KEY_PREFIX << 8) | key_id)) || !file_has_data(fkey)) return SW_FILE_NOT_FOUND(); if (key_has_purpose(fkey, ALGO_EC_DERIVE) == false) return SW_CONDITIONS_NOT_SATISFIED(); diff --git a/src/hsm/cmd_external_authenticate.c b/src/hsm/cmd_external_authenticate.c index df974e9..c7b9798 100644 --- a/src/hsm/cmd_external_authenticate.c +++ b/src/hsm/cmd_external_authenticate.c @@ -32,7 +32,7 @@ int cmd_external_authenticate() { if (apdu.nc == 0) return SW_WRONG_LENGTH(); file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF); - if (!ef_puk || !ef_puk->data || file_get_size(ef_puk) == 0) + if (!file_has_data(ef_puk)) return SW_FILE_NOT_FOUND(); uint8_t *puk_data = file_get_data(ef_puk); uint8_t *input = (uint8_t *)calloc(dev_name_len+challenge_len, sizeof(uint8_t)), hash[32]; diff --git a/src/hsm/cmd_initialize.c b/src/hsm/cmd_initialize.c index d1b4b29..70057ac 100644 --- a/src/hsm/cmd_initialize.c +++ b/src/hsm/cmd_initialize.c @@ -169,7 +169,7 @@ int cmd_initialize() { if (!fdkey) return SW_EXEC_ERROR(); int ret = 0; - if (ret_mkek != CCID_OK || file_get_size(fdkey) == 0 || file_get_data(fdkey) == NULL) { + if (ret_mkek != CCID_OK || !file_has_data(fdkey)) { mbedtls_ecdsa_context ecdsa; mbedtls_ecdsa_init(&ecdsa); mbedtls_ecp_group_id ec_id = MBEDTLS_ECP_DP_SECP256R1; diff --git a/src/hsm/cmd_mse.c b/src/hsm/cmd_mse.c index c1aa8e4..d0e3a69 100644 --- a/src/hsm/cmd_mse.c +++ b/src/hsm/cmd_mse.c @@ -54,7 +54,7 @@ int cmd_mse() { file_t *ef = search_dynamic_file(EF_PUK+i); if (!ef) break; - if (ef->data == NULL || file_get_size(ef) == 0) + if (!file_has_data(ef)) break; size_t chr_len = 0; const uint8_t *chr = cvc_get_chr(file_get_data(ef), file_get_size(ef), &chr_len); diff --git a/src/hsm/cmd_puk_auth.c b/src/hsm/cmd_puk_auth.c index 48472b3..47e6250 100644 --- a/src/hsm/cmd_puk_auth.c +++ b/src/hsm/cmd_puk_auth.c @@ -22,7 +22,7 @@ int cmd_puk_auth() { uint8_t p1 = P1(apdu), p2 = P2(apdu); file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF); - if (!ef_puk || !ef_puk->data || file_get_size(ef_puk) == 0) + if (!file_has_data(ef_puk)) return SW_FILE_NOT_FOUND(); uint8_t *puk_data = file_get_data(ef_puk); if (apdu.nc > 0) { @@ -35,7 +35,7 @@ int cmd_puk_auth() { ef = search_dynamic_file(EF_PUK+i); if (!ef) /* Never should not happen */ return SW_MEMORY_FAILURE(); - if (ef->data == NULL || file_get_size(ef) == 0) /* found first empty slot */ + if (!file_has_data(ef)) /* found first empty slot */ break; } uint8_t *tmp = (uint8_t *)calloc(file_get_size(ef_puk), sizeof(uint8_t)); @@ -64,7 +64,7 @@ int cmd_puk_auth() { file_t *ef = search_dynamic_file(EF_PUK+p2); if (!ef) return SW_INCORRECT_P1P2(); - if (ef->data == NULL || file_get_size(ef) == 0) + if (!file_has_data(ef)) return SW_REFERENCE_NOT_FOUND(); size_t chr_len = 0; const uint8_t *chr = cvc_get_chr(file_get_data(ef), file_get_size(ef), &chr_len); diff --git a/src/hsm/cmd_reset_retry.c b/src/hsm/cmd_reset_retry.c index cb4a678..131233e 100644 --- a/src/hsm/cmd_reset_retry.c +++ b/src/hsm/cmd_reset_retry.c @@ -25,7 +25,7 @@ int cmd_reset_retry() { if (!file_sopin || !file_pin1) { return SW_FILE_NOT_FOUND(); } - if (!file_sopin->data) { + if (!file_has_data(file_sopin)) { return SW_REFERENCE_NOT_FOUND(); } uint16_t opts = get_device_options(); diff --git a/src/hsm/cmd_signature.c b/src/hsm/cmd_signature.c index 0aed65a..0ccfd7f 100644 --- a/src/hsm/cmd_signature.c +++ b/src/hsm/cmd_signature.c @@ -94,7 +94,7 @@ int cmd_signature() { file_t *fkey; if (!isUserAuthenticated) return SW_SECURITY_STATUS_NOT_SATISFIED(); - if (!(fkey = search_dynamic_file((KEY_PREFIX << 8) | key_id)) || !fkey->data || file_get_size(fkey) == 0) + if (!(fkey = search_dynamic_file((KEY_PREFIX << 8) | key_id)) || !file_has_data(fkey)) return SW_FILE_NOT_FOUND(); if (get_key_counter(fkey) == 0) return SW_FILE_FULL(); From e29b3143ede32bbdd519d78e0ddb2c8fee4ed287 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Fri, 13 Jan 2023 18:49:08 +0100 Subject: [PATCH 18/84] Moving pointer Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 88b2978..5d2dd5a 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 88b2978ae5cf3f1de95ebaec0aec0acd3a24878e +Subproject commit 5d2dd5aa75b35f39d2877272d0c29b50c8ff1a5b From f2aa4aae79912f8e1eb9cf3bf0c723115170d409 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Sat, 14 Jan 2023 00:41:23 +0100 Subject: [PATCH 19/84] Moving pointer to latest bug fixes. Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 5d2dd5a..00f9e9c 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 5d2dd5aa75b35f39d2877272d0c29b50c8ff1a5b +Subproject commit 00f9e9c40836fe0c9dd1cfcba604b92e987fa92b From 17941397e9e1b2d961312af1a9c61069826d7ad4 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 16 Jan 2023 18:54:20 +0100 Subject: [PATCH 20/84] Fix exporting large ECC key. Signed-off-by: Pol Henarejos --- src/hsm/cvc.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/hsm/cvc.c b/src/hsm/cvc.c index 89cd225..0425084 100644 --- a/src/hsm/cvc.c +++ b/src/hsm/cvc.c @@ -63,10 +63,12 @@ const uint8_t *pointA[] = { }; size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, size_t buf_len) { + uint8_t Y_buf[MBEDTLS_ECP_MAX_PT_LEN]; const uint8_t oid_ecdsa[] = { 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x02, 0x02, 0x03 }; size_t p_size = mbedtls_mpi_size(&ecdsa->grp.P), a_size = mbedtls_mpi_size(&ecdsa->grp.A); size_t b_size = mbedtls_mpi_size(&ecdsa->grp.B), g_size = 1+mbedtls_mpi_size(&ecdsa->grp.G.X)+mbedtls_mpi_size(&ecdsa->grp.G.X); - size_t o_size = mbedtls_mpi_size(&ecdsa->grp.N), y_size = 1+mbedtls_mpi_size(&ecdsa->Q.X)+mbedtls_mpi_size(&ecdsa->Q.X); + size_t o_size = mbedtls_mpi_size(&ecdsa->grp.N), y_size = 0; + mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &y_size, Y_buf, sizeof(Y_buf)); size_t c_size = 1; size_t ptot_size = asn1_len_tag(0x81, p_size), atot_size = asn1_len_tag(0x82, a_size ? a_size : (pointA[ecdsa->grp.id] && ecdsa->grp.id < 6 ? p_size : 1)); size_t btot_size = asn1_len_tag(0x83, b_size), gtot_size = asn1_len_tag(0x84, g_size); @@ -106,8 +108,7 @@ size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, siz //order *p++ = 0x85; p += format_tlv_len(o_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.N, p, o_size); p += o_size; //Y - size_t y_new_size = 0; - *p++ = 0x86; p += format_tlv_len(y_size, p); mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &y_new_size, p, y_size); p += y_size; + *p++ = 0x86; p += format_tlv_len(y_size, p); memcpy(p, Y_buf, y_size); p += y_size; //cofactor *p++ = 0x87; p += format_tlv_len(c_size, p); if (ecdsa->grp.id == MBEDTLS_ECP_DP_CURVE448) @@ -312,9 +313,9 @@ size_t asn1_build_cert_description(const uint8_t *label, size_t label_len, const return p-buf; } -size_t asn1_build_prkd_ecc(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, uint8_t *buf, size_t buf_len) { +size_t asn1_build_prkd_generic(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, const uint8_t *seq, size_t seq_len, uint8_t *buf, size_t buf_len) { size_t seq1_size = asn1_len_tag(0x30, asn1_len_tag(0xC, label_len)); - size_t seq2_size = asn1_len_tag(0x30, asn1_len_tag(0x4, keyid_len)+asn1_len_tag(0x3, 3)); + size_t seq2_size = asn1_len_tag(0x30, asn1_len_tag(0x4, keyid_len)+asn1_len_tag(0x3, seq_len)); size_t seq3_size = asn1_len_tag(0xA1, asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, 0))+asn1_len_tag(0x2,2))); size_t tot_len = asn1_len_tag(0xA0, seq1_size+seq2_size+seq3_size); if (buf_len == 0 || buf == NULL) @@ -333,13 +334,13 @@ size_t asn1_build_prkd_ecc(const uint8_t *label, size_t label_len, const uint8_t //Seq 2 *p++ = 0x30; - p += format_tlv_len(asn1_len_tag(0x4, keyid_len)+asn1_len_tag(0x3, 3), p); + p += format_tlv_len(asn1_len_tag(0x4, keyid_len)+asn1_len_tag(0x3, seq_len), p); *p++ = 0x4; p += format_tlv_len(keyid_len, p); memcpy(p, keyid, keyid_len); p += keyid_len; *p++ = 0x3; - p += format_tlv_len(3, p); - memcpy(p, "\x07\x20\x80", 3); p += 3; + p += format_tlv_len(seq_len, p); + memcpy(p, seq, seq_len); p += seq_len; //Seq 3 *p++ = 0xA1; @@ -357,6 +358,14 @@ size_t asn1_build_prkd_ecc(const uint8_t *label, size_t label_len, const uint8_t return p-buf; } +size_t asn1_build_prkd_ecc(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, uint8_t *buf, size_t buf_len) { + return asn1_build_prkd_generic(label, label_len, keyid, keyid_len, keysize, (const uint8_t *)"\x07\x20\x80", 3, buf, buf_len); +} + +size_t asn1_build_prkd_rsa(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, uint8_t *buf, size_t buf_len) { + return asn1_build_prkd_generic(label, label_len, keyid, keyid_len, keysize, (const uint8_t *)"\x02\x74", 2, buf, buf_len); +} + const uint8_t *cvc_get_field(const uint8_t *data, size_t len, size_t *olen, uint16_t tag) { uint8_t *rdata = NULL; if (data == NULL || len == 0) From 89d617110f7c8f7933e0fef0c00296237c841bb8 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 16 Jan 2023 18:54:28 +0100 Subject: [PATCH 21/84] Add asn1_build_prkd_rsa() Signed-off-by: Pol Henarejos --- src/hsm/cvc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hsm/cvc.h b/src/hsm/cvc.h index 3b0135b..e87e224 100644 --- a/src/hsm/cvc.h +++ b/src/hsm/cvc.h @@ -52,5 +52,5 @@ extern int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, s extern mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len); extern int puk_verify(const uint8_t *sig, size_t sig_len, const uint8_t *hash, size_t hash_len, const uint8_t *ca, size_t ca_len); extern size_t asn1_build_prkd_ecc(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, uint8_t *buf, size_t buf_len); - +extern size_t asn1_build_prkd_rsa(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, uint8_t *buf, size_t buf_len); #endif From 0daddfd47726d8ded862f3a69ea88995f49b97ae Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 17 Jan 2023 00:05:31 +0100 Subject: [PATCH 22/84] Fix ECDSA-SHA384 and ECDSA-SHA512. Signed-off-by: Pol Henarejos --- src/hsm/cmd_signature.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/hsm/cmd_signature.c b/src/hsm/cmd_signature.c index 0ccfd7f..eb5f768 100644 --- a/src/hsm/cmd_signature.c +++ b/src/hsm/cmd_signature.c @@ -107,7 +107,11 @@ int cmd_signature() { md = MBEDTLS_MD_SHA256; else if (p2 == ALGO_EC_SHA224) md = MBEDTLS_MD_SHA224; - if (p2 == ALGO_RSA_PKCS1_SHA1 || p2 == ALGO_RSA_PSS_SHA1 || p2 == ALGO_EC_SHA1 || p2 == ALGO_RSA_PKCS1_SHA256 || p2 == ALGO_RSA_PSS_SHA256 || p2 == ALGO_EC_SHA256 || p2 == ALGO_EC_SHA224) { + else if (p2 == ALGO_EC_SHA384) + md = MBEDTLS_MD_SHA384; + else if (p2 == ALGO_EC_SHA512) + md = MBEDTLS_MD_SHA512; + if (p2 == ALGO_RSA_PKCS1_SHA1 || p2 == ALGO_RSA_PSS_SHA1 || p2 == ALGO_EC_SHA1 || p2 == ALGO_RSA_PKCS1_SHA256 || p2 == ALGO_RSA_PSS_SHA256 || p2 == ALGO_EC_SHA256 || p2 == ALGO_EC_SHA224 || p2 == ALGO_EC_SHA384 || p2 == ALGO_EC_SHA512) { generic_hash(md, apdu.data, apdu.nc, apdu.data); apdu.nc = mbedtls_md_get_size(mbedtls_md_info_from_type(md)); } @@ -216,8 +220,7 @@ int cmd_signature() { md = MBEDTLS_MD_SHA384; else if (p2 == ALGO_EC_SHA512) md = MBEDTLS_MD_SHA512; - int r; - r = load_private_key_ecdsa(&ctx, fkey); + int r = load_private_key_ecdsa(&ctx, fkey); if (r != CCID_OK) { mbedtls_ecdsa_free(&ctx); if (r == CCID_VERIFICATION_FAILED) From 9d47e620413e7b0894d98cd22304d1003ba5ab8b Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 17 Jan 2023 00:05:46 +0100 Subject: [PATCH 23/84] Fix signature for secp521r1. Signed-off-by: Pol Henarejos --- src/hsm/cvc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hsm/cvc.c b/src/hsm/cvc.c index 0425084..8b042e8 100644 --- a/src/hsm/cvc.c +++ b/src/hsm/cvc.c @@ -178,7 +178,7 @@ size_t asn1_cvc_cert(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf if (key_type == HSM_KEY_RSA) key_size = mbedtls_mpi_size(&((mbedtls_rsa_context *)rsa_ecdsa)->N); else if (key_type == HSM_KEY_EC) - key_size = 2*mbedtls_mpi_size(&((mbedtls_ecdsa_context *)rsa_ecdsa)->d); + key_size = 2*(int)((mbedtls_ecp_curve_info_from_grp_id(((mbedtls_ecdsa_context *)rsa_ecdsa)->grp.id)->bit_size + 7)/8); size_t body_size = asn1_cvc_cert_body(rsa_ecdsa, key_type, NULL, 0, ext, ext_len), sig_size = asn1_len_tag(0x5f37, key_size); size_t tot_len = asn1_len_tag(0x7f21, body_size+sig_size); if (buf_len == 0 || buf == NULL) @@ -207,8 +207,8 @@ size_t asn1_cvc_cert(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf mbedtls_mpi_init(&s); ret = mbedtls_ecdsa_sign(&ecdsa->grp, &r, &s, &ecdsa->d, hsh, sizeof(hsh), random_gen, NULL); if (ret == 0) { - mbedtls_mpi_write_binary(&r, p, mbedtls_mpi_size(&r)); p += mbedtls_mpi_size(&r); - mbedtls_mpi_write_binary(&s, p, mbedtls_mpi_size(&s)); p += mbedtls_mpi_size(&s); + mbedtls_mpi_write_binary(&r, p, key_size/2); p += key_size/2; + mbedtls_mpi_write_binary(&s, p, key_size/2); p += key_size/2; } else { memset(p, 0, key_size); From 8976dc1f79e10982fc248f14b35a5a383f6f47ee Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 17 Jan 2023 00:41:46 +0100 Subject: [PATCH 24/84] Added support for RSA-PKCSv15-SHA224, SHA384 and SHA512. Also added support for RSA-PSS-SHA224, SHA384 and SHA512. Signed-off-by: Pol Henarejos --- src/hsm/cmd_signature.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/hsm/cmd_signature.c b/src/hsm/cmd_signature.c index eb5f768..6f09944 100644 --- a/src/hsm/cmd_signature.c +++ b/src/hsm/cmd_signature.c @@ -105,13 +105,13 @@ int cmd_signature() { md = MBEDTLS_MD_SHA1; else if (p2 == ALGO_RSA_PKCS1_SHA256 || p2 == ALGO_RSA_PSS_SHA256 || p2 == ALGO_EC_SHA256) md = MBEDTLS_MD_SHA256; - else if (p2 == ALGO_EC_SHA224) + else if (p2 == ALGO_EC_SHA224 || p2 == ALGO_RSA_PKCS1_SHA224 || p2 == ALGO_RSA_PSS_SHA224) md = MBEDTLS_MD_SHA224; - else if (p2 == ALGO_EC_SHA384) + else if (p2 == ALGO_EC_SHA384 || p2 == ALGO_RSA_PKCS1_SHA384 || p2 == ALGO_RSA_PSS_SHA384) md = MBEDTLS_MD_SHA384; - else if (p2 == ALGO_EC_SHA512) + else if (p2 == ALGO_EC_SHA512 || p2 == ALGO_RSA_PKCS1_SHA512 || p2 == ALGO_RSA_PSS_SHA512) md = MBEDTLS_MD_SHA512; - if (p2 == ALGO_RSA_PKCS1_SHA1 || p2 == ALGO_RSA_PSS_SHA1 || p2 == ALGO_EC_SHA1 || p2 == ALGO_RSA_PKCS1_SHA256 || p2 == ALGO_RSA_PSS_SHA256 || p2 == ALGO_EC_SHA256 || p2 == ALGO_EC_SHA224 || p2 == ALGO_EC_SHA384 || p2 == ALGO_EC_SHA512) { + if (p2 == ALGO_RSA_PKCS1_SHA1 || p2 == ALGO_RSA_PSS_SHA1 || p2 == ALGO_EC_SHA1 || p2 == ALGO_RSA_PKCS1_SHA256 || p2 == ALGO_RSA_PSS_SHA256 || p2 == ALGO_EC_SHA256 || p2 == ALGO_EC_SHA224 || p2 == ALGO_EC_SHA384 || p2 == ALGO_EC_SHA512 || p2 == ALGO_RSA_PKCS1_SHA224 || p2 == ALGO_RSA_PKCS1_SHA384 || p2 == ALGO_RSA_PKCS1_SHA512 || p2 == ALGO_RSA_PSS_SHA224 || p2 == ALGO_RSA_PSS_SHA384 || p2 == ALGO_RSA_PSS_SHA512) { generic_hash(md, apdu.data, apdu.nc, apdu.data); apdu.nc = mbedtls_md_get_size(mbedtls_md_info_from_type(md)); } @@ -119,8 +119,7 @@ int cmd_signature() { mbedtls_rsa_context ctx; mbedtls_rsa_init(&ctx); - int r; - r = load_private_key_rsa(&ctx, fkey); + int r = load_private_key_rsa(&ctx, fkey); if (r != CCID_OK) { mbedtls_rsa_free(&ctx); if (r == CCID_VERIFICATION_FAILED) From 1af461c206d48191ee9377211aeb62b222831c61 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 17 Jan 2023 13:41:10 +0100 Subject: [PATCH 25/84] Add first battery of tests. It contains keypair generation for ECC and RSA, PIN blocking and signature generation and verification. Signed-off-by: Pol Henarejos --- tests/conftest.py | 246 +++++++++++++++++++++++++++++ tests/pico-hsm/test_keypair_gen.py | 40 +++++ tests/pico-hsm/test_pin.py | 48 ++++++ tests/pico-hsm/test_signature.py | 57 +++++++ tests/utils.py | 120 ++++++++++++++ 5 files changed, 511 insertions(+) create mode 100644 tests/conftest.py create mode 100644 tests/pico-hsm/test_keypair_gen.py create mode 100644 tests/pico-hsm/test_pin.py create mode 100644 tests/pico-hsm/test_signature.py create mode 100644 tests/utils.py diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 0000000..90c2903 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,246 @@ + +import sys +import pytest +from binascii import hexlify +from utils import APDUResponse, DOPrefixes, KeyType, Algorithm +import hashlib + +try: + from cvc.asn1 import ASN1 + from cvc import oid + from cvc.certificates import CVC + from cvc.ec_curves import ec_domain, find_curve +except ModuleNotFoundError: + print('ERROR: cvc module not found! Install pycvc package.\nTry with `pip install pycvc`') + sys.exit(-1) + +try: + from smartcard.CardType import AnyCardType + from smartcard.CardRequest import CardRequest + from smartcard.Exceptions import CardRequestTimeoutException, CardConnectionException +except ModuleNotFoundError: + print('ERROR: smarctard module not found! Install pyscard package.\nTry with `pip install pyscard`') + sys.exit(-1) + +try: + from cryptography.hazmat.primitives.asymmetric import ec, rsa, utils, padding + from cryptography.hazmat.primitives.kdf.hkdf import HKDF + from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat + from cryptography.hazmat.primitives.ciphers.aead import ChaCha20Poly1305 + from cryptography.hazmat.primitives import hashes, serialization +except ModuleNotFoundError: + print('ERROR: cryptography module not found! Install cryptography package.\nTry with `pip install cryptography`') + sys.exit(-1) + +class Device: + class EcDummy: + def __init__(self, name): + self.name = name + + def __init__(self,pin='648219'): + self.__pin = pin + cardtype = AnyCardType() + try: + # request card insertion + cardrequest = CardRequest(timeout=10, cardType=cardtype) + self.__card = cardrequest.waitforcard() + + # connect to the card and perform a few transmits + self.__card.connection.connect() + + except CardRequestTimeoutException: + raise Exception('time-out: no card inserted during last 10s') + self.select_applet() + + def select_applet(self): + self.__card.connection.transmit([0x00, 0xA4, 0x04, 0x00, 0xB, 0xE8, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x81, 0xC3, 0x1F, 0x02, 0x01, 0x0]) + + def send(self, command, cla=0x00, p1=0x00, p2=0x00, ne=None, data=None): + lc = [] + dataf = [] + if (data): + lc = [0x00] + list(len(data).to_bytes(2, 'big')) + dataf = list(data) + if (ne is None): + le = [0x00, 0x00] + else: + le = list(ne.to_bytes(2, 'big')) + if (isinstance(command, list) and len(command) > 1): + apdu = command + else: + apdu = [cla, command] + + apdu = apdu + [p1, p2] + lc + dataf + le + try: + response, sw1, sw2 = self.__card.connection.transmit(apdu) + except CardConnectionException: + self.__card.connection.reconnect() + response, sw1, sw2 = self.__card.connection.transmit(apdu) + + if (sw1 != 0x90): + if (sw1 == 0x63 and sw2 & 0xF0 == 0xC0): + pass + elif (sw1 == 0x6A and sw2 == 0x82): + self.select_applet() + if (sw1 == 0x90): + response, sw1, sw2 = self.__card.connection.transmit(apdu) + if (sw1 == 0x90): + return response + elif (sw1 == 0x69 and sw2 == 0x82): + response, sw1, sw2 = self.__card.connection.transmit([0x00, 0x20, 0x00, 0x81, len(self.__pin)] + list(self.__pin.encode()) + [0x0]) + if (sw1 == 0x90): + response, sw1, sw2 = self.__card.connection.transmit(apdu) + if (sw1 == 0x90): + return response + raise APDUResponse(sw1, sw2) + return response + + def get_login_retries(self): + self.select_applet() + try: + self.send(command=0x20, p2=0x81) + except APDUResponse as e: + if (e.sw1 == 0x63 and e.sw2 & 0xF0 == 0xC0): + return e.sw2 & 0x0F + raise e + + def initialize(self, pin='648219', sopin='57621880', options=None, retries=3, dkek_shares=None, puk_auts=None, puk_min_auts=None, key_domains=None): + if (retries is not None and not 0 < retries <= 10): + raise ValueError('Retries must be in the range (0,10]') + if (dkek_shares is not None and not 0 <= dkek_shares <= 10): + raise ValueError('DKEK shares must be in the range [0,10]') + if ((puk_auts is not None and puk_min_auts is None) or (puk_auts is None and puk_min_auts is not None)): + raise ValueError('PUK Auts and PUK Min Auts must be specified both') + if (puk_auts is not None and not 0 < puk_auts <= 8): + raise ValueError('PUK Auts must be in the range (0,8]') + if (puk_min_auts is not None and not 0 < puk_min_auts <= 8): + raise ValueError('PUK Min Auts must be in the range (0,8]') + if (puk_auts is not None and puk_min_auts is not None and puk_min_auts > puk_auts): + raise ValueError('PUK Min Auts must be less or equal to PUK Auts') + if (key_domains is not None and not 0 < key_domains <= 8): + raise ValueError('Key Domains must be in the range (0,8]') + + a = ASN1() + if (pin is not None): + a = a.add_tag(0x81, pin.encode()) + if (sopin is not None): + a = a.add_tag(0x82, sopin.encode()) + if (retries is not None): + a = a.add_tag(0x91, bytes([retries])) + if (dkek_shares is not None): + a = a.add_tag(0x92, bytes([dkek_shares])) + if (puk_auts is not None and puk_min_auts is not None): + a = a.add_tag(0x93, bytes([puk_auts, puk_min_auts])) + if (key_domains is not None): + a = a.add_tag(0x97, bytes([key_domains])) + + data = a.encode() + + self.send(cla=0x80, command=0x50, data=data) + + def login(self, pin=None): + if (pin is None): + pin = self.__pin + self.send(command=0x20, p2=0x81, data=pin.encode()) + + def get_first_free_id(self): + kids = self.list_keys(prefix=DOPrefixes.KEY_PREFIX) + mset = set(range(max(kids)))-set(kids) + if (len(mset) > 0): + return min(mset) + if (max(kids) == 255): + raise ValueError('Max number of key id reached') + return max(kids)+1 + + def list_keys(self, prefix=None): + resp = self.send(command=0x58) + if (prefix is not None): + grouped = [(resp[i],resp[i+1]) for i in range(0, len(resp), 2) if resp[i] == prefix.value] + _, kids = zip(*grouped) + return kids + return [(resp[i],resp[i+1]) for i in range(0, len(resp), 2)] + + def keypair_generation(self, type, param): + a = ASN1().add_tag(0x5f29, bytes([0])).add_tag(0x42, 'UTCA00001'.encode()) + if (type == KeyType.RSA): + if (not 1024 <= param <= 4096): + raise ValueError('RSA bits must be in the range [1024,4096]') + a.add_tag(0x7f49, ASN1().add_oid(oid.ID_TA_RSA_V1_5_SHA_256).add_tag(0x2, param.to_bytes(2, 'big')).encode()) + elif (type == KeyType.ECC): + if (param not in ('secp192r1', 'secp256r1', 'secp384r1', 'secp521r1', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1', 'secp192k1', 'secp256k1')): + raise ValueError('Wrong elliptic curve name') + + dom = ec_domain(Device.EcDummy(param)) + pubctx = [dom.P, dom.A, dom.B, dom.G, dom.O, None, dom.F] + a.add_object(0x7f49, oid.ID_TA_ECDSA_SHA_256, pubctx) + a.add_tag(0x5f20, 'UTCDUMMY00001'.encode()) + data = a.encode() + + keyid = self.get_first_free_id() + self.send(command=0x46, p1=keyid, data=list(data)) + return keyid + + def delete_file(self, fid): + self.send(command=0xE4, data=[fid >> 8, fid & 0xff]) + + def public_key(self, type, keyid, param=None): + response = self.send(command=0xB1, p1=0xCE, p2=keyid, data=[0x54, 0x02, 0x00, 0x00]) + + cert = bytearray(response) + roid = CVC().decode(cert).pubkey().oid() + if (roid == oid.ID_TA_ECDSA_SHA_256): + curve = find_curve(ec_domain(Device.EcDummy(param)).P) + Y = bytes(CVC().decode(cert).pubkey().find(0x86).data()) + return ec.EllipticCurvePublicKey.from_encoded_point( + curve, + Y, + ) + elif (roid == oid.ID_TA_RSA_V1_5_SHA_256): + n = int.from_bytes(bytes(CVC().decode(cert).pubkey().find(0x81).data()), 'big') + e = int.from_bytes(bytes(CVC().decode(cert).pubkey().find(0x82).data()), 'big') + return rsa.RSAPublicNumbers(e, n).public_key() + return None + + def sign(self, keyid, scheme, data): + resp = self.send(cla=0x80, command=0x68, p1=keyid, p2=scheme.value, data=data) + return resp + + def verify(self, pubkey, data, signature, scheme): + if (Algorithm.ALGO_EC_RAW.value <= scheme.value <= Algorithm.ALGO_EC_SHA512.value): + if (scheme == Algorithm.ALGO_EC_SHA1): + hsh = hashes.SHA1() + elif (scheme == Algorithm.ALGO_EC_SHA224): + hsh = hashes.SHA224() + elif (scheme == Algorithm.ALGO_EC_SHA256): + hsh = hashes.SHA256() + elif (scheme == Algorithm.ALGO_EC_RAW): + hsh = utils.Prehashed(hashes.SHA512()) + elif (scheme == Algorithm.ALGO_EC_SHA384): + hsh = hashes.SHA384() + elif (scheme == Algorithm.ALGO_EC_SHA512): + hsh = hashes.SHA512() + return pubkey.verify(signature, data, ec.ECDSA(hsh)) + elif (Algorithm.ALGO_RSA_PKCS1_SHA1.value <= scheme.value <= Algorithm.ALGO_RSA_PSS_SHA512.value): + if (scheme == Algorithm.ALGO_RSA_PKCS1_SHA1 or scheme == Algorithm.ALGO_RSA_PSS_SHA1): + hsh = hashes.SHA1() + elif (scheme == Algorithm.ALGO_RSA_PKCS1_SHA224 or scheme == Algorithm.ALGO_RSA_PSS_SHA224): + hsh = hashes.SHA224() + elif (scheme == Algorithm.ALGO_RSA_PKCS1_SHA256 or scheme == Algorithm.ALGO_RSA_PSS_SHA256): + hsh = hashes.SHA256() + elif (scheme == Algorithm.ALGO_RSA_PKCS1_SHA384 or scheme == Algorithm.ALGO_RSA_PSS_SHA384): + hsh = hashes.SHA384() + elif (scheme == Algorithm.ALGO_RSA_PKCS1_SHA512 or scheme == Algorithm.ALGO_RSA_PSS_SHA512): + hsh = hashes.SHA512() + if (Algorithm.ALGO_RSA_PKCS1_SHA1.value <= scheme.value <= Algorithm.ALGO_RSA_PKCS1_SHA512.value): + padd = padding.PKCS1v15() + elif (Algorithm.ALGO_RSA_PSS_SHA1.value <= scheme.value <= Algorithm.ALGO_RSA_PSS_SHA512.value): + padd = padding.PSS( + mgf=padding.MGF1(hsh), + salt_length=padding.PSS.AUTO + ) + return pubkey.verify(signature, data, padd, hsh) + +@pytest.fixture(scope="session") +def device(): + dev = Device() + return dev diff --git a/tests/pico-hsm/test_keypair_gen.py b/tests/pico-hsm/test_keypair_gen.py new file mode 100644 index 0000000..ff8f120 --- /dev/null +++ b/tests/pico-hsm/test_keypair_gen.py @@ -0,0 +1,40 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +from utils import KeyType, DOPrefixes + +@pytest.mark.parametrize( + "curve", ['secp192r1', 'secp256r1', 'secp384r1', 'secp521r1', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1', 'secp192k1', 'secp256k1'] +) +def test_gen_ecc(device, curve): + keyid = device.keypair_generation(KeyType.ECC, curve) + resp = device.list_keys() + assert((DOPrefixes.KEY_PREFIX.value, keyid) in resp) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + +@pytest.mark.parametrize( + "modulus", [1024, 2048, 4096] +) +def test_gen_rsa(device, modulus): + keyid = device.keypair_generation(KeyType.RSA, modulus) + resp = device.list_keys() + assert((DOPrefixes.KEY_PREFIX.value, keyid) in resp) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + diff --git a/tests/pico-hsm/test_pin.py b/tests/pico-hsm/test_pin.py new file mode 100644 index 0000000..2e96a0e --- /dev/null +++ b/tests/pico-hsm/test_pin.py @@ -0,0 +1,48 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +from utils import APDUResponse, SWCodes + +PIN = '648219' + +def test_pin(device): + device.initialize(retries=3) + retries = device.get_login_retries() + assert(retries == 3) + + device.login(PIN) + + with pytest.raises(APDUResponse) as e: + device.login('112233') + assert(e.value.sw1 == 0x63 and e.value.sw2 == 0xC2) + + with pytest.raises(APDUResponse) as e: + device.login('112233') + assert(e.value.sw1 == 0x63 and e.value.sw2 == 0xC1) + + with pytest.raises(APDUResponse) as e: + device.login('112233') + assert(e.value.sw == SWCodes.SW_PIN_BLOCKED.value) + + device.initialize(retries=3) + retries = device.get_login_retries() + assert(retries == 3) + + diff --git a/tests/pico-hsm/test_signature.py b/tests/pico-hsm/test_signature.py new file mode 100644 index 0000000..4c88742 --- /dev/null +++ b/tests/pico-hsm/test_signature.py @@ -0,0 +1,57 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +from utils import KeyType, DOPrefixes, Algorithm +from binascii import hexlify +import hashlib + +data = b'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam neque urna, iaculis quis auctor scelerisque, auctor ut risus. In rhoncus, odio consequat consequat ultrices, ex libero dictum risus, accumsan interdum nisi orci ac neque. Ut vitae sem in metus hendrerit facilisis. Mauris maximus tristique mi, quis blandit lectus convallis eget.' + + +@pytest.mark.parametrize( + "curve", ['secp192r1', 'secp256r1', 'secp384r1', 'secp521r1',] +) +@pytest.mark.parametrize( + "scheme", [Algorithm.ALGO_EC_RAW, Algorithm.ALGO_EC_SHA1, Algorithm.ALGO_EC_SHA224, Algorithm.ALGO_EC_SHA256, Algorithm.ALGO_EC_SHA384, Algorithm.ALGO_EC_SHA512] +) +def test_signature_ecc(device, curve, scheme): + keyid = device.keypair_generation(KeyType.ECC, curve) + pubkey = device.public_key(type=KeyType.ECC, keyid=keyid, param=curve) + if (scheme == Algorithm.ALGO_EC_RAW): + datab = hashlib.sha512(data).digest() + else: + datab = data + signature = device.sign(keyid=keyid, scheme=scheme, data=datab) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + device.verify(pubkey, datab, signature, scheme) + +@pytest.mark.parametrize( + "modulus", [1024,2048] +) +@pytest.mark.parametrize( + "scheme", [Algorithm.ALGO_RSA_PKCS1_SHA1, Algorithm.ALGO_RSA_PKCS1_SHA224, Algorithm.ALGO_RSA_PKCS1_SHA256, Algorithm.ALGO_RSA_PKCS1_SHA384, Algorithm.ALGO_RSA_PKCS1_SHA512, Algorithm.ALGO_RSA_PSS_SHA1, Algorithm.ALGO_RSA_PSS_SHA224, Algorithm.ALGO_RSA_PSS_SHA256, Algorithm.ALGO_RSA_PSS_SHA384, Algorithm.ALGO_RSA_PSS_SHA512] +) +def test_signature_rsa(device, modulus, scheme): + keyid = device.keypair_generation(KeyType.RSA, modulus) + pubkey = device.public_key(type=KeyType.RSA, keyid=keyid) + signature = device.sign(keyid=keyid, scheme=scheme, data=data) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + device.verify(pubkey, data, signature, scheme) + diff --git a/tests/utils.py b/tests/utils.py new file mode 100644 index 0000000..4923507 --- /dev/null +++ b/tests/utils.py @@ -0,0 +1,120 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +from enum import Enum + +class SWCodes(Enum): + SW_BYTES_REMAINING_00 = 0x6100 + SW_WARNING_STATE_UNCHANGED = 0x6200 + SW_WARNING_CORRUPTED = 0x6281 + SW_WARNING_EOF = 0x6282 + SW_WARNING_EF_DEACTIVATED = 0x6283 + SW_WARNING_WRONG_FCI = 0x6284 + SW_WARNING_EF_TERMINATED = 0x6285 + + SW_WARNING_NOINFO = 0x6300 + SW_WARNING_FILLUP = 0x6381 + + SW_EXEC_ERROR = 0x6400 + + SW_SECURE_MESSAGE_EXEC_ERROR = 0x6600 + + SW_WRONG_LENGTH = 0x6700 + + SW_LOGICAL_CHANNEL_NOT_SUPPORTED = 0x6881 + SW_SECURE_MESSAGING_NOT_SUPPORTED = 0x6882 + + SW_COMMAND_INCOMPATIBLE = 0x6981 + SW_SECURITY_STATUS_NOT_SATISFIED = 0x6982 + SW_PIN_BLOCKED = 0x6983 + SW_DATA_INVALID = 0x6984 + SW_CONDITIONS_NOT_SATISFIED = 0x6985 + SW_COMMAND_NOT_ALLOWED = 0x6986 + SW_SECURE_MESSAGING_MISSING_DO = 0x6987 + SW_SECURE_MESSAGING_INCORRECT_DO = 0x6988 + SW_APPLET_SELECT_FAILED = 0x6999 + + SW_INCORRECT_PARAMS = 0x6A80 + SW_FUNC_NOT_SUPPORTED = 0x6A81 + SW_FILE_NOT_FOUND = 0x6A82 + SW_RECORD_NOT_FOUND = 0x6A83 + SW_FILE_FULL = 0x6A84 + SW_WRONG_NE = 0x6A85 + SW_INCORRECT_P1P2 = 0x6A86 + SW_WRONG_NC = 0x6A87 + SW_REFERENCE_NOT_FOUND = 0x6A88 + SW_FILE_EXISTS = 0x6A89 + + SW_WRONG_P1P2 = 0x6B00 + + SW_CORRECT_LENGTH_00 = 0x6C00 + + SW_INS_NOT_SUPPORTED = 0x6D00 + + SW_CLA_NOT_SUPPORTED = 0x6E00 + + SW_UNKNOWN = 0x6F00 + + SW_OK = 0x900 + +class APDUResponse(Exception): + def __init__(self, sw1, sw2): + self.sw1 = sw1 + self.sw2 = sw2 + self.sw = sw1 << 8 | sw2 + super().__init__(f'SW:{sw1:02X}{sw2:02X}') + +class DOPrefixes(Enum): + PRKD_PREFIX = 0xC4 + CD_PREFIX = 0xC8 + DCOD_PREFIX = 0xC9 + CA_CERTIFICATE_PREFIX = 0xCA + KEY_PREFIX = 0xCC + PROT_DATA_PREFIX = 0xCD + EE_CERTIFICATE_PREFIX = 0xCE + DATA_PREFIX = 0xCF + +class KeyType(Enum): + RSA = 1 + ECC = 2 + +class Algorithm(Enum): + ALGO_EC_RAW = 0x70 + ALGO_EC_SHA1 = 0x71 + ALGO_EC_SHA224 = 0x72 + ALGO_EC_SHA256 = 0x73 + ALGO_EC_SHA384 = 0x74 + ALGO_EC_SHA512 = 0x75 + + ALGO_RSA_RAW = 0x20 + ALGO_RSA_DECRYPT = 0x21 + ALGO_RSA_DECRYPT_PKCS1 = 0x22 + ALGO_RSA_DECRYPT_OEP = 0x23 + ALGO_RSA_PKCS1 = 0x30 + ALGO_RSA_PKCS1_SHA1 = 0x31 + ALGO_RSA_PKCS1_SHA224 = 0x32 + ALGO_RSA_PKCS1_SHA256 = 0x33 + ALGO_RSA_PKCS1_SHA384 = 0x34 + ALGO_RSA_PKCS1_SHA512 = 0x35 + ALGO_RSA_PSS = 0x40 + ALGO_RSA_PSS_SHA1 = 0x41 + ALGO_RSA_PSS_SHA224 = 0x42 + ALGO_RSA_PSS_SHA256 = 0x43 + ALGO_RSA_PSS_SHA384 = 0x44 + ALGO_RSA_PSS_SHA512 = 0x45 From 6f8769ee8d7aaf54ed97e06dcb8903604555a4e6 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 01:24:10 +0100 Subject: [PATCH 26/84] Added scripts for testing in a docker container. Signed-off-by: Pol Henarejos --- tests/docker/jammy/Dockerfile | 29 ++++++++++ tests/docker_env.sh | 106 ++++++++++++++++++++++++++++++++++ tests/run-test-in-docker.sh | 6 ++ tests/start-up-and-test.sh | 5 ++ 4 files changed, 146 insertions(+) create mode 100644 tests/docker/jammy/Dockerfile create mode 100644 tests/docker_env.sh create mode 100755 tests/run-test-in-docker.sh create mode 100755 tests/start-up-and-test.sh diff --git a/tests/docker/jammy/Dockerfile b/tests/docker/jammy/Dockerfile new file mode 100644 index 0000000..7de8b99 --- /dev/null +++ b/tests/docker/jammy/Dockerfile @@ -0,0 +1,29 @@ +FROM ubuntu:jammy + +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt update && apt upgrade -y +RUN apt install -y libccid \ + libpcsclite-dev \ + git \ + autoconf \ + pkg-config \ + libtool \ + help2man \ + automake \ + gcc \ + make \ + build-essential \ + opensc \ + python3 \ + python3-pip \ + swig \ + cmake \ + && rm -rf /var/lib/apt/lists/* +RUN pip3 install pytest pycvc cryptography pyscard +RUN git clone https://github.com/frankmorgner/vsmartcard.git +WORKDIR /vsmartcard/virtualsmartcard +RUN autoreconf --verbose --install +RUN ./configure --sysconfdir=/etc +RUN make && make install +WORKDIR / diff --git a/tests/docker_env.sh b/tests/docker_env.sh new file mode 100644 index 0000000..4bdc912 --- /dev/null +++ b/tests/docker_env.sh @@ -0,0 +1,106 @@ +#!/bin/bash -eu + +# Taken from Mbed-TLS project +# https://github.com/Mbed-TLS/mbedtls/blob/master/tests/scripts/docker_env.sh +# +# docker_env.sh +# +# Purpose +# ------- +# +# This is a helper script to enable running tests under a Docker container, +# thus making it easier to get set up as well as isolating test dependencies +# (which include legacy/insecure configurations of openssl and gnutls). +# +# WARNING: the Dockerfile used by this script is no longer maintained! See +# https://github.com/Mbed-TLS/mbedtls-test/blob/master/README.md#quick-start +# for the set of Docker images we use on the CI. +# +# Notes for users +# --------------- +# This script expects a Linux x86_64 system with a recent version of Docker +# installed and available for use, as well as http/https access. If a proxy +# server must be used, invoke this script with the usual environment variables +# (http_proxy and https_proxy) set appropriately. If an alternate Docker +# registry is needed, specify MBEDTLS_DOCKER_REGISTRY to point at the +# host name. +# +# +# Running this script directly will check for Docker availability and set up +# the Docker image. + +# Copyright The Mbed TLS Contributors +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# default values, can be overridden by the environment +: ${MBEDTLS_DOCKER_GUEST:=jammy} + + +DOCKER_IMAGE_TAG="pico-hsm-test:${MBEDTLS_DOCKER_GUEST}" + +# Make sure docker is available +if ! which docker > /dev/null; then + echo "Docker is required but doesn't seem to be installed. See https://www.docker.com/ to get started" + exit 1 +fi + +# Figure out if we need to 'sudo docker' +if groups | grep docker > /dev/null; then + DOCKER="docker" +else + echo "Using sudo to invoke docker since you're not a member of the docker group..." + DOCKER="docker" +fi + +# Figure out the number of processors available +if [ "$(uname)" == "Darwin" ]; then + NUM_PROC="$(sysctl -n hw.logicalcpu)" +else + NUM_PROC="$(nproc)" +fi + +# Build the Docker image +echo "Getting docker image up to date (this may take a few minutes)..." +${DOCKER} image build \ + -t ${DOCKER_IMAGE_TAG} \ + --cache-from=${DOCKER_IMAGE_TAG} \ + --network host \ + --build-arg MAKEFLAGS_PARALLEL="-j ${NUM_PROC}" \ + tests/docker/${MBEDTLS_DOCKER_GUEST} + +run_in_docker() +{ + ENV_ARGS="" + while [ "$1" == "-e" ]; do + ENV_ARGS="${ENV_ARGS} $1 $2" + shift 2 + done + + WORKDIR="${PWD}" + if [ "$1" == '-w' ]; then + WORKDIR="$2" + shift 2 + fi + + ${DOCKER} container run -it --rm \ + --cap-add SYS_PTRACE \ + --volume $PWD:$PWD \ + --workdir ${WORKDIR} \ + -e MAKEFLAGS \ + ${ENV_ARGS} \ + ${DOCKER_IMAGE_TAG} \ + $@ +} diff --git a/tests/run-test-in-docker.sh b/tests/run-test-in-docker.sh new file mode 100755 index 0000000..b8cbb3d --- /dev/null +++ b/tests/run-test-in-docker.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eu + +source tests/docker_env.sh +run_in_docker rm -f memory.flash +run_in_docker ./tests/start-up-and-test.sh + diff --git a/tests/start-up-and-test.sh b/tests/start-up-and-test.sh new file mode 100755 index 0000000..d7aaa04 --- /dev/null +++ b/tests/start-up-and-test.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eu + +/usr/sbin/pcscd & +./build_in_docker/pico_hsm > /dev/null & +pytest tests -W ignore::DeprecationWarning From 8f593f63577239d8275610494023251c0158c57d Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 01:24:35 +0100 Subject: [PATCH 27/84] Added support for build emulation in Apple and Linux. Signed-off-by: Pol Henarejos --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2305997..fcb5fc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,10 +89,16 @@ target_compile_options(pico_hsm PUBLIC -fdata-sections -ffunction-sections ) - target_link_options(pico_hsm PUBLIC +if(APPLE) +target_link_options(pico_hsm PUBLIC -Wl,-dead_strip ) else() +target_link_options(pico_hsm PUBLIC + -Wl,--gc-sections + ) +endif (APPLE) +else() pico_add_extra_outputs(pico_hsm) target_link_libraries(pico_hsm PRIVATE pico_hsm_sdk pico_stdlib pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id hardware_rtc tinyusb_device tinyusb_board) From 52114b2d85ef655cf1fa3b6c80e1c15b9bb137ba Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 01:25:05 +0100 Subject: [PATCH 28/84] Added initialization on each keypairgen. Signed-off-by: Pol Henarejos --- tests/pico-hsm/test_keypair_gen.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/pico-hsm/test_keypair_gen.py b/tests/pico-hsm/test_keypair_gen.py index ff8f120..30254ad 100644 --- a/tests/pico-hsm/test_keypair_gen.py +++ b/tests/pico-hsm/test_keypair_gen.py @@ -24,6 +24,7 @@ from utils import KeyType, DOPrefixes "curve", ['secp192r1', 'secp256r1', 'secp384r1', 'secp521r1', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1', 'secp192k1', 'secp256k1'] ) def test_gen_ecc(device, curve): + device.initialize(retries=3) keyid = device.keypair_generation(KeyType.ECC, curve) resp = device.list_keys() assert((DOPrefixes.KEY_PREFIX.value, keyid) in resp) @@ -33,6 +34,7 @@ def test_gen_ecc(device, curve): "modulus", [1024, 2048, 4096] ) def test_gen_rsa(device, modulus): + device.initialize(retries=3) keyid = device.keypair_generation(KeyType.RSA, modulus) resp = device.list_keys() assert((DOPrefixes.KEY_PREFIX.value, keyid) in resp) From 35c42bccb4db82d2ea66d619ba0403e2e9a9b8b8 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 01:25:25 +0100 Subject: [PATCH 29/84] List PRKD if exist. Signed-off-by: Pol Henarejos --- src/hsm/cmd_list_keys.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/hsm/cmd_list_keys.c b/src/hsm/cmd_list_keys.c index ea59704..4d70e98 100644 --- a/src/hsm/cmd_list_keys.c +++ b/src/hsm/cmd_list_keys.c @@ -33,13 +33,20 @@ int cmd_list_keys() //first CC for (int i = 0; i < dynamic_files; i++) { file_t *f = &dynamic_file[i]; - if ((f->fid & 0xff00) == (PRKD_PREFIX << 8)) { - res_APDU[res_APDU_size++] = PRKD_PREFIX; - res_APDU[res_APDU_size++] = f->fid & 0xff; + if ((f->fid & 0xff00) == (KEY_PREFIX << 8)) + { res_APDU[res_APDU_size++] = KEY_PREFIX; res_APDU[res_APDU_size++] = f->fid & 0xff; } } + for (int i = 0; i < dynamic_files; i++) { + file_t *f = &dynamic_file[i]; + if ((f->fid & 0xff00) == (PRKD_PREFIX << 8)) + { + res_APDU[res_APDU_size++] = PRKD_PREFIX; + res_APDU[res_APDU_size++] = f->fid & 0xff; + } + } //second CD for (int i = 0; i < dynamic_files; i++) { file_t *f = &dynamic_file[i]; From ca093eb81e73d03d2c2a743b0ddad37e461e1b2d Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 11:59:26 +0100 Subject: [PATCH 30/84] Add emulation and test workflow. Signed-off-by: Pol Henarejos --- .github/workflows/test.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..1cc72fd --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,33 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "Emulation and test" + +on: + push: + branches: [ "master", "development" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "master", "development" ] + schedule: + - cron: '23 5 * * 4' + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: build + run: ./tests/build-in-docker.sh + - name: run and test + run: ./tests/run-test-in-docker.sh From fc8d39882fa75c183a782e80b3fbe8ca65804a83 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 12:00:57 +0100 Subject: [PATCH 31/84] Add missing build file. Signed-off-by: Pol Henarejos --- tests/build-in-docker.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 tests/build-in-docker.sh diff --git a/tests/build-in-docker.sh b/tests/build-in-docker.sh new file mode 100755 index 0000000..d0b636e --- /dev/null +++ b/tests/build-in-docker.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eu + +source tests/docker_env.sh +#run_in_docker rm -rf CMakeFiles +run_in_docker mkdir -p build_in_docker +run_in_docker -w "$PWD/build_in_docker" cmake -DENABLE_EMULATION=1 .. +run_in_docker -w "$PWD/build_in_docker" make -j ${NUM_PROC} From 8540fdcf19ca1f6df9e52232d458fbcf412203cb Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 12:01:20 +0100 Subject: [PATCH 32/84] Updating pointer. Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 00f9e9c..a9eee86 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 00f9e9c40836fe0c9dd1cfcba604b92e987fa92b +Subproject commit a9eee861fe4e86896d98cc63cc89ec2a96d24599 From bac15d54727d80c109532390716f1337b9bc8627 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 12:05:03 +0100 Subject: [PATCH 33/84] Removing TTY from docker. Signed-off-by: Pol Henarejos --- tests/docker_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker_env.sh b/tests/docker_env.sh index 4bdc912..c11fcb0 100644 --- a/tests/docker_env.sh +++ b/tests/docker_env.sh @@ -95,7 +95,7 @@ run_in_docker() shift 2 fi - ${DOCKER} container run -it --rm \ + ${DOCKER} container run --rm \ --cap-add SYS_PTRACE \ --volume $PWD:$PWD \ --workdir ${WORKDIR} \ From ebd8dc7bb8d2277331f984a0ecce756bbfa59f57 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 12:08:16 +0100 Subject: [PATCH 34/84] Add apt-utils package. Signed-off-by: Pol Henarejos --- tests/docker/jammy/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/jammy/Dockerfile b/tests/docker/jammy/Dockerfile index 7de8b99..77f072d 100644 --- a/tests/docker/jammy/Dockerfile +++ b/tests/docker/jammy/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:jammy ARG DEBIAN_FRONTEND=noninteractive RUN apt update && apt upgrade -y +RUN apt install -y apt-utils RUN apt install -y libccid \ libpcsclite-dev \ git \ From a4026e0ca0d73af2a6ebdd524ed14e8302097eb8 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 12:09:46 +0100 Subject: [PATCH 35/84] Submodules must be pulled. Signed-off-by: Pol Henarejos --- tests/build-in-docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/build-in-docker.sh b/tests/build-in-docker.sh index d0b636e..c8880c4 100755 --- a/tests/build-in-docker.sh +++ b/tests/build-in-docker.sh @@ -2,6 +2,7 @@ source tests/docker_env.sh #run_in_docker rm -rf CMakeFiles +run_in_docker git submodule update --recursive run_in_docker mkdir -p build_in_docker run_in_docker -w "$PWD/build_in_docker" cmake -DENABLE_EMULATION=1 .. run_in_docker -w "$PWD/build_in_docker" make -j ${NUM_PROC} From 07f85dc4b82857d7c774fd9c9d386274ea666f94 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 12:18:18 +0100 Subject: [PATCH 36/84] Add warning removal Signed-off-by: Pol Henarejos --- tests/build-in-docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/build-in-docker.sh b/tests/build-in-docker.sh index c8880c4..514f267 100755 --- a/tests/build-in-docker.sh +++ b/tests/build-in-docker.sh @@ -2,6 +2,7 @@ source tests/docker_env.sh #run_in_docker rm -rf CMakeFiles +run_in_docker git config --global --add safe.directory '*' run_in_docker git submodule update --recursive run_in_docker mkdir -p build_in_docker run_in_docker -w "$PWD/build_in_docker" cmake -DENABLE_EMULATION=1 .. From 307eb63ee5ac126f754e91465b3ca7bc463c80d4 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 12:59:03 +0100 Subject: [PATCH 37/84] Init submodules in actions. Signed-off-by: Pol Henarejos --- .github/workflows/test.yml | 9 ++++++--- tests/build-in-docker.sh | 2 -- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1cc72fd..e4575df 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,8 +26,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: build + - name: Checkout repository and submodules + uses: actions/checkout@v3 + with: + submodules: recursive + - name: Build in container run: ./tests/build-in-docker.sh - - name: run and test + - name: Start emulation and test run: ./tests/run-test-in-docker.sh diff --git a/tests/build-in-docker.sh b/tests/build-in-docker.sh index 514f267..d0b636e 100755 --- a/tests/build-in-docker.sh +++ b/tests/build-in-docker.sh @@ -2,8 +2,6 @@ source tests/docker_env.sh #run_in_docker rm -rf CMakeFiles -run_in_docker git config --global --add safe.directory '*' -run_in_docker git submodule update --recursive run_in_docker mkdir -p build_in_docker run_in_docker -w "$PWD/build_in_docker" cmake -DENABLE_EMULATION=1 .. run_in_docker -w "$PWD/build_in_docker" make -j ${NUM_PROC} From 24d430a3ac43fbbd1fcd89cfb6da174c8e6ce8bb Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 13:04:34 +0100 Subject: [PATCH 38/84] Updating pointer to include aesni Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index a9eee86..7e8021a 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit a9eee861fe4e86896d98cc63cc89ec2a96d24599 +Subproject commit 7e8021a3de87157115bd58224f7ee0dfc1184679 From 2f5fcd1f1468f3e10ca514c7dd469d8e3074a319 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 13:09:17 +0100 Subject: [PATCH 39/84] Start pcscd with debug flag to get more debug info. Signed-off-by: Pol Henarejos --- tests/start-up-and-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/start-up-and-test.sh b/tests/start-up-and-test.sh index d7aaa04..4fcbf37 100755 --- a/tests/start-up-and-test.sh +++ b/tests/start-up-and-test.sh @@ -1,5 +1,5 @@ #!/bin/bash -eu -/usr/sbin/pcscd & +/usr/sbin/pcscd -d & ./build_in_docker/pico_hsm > /dev/null & pytest tests -W ignore::DeprecationWarning From 9077e78315be912ba851ee1682d61ceb77ea8e4f Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 13:15:04 +0100 Subject: [PATCH 40/84] More flags to debug Signed-off-by: Pol Henarejos --- tests/start-up-and-test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/start-up-and-test.sh b/tests/start-up-and-test.sh index 4fcbf37..7c66579 100755 --- a/tests/start-up-and-test.sh +++ b/tests/start-up-and-test.sh @@ -1,5 +1,5 @@ #!/bin/bash -eu -/usr/sbin/pcscd -d & -./build_in_docker/pico_hsm > /dev/null & +/usr/sbin/pcscd -f -d & +./build_in_docker/pico_hsm & pytest tests -W ignore::DeprecationWarning From 3b0e34f4654baffe153cdd793f4ec1c8af084d19 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 13:23:39 +0100 Subject: [PATCH 41/84] More tries... Signed-off-by: Pol Henarejos --- tests/start-up-and-test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/start-up-and-test.sh b/tests/start-up-and-test.sh index 7c66579..512bd6b 100755 --- a/tests/start-up-and-test.sh +++ b/tests/start-up-and-test.sh @@ -1,5 +1,5 @@ #!/bin/bash -eu /usr/sbin/pcscd -f -d & -./build_in_docker/pico_hsm & -pytest tests -W ignore::DeprecationWarning +./build_in_docker/pico_hsm +#pytest tests -W ignore::DeprecationWarning From c4de88e6c618f72b407af28495135284cc834d28 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 15:39:31 +0100 Subject: [PATCH 42/84] Moving pointer Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 7e8021a..07c15e0 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 7e8021a3de87157115bd58224f7ee0dfc1184679 +Subproject commit 07c15e0a3c42d1a06fe811df57d130581b90b4c0 From ab71b3163bbdb2315049edcf033b9bf7a7aac616 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 16:07:41 +0100 Subject: [PATCH 43/84] Adding sleep just in case. Signed-off-by: Pol Henarejos --- tests/start-up-and-test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/start-up-and-test.sh b/tests/start-up-and-test.sh index 512bd6b..9b17520 100755 --- a/tests/start-up-and-test.sh +++ b/tests/start-up-and-test.sh @@ -1,5 +1,6 @@ #!/bin/bash -eu /usr/sbin/pcscd -f -d & +sleep 2 ./build_in_docker/pico_hsm #pytest tests -W ignore::DeprecationWarning From 478b18609412337d7289eba7a5e7faaff7b9647f Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 30 Jan 2023 16:09:57 +0100 Subject: [PATCH 44/84] Finally it seems to work. Signed-off-by: Pol Henarejos --- tests/start-up-and-test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/start-up-and-test.sh b/tests/start-up-and-test.sh index 9b17520..2847bb7 100755 --- a/tests/start-up-and-test.sh +++ b/tests/start-up-and-test.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu -/usr/sbin/pcscd -f -d & +/usr/sbin/pcscd & sleep 2 -./build_in_docker/pico_hsm -#pytest tests -W ignore::DeprecationWarning +./build_in_docker/pico_hsm > /dev/null & +pytest tests -W ignore::DeprecationWarning From 2ce458dad50e641798d0eb1f73709833beef815d Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Sun, 12 Feb 2023 21:53:01 +0100 Subject: [PATCH 45/84] Adding BP curves and RSA 4k to signature test. Signed-off-by: Pol Henarejos --- tests/pico-hsm/test_signature.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pico-hsm/test_signature.py b/tests/pico-hsm/test_signature.py index 4c88742..8d2272b 100644 --- a/tests/pico-hsm/test_signature.py +++ b/tests/pico-hsm/test_signature.py @@ -26,7 +26,7 @@ data = b'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam neque u @pytest.mark.parametrize( - "curve", ['secp192r1', 'secp256r1', 'secp384r1', 'secp521r1',] + "curve", ['secp192r1', 'secp256r1', 'secp384r1', 'secp521r1', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1', 'secp256k1'] ) @pytest.mark.parametrize( "scheme", [Algorithm.ALGO_EC_RAW, Algorithm.ALGO_EC_SHA1, Algorithm.ALGO_EC_SHA224, Algorithm.ALGO_EC_SHA256, Algorithm.ALGO_EC_SHA384, Algorithm.ALGO_EC_SHA512] @@ -43,7 +43,7 @@ def test_signature_ecc(device, curve, scheme): device.verify(pubkey, datab, signature, scheme) @pytest.mark.parametrize( - "modulus", [1024,2048] + "modulus", [1024,2048,4096] ) @pytest.mark.parametrize( "scheme", [Algorithm.ALGO_RSA_PKCS1_SHA1, Algorithm.ALGO_RSA_PKCS1_SHA224, Algorithm.ALGO_RSA_PKCS1_SHA256, Algorithm.ALGO_RSA_PKCS1_SHA384, Algorithm.ALGO_RSA_PKCS1_SHA512, Algorithm.ALGO_RSA_PSS_SHA1, Algorithm.ALGO_RSA_PSS_SHA224, Algorithm.ALGO_RSA_PSS_SHA256, Algorithm.ALGO_RSA_PSS_SHA384, Algorithm.ALGO_RSA_PSS_SHA512] From 8bc4b133cadd961f6523f1586c41f2f282eb4bec Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Sun, 12 Feb 2023 21:53:19 +0100 Subject: [PATCH 46/84] Adding routine for asymmetric decryption. Signed-off-by: Pol Henarejos --- tests/conftest.py | 12 +++++++++++- tests/utils.py | 5 +++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 90c2903..aee6aa2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,7 +2,7 @@ import sys import pytest from binascii import hexlify -from utils import APDUResponse, DOPrefixes, KeyType, Algorithm +from utils import APDUResponse, DOPrefixes, KeyType, Algorithm, Padding import hashlib try: @@ -240,6 +240,16 @@ class Device: ) return pubkey.verify(signature, data, padd, hsh) + def decrypt(self, keyid, data, pad): + if (isinstance(pad, padding.OAEP)): + p2 = Padding.OAEP.value + elif (isinstance(pad, padding.PKCS1v15)): + p2 = Padding.PKCS.value + else: + p2 = Padding.RAW.value + resp = self.send(command=0x62, p1=keyid, p2=p2, data=list(data)) + return bytes(resp) + @pytest.fixture(scope="session") def device(): dev = Device() diff --git a/tests/utils.py b/tests/utils.py index 4923507..7ce2cca 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -118,3 +118,8 @@ class Algorithm(Enum): ALGO_RSA_PSS_SHA256 = 0x43 ALGO_RSA_PSS_SHA384 = 0x44 ALGO_RSA_PSS_SHA512 = 0x45 + +class Padding(Enum): + RAW = 0x21 + PKCS = 0x22 + OAEP = 0x23 From fbabb81acd4c379d6b85a3232c08caa1415d022b Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Sun, 12 Feb 2023 21:53:47 +0100 Subject: [PATCH 47/84] Fix asymmetric decrypt for OAEP. It only supports SHA256. Signed-off-by: Pol Henarejos --- src/hsm/cmd_decrypt_asym.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hsm/cmd_decrypt_asym.c b/src/hsm/cmd_decrypt_asym.c index f4835dc..201c086 100644 --- a/src/hsm/cmd_decrypt_asym.c +++ b/src/hsm/cmd_decrypt_asym.c @@ -42,7 +42,7 @@ int cmd_decrypt_asym() { mbedtls_rsa_context ctx; mbedtls_rsa_init(&ctx); if (p2 == ALGO_RSA_DECRYPT_OEP) - mbedtls_rsa_set_padding(&ctx, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_NONE); + mbedtls_rsa_set_padding(&ctx, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA256); int r = load_private_key_rsa(&ctx, ef); if (r != CCID_OK) { mbedtls_rsa_free(&ctx); From 68071825c23ce8a36b5287b884b3cbcd968e6889 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 13 Feb 2023 23:24:04 +0100 Subject: [PATCH 48/84] Fix EC public key computation when importing. Signed-off-by: Pol Henarejos --- src/hsm/kek.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/hsm/kek.c b/src/hsm/kek.c index f7a46cf..2b0e7c0 100644 --- a/src/hsm/kek.c +++ b/src/hsm/kek.c @@ -589,6 +589,12 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len, mbedtls_ecdsa_free(ecdsa); return CCID_EXEC_ERROR; } + + r = mbedtls_ecp_mul(&ecdsa->grp, &ecdsa->Q, &ecdsa->d, &ecdsa->grp.G, random_gen, NULL); + if (r != 0) { + mbedtls_ecdsa_free(ecdsa); + return CCID_EXEC_ERROR; + } } else if (key_type == 15) { memcpy(key_ctx, kb+ofs, key_size); From af16be64a2372abb14915dcf1a9d3324759e0d46 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 13 Feb 2023 23:30:27 +0100 Subject: [PATCH 49/84] Adding checks on ec import. Signed-off-by: Pol Henarejos --- src/hsm/kek.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/hsm/kek.c b/src/hsm/kek.c index 2b0e7c0..2c1f260 100644 --- a/src/hsm/kek.c +++ b/src/hsm/kek.c @@ -589,8 +589,16 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len, mbedtls_ecdsa_free(ecdsa); return CCID_EXEC_ERROR; } + ofs += len; - r = mbedtls_ecp_mul(&ecdsa->grp, &ecdsa->Q, &ecdsa->d, &ecdsa->grp.G, random_gen, NULL); + //Q + len = get_uint16_t(kb, ofs); ofs += 2; + r = mbedtls_ecp_point_read_binary(&ecdsa->grp, &ecdsa->Q, kb + ofs, len); + if (r != 0) { + mbedtls_ecdsa_free(ecdsa); + return CCID_EXEC_ERROR; + } + r = mbedtls_ecp_check_pub_priv(ecdsa, ecdsa, random_gen, NULL); if (r != 0) { mbedtls_ecdsa_free(ecdsa); return CCID_EXEC_ERROR; From 8f6ae52c7059c9a9c59d2c10216a911ac0500aa0 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 13 Feb 2023 23:52:58 +0100 Subject: [PATCH 50/84] Added routines for import key. Signed-off-by: Pol Henarejos --- tests/conftest.py | 103 ++++++++++++++++++++++++++++++++++++++++++---- tests/utils.py | 3 ++ 2 files changed, 99 insertions(+), 7 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index aee6aa2..4cc960f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,8 +1,28 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" import sys import pytest +import os from binascii import hexlify -from utils import APDUResponse, DOPrefixes, KeyType, Algorithm, Padding +from utils import APDUResponse, DOPrefixes, KeyType, Algorithm, Padding, int_to_bytes +from const import * import hashlib try: @@ -24,14 +44,14 @@ except ModuleNotFoundError: try: from cryptography.hazmat.primitives.asymmetric import ec, rsa, utils, padding - from cryptography.hazmat.primitives.kdf.hkdf import HKDF + from cryptography.hazmat.primitives import hashes, cmac + from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat - from cryptography.hazmat.primitives.ciphers.aead import ChaCha20Poly1305 - from cryptography.hazmat.primitives import hashes, serialization except ModuleNotFoundError: print('ERROR: cryptography module not found! Install cryptography package.\nTry with `pip install cryptography`') sys.exit(-1) + class Device: class EcDummy: def __init__(self, name): @@ -104,7 +124,7 @@ class Device: return e.sw2 & 0x0F raise e - def initialize(self, pin='648219', sopin='57621880', options=None, retries=3, dkek_shares=None, puk_auts=None, puk_min_auts=None, key_domains=None): + def initialize(self, pin=DEFAULT_PIN, sopin=DEFAULT_SOPIN, options=None, retries=DEFAULT_RETRIES, dkek_shares=None, puk_auts=None, puk_min_auts=None, key_domains=None): if (retries is not None and not 0 < retries <= 10): raise ValueError('Retries must be in the range (0,10]') if (dkek_shares is not None and not 0 <= dkek_shares <= 10): @@ -183,8 +203,8 @@ class Device: def delete_file(self, fid): self.send(command=0xE4, data=[fid >> 8, fid & 0xff]) - def public_key(self, type, keyid, param=None): - response = self.send(command=0xB1, p1=0xCE, p2=keyid, data=[0x54, 0x02, 0x00, 0x00]) + def public_key(self, keyid, param=None): + response = self.send(command=0xB1, p1=DOPrefixes.EE_CERTIFICATE_PREFIX.value, p2=keyid, data=[0x54, 0x02, 0x00, 0x00]) cert = bytearray(response) roid = CVC().decode(cert).pubkey().oid() @@ -250,6 +270,75 @@ class Device: resp = self.send(command=0x62, p1=keyid, p2=p2, data=list(data)) return bytes(resp) + def import_dkek(self, dkek): + resp = self.send(cla=0x80, command=0x52, p1=0x0, p2=0x0, data=dkek) + return resp + + def import_key(self, pkey, dkek=None): + data = b'' + kcv = hashlib.sha256(dkek or b'\x00'*32).digest()[:8] + kenc = hashlib.sha256((dkek or b'\x00'*32) + b'\x00\x00\x00\x01').digest() + kmac = hashlib.sha256((dkek or b'\x00'*32) + b'\x00\x00\x00\x02').digest() + data += kcv + pubnum = pkey.public_key().public_numbers() + if (isinstance(pkey, rsa.RSAPrivateKey)): + data += b'\x05' + algo = b'\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02' + elif (isinstance(pkey, ec.EllipticCurvePrivateKey)): + data += b'\x0C' + algo = b'\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03' + + data += algo + data += b'\x00'*6 + + kb = os.urandom(8) + if (isinstance(pkey, rsa.RSAPrivateKey)): + kb += int_to_bytes(pkey.key_size, length=2) + pnum = pkey.private_numbers() + kb += int_to_bytes((pnum.d.bit_length()+7)//8, length=2) + kb += int_to_bytes(pnum.d) + kb += int_to_bytes((pubnum.n.bit_length()+7)//8, length=2) + kb += int_to_bytes(pubnum.n) + kb += int_to_bytes((pubnum.e.bit_length()+7)//8, length=2) + kb += int_to_bytes(pubnum.e) + elif (isinstance(pkey, ec.EllipticCurvePrivateKey)): + curve = ec_domain(pkey.curve) + kb += int_to_bytes(len(curve.P)*8, length=2) + kb += int_to_bytes(len(curve.A), length=2) + kb += curve.A + kb += int_to_bytes(len(curve.B), length=2) + kb += curve.B + kb += int_to_bytes(len(curve.P), length=2) + kb += curve.P + kb += int_to_bytes(len(curve.O), length=2) + kb += curve.O + kb += int_to_bytes(len(curve.G), length=2) + kb += curve.G + kb += int_to_bytes((pkey.private_numbers().private_value.bit_length()+7)//8, length=2) + kb += int_to_bytes(pkey.private_numbers().private_value) + p = pkey.public_key().public_bytes(Encoding.X962, PublicFormat.UncompressedPoint) + kb += int_to_bytes(len(p), length=2) + kb += p + + kb_len_pad = (len(kb)//16)*16 + if (len(kb) % 16 > 0): + kb_len_pad = (len(kb)//16 + 1)*16 + if (len(kb) < kb_len_pad): + kb += b'\x80' + kb += b'\x00' * (kb_len_pad-len(kb)) + cipher = Cipher(algorithms.AES(kenc), modes.CBC(b'\x00'*16)) + encryptor = cipher.encryptor() + ct = encryptor.update(kb) + encryptor.finalize() + data += ct + c = cmac.CMAC(algorithms.AES(kmac)) + c.update(data) + data += c.finalize() + + p1 = self.get_first_free_id() + resp = self.send(cla=0x80, command=0x74, p1=p1, p2=0x93, data=data) + return p1 + + @pytest.fixture(scope="session") def device(): dev = Device() diff --git a/tests/utils.py b/tests/utils.py index 7ce2cca..e5935b9 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -123,3 +123,6 @@ class Padding(Enum): RAW = 0x21 PKCS = 0x22 OAEP = 0x23 + +def int_to_bytes(x, length=None, byteorder='big'): + return x.to_bytes(length or (x.bit_length() + 7) // 8, byteorder=byteorder) From 0685be5f1ea913b7ed294c0d9cf677ffc967e139 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 13 Feb 2023 23:53:41 +0100 Subject: [PATCH 51/84] EE_CERTIFICATE is added when importing key. Signed-off-by: Pol Henarejos --- src/hsm/cmd_key_unwrap.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/hsm/cmd_key_unwrap.c b/src/hsm/cmd_key_unwrap.c index c541f2e..a6712ed 100644 --- a/src/hsm/cmd_key_unwrap.c +++ b/src/hsm/cmd_key_unwrap.c @@ -18,6 +18,7 @@ #include "crypto_utils.h" #include "sc_hsm.h" #include "kek.h" +#include "cvc.h" int cmd_key_unwrap() { int key_id = P1(apdu), r = 0; @@ -35,12 +36,16 @@ int cmd_key_unwrap() { mbedtls_rsa_init(&ctx); do { r = dkek_decode_key(++kdom, &ctx, apdu.data, apdu.nc, NULL, &allowed, &allowed_len); - } while((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS); + } while ((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS); if (r != CCID_OK) { mbedtls_rsa_free(&ctx); return SW_EXEC_ERROR(); } r = store_keys(&ctx, HSM_KEY_RSA, key_id); + if ((res_APDU_size = asn1_cvc_aut(&ctx, HSM_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) { + mbedtls_rsa_free(&ctx); + return SW_EXEC_ERROR(); + } mbedtls_rsa_free(&ctx); if (r != CCID_OK) { return SW_EXEC_ERROR(); @@ -57,6 +62,10 @@ int cmd_key_unwrap() { return SW_EXEC_ERROR(); } r = store_keys(&ctx, HSM_KEY_EC, key_id); + if ((res_APDU_size = asn1_cvc_aut(&ctx, HSM_KEY_EC, res_APDU, 4096, NULL, 0)) == 0) { + mbedtls_ecdsa_free(&ctx); + return SW_EXEC_ERROR(); + } mbedtls_ecdsa_free(&ctx); if (r != CCID_OK) { return SW_EXEC_ERROR(); @@ -102,5 +111,13 @@ int cmd_key_unwrap() { if (r != CCID_OK) return r; } + if (res_APDU_size > 0) { + file_t *fpk = file_new((EE_CERTIFICATE_PREFIX << 8) | key_id); + r = flash_write_data_to_file(fpk, res_APDU, res_APDU_size); + if (r != 0) + return SW_EXEC_ERROR(); + low_flash_available(); + res_APDU_size = 0; + } return SW_OK(); } From 79d86a335c4c46a3ea8a3bfa3ea4e2f68a83278b Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 13 Feb 2023 23:54:41 +0100 Subject: [PATCH 52/84] Adding more tests and renaming old ones. Signed-off-by: Pol Henarejos --- tests/const.py | 24 ++++++++ tests/pico-hsm/test_005_dkek.py | 37 ++++++++++++ .../pico-hsm/{test_pin.py => test_010_pin.py} | 37 ++++++------ ...keypair_gen.py => test_020_keypair_gen.py} | 2 + tests/pico-hsm/test_021_key_import.py | 57 +++++++++++++++++++ ...est_signature.py => test_030_signature.py} | 4 +- tests/pico-hsm/test_040_decrypt.py | 48 ++++++++++++++++ 7 files changed, 191 insertions(+), 18 deletions(-) create mode 100644 tests/const.py create mode 100644 tests/pico-hsm/test_005_dkek.py rename tests/pico-hsm/{test_pin.py => test_010_pin.py} (58%) rename tests/pico-hsm/{test_keypair_gen.py => test_020_keypair_gen.py} (91%) create mode 100644 tests/pico-hsm/test_021_key_import.py rename tests/pico-hsm/{test_signature.py => test_030_signature.py} (95%) create mode 100644 tests/pico-hsm/test_040_decrypt.py diff --git a/tests/const.py b/tests/const.py new file mode 100644 index 0000000..56f64c3 --- /dev/null +++ b/tests/const.py @@ -0,0 +1,24 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +DEFAULT_PIN = '648219' +DEFAULT_SOPIN = '57621880' +DEFAULT_RETRIES = 3 +DEFAULT_DKEK = [0x1] * 32 +DEFAULT_DKEK_SHARES = 2 diff --git a/tests/pico-hsm/test_005_dkek.py b/tests/pico-hsm/test_005_dkek.py new file mode 100644 index 0000000..0e1d974 --- /dev/null +++ b/tests/pico-hsm/test_005_dkek.py @@ -0,0 +1,37 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +import hashlib +from utils import APDUResponse, SWCodes +from const import DEFAULT_PIN, DEFAULT_RETRIES, DEFAULT_DKEK, DEFAULT_DKEK_SHARES + +def test_dkek(device): + device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES) + device.login(DEFAULT_PIN) + resp = device.import_dkek(DEFAULT_DKEK) + assert(resp[0] == DEFAULT_DKEK_SHARES) + assert(resp[1] == DEFAULT_DKEK_SHARES-1) + + resp = device.import_dkek(DEFAULT_DKEK) + assert(resp[1] == DEFAULT_DKEK_SHARES-2) + + kcv = hashlib.sha256(b'\x00'*32).digest()[:8] + assert(bytes(resp[2:]) == kcv) + diff --git a/tests/pico-hsm/test_pin.py b/tests/pico-hsm/test_010_pin.py similarity index 58% rename from tests/pico-hsm/test_pin.py rename to tests/pico-hsm/test_010_pin.py index 2e96a0e..7a2d366 100644 --- a/tests/pico-hsm/test_pin.py +++ b/tests/pico-hsm/test_010_pin.py @@ -19,30 +19,35 @@ import pytest from utils import APDUResponse, SWCodes +from const import DEFAULT_PIN, DEFAULT_RETRIES -PIN = '648219' +WRONG_PIN = '112233' +RETRIES = DEFAULT_RETRIES -def test_pin(device): - device.initialize(retries=3) +def test_pin_init_retries(device): + device.initialize(retries=RETRIES) retries = device.get_login_retries() - assert(retries == 3) + assert(retries == RETRIES) - device.login(PIN) +def test_pin_login(device): + device.initialize(retries=RETRIES) + device.login(DEFAULT_PIN) + +def test_pin_retries(device): + device.initialize(retries=RETRIES) + device.login(DEFAULT_PIN) + + for ret in range(RETRIES-1): + with pytest.raises(APDUResponse) as e: + device.login(WRONG_PIN) + assert(e.value.sw1 == 0x63 and e.value.sw2 == (0xC0 | (RETRIES-1-ret))) with pytest.raises(APDUResponse) as e: - device.login('112233') - assert(e.value.sw1 == 0x63 and e.value.sw2 == 0xC2) - - with pytest.raises(APDUResponse) as e: - device.login('112233') - assert(e.value.sw1 == 0x63 and e.value.sw2 == 0xC1) - - with pytest.raises(APDUResponse) as e: - device.login('112233') + device.login(WRONG_PIN) assert(e.value.sw == SWCodes.SW_PIN_BLOCKED.value) - device.initialize(retries=3) + device.initialize(retries=RETRIES) retries = device.get_login_retries() - assert(retries == 3) + assert(retries == RETRIES) diff --git a/tests/pico-hsm/test_keypair_gen.py b/tests/pico-hsm/test_020_keypair_gen.py similarity index 91% rename from tests/pico-hsm/test_keypair_gen.py rename to tests/pico-hsm/test_020_keypair_gen.py index 30254ad..abff9d1 100644 --- a/tests/pico-hsm/test_keypair_gen.py +++ b/tests/pico-hsm/test_020_keypair_gen.py @@ -29,6 +29,7 @@ def test_gen_ecc(device, curve): resp = device.list_keys() assert((DOPrefixes.KEY_PREFIX.value, keyid) in resp) device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX.value << 8 | keyid) @pytest.mark.parametrize( "modulus", [1024, 2048, 4096] @@ -39,4 +40,5 @@ def test_gen_rsa(device, modulus): resp = device.list_keys() assert((DOPrefixes.KEY_PREFIX.value, keyid) in resp) device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX.value << 8 | keyid) diff --git a/tests/pico-hsm/test_021_key_import.py b/tests/pico-hsm/test_021_key_import.py new file mode 100644 index 0000000..5b7a341 --- /dev/null +++ b/tests/pico-hsm/test_021_key_import.py @@ -0,0 +1,57 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +import hashlib +from utils import KeyType, DOPrefixes +from cryptography.hazmat.primitives.asymmetric import rsa, ec +from const import DEFAULT_RETRIES, DEFAULT_DKEK_SHARES, DEFAULT_DKEK + +def test_prepare_dkek(device): + device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES) + resp = device.import_dkek(DEFAULT_DKEK) + resp = device.import_dkek(DEFAULT_DKEK) + kcv = hashlib.sha256(b'\x00'*32).digest()[:8] + assert(bytes(resp[2:]) == kcv) + +@pytest.mark.parametrize( + "modulus", [1024, 2048, 4096] +) +def test_import_rsa(device, modulus): + pkey = rsa.generate_private_key( + public_exponent=65537, + key_size=modulus, + ) + keyid = device.import_key(pkey) + pubkey = device.public_key(keyid) + assert(pubkey.public_numbers() == pkey.public_key().public_numbers()) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX.value << 8 | keyid) + + +@pytest.mark.parametrize( + "curve", [ec.SECP192R1, ec.SECP256R1, ec.SECP384R1, ec.SECP521R1, ec.SECP256K1, ec.BrainpoolP256R1, ec.BrainpoolP384R1, ec.BrainpoolP512R1] +) +def test_import_ecc(device, curve): + pkey = ec.generate_private_key(curve()) + keyid = device.import_key(pkey) + pubkey = device.public_key(keyid, param=curve().name) + assert(pubkey.public_numbers() == pkey.public_key().public_numbers()) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX.value << 8 | keyid) diff --git a/tests/pico-hsm/test_signature.py b/tests/pico-hsm/test_030_signature.py similarity index 95% rename from tests/pico-hsm/test_signature.py rename to tests/pico-hsm/test_030_signature.py index 8d2272b..887d239 100644 --- a/tests/pico-hsm/test_signature.py +++ b/tests/pico-hsm/test_030_signature.py @@ -33,7 +33,7 @@ data = b'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam neque u ) def test_signature_ecc(device, curve, scheme): keyid = device.keypair_generation(KeyType.ECC, curve) - pubkey = device.public_key(type=KeyType.ECC, keyid=keyid, param=curve) + pubkey = device.public_key(keyid=keyid, param=curve) if (scheme == Algorithm.ALGO_EC_RAW): datab = hashlib.sha512(data).digest() else: @@ -50,7 +50,7 @@ def test_signature_ecc(device, curve, scheme): ) def test_signature_rsa(device, modulus, scheme): keyid = device.keypair_generation(KeyType.RSA, modulus) - pubkey = device.public_key(type=KeyType.RSA, keyid=keyid) + pubkey = device.public_key(keyid=keyid) signature = device.sign(keyid=keyid, scheme=scheme, data=data) device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) device.verify(pubkey, data, signature, scheme) diff --git a/tests/pico-hsm/test_040_decrypt.py b/tests/pico-hsm/test_040_decrypt.py new file mode 100644 index 0000000..8890d2e --- /dev/null +++ b/tests/pico-hsm/test_040_decrypt.py @@ -0,0 +1,48 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +from utils import KeyType, DOPrefixes, Algorithm +from binascii import hexlify +import hashlib +from cryptography.hazmat.primitives.asymmetric import padding +from cryptography.hazmat.primitives import hashes + +data = b'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam neque urna, iaculis quis auctor scelerisque, auctor ut risus. In rhoncus, odio consequat consequat ultrices, ex libero dictum risus, accumsan interdum nisi orci ac neque. Ut vitae sem in metus hendrerit facilisis. Mauris maximus tristique mi, quis blandit lectus convallis eget.' + +@pytest.mark.parametrize( + "modulus", [1024,2048,4096] +) +@pytest.mark.parametrize( + "pad", [padding.PKCS1v15(), padding.OAEP( + mgf=padding.MGF1(algorithm=hashes.SHA256()), + algorithm=hashes.SHA256(), + label=None + )] +) +def test_decrypt_rsa(device, modulus, pad): + + keyid = device.keypair_generation(KeyType.RSA, modulus) + pubkey = device.public_key(keyid=keyid) + message = data[:(modulus//8)-100] + ciphered = pubkey.encrypt(message, pad) + datab = device.decrypt(keyid, ciphered, pad) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + assert(datab == message) + From 407110def426d856ac33808e4d6717ffe054ec2c Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 11:25:02 +0100 Subject: [PATCH 53/84] Added ECDH tests. Signed-off-by: Pol Henarejos --- tests/conftest.py | 6 ++- tests/pico-hsm/test_022_key_derivation.py | 52 +++++++++++++++++++++++ tests/utils.py | 1 + 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 tests/pico-hsm/test_022_key_derivation.py diff --git a/tests/conftest.py b/tests/conftest.py index 4cc960f..d5915a1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -335,9 +335,13 @@ class Device: data += c.finalize() p1 = self.get_first_free_id() - resp = self.send(cla=0x80, command=0x74, p1=p1, p2=0x93, data=data) + _ = self.send(cla=0x80, command=0x74, p1=p1, p2=0x93, data=data) return p1 + def exchange(self, keyid, pubkey): + resp = self.send(cla=0x80, command=0x62, p1=keyid, p2=Algorithm.ALGO_EC_DH.value, data=pubkey.public_bytes(Encoding.X962, PublicFormat.UncompressedPoint)) + return resp + @pytest.fixture(scope="session") def device(): diff --git a/tests/pico-hsm/test_022_key_derivation.py b/tests/pico-hsm/test_022_key_derivation.py new file mode 100644 index 0000000..e28298a --- /dev/null +++ b/tests/pico-hsm/test_022_key_derivation.py @@ -0,0 +1,52 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +import hashlib +from utils import KeyType, DOPrefixes +from cryptography.hazmat.primitives.asymmetric import rsa, ec +from const import DEFAULT_RETRIES, DEFAULT_DKEK_SHARES, DEFAULT_DKEK + +def test_prepare_dkek(device): + device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES) + resp = device.import_dkek(DEFAULT_DKEK) + resp = device.import_dkek(DEFAULT_DKEK) + kcv = hashlib.sha256(b'\x00'*32).digest()[:8] + assert(bytes(resp[2:]) == kcv) + +@pytest.mark.parametrize( + "curve", [ec.SECP192R1, ec.SECP256R1, ec.SECP384R1, ec.SECP521R1, ec.SECP256K1, ec.BrainpoolP256R1, ec.BrainpoolP384R1, ec.BrainpoolP512R1] +) +def test_exchange_ecc(device, curve): + pkeyA = ec.generate_private_key(curve()) + pbkeyA = pkeyA.public_key() + keyid = device.import_key(pkeyA) + pkeyB = ec.generate_private_key(curve()) + pbkeyB = pkeyB.public_key() + + sharedB = pkeyB.exchange(ec.ECDH(), pbkeyA) + sharedA = device.exchange(keyid, pbkeyB) + + assert(bytes(sharedA) == sharedB) + + sharedAA = pkeyA.exchange(ec.ECDH(), pbkeyB) + assert(bytes(sharedA) == sharedAA) + + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX.value << 8 | keyid) diff --git a/tests/utils.py b/tests/utils.py index e5935b9..d59505c 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -101,6 +101,7 @@ class Algorithm(Enum): ALGO_EC_SHA256 = 0x73 ALGO_EC_SHA384 = 0x74 ALGO_EC_SHA512 = 0x75 + ALGO_EC_DH = 0x80 ALGO_RSA_RAW = 0x20 ALGO_RSA_DECRYPT = 0x21 From 14c7852143b290c4de4a51b1071c37771e750f0a Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 11:28:11 +0100 Subject: [PATCH 54/84] Fix returning shared secret. I do not know why a 0x04 was prepended. Signed-off-by: Pol Henarejos --- src/hsm/cmd_decrypt_asym.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/hsm/cmd_decrypt_asym.c b/src/hsm/cmd_decrypt_asym.c index 201c086..6ade4df 100644 --- a/src/hsm/cmd_decrypt_asym.c +++ b/src/hsm/cmd_decrypt_asym.c @@ -118,14 +118,13 @@ int cmd_decrypt_asym() { return SW_DATA_INVALID(); } size_t olen = 0; - res_APDU[0] = 0x04; - r = mbedtls_ecdh_calc_secret(&ctx, &olen, res_APDU+1, MBEDTLS_ECP_MAX_BYTES, random_gen, NULL); + r = mbedtls_ecdh_calc_secret(&ctx, &olen, res_APDU, MBEDTLS_ECP_MAX_BYTES, random_gen, NULL); mbedtls_ecdh_free(&ctx); if (r != 0) { return SW_EXEC_ERROR(); } if (p2 == ALGO_EC_DH) - res_APDU_size = olen+1; + res_APDU_size = olen; else { res_APDU_size = 0; size_t ext_len = 0; @@ -153,7 +152,7 @@ int cmd_decrypt_asym() { if (tf) { if (file_get_size(tf) == kdom_uid_len && memcmp(file_get_data(tf), kdom_uid, kdom_uid_len) == 0) { file_new(EF_DKEK+n); - if (store_dkek_key(n, res_APDU+1) != CCID_OK) + if (store_dkek_key(n, res_APDU) != CCID_OK) return SW_EXEC_ERROR(); return SW_OK(); } From 3b9c2d159b698ae1033831ed0f9019239b3d2298 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 18:47:43 +0100 Subject: [PATCH 55/84] Fix returning existing key domain. Signed-off-by: Pol Henarejos --- src/hsm/cmd_key_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hsm/cmd_key_domain.c b/src/hsm/cmd_key_domain.c index 3ae114b..0ca4b0e 100644 --- a/src/hsm/cmd_key_domain.c +++ b/src/hsm/cmd_key_domain.c @@ -71,7 +71,7 @@ int cmd_key_domain() { } else { file_t *tf = search_dynamic_file(EF_XKEK+p2); - if (2*p2 >= tf_kd_size || current_dkeks == 0) + if (2*p2 >= tf_kd_size) return SW_INCORRECT_P1P2(); if (current_dkeks == 0xff && !tf) //XKEK have always 0xff return SW_REFERENCE_NOT_FOUND(); From 43a49d2a1435ce499213adb0f64f37c21fb66985 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 18:51:30 +0100 Subject: [PATCH 56/84] Return reference not found when deleting a key domain. Signed-off-by: Pol Henarejos --- src/hsm/cmd_key_domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hsm/cmd_key_domain.c b/src/hsm/cmd_key_domain.c index 0ca4b0e..e32db5d 100644 --- a/src/hsm/cmd_key_domain.c +++ b/src/hsm/cmd_key_domain.c @@ -111,6 +111,8 @@ int cmd_key_domain() { return SW_EXEC_ERROR(); } low_flash_available(); + if (p1 == 0x3) + return SW_REFERENCE_NOT_FOUND(); } else if (p1 == 0x2) { //XKEK Key Domain creation if (apdu.nc > 0) { From 1e846600dd5d0669eaaa5a4fc8a5a755df271c1f Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 18:51:50 +0100 Subject: [PATCH 57/84] Add test info Signed-off-by: Pol Henarejos --- tests/pico-hsm/test_000_info.py | 35 +++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 tests/pico-hsm/test_000_info.py diff --git a/tests/pico-hsm/test_000_info.py b/tests/pico-hsm/test_000_info.py new file mode 100644 index 0000000..9e5cf0a --- /dev/null +++ b/tests/pico-hsm/test_000_info.py @@ -0,0 +1,35 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +from const import EF_TERMCA + +def test_select(device): + device.select_applet() + +def test_termca(device): + data = device.get_termca() + assert(b'ESPICOHSMTR' == data['cv']['chr'][:11]) + assert(b'ESPICOHSMDV' == data['cv']['car'][:11]) + assert(b'ESPICOHSMDV' == data['dv']['chr'][:11]) + assert(b'ESPICOHSMCA' == data['dv']['car'][:11]) + assert(data['cv']['car'] == data['dv']['chr']) + +def test_get_version(device): + version = device.get_version() From 5508e531a01aff95cced78cc56e71416f39bafb3 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 18:52:12 +0100 Subject: [PATCH 58/84] Added key domain tests. Signed-off-by: Pol Henarejos --- tests/conftest.py | 66 +++++++++++++++++++++-- tests/const.py | 2 + tests/pico-hsm/test_004_key_domains.py | 72 ++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 5 deletions(-) create mode 100644 tests/pico-hsm/test_004_key_domains.py diff --git a/tests/conftest.py b/tests/conftest.py index d5915a1..21b4c0e 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -75,7 +75,7 @@ class Device: def select_applet(self): self.__card.connection.transmit([0x00, 0xA4, 0x04, 0x00, 0xB, 0xE8, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x81, 0xC3, 0x1F, 0x02, 0x01, 0x0]) - def send(self, command, cla=0x00, p1=0x00, p2=0x00, ne=None, data=None): + def send(self, command, cla=0x00, p1=0x00, p2=0x00, ne=None, data=None, codes=[]): lc = [] dataf = [] if (data): @@ -97,22 +97,26 @@ class Device: self.__card.connection.reconnect() response, sw1, sw2 = self.__card.connection.transmit(apdu) + code = (sw1<<8|sw2) if (sw1 != 0x90): if (sw1 == 0x63 and sw2 & 0xF0 == 0xC0): pass - elif (sw1 == 0x6A and sw2 == 0x82): + elif (code == 0x6A82): self.select_applet() if (sw1 == 0x90): response, sw1, sw2 = self.__card.connection.transmit(apdu) if (sw1 == 0x90): return response - elif (sw1 == 0x69 and sw2 == 0x82): + elif (code == 0x6982): response, sw1, sw2 = self.__card.connection.transmit([0x00, 0x20, 0x00, 0x81, len(self.__pin)] + list(self.__pin.encode()) + [0x0]) if (sw1 == 0x90): response, sw1, sw2 = self.__card.connection.transmit(apdu) if (sw1 == 0x90): return response - raise APDUResponse(sw1, sw2) + if (code not in codes): + raise APDUResponse(sw1, sw2) + if (len(codes) > 1): + return response, code return response def get_login_retries(self): @@ -203,8 +207,15 @@ class Device: def delete_file(self, fid): self.send(command=0xE4, data=[fid >> 8, fid & 0xff]) + def get_contents(self, p1, p2=None): + if (p2): + resp = self.send(command=0xB1, p1=p1, p2=p2, data=[0x54, 0x02, 0x00, 0x00]) + else: + resp = self.get_contents(p1=p1 >> 8, p2=p1 & 0xff) + return bytes(resp) + def public_key(self, keyid, param=None): - response = self.send(command=0xB1, p1=DOPrefixes.EE_CERTIFICATE_PREFIX.value, p2=keyid, data=[0x54, 0x02, 0x00, 0x00]) + response = self.get_contents(p1=DOPrefixes.EE_CERTIFICATE_PREFIX, p2=keyid) cert = bytearray(response) roid = CVC().decode(cert).pubkey().oid() @@ -342,6 +353,51 @@ class Device: resp = self.send(cla=0x80, command=0x62, p1=keyid, p2=Algorithm.ALGO_EC_DH.value, data=pubkey.public_bytes(Encoding.X962, PublicFormat.UncompressedPoint)) return resp + def parse_cvc(self, data): + car = CVC().decode(data).car() + chr = CVC().decode(data).chr() + return {'car': car, 'chr': chr} + + def get_termca(self): + resp = self.get_contents(EF_TERMCA) + cv_data = self.parse_cvc(resp) + a = ASN1().decode(resp).find(0x7f21).data() + tlen = len(ASN1.calculate_len(len(a))) + ret = {'cv': cv_data} + if (len(a)+2+tlen < len(resp)): # There's more certificate + resp = resp[2+len(a)+tlen:] + dv_data = self.parse_cvc(resp) + ret['dv'] = dv_data + return ret + + def get_version(self): + resp = self.send(cla=0x80, command=0x50) + return resp[5]+0.1*resp[6] + + def get_key_domain(self, key_domain=0): + resp, code = self.send(cla=0x80, command=0x52, p2=key_domain, codes=[0x9000, 0x6A88, 0x6A86]) + if (code == 0x9000): + return {'dkek': { 'total': resp[0], 'missing': resp[1]}, 'kcv': resp[2:10]} + return {'error': code} + + def get_key_domains(self): + for k in range(0xFF): + _, code = self.send(cla=0x80, command=0x52, p2=k, codes=[0x9000, 0x6A88, 0x6A86]) + if (code == 0x6A86): + return k + return 0 + + def set_key_domain(self, key_domain=0, total=DEFAULT_DKEK_SHARES): + resp = self.send(cla=0x80, command=0x52, p1=0x1, p2=key_domain, data=[total]) + return resp + + def clear_key_domain(self, key_domain=0): + resp = self.send(cla=0x80, command=0x52, p1=0x4, p2=key_domain) + return resp + + def delete_key_domain(self, key_domain=0): + self.send(cla=0x80, command=0x52, p1=0x3, p2=key_domain, codes=[0x6A88]) + @pytest.fixture(scope="session") def device(): diff --git a/tests/const.py b/tests/const.py index 56f64c3..2494b87 100644 --- a/tests/const.py +++ b/tests/const.py @@ -22,3 +22,5 @@ DEFAULT_SOPIN = '57621880' DEFAULT_RETRIES = 3 DEFAULT_DKEK = [0x1] * 32 DEFAULT_DKEK_SHARES = 2 + +EF_TERMCA = 0x2f02 diff --git a/tests/pico-hsm/test_004_key_domains.py b/tests/pico-hsm/test_004_key_domains.py new file mode 100644 index 0000000..555870f --- /dev/null +++ b/tests/pico-hsm/test_004_key_domains.py @@ -0,0 +1,72 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +from const import DEFAULT_DKEK_SHARES, DEFAULT_DKEK + +KEY_DOMAINS = 3 + +def test_key_domains(device): + device.initialize(key_domains=KEY_DOMAINS) + for k in range(KEY_DOMAINS): + kd = device.get_key_domain(key_domain=k) + assert('error' in kd) + assert(kd['error'] == 0x6A88) + + kd = device.get_key_domain(key_domain=KEY_DOMAINS) + assert('error' in kd) + assert(kd['error'] == 0x6A86) + assert(device.get_key_domains() == KEY_DOMAINS) + +def test_set_key_domain(device): + kd = device.get_key_domain(key_domain=0) + assert('error' in kd) + assert(kd['error'] == 0x6A88) + + device.set_key_domain(key_domain=0) + kd = device.get_key_domain(key_domain=0) + assert('error' not in kd) + assert('dkek' in kd) + assert('total' in kd['dkek']) + assert(kd['dkek']['total'] == DEFAULT_DKEK_SHARES) + assert('missing' in kd['dkek']) + assert(kd['dkek']['missing'] == DEFAULT_DKEK_SHARES) + +def test_clear_key_domain(device): + kd = device.get_key_domain(key_domain=0) + assert(kd['dkek']['total'] == DEFAULT_DKEK_SHARES) + + device.import_dkek(DEFAULT_DKEK) + kd = device.get_key_domain(key_domain=0) + assert(kd['dkek']['missing'] == DEFAULT_DKEK_SHARES-1) + + device.clear_key_domain(key_domain=0) + kd = device.get_key_domain(key_domain=0) + assert(kd['dkek']['missing'] == DEFAULT_DKEK_SHARES) + +def test_delete_key_domain(device): + assert(device.get_key_domains() == KEY_DOMAINS) + kd = device.get_key_domain(key_domain=0) + assert(kd['dkek']['total'] == DEFAULT_DKEK_SHARES) + + device.delete_key_domain(key_domain=0) + assert(device.get_key_domains() == KEY_DOMAINS) + kd = device.get_key_domain(key_domain=0) + assert('error' in kd) + assert(kd['error'] == 0x6A88) From 319000df1aad4f9d9a1592e914ccd5f42901d763 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 21:38:06 +0100 Subject: [PATCH 59/84] Add challenge tests. Signed-off-by: Pol Henarejos --- tests/conftest.py | 5 +++ tests/pico-hsm/test_003_challenge.py | 57 ++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 tests/pico-hsm/test_003_challenge.py diff --git a/tests/conftest.py b/tests/conftest.py index 21b4c0e..de646e8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -81,6 +81,8 @@ class Device: if (data): lc = [0x00] + list(len(data).to_bytes(2, 'big')) dataf = list(data) + else: + lc = [0x00*3] if (ne is None): le = [0x00, 0x00] else: @@ -398,6 +400,9 @@ class Device: def delete_key_domain(self, key_domain=0): self.send(cla=0x80, command=0x52, p1=0x3, p2=key_domain, codes=[0x6A88]) + def get_challenge(self, length): + return self.send(cla=0x80, command=0x84, ne=length) + @pytest.fixture(scope="session") def device(): diff --git a/tests/pico-hsm/test_003_challenge.py b/tests/pico-hsm/test_003_challenge.py new file mode 100644 index 0000000..46a7c5e --- /dev/null +++ b/tests/pico-hsm/test_003_challenge.py @@ -0,0 +1,57 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +import math +from collections import Counter + +def mean(x): + sum = 0 + for i in x: + sum += i + return sum/len(x) + +def var(x): + sum = 0 + m = mean(x) + for i in x: + sum += (i-m)**2 + return sum/len(x) + +@pytest.mark.parametrize( + "length", [1, 256, 1024] +) +def test_challenge(device, length): + data = device.get_challenge(length) + assert(len(data) == length) + +def test_randomness(device): + data = [] + N = 1000 + for k2 in range(N): + data += device.get_challenge(1024) + + _, values = zip(*Counter(data).items()) + + nm = mean(values)/(N*1024/256) + sm = math.sqrt(var(values))/mean(values) + + assert(0.99 <= nm <= 1.01) + assert(sm <= 0.02) + From d81d51d6fca7e3feeb476b48859a3ac1384154c8 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 21:51:46 +0100 Subject: [PATCH 60/84] Fix get public key. Signed-off-by: Pol Henarejos --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index de646e8..1bcaa59 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -217,7 +217,7 @@ class Device: return bytes(resp) def public_key(self, keyid, param=None): - response = self.get_contents(p1=DOPrefixes.EE_CERTIFICATE_PREFIX, p2=keyid) + response = self.get_contents(p1=DOPrefixes.EE_CERTIFICATE_PREFIX.value, p2=keyid) cert = bytearray(response) roid = CVC().decode(cert).pubkey().oid() From 962d1c69168e3876f1f5f82364194f711c164af6 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 22:53:30 +0100 Subject: [PATCH 61/84] When runing a test, load a initial flash image that contains KEYDEV. Signed-off-by: Pol Henarejos --- tests/memory.tar.gz | Bin 0 -> 9424 bytes tests/run-test-in-docker.sh | 1 - tests/start-up-and-test.sh | 2 ++ 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 tests/memory.tar.gz diff --git a/tests/memory.tar.gz b/tests/memory.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..038deced26f5921f35a27b1a75d028b36d083a60 GIT binary patch literal 9424 zcmeIu`9ISQ0KoA*j0Y`*9-ff$BuA4DE#=tr6z0{EE3p)5wdGm4kK|Y>S5`X6x#g^d ztTkt}l`Rb$awMC(kQnCJX!t%qKmS6n@8>`GybaQnAR)js79u~>VXe~Ss;q@QA1*jePQpAl z<{P-_H1f=f1KN$)xfS~}arFY;Hby|ZR~`m?nE!!lOMS}9ZXeD+7iqUfv016oBCazc zk#w7tpYcFlNVI>WXjj81g6|$mt(-)!OjoYTWaYh#X|M?5C!ZQip3uB?2Q6f9Y!N=LC@p*~GKE=P;URj0K!b9nDK zTn$=NGe-`WZN0WZti0?pUV85+@-izM30O#sme5;?MeUYJ+~sG{={YW@_Ij=xq5g%F z8RfDx)(Nsq=auUeFw#%p7zO6v@K$qcVVv32TB-uZ_&_a#yPxCafMh)nPGRr}3rU2ZJtsS3?lE zUrKK}){Ro?FRs{J-~@?&l6vd*L-}tQoFd{CUW8U#0+6N;^(7}uf+seKkdBAunB^x2 zHP7T+M|?Zljk4BVu0m>CobdCB7PlGlMg3;BH2nJad*^1`sy}s?l0Cy~nu45Q$^T$; zM^hBoatGxDx1Z`8QSaN~SC9uQ!PvhtQpMpS6O$6pDe5T}6yPsfLD1#`pb$s4=4KCZ z>S}%Isr0%bTB@6_UI}cO;!JwYz4e7UZ=iH@o6bW%kPgjNda=@7p&r3oYBnox={U?9 z(mjhPzUEQ}7bYEiugkv9-(WvADZnA8bYt2^d38MA{oP|-Z<$uBGZ#F0X^_-XsqZBPo832BUW)V zhavF7u>O?AH374Qlwi03M}0P#1p?`TtrY8U+ePZ+w>U{DGi(8HCL z-!>vay-O%=m%L-We;gEI-?obag-ovBuoi2nZ9y;xn^Wzz2)U>EvvIvp9w2}w_B7v;ue8wWTOuu(V^9%sD zVtsA2<8`UI=59(m@{?GFi@1`XS6$RFqWsu-fR#ufPS`N3#8lr@0%>)eKiRc=&1ZAi VM-v@|;tN_3NM>pCUWnpN$bVYqwWt69 literal 0 HcmV?d00001 diff --git a/tests/run-test-in-docker.sh b/tests/run-test-in-docker.sh index b8cbb3d..ca3486e 100755 --- a/tests/run-test-in-docker.sh +++ b/tests/run-test-in-docker.sh @@ -1,6 +1,5 @@ #!/bin/bash -eu source tests/docker_env.sh -run_in_docker rm -f memory.flash run_in_docker ./tests/start-up-and-test.sh diff --git a/tests/start-up-and-test.sh b/tests/start-up-and-test.sh index 2847bb7..528957b 100755 --- a/tests/start-up-and-test.sh +++ b/tests/start-up-and-test.sh @@ -2,5 +2,7 @@ /usr/sbin/pcscd & sleep 2 +rm -f memory.flash +tar -xf tests/memory.tar.gz ./build_in_docker/pico_hsm > /dev/null & pytest tests -W ignore::DeprecationWarning From 380d47faa17fbc3418f7c7fed7edbe75c8812754 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 23:05:37 +0100 Subject: [PATCH 62/84] Renaming for avoiding confusions Signed-off-by: Pol Henarejos --- .../{test_022_key_derivation.py => test_022_key_exchange.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/pico-hsm/{test_022_key_derivation.py => test_022_key_exchange.py} (100%) diff --git a/tests/pico-hsm/test_022_key_derivation.py b/tests/pico-hsm/test_022_key_exchange.py similarity index 100% rename from tests/pico-hsm/test_022_key_derivation.py rename to tests/pico-hsm/test_022_key_exchange.py From cab72f200a678f18cb05a2aa17a2e735dca1619e Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 23:12:48 +0100 Subject: [PATCH 63/84] Moving pointer Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 07c15e0..15a2c96 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 07c15e0a3c42d1a06fe811df57d130581b90b4c0 +Subproject commit 15a2c96854941154dc53aa93bc1ed8f105e3935a From daaa5bf402d5503596059b032d37488eb0b62bf6 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 23:13:46 +0100 Subject: [PATCH 64/84] Harmonize coding style. Signed-off-by: Pol Henarejos --- src/hsm/cmd_challenge.c | 8 +- src/hsm/cmd_change_pin.c | 20 +- src/hsm/cmd_cipher_sym.c | 279 +++++++++++------ src/hsm/cmd_decrypt_asym.c | 79 +++-- src/hsm/cmd_delete_file.c | 21 +- src/hsm/cmd_derive_asym.c | 42 +-- src/hsm/cmd_external_authenticate.c | 31 +- src/hsm/cmd_extras.c | 91 ++++-- src/hsm/cmd_general_authenticate.c | 21 +- src/hsm/cmd_initialize.c | 82 ++--- src/hsm/cmd_key_domain.c | 99 +++--- src/hsm/cmd_key_gen.c | 26 +- src/hsm/cmd_key_unwrap.c | 47 +-- src/hsm/cmd_key_wrap.c | 44 ++- src/hsm/cmd_keypair_gen.c | 66 ++-- src/hsm/cmd_list_keys.c | 6 +- src/hsm/cmd_mse.c | 36 ++- src/hsm/cmd_pso.c | 73 +++-- src/hsm/cmd_puk_auth.c | 45 +-- src/hsm/cmd_read_binary.c | 57 ++-- src/hsm/cmd_reset_retry.c | 57 ++-- src/hsm/cmd_select.c | 59 ++-- src/hsm/cmd_session_pin.c | 7 +- src/hsm/cmd_signature.c | 200 ++++++------ src/hsm/cmd_update_ef.c | 46 +-- src/hsm/cmd_verify.c | 33 +- src/hsm/cvc.c | 466 +++++++++++++++++++--------- src/hsm/cvc.h | 45 ++- src/hsm/files.c | 115 +++++-- src/hsm/files.h | 2 +- src/hsm/kek.c | 347 ++++++++++++++------- src/hsm/kek.h | 16 +- src/hsm/sc_hsm.c | 269 +++++++++------- src/hsm/sc_hsm.h | 54 ++-- src/hsm/version.h | 1 - 35 files changed, 1832 insertions(+), 1058 deletions(-) diff --git a/src/hsm/cmd_challenge.c b/src/hsm/cmd_challenge.c index 1fa5215..6d9fd31 100644 --- a/src/hsm/cmd_challenge.c +++ b/src/hsm/cmd_challenge.c @@ -21,10 +21,12 @@ uint8_t challenge[256]; uint8_t challenge_len = 0; -int cmd_challenge() { - uint8_t *rb = (uint8_t *)random_bytes_get(apdu.ne); - if (!rb) +int cmd_challenge() +{ + uint8_t *rb = (uint8_t *) random_bytes_get(apdu.ne); + if (!rb) { return SW_WRONG_LENGTH(); + } memcpy(res_APDU, rb, apdu.ne); challenge_len = MIN(apdu.ne, sizeof(challenge)); memcpy(challenge, rb, challenge_len); diff --git a/src/hsm/cmd_change_pin.c b/src/hsm/cmd_change_pin.c index df21ffd..4c84add 100644 --- a/src/hsm/cmd_change_pin.c +++ b/src/hsm/cmd_change_pin.c @@ -19,14 +19,16 @@ #include "sc_hsm.h" #include "kek.h" -int cmd_change_pin() { +int cmd_change_pin() +{ if (P1(apdu) == 0x0) { if (P2(apdu) == 0x81 || P2(apdu) == 0x88) { file_t *file_pin = NULL; - if (P2(apdu) == 0x81) + if (P2(apdu) == 0x81) { file_pin = file_pin1; - else if (P2(apdu) == 0x88) + } else if (P2(apdu) == 0x88) { file_pin = file_sopin; + } if (!file_pin) { return SW_FILE_NOT_FOUND(); } @@ -35,26 +37,28 @@ int cmd_change_pin() { } uint8_t pin_len = file_read_uint8(file_get_data(file_pin)); int r = check_pin(file_pin, apdu.data, pin_len); - if (r != 0x9000) + if (r != 0x9000) { return r; + } uint8_t mkek[MKEK_SIZE]; r = load_mkek(mkek); //loads the MKEK with old pin - if (r != CCID_OK) + if (r != CCID_OK) { return SW_EXEC_ERROR(); + } //encrypt MKEK with new pin if (P2(apdu) == 0x81) { hash_multi(apdu.data+pin_len, apdu.nc-pin_len, session_pin); has_session_pin = true; - } - else if (P2(apdu) == 0x88) { + } else if (P2(apdu) == 0x88) { hash_multi(apdu.data+pin_len, apdu.nc-pin_len, session_sopin); has_session_sopin = true; } r = store_mkek(mkek); release_mkek(mkek); - if (r != CCID_OK) + if (r != CCID_OK) { return SW_EXEC_ERROR(); + } uint8_t dhash[33]; dhash[0] = apdu.nc-pin_len; double_hash_pin(apdu.data+pin_len, apdu.nc-pin_len, dhash+1); diff --git a/src/hsm/cmd_cipher_sym.c b/src/hsm/cmd_cipher_sym.c index 13e03d3..6a46e75 100644 --- a/src/hsm/cmd_cipher_sym.c +++ b/src/hsm/cmd_cipher_sym.c @@ -36,18 +36,19 @@ /* This is copied from pkcs5.c Mbedtls */ /** Unfortunately it is declared as static, so I cannot call it. **/ -static int pkcs5_parse_pbkdf2_params( const mbedtls_asn1_buf *params, - mbedtls_asn1_buf *salt, int *iterations, - int *keylen, mbedtls_md_type_t *md_type ) +static int pkcs5_parse_pbkdf2_params(const mbedtls_asn1_buf *params, + mbedtls_asn1_buf *salt, int *iterations, + int *keylen, mbedtls_md_type_t *md_type) { int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; mbedtls_asn1_buf prf_alg_oid; unsigned char *p = params->p; const unsigned char *end = params->p + params->len; - if (params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) - return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT, - MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) ); + if (params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) { + return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT, + MBEDTLS_ERR_ASN1_UNEXPECTED_TAG); + } /* * PBKDF2-params ::= SEQUENCE { * salt OCTET STRING, @@ -57,42 +58,57 @@ static int pkcs5_parse_pbkdf2_params( const mbedtls_asn1_buf *params, * } * */ - if( ( ret = mbedtls_asn1_get_tag( &p, end, &salt->len, - MBEDTLS_ASN1_OCTET_STRING ) ) != 0 ) - return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret ) ); + if ((ret = mbedtls_asn1_get_tag(&p, end, &salt->len, + MBEDTLS_ASN1_OCTET_STRING)) != 0) { + return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret); + } salt->p = p; p += salt->len; - if( ( ret = mbedtls_asn1_get_int( &p, end, iterations ) ) != 0 ) - return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret ) ); - - if( p == end ) - return( 0 ); - - if( ( ret = mbedtls_asn1_get_int( &p, end, keylen ) ) != 0 ) { - if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) - return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret ) ); + if ((ret = mbedtls_asn1_get_int(&p, end, iterations)) != 0) { + return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret); } - if( p == end ) - return( 0 ); + if (p == end) { + return 0; + } - if( ( ret = mbedtls_asn1_get_alg_null( &p, end, &prf_alg_oid ) ) != 0 ) - return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret ) ); + if ((ret = mbedtls_asn1_get_int(&p, end, keylen)) != 0) { + if (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) { + return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret); + } + } - if( mbedtls_oid_get_md_hmac( &prf_alg_oid, md_type ) != 0 ) - return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE ); + if (p == end) { + return 0; + } - if( p != end ) - return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT, - MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ) ); + if ((ret = mbedtls_asn1_get_alg_null(&p, end, &prf_alg_oid)) != 0) { + return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret); + } - return( 0 ); + if (mbedtls_oid_get_md_hmac(&prf_alg_oid, md_type) != 0) { + return MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE; + } + + if (p != end) { + return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT, + MBEDTLS_ERR_ASN1_LENGTH_MISMATCH); + } + + return 0; } /* Taken from https://github.com/Mbed-TLS/mbedtls/issues/2335 */ -int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, size_t input_len, uint8_t *input, size_t shared_info_len, uint8_t *shared_info, size_t output_len, uint8_t *output) { +int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, + size_t input_len, + uint8_t *input, + size_t shared_info_len, + uint8_t *shared_info, + size_t output_len, + uint8_t *output) +{ mbedtls_md_context_t md_ctx; const mbedtls_md_info_t *md_info = NULL; int hashlen = 0, exit_code = MBEDTLS_ERR_MD_BAD_INPUT_DATA; @@ -143,18 +159,23 @@ int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, size_t input_len, uint8_t * return 0; } -int cmd_cipher_sym() { +int cmd_cipher_sym() +{ int key_id = P1(apdu); int algo = P2(apdu); - if (!isUserAuthenticated) + if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); + } file_t *ef = search_dynamic_file((KEY_PREFIX << 8) | key_id); - if (!ef) + if (!ef) { return SW_FILE_NOT_FOUND(); - if (key_has_purpose(ef, algo) == false) + } + if (key_has_purpose(ef, algo) == false) { return SW_CONDITIONS_NOT_SATISFIED(); - if (wait_button_pressed() == true) // timeout + } + if (wait_button_pressed() == true) { // timeout return SW_SECURE_MESSAGE_EXEC_ERROR(); + } int key_size = file_get_size(ef); uint8_t kdata[32]; //maximum AES key size memcpy(kdata, file_get_data(ef), key_size); @@ -176,21 +197,30 @@ int cmd_cipher_sym() { mbedtls_aes_free(&aes); return SW_EXEC_ERROR(); } - r = mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_ENCRYPT, apdu.nc, tmp_iv, apdu.data, res_APDU); + r = mbedtls_aes_crypt_cbc(&aes, + MBEDTLS_AES_ENCRYPT, + apdu.nc, + tmp_iv, + apdu.data, + res_APDU); mbedtls_platform_zeroize(kdata, sizeof(kdata)); if (r != 0) { mbedtls_aes_free(&aes); return SW_EXEC_ERROR(); } - } - else if (algo == ALGO_AES_CBC_DECRYPT) { + } else if (algo == ALGO_AES_CBC_DECRYPT) { int r = mbedtls_aes_setkey_dec(&aes, kdata, key_size*8); if (r != 0) { mbedtls_platform_zeroize(kdata, sizeof(kdata)); mbedtls_aes_free(&aes); return SW_EXEC_ERROR(); } - r = mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_DECRYPT, apdu.nc, tmp_iv, apdu.data, res_APDU); + r = mbedtls_aes_crypt_cbc(&aes, + MBEDTLS_AES_DECRYPT, + apdu.nc, + tmp_iv, + apdu.data, + res_APDU); mbedtls_platform_zeroize(kdata, sizeof(kdata)); if (r != 0) { mbedtls_aes_free(&aes); @@ -199,36 +229,44 @@ int cmd_cipher_sym() { } res_APDU_size = apdu.nc; mbedtls_aes_free(&aes); - } - else if (algo == ALGO_AES_CMAC) { + } else if (algo == ALGO_AES_CMAC) { const mbedtls_cipher_info_t *cipher_info; - if (key_size == 16) + if (key_size == 16) { cipher_info = mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_128_ECB); - else if (key_size == 24) + } else if (key_size == 24) { cipher_info = mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_192_ECB); - else if (key_size == 32) + } else if (key_size == 32) { cipher_info = mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB); - else { + } else { mbedtls_platform_zeroize(kdata, sizeof(kdata)); return SW_WRONG_DATA(); } int r = mbedtls_cipher_cmac(cipher_info, kdata, key_size*8, apdu.data, apdu.nc, res_APDU); mbedtls_platform_zeroize(kdata, sizeof(kdata)); - if (r != 0) + if (r != 0) { return SW_EXEC_ERROR(); + } res_APDU_size = 16; - } - else if (algo == ALGO_AES_DERIVE) { - int r = mbedtls_hkdf(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), NULL, 0, file_get_data(ef), key_size, apdu.data, apdu.nc, res_APDU, apdu.nc); + } else if (algo == ALGO_AES_DERIVE) { + int r = mbedtls_hkdf(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), + NULL, + 0, + file_get_data(ef), + key_size, + apdu.data, + apdu.nc, + res_APDU, + apdu.nc); mbedtls_platform_zeroize(kdata, sizeof(kdata)); - if (r != 0) + if (r != 0) { return SW_EXEC_ERROR(); + } res_APDU_size = apdu.nc; - } - else if (algo == ALGO_EXT_CIPHER_ENCRYPT || algo == ALGO_EXT_CIPHER_DECRYPT) { + } else if (algo == ALGO_EXT_CIPHER_ENCRYPT || algo == ALGO_EXT_CIPHER_DECRYPT) { size_t oid_len = 0, aad_len = 0, iv_len = 0, enc_len = 0; uint8_t *oid = NULL, *aad = NULL, *iv = NULL, *enc = NULL; - if (!asn1_find_tag(apdu.data, apdu.nc, 0x6, &oid_len, &oid) || oid_len == 0 || oid == NULL) { + if (!asn1_find_tag(apdu.data, apdu.nc, 0x6, &oid_len, + &oid) || oid_len == 0 || oid == NULL) { mbedtls_platform_zeroize(kdata, sizeof(kdata)); return SW_WRONG_DATA(); } @@ -246,57 +284,88 @@ int cmd_cipher_sym() { mbedtls_chachapoly_context ctx; mbedtls_chachapoly_init(&ctx); if (algo == ALGO_EXT_CIPHER_ENCRYPT) { - r = mbedtls_chachapoly_encrypt_and_tag(&ctx, enc_len, iv ? iv : tmp_iv, aad, aad_len, enc, res_APDU, res_APDU + enc_len); - } - else if (algo == ALGO_EXT_CIPHER_DECRYPT) { - r = mbedtls_chachapoly_auth_decrypt(&ctx, enc_len - 16, iv ? iv : tmp_iv, aad, aad_len, enc + enc_len - 16, enc, res_APDU); + r = mbedtls_chachapoly_encrypt_and_tag(&ctx, + enc_len, + iv ? iv : tmp_iv, + aad, + aad_len, + enc, + res_APDU, + res_APDU + enc_len); + } else if (algo == ALGO_EXT_CIPHER_DECRYPT) { + r = mbedtls_chachapoly_auth_decrypt(&ctx, + enc_len - 16, + iv ? iv : tmp_iv, + aad, + aad_len, + enc + enc_len - 16, + enc, + res_APDU); } mbedtls_platform_zeroize(kdata, sizeof(kdata)); mbedtls_chachapoly_free(&ctx); - if (r != 0) + if (r != 0) { return SW_EXEC_ERROR(); - if (algo == ALGO_EXT_CIPHER_ENCRYPT) + } + if (algo == ALGO_EXT_CIPHER_ENCRYPT) { res_APDU_size = enc_len + 16; - else if (algo == ALGO_EXT_CIPHER_DECRYPT) + } else if (algo == ALGO_EXT_CIPHER_DECRYPT) { res_APDU_size = enc_len - 16; - } - else if (memcmp(oid, OID_DIGEST, 7) == 0) { + } + } else if (memcmp(oid, OID_DIGEST, 7) == 0) { const mbedtls_md_info_t *md_info = NULL; - if (memcmp(oid, OID_HMAC_SHA1, oid_len) == 0) + if (memcmp(oid, OID_HMAC_SHA1, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1); - else if (memcmp(oid, OID_HMAC_SHA224, oid_len) == 0) + } else if (memcmp(oid, OID_HMAC_SHA224, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA224); - else if (memcmp(oid, OID_HMAC_SHA256, oid_len) == 0) + } else if (memcmp(oid, OID_HMAC_SHA256, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256); - else if (memcmp(oid, OID_HMAC_SHA384, oid_len) == 0) + } else if (memcmp(oid, OID_HMAC_SHA384, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384); - else if (memcmp(oid, OID_HMAC_SHA512, oid_len) == 0) + } else if (memcmp(oid, OID_HMAC_SHA512, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512); - if (md_info == NULL) + } + if (md_info == NULL) { return SW_WRONG_DATA(); + } int r = mbedtls_md_hmac(md_info, kdata, key_size, apdu.data, apdu.nc, res_APDU); mbedtls_platform_zeroize(kdata, sizeof(kdata)); - if (r != 0) + if (r != 0) { return SW_EXEC_ERROR(); + } res_APDU_size = md_info->size; - } - else if (memcmp(oid, OID_HKDF_SHA256, oid_len) == 0 || memcmp(oid, OID_HKDF_SHA384, oid_len) == 0 || memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) { + } else if (memcmp(oid, OID_HKDF_SHA256, + oid_len) == 0 || + memcmp(oid, OID_HKDF_SHA384, + oid_len) == 0 || memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) { const mbedtls_md_info_t *md_info = NULL; - if (memcmp(oid, OID_HKDF_SHA256, oid_len) == 0) + if (memcmp(oid, OID_HKDF_SHA256, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256); - else if (memcmp(oid, OID_HKDF_SHA384, oid_len) == 0) + } else if (memcmp(oid, OID_HKDF_SHA384, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384); - else if (memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) + } else if (memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512); - int r = mbedtls_hkdf(md_info, iv, iv_len, kdata, key_size, enc, enc_len, res_APDU, apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : mbedtls_md_get_size(md_info)); + } + int r = mbedtls_hkdf(md_info, + iv, + iv_len, + kdata, + key_size, + enc, + enc_len, + res_APDU, + apdu.ne > 0 && + apdu.ne < 65536 ? apdu.ne : mbedtls_md_get_size(md_info)); mbedtls_platform_zeroize(kdata, sizeof(kdata)); - if (r != 0) + if (r != 0) { return SW_EXEC_ERROR(); - res_APDU_size = apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne :mbedtls_md_get_size(md_info); - } - else if (memcmp(oid, OID_PKCS5_PBKDF2, oid_len) == 0) { + } + res_APDU_size = apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : mbedtls_md_get_size(md_info); + } else if (memcmp(oid, OID_PKCS5_PBKDF2, oid_len) == 0) { int iterations = 0, keylen = 0; - mbedtls_asn1_buf salt, params = { .p = enc, .len = enc_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) }; + mbedtls_asn1_buf salt, + params = + { .p = enc, .len = enc_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) }; mbedtls_md_type_t md_type = MBEDTLS_MD_SHA1; mbedtls_md_context_t md_ctx; @@ -312,43 +381,63 @@ int cmd_cipher_sym() { mbedtls_platform_zeroize(kdata, sizeof(kdata)); return SW_WRONG_DATA(); } - r = mbedtls_pkcs5_pbkdf2_hmac(&md_ctx, kdata, key_size, salt.p, salt.len, iterations, keylen ? keylen : (apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32), res_APDU); + r = mbedtls_pkcs5_pbkdf2_hmac(&md_ctx, + kdata, + key_size, + salt.p, + salt.len, + iterations, + keylen ? keylen : (apdu.ne > 0 && + apdu.ne < 65536 ? apdu.ne : 32), + res_APDU); mbedtls_platform_zeroize(kdata, sizeof(kdata)); mbedtls_md_free(&md_ctx); - if (r != 0) + if (r != 0) { return SW_EXEC_ERROR(); + } res_APDU_size = keylen ? keylen : (apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32); - } - else if (memcmp(oid, OID_PKCS5_PBES2, oid_len) == 0) { - mbedtls_asn1_buf params = { .p = aad, .len = aad_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) }; - int r = mbedtls_pkcs5_pbes2(¶ms, algo == ALGO_EXT_CIPHER_ENCRYPT ? MBEDTLS_PKCS5_ENCRYPT : MBEDTLS_PKCS5_DECRYPT, kdata, key_size, enc, enc_len, res_APDU); + } else if (memcmp(oid, OID_PKCS5_PBES2, oid_len) == 0) { + mbedtls_asn1_buf params = + { .p = aad, .len = aad_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) }; + int r = mbedtls_pkcs5_pbes2(¶ms, + algo == ALGO_EXT_CIPHER_ENCRYPT ? MBEDTLS_PKCS5_ENCRYPT : MBEDTLS_PKCS5_DECRYPT, + kdata, + key_size, + enc, + enc_len, + res_APDU); mbedtls_platform_zeroize(kdata, sizeof(kdata)); if (r != 0) { return SW_WRONG_DATA(); } res_APDU_size = enc_len; - } - else if (memcmp(oid, OID_KDF_X963, oid_len) == 0) { + } else if (memcmp(oid, OID_KDF_X963, oid_len) == 0) { mbedtls_md_type_t md_type = MBEDTLS_MD_SHA1; - if (memcmp(enc, OID_HMAC_SHA1, enc_len) == 0) + if (memcmp(enc, OID_HMAC_SHA1, enc_len) == 0) { md_type = MBEDTLS_MD_SHA1; - else if (memcmp(enc, OID_HMAC_SHA224, enc_len) == 0) + } else if (memcmp(enc, OID_HMAC_SHA224, enc_len) == 0) { md_type = MBEDTLS_MD_SHA224; - else if (memcmp(enc, OID_HMAC_SHA256, enc_len) == 0) + } else if (memcmp(enc, OID_HMAC_SHA256, enc_len) == 0) { md_type = MBEDTLS_MD_SHA256; - else if (memcmp(enc, OID_HMAC_SHA384, enc_len) == 0) + } else if (memcmp(enc, OID_HMAC_SHA384, enc_len) == 0) { md_type = MBEDTLS_MD_SHA384; - else if (memcmp(enc, OID_HMAC_SHA512, enc_len) == 0) + } else if (memcmp(enc, OID_HMAC_SHA512, enc_len) == 0) { md_type = MBEDTLS_MD_SHA512; - int r = mbedtls_ansi_x936_kdf(md_type, key_size, kdata, aad_len, aad, apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32, res_APDU); + } + int r = mbedtls_ansi_x936_kdf(md_type, + key_size, + kdata, + aad_len, + aad, + apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32, + res_APDU); mbedtls_platform_zeroize(kdata, sizeof(kdata)); if (r != 0) { return SW_WRONG_DATA(); } res_APDU_size = apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32; } - } - else { + } else { mbedtls_platform_zeroize(kdata, sizeof(kdata)); return SW_WRONG_P1P2(); } diff --git a/src/hsm/cmd_decrypt_asym.c b/src/hsm/cmd_decrypt_asym.c index 6ade4df..73ff62c 100644 --- a/src/hsm/cmd_decrypt_asym.c +++ b/src/hsm/cmd_decrypt_asym.c @@ -26,56 +26,65 @@ #include "random.h" #include "oid.h" -int cmd_decrypt_asym() { +int cmd_decrypt_asym() +{ int key_id = P1(apdu); uint8_t p2 = P2(apdu); - if (!isUserAuthenticated) + if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); + } file_t *ef = search_dynamic_file((KEY_PREFIX << 8) | key_id); - if (!ef) + if (!ef) { return SW_FILE_NOT_FOUND(); - if (get_key_counter(ef) == 0) + } + if (get_key_counter(ef) == 0) { return SW_FILE_FULL(); - if (key_has_purpose(ef, p2) == false) + } + if (key_has_purpose(ef, p2) == false) { return SW_CONDITIONS_NOT_SATISFIED(); + } if (p2 >= ALGO_RSA_DECRYPT && p2 <= ALGO_RSA_DECRYPT_OEP) { mbedtls_rsa_context ctx; mbedtls_rsa_init(&ctx); - if (p2 == ALGO_RSA_DECRYPT_OEP) + if (p2 == ALGO_RSA_DECRYPT_OEP) { mbedtls_rsa_set_padding(&ctx, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA256); + } int r = load_private_key_rsa(&ctx, ef); if (r != CCID_OK) { mbedtls_rsa_free(&ctx); - if (r == CCID_VERIFICATION_FAILED) + if (r == CCID_VERIFICATION_FAILED) { return SW_SECURE_MESSAGE_EXEC_ERROR(); + } return SW_EXEC_ERROR(); } int key_size = file_get_size(ef); - if (apdu.nc < key_size) //needs padding + if (apdu.nc < key_size) { //needs padding memset(apdu.data+apdu.nc, 0, key_size-apdu.nc); + } if (p2 == ALGO_RSA_DECRYPT_PKCS1 || p2 == ALGO_RSA_DECRYPT_OEP) { size_t olen = apdu.nc; r = mbedtls_rsa_pkcs1_decrypt(&ctx, random_gen, NULL, &olen, apdu.data, res_APDU, 512); - if (r == 0) + if (r == 0) { res_APDU_size = olen; - } - else { + } + } else { r = mbedtls_rsa_private(&ctx, random_gen, NULL, apdu.data, res_APDU); - if (r == 0) + if (r == 0) { res_APDU_size = key_size; + } } if (r != 0) { mbedtls_rsa_free(&ctx); return SW_EXEC_ERROR(); } mbedtls_rsa_free(&ctx); - } - else if (p2 == ALGO_EC_DH || p2 == ALGO_EC_DH_XKEK) { + } else if (p2 == ALGO_EC_DH || p2 == ALGO_EC_DH_XKEK) { mbedtls_ecdh_context ctx; - if (wait_button_pressed() == true) //timeout + if (wait_button_pressed() == true) { //timeout return SW_SECURE_MESSAGE_EXEC_ERROR(); + } int key_size = file_get_size(ef); - uint8_t *kdata = (uint8_t *)calloc(1,key_size); + uint8_t *kdata = (uint8_t *) calloc(1, key_size); memcpy(kdata, file_get_data(ef), key_size); if (mkek_decrypt(kdata, key_size) != 0) { mbedtls_platform_zeroize(kdata, key_size); @@ -100,9 +109,9 @@ int cmd_decrypt_asym() { return SW_DATA_INVALID(); } r = -1; - if (p2 == ALGO_EC_DH) + if (p2 == ALGO_EC_DH) { r = mbedtls_ecdh_read_public(&ctx, apdu.data-1, apdu.nc+1); - else if (p2 == ALGO_EC_DH_XKEK) { + } else if (p2 == ALGO_EC_DH_XKEK) { size_t pub_len = 0; const uint8_t *pub = cvc_get_pub(apdu.data, apdu.nc, &pub_len); if (pub) { @@ -118,19 +127,22 @@ int cmd_decrypt_asym() { return SW_DATA_INVALID(); } size_t olen = 0; - r = mbedtls_ecdh_calc_secret(&ctx, &olen, res_APDU, MBEDTLS_ECP_MAX_BYTES, random_gen, NULL); + r = + mbedtls_ecdh_calc_secret(&ctx, &olen, res_APDU, MBEDTLS_ECP_MAX_BYTES, random_gen, + NULL); mbedtls_ecdh_free(&ctx); if (r != 0) { return SW_EXEC_ERROR(); } - if (p2 == ALGO_EC_DH) + if (p2 == ALGO_EC_DH) { res_APDU_size = olen; - else { + } else { res_APDU_size = 0; size_t ext_len = 0; const uint8_t *ext = NULL; - if ((ext = cvc_get_ext(apdu.data, apdu.nc, &ext_len)) == NULL) + if ((ext = cvc_get_ext(apdu.data, apdu.nc, &ext_len)) == NULL) { return SW_WRONG_DATA(); + } uint8_t *p = NULL, *tag_data = NULL, *kdom_uid = NULL; uint16_t tag = 0; size_t tag_len = 0, kdom_uid_len = 0; @@ -138,31 +150,40 @@ int cmd_decrypt_asym() { if (tag == 0x73) { size_t oid_len = 0; uint8_t *oid_data = NULL; - if (asn1_find_tag(tag_data, tag_len, 0x6, &oid_len, &oid_data) == true && oid_len == strlen(OID_ID_KEY_DOMAIN_UID) && memcmp(oid_data, OID_ID_KEY_DOMAIN_UID, strlen(OID_ID_KEY_DOMAIN_UID)) == 0) { - if (asn1_find_tag(tag_data, tag_len, 0x80, &kdom_uid_len, &kdom_uid) == false) + if (asn1_find_tag(tag_data, tag_len, 0x6, &oid_len, + &oid_data) == true && + oid_len == strlen(OID_ID_KEY_DOMAIN_UID) && + memcmp(oid_data, OID_ID_KEY_DOMAIN_UID, + strlen(OID_ID_KEY_DOMAIN_UID)) == 0) { + if (asn1_find_tag(tag_data, tag_len, 0x80, &kdom_uid_len, + &kdom_uid) == false) { return SW_WRONG_DATA(); + } break; } } } - if (kdom_uid_len == 0 || kdom_uid == NULL) + if (kdom_uid_len == 0 || kdom_uid == NULL) { return SW_WRONG_DATA(); + } for (int n = 0; n < MAX_KEY_DOMAINS; n++) { file_t *tf = search_dynamic_file(EF_XKEK+n); if (tf) { - if (file_get_size(tf) == kdom_uid_len && memcmp(file_get_data(tf), kdom_uid, kdom_uid_len) == 0) { + if (file_get_size(tf) == kdom_uid_len && + memcmp(file_get_data(tf), kdom_uid, kdom_uid_len) == 0) { file_new(EF_DKEK+n); - if (store_dkek_key(n, res_APDU) != CCID_OK) + if (store_dkek_key(n, res_APDU) != CCID_OK) { return SW_EXEC_ERROR(); + } return SW_OK(); } } } return SW_REFERENCE_NOT_FOUND(); } - } - else + } else { return SW_WRONG_P1P2(); + } decrement_key_counter(ef); return SW_OK(); } diff --git a/src/hsm/cmd_delete_file.c b/src/hsm/cmd_delete_file.c index 3b69e78..8659f48 100644 --- a/src/hsm/cmd_delete_file.c +++ b/src/hsm/cmd_delete_file.c @@ -17,24 +17,29 @@ #include "sc_hsm.h" -int cmd_delete_file() { +int cmd_delete_file() +{ file_t *ef = NULL; - if (!isUserAuthenticated) + if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); + } if (apdu.nc == 0) { ef = currentEF; - if (!(ef = search_dynamic_file(ef->fid))) + if (!(ef = search_dynamic_file(ef->fid))) { return SW_FILE_NOT_FOUND(); - } - else { + } + } else { uint16_t fid = (apdu.data[0] << 8) | apdu.data[1]; - if (!(ef = search_dynamic_file(fid))) + if (!(ef = search_dynamic_file(fid))) { return SW_FILE_NOT_FOUND(); + } } - if (!authenticate_action(ef, ACL_OP_DELETE_SELF)) + if (!authenticate_action(ef, ACL_OP_DELETE_SELF)) { return SW_SECURITY_STATUS_NOT_SATISFIED(); - if (delete_file(ef) != CCID_OK) + } + if (delete_file(ef) != CCID_OK) { return SW_EXEC_ERROR(); + } return SW_OK(); } diff --git a/src/hsm/cmd_derive_asym.c b/src/hsm/cmd_derive_asym.c index 3eb2121..8bf604e 100644 --- a/src/hsm/cmd_derive_asym.c +++ b/src/hsm/cmd_derive_asym.c @@ -22,33 +22,38 @@ #include "cvc.h" #define MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED -0x006E -#define MOD_ADD( N ) \ - while( mbedtls_mpi_cmp_mpi( &(N), &grp->P ) >= 0 ) \ - MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( &(N), &(N), &grp->P ) ) -static inline int mbedtls_mpi_add_mod( const mbedtls_ecp_group *grp, - mbedtls_mpi *X, - const mbedtls_mpi *A, - const mbedtls_mpi *B ) +#define MOD_ADD(N) \ + while (mbedtls_mpi_cmp_mpi(&(N), &grp->P) >= 0) \ + MBEDTLS_MPI_CHK(mbedtls_mpi_sub_abs(&(N), &(N), &grp->P)) +static inline int mbedtls_mpi_add_mod(const mbedtls_ecp_group *grp, + mbedtls_mpi *X, + const mbedtls_mpi *A, + const mbedtls_mpi *B) { int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; - MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( X, A, B ) ); - MOD_ADD( *X ); + MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(X, A, B)); + MOD_ADD(*X); cleanup: - return( ret ); + return ret; } -int cmd_derive_asym() { +int cmd_derive_asym() +{ uint8_t key_id = P1(apdu); uint8_t dest_id = P2(apdu); file_t *fkey; - if (!isUserAuthenticated) + if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); - if (!(fkey = search_dynamic_file((KEY_PREFIX << 8) | key_id)) || !file_has_data(fkey)) + } + if (!(fkey = search_dynamic_file((KEY_PREFIX << 8) | key_id)) || !file_has_data(fkey)) { return SW_FILE_NOT_FOUND(); - if (key_has_purpose(fkey, ALGO_EC_DERIVE) == false) + } + if (key_has_purpose(fkey, ALGO_EC_DERIVE) == false) { return SW_CONDITIONS_NOT_SATISFIED(); - if (apdu.nc == 0) + } + if (apdu.nc == 0) { return SW_WRONG_LENGTH(); + } if (apdu.data[0] == ALGO_EC_DERIVE) { mbedtls_ecdsa_context ctx; mbedtls_ecdsa_init(&ctx); @@ -57,8 +62,9 @@ int cmd_derive_asym() { r = load_private_key_ecdsa(&ctx, fkey); if (r != CCID_OK) { mbedtls_ecdsa_free(&ctx); - if (r == CCID_VERIFICATION_FAILED) + if (r == CCID_VERIFICATION_FAILED) { return SW_SECURE_MESSAGE_EXEC_ERROR(); + } return SW_EXEC_ERROR(); } mbedtls_mpi a, nd; @@ -90,8 +96,8 @@ int cmd_derive_asym() { return SW_EXEC_ERROR(); } mbedtls_ecdsa_free(&ctx); - } - else + } else { return SW_WRONG_DATA(); + } return SW_OK(); } diff --git a/src/hsm/cmd_external_authenticate.c b/src/hsm/cmd_external_authenticate.c index c7b9798..5bbccaa 100644 --- a/src/hsm/cmd_external_authenticate.c +++ b/src/hsm/cmd_external_authenticate.c @@ -24,29 +24,42 @@ extern file_t *ef_puk_aut; extern uint8_t challenge[256]; extern uint8_t challenge_len; -int cmd_external_authenticate() { - if (P1(apdu) != 0x0 || P2(apdu) != 0x0) +int cmd_external_authenticate() +{ + if (P1(apdu) != 0x0 || P2(apdu) != 0x0) { return SW_INCORRECT_P1P2(); - if (ef_puk_aut == NULL) + } + if (ef_puk_aut == NULL) { return SW_REFERENCE_NOT_FOUND(); - if (apdu.nc == 0) + } + if (apdu.nc == 0) { return SW_WRONG_LENGTH(); + } file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF); - if (!file_has_data(ef_puk)) + if (!file_has_data(ef_puk)) { return SW_FILE_NOT_FOUND(); + } uint8_t *puk_data = file_get_data(ef_puk); - uint8_t *input = (uint8_t *)calloc(dev_name_len+challenge_len, sizeof(uint8_t)), hash[32]; + uint8_t *input = (uint8_t *) calloc(dev_name_len+challenge_len, sizeof(uint8_t)), hash[32]; memcpy(input, dev_name, dev_name_len); memcpy(input+dev_name_len, challenge, challenge_len); hash256(input, dev_name_len+challenge_len, hash); - int r = puk_verify(apdu.data, apdu.nc, hash, 32, file_get_data(ef_puk_aut), file_get_size(ef_puk_aut)); + int r = + puk_verify(apdu.data, + apdu.nc, + hash, + 32, + file_get_data(ef_puk_aut), + file_get_size(ef_puk_aut)); free(input); - if (r != 0) + if (r != 0) { return SW_CONDITIONS_NOT_SATISFIED(); + } puk_status[ef_puk_aut->fid & (MAX_PUK-1)] = 1; uint8_t auts = 0; - for (int i = 0; i < puk_data[0]; i++) + for (int i = 0; i < puk_data[0]; i++) { auts += puk_status[i]; + } if (auts >= puk_data[2]) { isUserAuthenticated = true; } diff --git a/src/hsm/cmd_extras.c b/src/hsm/cmd_extras.c index c46a520..b04d5f0 100644 --- a/src/hsm/cmd_extras.c +++ b/src/hsm/cmd_extras.c @@ -27,15 +27,18 @@ #include "mbedtls/hkdf.h" #include "mbedtls/chachapoly.h" -int cmd_extras() { +int cmd_extras() +{ if (P1(apdu) == 0xA) { //datetime operations - if (P2(apdu) != 0x0) + if (P2(apdu) != 0x0) { return SW_INCORRECT_P1P2(); + } if (apdu.nc == 0) { #ifndef ENABLE_EMULATION datetime_t dt; - if (!rtc_get_datetime(&dt)) + if (!rtc_get_datetime(&dt)) { return SW_EXEC_ERROR(); + } res_APDU[res_APDU_size++] = dt.year >> 8; res_APDU[res_APDU_size++] = dt.year & 0xff; res_APDU[res_APDU_size++] = dt.month; @@ -45,10 +48,10 @@ int cmd_extras() { res_APDU[res_APDU_size++] = dt.min; res_APDU[res_APDU_size++] = dt.sec; #endif - } - else { - if (apdu.nc != 8) + } else { + if (apdu.nc != 8) { return SW_WRONG_LENGTH(); + } #ifndef ENABLE_EMULATION datetime_t dt; dt.year = (apdu.data[0] << 8) | (apdu.data[1]); @@ -58,29 +61,29 @@ int cmd_extras() { dt.hour = apdu.data[5]; dt.min = apdu.data[6]; dt.sec = apdu.data[7]; - if (!rtc_set_datetime(&dt)) + if (!rtc_set_datetime(&dt)) { return SW_WRONG_DATA(); + } #endif } - } - else if (P1(apdu) == 0x6) { //dynamic options - if (P2(apdu) != 0x0) + } else if (P1(apdu) == 0x6) { //dynamic options + if (P2(apdu) != 0x0) { return SW_INCORRECT_P1P2(); - if (apdu.nc > sizeof(uint8_t)) + } + if (apdu.nc > sizeof(uint8_t)) { return SW_WRONG_LENGTH(); + } uint16_t opts = get_device_options(); if (apdu.nc == 0) { res_APDU[res_APDU_size++] = opts >> 8; res_APDU[res_APDU_size++] = opts & 0xff; - } - else { + } else { uint8_t newopts[] = { apdu.data[0], (opts & 0xff) }; file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF); flash_write_data_to_file(tf, newopts, sizeof(newopts)); low_flash_available(); } - } - else if (P1(apdu) == 0x3A) { // secure lock + } else if (P1(apdu) == 0x3A) { // secure lock if (apdu.nc == 0) { return SW_WRONG_LENGTH(); } @@ -88,9 +91,16 @@ int cmd_extras() { mbedtls_ecdh_context hkey; mbedtls_ecdh_init(&hkey); mbedtls_ecdh_setup(&hkey, MBEDTLS_ECP_DP_SECP256R1); - int ret = mbedtls_ecdh_gen_public(&hkey.ctx.mbed_ecdh.grp, &hkey.ctx.mbed_ecdh.d, &hkey.ctx.mbed_ecdh.Q, random_gen, NULL); + int ret = mbedtls_ecdh_gen_public(&hkey.ctx.mbed_ecdh.grp, + &hkey.ctx.mbed_ecdh.d, + &hkey.ctx.mbed_ecdh.Q, + random_gen, + NULL); mbedtls_mpi_lset(&hkey.ctx.mbed_ecdh.Qp.Z, 1); - ret = mbedtls_ecp_point_read_binary(&hkey.ctx.mbed_ecdh.grp, &hkey.ctx.mbed_ecdh.Qp, apdu.data, apdu.nc); + ret = mbedtls_ecp_point_read_binary(&hkey.ctx.mbed_ecdh.grp, + &hkey.ctx.mbed_ecdh.Qp, + apdu.data, + apdu.nc); if (ret != 0) { mbedtls_ecdh_free(&hkey); return SW_WRONG_DATA(); @@ -99,30 +109,48 @@ int cmd_extras() { uint8_t buf[MBEDTLS_ECP_MAX_BYTES]; size_t olen = 0; - ret = mbedtls_ecdh_calc_secret(&hkey, &olen, buf, MBEDTLS_ECP_MAX_BYTES, random_gen, NULL); + ret = mbedtls_ecdh_calc_secret(&hkey, + &olen, + buf, + MBEDTLS_ECP_MAX_BYTES, + random_gen, + NULL); if (ret != 0) { mbedtls_ecdh_free(&hkey); mbedtls_platform_zeroize(buf, sizeof(buf)); return SW_WRONG_DATA(); } - ret = mbedtls_hkdf(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), NULL, 0, buf, olen, mse.Qpt, sizeof(mse.Qpt), mse.key_enc, sizeof(mse.key_enc)); + ret = mbedtls_hkdf(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), + NULL, + 0, + buf, + olen, + mse.Qpt, + sizeof(mse.Qpt), + mse.key_enc, + sizeof(mse.key_enc)); mbedtls_platform_zeroize(buf, sizeof(buf)); if (ret != 0) { mbedtls_ecdh_free(&hkey); return SW_EXEC_ERROR(); } - ret = mbedtls_ecp_point_write_binary(&hkey.ctx.mbed_ecdh.grp, &hkey.ctx.mbed_ecdh.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &olen, res_APDU, 4096); + ret = mbedtls_ecp_point_write_binary(&hkey.ctx.mbed_ecdh.grp, + &hkey.ctx.mbed_ecdh.Q, + MBEDTLS_ECP_PF_UNCOMPRESSED, + &olen, + res_APDU, + 4096); mbedtls_ecdh_free(&hkey); if (ret != 0) { return SW_EXEC_ERROR(); } mse.init = true; res_APDU_size = olen; - } - else if (P2(apdu) == 0x02 || P2(apdu) == 0x03 || P2(apdu) == 0x04) { - if (mse.init == false) + } else if (P2(apdu) == 0x02 || P2(apdu) == 0x03 || P2(apdu) == 0x04) { + if (mse.init == false) { return SW_COMMAND_NOT_ALLOWED(); + } int ret = mse_decrypt_ct(apdu.data, apdu.nc); if (ret != 0) { @@ -131,12 +159,13 @@ int cmd_extras() { if (P2(apdu) == 0x02 || P2(apdu) == 0x04) { // Enable uint16_t opts = get_device_options(); uint8_t newopts[] = { opts >> 8, (opts & 0xff) }; - if ((P2(apdu) == 0x02 && !(opts & HSM_OPT_SECURE_LOCK)) || (P2(apdu) == 0x04 && (opts & HSM_OPT_SECURE_LOCK))) { + if ((P2(apdu) == 0x02 && !(opts & HSM_OPT_SECURE_LOCK)) || + (P2(apdu) == 0x04 && (opts & HSM_OPT_SECURE_LOCK))) { uint16_t tfids[] = { EF_MKEK, EF_MKEK_SO }; for (int t = 0; t < sizeof(tfids)/sizeof(uint16_t); t++) { file_t *tf = search_by_fid(tfids[t], NULL, SPECIFY_EF); if (tf) { - uint8_t *tmp = (uint8_t *)calloc(1, file_get_size(tf)); + uint8_t *tmp = (uint8_t *) calloc(1, file_get_size(tf)); memcpy(tmp, file_get_data(tf), file_get_size(tf)); for (int i = 0; i < MKEK_KEY_SIZE; i++) { MKEK_KEY(tmp)[i] ^= apdu.data[i]; @@ -146,21 +175,21 @@ int cmd_extras() { } } } - if (P2(apdu) == 0x02) + if (P2(apdu) == 0x02) { newopts[0] |= HSM_OPT_SECURE_LOCK >> 8; - else if (P2(apdu) == 0x04) + } else if (P2(apdu) == 0x04) { newopts[0] &= ~HSM_OPT_SECURE_LOCK >> 8; + } file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF); flash_write_data_to_file(tf, newopts, sizeof(newopts)); low_flash_available(); - } - else if (P2(apdu) == 0x03) { + } else if (P2(apdu) == 0x03) { memcpy(mkek_mask, apdu.data, apdu.nc); has_mkek_mask = true; } } - } - else + } else { return SW_INCORRECT_P1P2(); + } return SW_OK(); } diff --git a/src/hsm/cmd_general_authenticate.c b/src/hsm/cmd_general_authenticate.c index 6d1620a..7933fe5 100644 --- a/src/hsm/cmd_general_authenticate.c +++ b/src/hsm/cmd_general_authenticate.c @@ -24,7 +24,8 @@ #include "eac.h" #include "files.h" -int cmd_general_authenticate() { +int cmd_general_authenticate() +{ if (P1(apdu) == 0x0 && P2(apdu) == 0x0) { if (apdu.data[0] == 0x7C) { int r = 0; @@ -40,8 +41,9 @@ int cmd_general_authenticate() { } } file_t *fkey = search_by_fid(EF_KEY_DEV, NULL, SPECIFY_EF); - if (!fkey) + if (!fkey) { return SW_EXEC_ERROR(); + } mbedtls_ecdsa_context ectx; mbedtls_ecdsa_init(&ectx); r = load_private_key_ecdsa(&ectx, fkey); @@ -71,7 +73,12 @@ int cmd_general_authenticate() { } size_t olen = 0; uint8_t derived[MBEDTLS_ECP_MAX_BYTES]; - r = mbedtls_ecdh_calc_secret(&ctx, &olen, derived, MBEDTLS_ECP_MAX_BYTES, random_gen, NULL); + r = mbedtls_ecdh_calc_secret(&ctx, + &olen, + derived, + MBEDTLS_ECP_MAX_BYTES, + random_gen, + NULL); mbedtls_ecdh_free(&ctx); if (r != 0) { return SW_EXEC_ERROR(); @@ -79,10 +86,11 @@ int cmd_general_authenticate() { sm_derive_all_keys(derived, olen); - uint8_t *t = (uint8_t *)calloc(1, pubkey_len+16); + uint8_t *t = (uint8_t *) calloc(1, pubkey_len+16); memcpy(t, "\x7F\x49\x4F\x06\x0A", 5); - if (sm_get_protocol() == MSE_AES) + if (sm_get_protocol() == MSE_AES) { memcpy(t+5, OID_ID_CA_ECDH_AES_CBC_CMAC_128, 10); + } t[15] = 0x86; memcpy(t+16, pubkey, pubkey_len); @@ -98,8 +106,9 @@ int cmd_general_authenticate() { r = sm_sign(t, pubkey_len+16, res_APDU+res_APDU_size); free(t); - if (r != CCID_OK) + if (r != CCID_OK) { return SW_EXEC_ERROR(); + } res_APDU_size += 8; } } diff --git a/src/hsm/cmd_initialize.c b/src/hsm/cmd_initialize.c index 70057ac..9b1c6f2 100644 --- a/src/hsm/cmd_initialize.c +++ b/src/hsm/cmd_initialize.c @@ -27,7 +27,8 @@ extern void scan_all(); extern char __StackLimit; -int heapLeft() { +int heapLeft() +{ #ifndef ENABLE_EMULATION char *p = malloc(256); // try to avoid undue fragmentation int left = &__StackLimit - p; @@ -38,7 +39,8 @@ int heapLeft() { return left; } -int cmd_initialize() { +int cmd_initialize() +{ if (apdu.nc > 0) { uint8_t mkek[MKEK_SIZE]; int ret_mkek = load_mkek(mkek); //Try loading MKEK with previous session @@ -52,8 +54,7 @@ int cmd_initialize() { if (tag == 0x80) { //options file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF); flash_write_data_to_file(tf, tag_data, tag_len); - } - else if (tag == 0x81) { //user pin + } else if (tag == 0x81) { //user pin if (file_pin1 && file_pin1->data) { uint8_t dhash[33]; dhash[0] = tag_len; @@ -62,8 +63,7 @@ int cmd_initialize() { hash_multi(tag_data, tag_len, session_pin); has_session_pin = true; } - } - else if (tag == 0x82) { //sopin pin + } else if (tag == 0x82) { //sopin pin if (file_sopin && file_sopin->data) { uint8_t dhash[33]; dhash[0] = tag_len; @@ -72,8 +72,7 @@ int cmd_initialize() { hash_multi(tag_data, tag_len, session_sopin); has_session_sopin = true; } - } - else if (tag == 0x91) { //retries user pin + } else if (tag == 0x91) { //retries user pin file_t *tf = search_by_fid(0x1082, NULL, SPECIFY_EF); if (tf && tf->data) { flash_write_data_to_file(tf, tag_data, tag_len); @@ -81,8 +80,7 @@ int cmd_initialize() { if (file_retries_pin1 && file_retries_pin1->data) { flash_write_data_to_file(file_retries_pin1, tag_data, tag_len); } - } - else if (tag == 0x92) { + } else if (tag == 0x92) { dkeks = tag_data; file_t *tf = file_new(EF_DKEK); if (!tf) { @@ -90,14 +88,13 @@ int cmd_initialize() { return SW_MEMORY_FAILURE(); } flash_write_data_to_file(tf, NULL, 0); - } - else if (tag == 0x93) { + } else if (tag == 0x93) { file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF); if (!ef_puk) { release_mkek(mkek); return SW_MEMORY_FAILURE(); } - uint8_t pk_status[4], puks = MIN(tag_data[0],MAX_PUK); + uint8_t pk_status[4], puks = MIN(tag_data[0], MAX_PUK); memset(pk_status, 0, sizeof(pk_status)); pk_status[0] = puks; pk_status[1] = puks; @@ -111,17 +108,16 @@ int cmd_initialize() { } flash_write_data_to_file(tf, NULL, 0); } - } - else if (tag == 0x97) { + } else if (tag == 0x97) { kds = tag_data; /* - for (int i = 0; i < MIN(*kds,MAX_KEY_DOMAINS); i++) { + for (int i = 0; i < MIN(*kds,MAX_KEY_DOMAINS); i++) { file_t *tf = file_new(EF_DKEK+i); if (!tf) return SW_MEMORY_FAILURE(); flash_write_data_to_file(tf, NULL, 0); - } - */ + } + */ } } file_t *tf_kd = search_by_fid(EF_KEY_DOMAIN, NULL, SPECIFY_EF); @@ -129,8 +125,9 @@ int cmd_initialize() { release_mkek(mkek); return SW_EXEC_ERROR(); } - if (ret_mkek != CCID_OK) + if (ret_mkek != CCID_OK) { ret_mkek = load_mkek(mkek); //Try again with new PIN/SO-PIN just in case some is the same + } if (store_mkek(ret_mkek == CCID_OK ? mkek : NULL) != CCID_OK) { release_mkek(mkek); return SW_EXEC_ERROR(); @@ -139,35 +136,39 @@ int cmd_initialize() { if (dkeks) { if (*dkeks > 0) { uint16_t d = *dkeks; - if (flash_write_data_to_file(tf_kd, (const uint8_t *)&d, sizeof(d)) != CCID_OK) + if (flash_write_data_to_file(tf_kd, (const uint8_t *) &d, sizeof(d)) != CCID_OK) { return SW_EXEC_ERROR(); - } - else { + } + } else { int r = save_dkek_key(0, random_bytes_get(32)); - if (r != CCID_OK) + if (r != CCID_OK) { return SW_EXEC_ERROR(); + } uint16_t d = 0x0101; - if (flash_write_data_to_file(tf_kd, (const uint8_t *)&d, sizeof(d)) != CCID_OK) + if (flash_write_data_to_file(tf_kd, (const uint8_t *) &d, sizeof(d)) != CCID_OK) { return SW_EXEC_ERROR(); + } } - } - else { + } else { uint16_t d = 0x0000; - if (flash_write_data_to_file(tf_kd, (const uint8_t *)&d, sizeof(d)) != CCID_OK) + if (flash_write_data_to_file(tf_kd, (const uint8_t *) &d, sizeof(d)) != CCID_OK) { return SW_EXEC_ERROR(); + } } if (kds) { - uint8_t t[MAX_KEY_DOMAINS*2], k = MIN(*kds,MAX_KEY_DOMAINS); + uint8_t t[MAX_KEY_DOMAINS*2], k = MIN(*kds, MAX_KEY_DOMAINS); memset(t, 0xff, 2*k); - if (flash_write_data_to_file(tf_kd, t, 2*k) != CCID_OK) + if (flash_write_data_to_file(tf_kd, t, 2*k) != CCID_OK) { return SW_EXEC_ERROR(); + } } /* When initialized, it has all credentials */ isUserAuthenticated = true; /* Create terminal private key */ file_t *fdkey = search_by_fid(EF_KEY_DEV, NULL, SPECIFY_EF); - if (!fdkey) + if (!fdkey) { return SW_EXEC_ERROR(); + } int ret = 0; if (ret_mkek != CCID_OK || !file_has_data(fdkey)) { mbedtls_ecdsa_context ecdsa; @@ -193,19 +194,28 @@ int cmd_initialize() { file_t *fpk = search_by_fid(EF_EE_DEV, NULL, SPECIFY_EF); ret = flash_write_data_to_file(fpk, res_APDU, cvc_len); - if (ret != 0) + if (ret != 0) { return SW_EXEC_ERROR(); + } - const uint8_t *keyid = (const uint8_t *)"\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0", *label = (const uint8_t *)"ESTERMHSM"; - size_t prkd_len = asn1_build_prkd_ecc(label, strlen((const char *)label), keyid, 20, 192, res_APDU, 4096); + const uint8_t *keyid = + (const uint8_t *) "\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0", + *label = (const uint8_t *) "ESTERMHSM"; + size_t prkd_len = asn1_build_prkd_ecc(label, + strlen((const char *) label), + keyid, + 20, + 192, + res_APDU, + 4096); fpk = search_by_fid(EF_PRKD_DEV, NULL, SPECIFY_EF); ret = flash_write_data_to_file(fpk, res_APDU, prkd_len); } - if (ret != 0) + if (ret != 0) { return SW_EXEC_ERROR(); + } low_flash_available(); - } - else { //free memory bytes request + } else { //free memory bytes request int heap_left = heapLeft(); res_APDU[0] = ((heap_left >> 24) & 0xff); res_APDU[1] = ((heap_left >> 16) & 0xff); diff --git a/src/hsm/cmd_key_domain.c b/src/hsm/cmd_key_domain.c index e32db5d..aa28317 100644 --- a/src/hsm/cmd_key_domain.c +++ b/src/hsm/cmd_key_domain.c @@ -21,36 +21,47 @@ #include "kek.h" #include "files.h" -uint8_t get_key_domain(file_t *fkey) { +uint8_t get_key_domain(file_t *fkey) +{ size_t tag_len = 0; const uint8_t *meta_tag = get_meta_tag(fkey, 0x92, &tag_len); - if (meta_tag) + if (meta_tag) { return *meta_tag; + } return 0xff; } -int cmd_key_domain() { +int cmd_key_domain() +{ //if (dkeks == 0) // return SW_COMMAND_NOT_ALLOWED(); uint8_t p1 = P1(apdu), p2 = P2(apdu); - if ((has_session_pin == false || isUserAuthenticated == false) && apdu.nc > 0 && !(p1 == 0x0 && p2 == 0x0)) + if ((has_session_pin == false || isUserAuthenticated == false) && apdu.nc > 0 && + !(p1 == 0x0 && p2 == 0x0)) { return SW_CONDITIONS_NOT_SATISFIED(); - if (p2 >= MAX_KEY_DOMAINS) + } + if (p2 >= MAX_KEY_DOMAINS) { return SW_WRONG_P1P2(); + } file_t *tf_kd = search_by_fid(EF_KEY_DOMAIN, NULL, SPECIFY_EF); - if (!tf_kd) + if (!tf_kd) { return SW_EXEC_ERROR(); + } uint16_t tf_kd_size = file_get_size(tf_kd); - if (tf_kd_size == 0) + if (tf_kd_size == 0) { return SW_WRONG_P1P2(); - uint8_t *kdata = file_get_data(tf_kd), dkeks = kdata ? kdata[2*p2] : 0, current_dkeks = kdata ? kdata[2*p2+1] : 0; + } + uint8_t *kdata = file_get_data(tf_kd), dkeks = kdata ? kdata[2*p2] : 0, + current_dkeks = kdata ? kdata[2*p2+1] : 0; if (p1 == 0x0) { //dkek import if (apdu.nc > 0) { file_t *tf = file_new(EF_DKEK+p2); - if (!tf) + if (!tf) { return SW_MEMORY_FAILURE(); - if (apdu.nc < 32) + } + if (apdu.nc < 32) { return SW_WRONG_LENGTH(); + } if (current_dkeks == dkeks) { return SW_COMMAND_NOT_ALLOWED(); } @@ -65,25 +76,28 @@ int cmd_key_domain() { uint8_t t[MAX_KEY_DOMAINS*2]; memcpy(t, kdata, tf_kd_size); t[2*p2+1] = current_dkeks; - if (flash_write_data_to_file(tf_kd, t, tf_kd_size) != CCID_OK) + if (flash_write_data_to_file(tf_kd, t, tf_kd_size) != CCID_OK) { return SW_EXEC_ERROR(); + } low_flash_available(); - } - else { + } else { file_t *tf = search_dynamic_file(EF_XKEK+p2); - if (2*p2 >= tf_kd_size) + if (2*p2 >= tf_kd_size) { return SW_INCORRECT_P1P2(); - if (current_dkeks == 0xff && !tf) //XKEK have always 0xff + } + if (current_dkeks == 0xff && !tf) { //XKEK have always 0xff return SW_REFERENCE_NOT_FOUND(); + } } - } - else if (p1 == 0x1 || p1 == 0x3 || p1 == 0x4) { //key domain setup - if (p1 == 0x1 && apdu.nc != 1) + } else if (p1 == 0x1 || p1 == 0x3 || p1 == 0x4) { //key domain setup + if (p1 == 0x1 && apdu.nc != 1) { return SW_WRONG_LENGTH(); + } if (p1 == 0x3) { //if key domain is not empty, command is denied for (int i = 0; i < dynamic_files; i++) { - if (get_key_domain(&dynamic_file[i]) == p2) + if (get_key_domain(&dynamic_file[i]) == p2) { return SW_FILE_EXISTS(); + } } } uint8_t t[MAX_KEY_DOMAINS*2]; @@ -91,57 +105,64 @@ int cmd_key_domain() { if (p1 == 0x1) { t[2*p2] = dkeks = apdu.data[0]; t[2*p2+1] = current_dkeks = 0; - } - else if (p1 == 0x3) { + } else if (p1 == 0x3) { t[2*p2] = dkeks = 0xff; t[2*p2+1] = 0xff; - } - else if (p1 == 0x4) { + } else if (p1 == 0x4) { t[2*p2+1] = current_dkeks = 0; } - if (flash_write_data_to_file(tf_kd, t, tf_kd_size) != CCID_OK) + if (flash_write_data_to_file(tf_kd, t, tf_kd_size) != CCID_OK) { return SW_EXEC_ERROR(); + } file_t *tf = NULL; if ((tf = search_dynamic_file(EF_DKEK+p2))) { - if (delete_file(tf) != CCID_OK) + if (delete_file(tf) != CCID_OK) { return SW_EXEC_ERROR(); + } } if (p1 == 0x3 && (tf = search_dynamic_file(EF_XKEK+p2))) { - if (delete_file(tf) != CCID_OK) + if (delete_file(tf) != CCID_OK) { return SW_EXEC_ERROR(); + } } low_flash_available(); - if (p1 == 0x3) + if (p1 == 0x3) { return SW_REFERENCE_NOT_FOUND(); - } - else if (p1 == 0x2) { //XKEK Key Domain creation + } + } else if (p1 == 0x2) { //XKEK Key Domain creation if (apdu.nc > 0) { size_t pub_len = 0; file_t *fterm = search_by_fid(EF_TERMCA, NULL, SPECIFY_EF); - if (!fterm) + if (!fterm) { return SW_EXEC_ERROR(); + } const uint8_t *pub = cvc_get_pub(file_get_data(fterm), file_get_size(fterm), &pub_len); - if (!pub) + if (!pub) { return SW_EXEC_ERROR(); + } size_t t86_len = 0; const uint8_t *t86 = cvc_get_field(pub, pub_len, &t86_len, 0x86); - if (!t86 || t86[0] != 0x4) + if (!t86 || t86[0] != 0x4) { return SW_EXEC_ERROR(); + } size_t t54_len = 0; const uint8_t *t54 = cvc_get_field(apdu.data, apdu.nc, &t54_len, 0x54); - if (!t54) + if (!t54) { return SW_WRONG_DATA(); - uint8_t hash[32], *input = (uint8_t *)calloc(1, (t86_len-1)/2+1); + } + uint8_t hash[32], *input = (uint8_t *) calloc(1, (t86_len-1)/2+1); input[0] = 0x54; memcpy(input+1, t86+1, (t86_len-1)/2); hash256(input, (t86_len-1)/2+1, hash); free(input); int r = puk_verify(t54, t54_len, hash, 32, apdu.data, apdu.nc); - if (r != 0) + if (r != 0) { return SW_CONDITIONS_NOT_SATISFIED(); + } file_t *tf = file_new(EF_XKEK+p2); - if (!tf) + if (!tf) { return SW_MEMORY_FAILURE(); + } //All checks done. Get Key Domain UID pub = cvc_get_pub(apdu.data, apdu.nc, &pub_len); @@ -154,10 +175,10 @@ int cmd_key_domain() { } } } - } - else + } else { return SW_INCORRECT_P1P2(); - memset(res_APDU,0,10); + } + memset(res_APDU, 0, 10); res_APDU[0] = dkeks; res_APDU[1] = dkeks > current_dkeks ? dkeks-current_dkeks : 0; dkek_kcv(p2, res_APDU+2); diff --git a/src/hsm/cmd_key_gen.c b/src/hsm/cmd_key_gen.c index 949ddb6..9551895 100644 --- a/src/hsm/cmd_key_gen.c +++ b/src/hsm/cmd_key_gen.c @@ -19,34 +19,40 @@ #include "sc_hsm.h" #include "random.h" -int cmd_key_gen() { +int cmd_key_gen() +{ uint8_t key_id = P1(apdu); uint8_t p2 = P2(apdu); uint8_t key_size = 32; int r; - if (!isUserAuthenticated) + if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); - if (p2 == 0xB2) + } + if (p2 == 0xB2) { key_size = 32; - else if (p2 == 0xB1) + } else if (p2 == 0xB1) { key_size = 24; - else if (p2 == 0xB0) + } else if (p2 == 0xB0) { key_size = 16; + } //at this moment, we do not use the template, as only CBC is supported by the driver (encrypt, decrypt and CMAC) uint8_t aes_key[32]; //maximum AES key size memcpy(aes_key, random_bytes_get(key_size), key_size); int aes_type = 0x0; - if (key_size == 16) + if (key_size == 16) { aes_type = HSM_KEY_AES_128; - else if (key_size == 24) + } else if (key_size == 24) { aes_type = HSM_KEY_AES_192; - else if (key_size == 32) + } else if (key_size == 32) { aes_type = HSM_KEY_AES_256; + } r = store_keys(aes_key, aes_type, key_id); - if (r != CCID_OK) + if (r != CCID_OK) { return SW_MEMORY_FAILURE(); - if (find_and_store_meta_key(key_id) != CCID_OK) + } + if (find_and_store_meta_key(key_id) != CCID_OK) { return SW_EXEC_ERROR(); + } low_flash_available(); return SW_OK(); } diff --git a/src/hsm/cmd_key_unwrap.c b/src/hsm/cmd_key_unwrap.c index a6712ed..82167a5 100644 --- a/src/hsm/cmd_key_unwrap.c +++ b/src/hsm/cmd_key_unwrap.c @@ -20,17 +20,21 @@ #include "kek.h" #include "cvc.h" -int cmd_key_unwrap() { +int cmd_key_unwrap() +{ int key_id = P1(apdu), r = 0; - if (P2(apdu) != 0x93) + if (P2(apdu) != 0x93) { return SW_WRONG_P1P2(); - if (!isUserAuthenticated) + } + if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); + } int key_type = dkek_type_key(apdu.data); uint8_t kdom = -1, *allowed = NULL; size_t allowed_len = 0; - if (key_type == 0x0) + if (key_type == 0x0) { return SW_DATA_INVALID(); + } if (key_type == HSM_KEY_RSA) { mbedtls_rsa_context ctx; mbedtls_rsa_init(&ctx); @@ -50,13 +54,12 @@ int cmd_key_unwrap() { if (r != CCID_OK) { return SW_EXEC_ERROR(); } - } - else if (key_type == HSM_KEY_EC) { + } else if (key_type == HSM_KEY_EC) { mbedtls_ecdsa_context ctx; mbedtls_ecdsa_init(&ctx); do { r = dkek_decode_key(++kdom, &ctx, apdu.data, apdu.nc, NULL, &allowed, &allowed_len); - } while((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS); + } while ((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS); if (r != CCID_OK) { mbedtls_ecdsa_free(&ctx); return SW_EXEC_ERROR(); @@ -70,24 +73,30 @@ int cmd_key_unwrap() { if (r != CCID_OK) { return SW_EXEC_ERROR(); } - } - else if (key_type == HSM_KEY_AES) { + } else if (key_type == HSM_KEY_AES) { uint8_t aes_key[32]; int key_size = 0, aes_type = 0; do { - r = dkek_decode_key(++kdom, aes_key, apdu.data, apdu.nc, &key_size, &allowed, &allowed_len); - } while((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS); + r = dkek_decode_key(++kdom, + aes_key, + apdu.data, + apdu.nc, + &key_size, + &allowed, + &allowed_len); + } while ((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS); if (r != CCID_OK) { return SW_EXEC_ERROR(); } - if (key_size == 32) + if (key_size == 32) { aes_type = HSM_KEY_AES_256; - else if (key_size == 24) + } else if (key_size == 24) { aes_type = HSM_KEY_AES_192; - else if (key_size == 16) + } else if (key_size == 16) { aes_type = HSM_KEY_AES_128; - else + } else { return SW_EXEC_ERROR(); + } r = store_keys(aes_key, aes_type, key_id); if (r != CCID_OK) { return SW_EXEC_ERROR(); @@ -95,7 +104,7 @@ int cmd_key_unwrap() { } if ((allowed != NULL && allowed_len > 0) || kdom >= 0) { size_t meta_len = (allowed_len > 0 ? 2+allowed_len : 0) + (kdom >= 0 ? 3 : 0); - uint8_t *meta = (uint8_t *)calloc(1,meta_len), *m = meta; + uint8_t *meta = (uint8_t *) calloc(1, meta_len), *m = meta; if (allowed_len > 0) { *m++ = 0x91; *m++ = allowed_len; @@ -108,14 +117,16 @@ int cmd_key_unwrap() { } r = meta_add((KEY_PREFIX << 8) | key_id, meta, meta_len); free(meta); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } } if (res_APDU_size > 0) { file_t *fpk = file_new((EE_CERTIFICATE_PREFIX << 8) | key_id); r = flash_write_data_to_file(fpk, res_APDU, res_APDU_size); - if (r != 0) + if (r != 0) { return SW_EXEC_ERROR(); + } low_flash_available(); res_APDU_size = 0; } diff --git a/src/hsm/cmd_key_wrap.c b/src/hsm/cmd_key_wrap.c index 0f96bed..3c90e5b 100644 --- a/src/hsm/cmd_key_wrap.c +++ b/src/hsm/cmd_key_wrap.c @@ -22,21 +22,28 @@ extern uint8_t get_key_domain(file_t *fkey); -int cmd_key_wrap() { +int cmd_key_wrap() +{ int key_id = P1(apdu), r = 0; - if (P2(apdu) != 0x92) + if (P2(apdu) != 0x92) { return SW_WRONG_P1P2(); - if (!isUserAuthenticated) + } + if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); + } file_t *ef = search_dynamic_file((KEY_PREFIX << 8) | key_id); + printf("%d %p\n", key_id, ef); uint8_t kdom = get_key_domain(ef); - if (!ef) + if (!ef) { return SW_FILE_NOT_FOUND(); - if (key_has_purpose(ef, ALGO_WRAP) == false) + } + if (key_has_purpose(ef, ALGO_WRAP) == false) { return SW_CONDITIONS_NOT_SATISFIED(); + } file_t *prkd = search_dynamic_file((PRKD_PREFIX << 8) | key_id); - if (!prkd) + if (!prkd) { return SW_FILE_NOT_FOUND(); + } const uint8_t *dprkd = file_get_data(prkd); size_t wrap_len = MAX_DKEK_ENCODE_KEY_BUFFER; size_t tag_len = 0; @@ -47,47 +54,50 @@ int cmd_key_wrap() { r = load_private_key_rsa(&ctx, ef); if (r != CCID_OK) { mbedtls_rsa_free(&ctx); - if (r == CCID_VERIFICATION_FAILED) + if (r == CCID_VERIFICATION_FAILED) { return SW_SECURE_MESSAGE_EXEC_ERROR(); + } return SW_EXEC_ERROR(); } r = dkek_encode_key(kdom, &ctx, HSM_KEY_RSA, res_APDU, &wrap_len, meta_tag, tag_len); mbedtls_rsa_free(&ctx); - } - else if (*dprkd == P15_KEYTYPE_ECC) { + } else if (*dprkd == P15_KEYTYPE_ECC) { mbedtls_ecdsa_context ctx; mbedtls_ecdsa_init(&ctx); r = load_private_key_ecdsa(&ctx, ef); if (r != CCID_OK) { mbedtls_ecdsa_free(&ctx); - if (r == CCID_VERIFICATION_FAILED) + if (r == CCID_VERIFICATION_FAILED) { return SW_SECURE_MESSAGE_EXEC_ERROR(); + } return SW_EXEC_ERROR(); } r = dkek_encode_key(kdom, &ctx, HSM_KEY_EC, res_APDU, &wrap_len, meta_tag, tag_len); mbedtls_ecdsa_free(&ctx); - } - else if (*dprkd == P15_KEYTYPE_AES) { + } else if (*dprkd == P15_KEYTYPE_AES) { uint8_t kdata[32]; //maximum AES key size - if (wait_button_pressed() == true) //timeout + if (wait_button_pressed() == true) { //timeout return SW_SECURE_MESSAGE_EXEC_ERROR(); + } int key_size = file_get_size(ef), aes_type = HSM_KEY_AES; memcpy(kdata, file_get_data(ef), key_size); if (mkek_decrypt(kdata, key_size) != 0) { return SW_EXEC_ERROR(); } - if (key_size == 32) + if (key_size == 32) { aes_type = HSM_KEY_AES_256; - else if (key_size == 24) + } else if (key_size == 24) { aes_type = HSM_KEY_AES_192; - else if (key_size == 16) + } else if (key_size == 16) { aes_type = HSM_KEY_AES_128; + } r = dkek_encode_key(kdom, kdata, aes_type, res_APDU, &wrap_len, meta_tag, tag_len); mbedtls_platform_zeroize(kdata, sizeof(kdata)); } - if (r != CCID_OK) + if (r != CCID_OK) { return SW_EXEC_ERROR(); + } res_APDU_size = wrap_len; return SW_OK(); } diff --git a/src/hsm/cmd_keypair_gen.c b/src/hsm/cmd_keypair_gen.c index ba497ac..8422868 100644 --- a/src/hsm/cmd_keypair_gen.c +++ b/src/hsm/cmd_keypair_gen.c @@ -24,15 +24,18 @@ #include "random.h" #include "kek.h" -int cmd_keypair_gen() { +int cmd_keypair_gen() +{ uint8_t key_id = P1(apdu); - if (!isUserAuthenticated) + if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); + } int ret = 0; size_t tout = 0; //sc_asn1_print_tags(apdu.data, apdu.nc); uint8_t *p = NULL; + //DEBUG_DATA(apdu.data,apdu.nc); if (asn1_find_tag(apdu.data, apdu.nc, 0x7f49, &tout, &p) && tout > 0 && p != NULL) { size_t oid_len = 0; uint8_t *oid = NULL; @@ -55,32 +58,35 @@ int cmd_keypair_gen() { key_size = (key_size << 8) | *dt++; } } - printf("KEYPAIR RSA %lu (%lx)\r\n",(unsigned long)key_size,(unsigned long)exponent); + printf("KEYPAIR RSA %lu (%lx)\r\n", + (unsigned long) key_size, + (unsigned long) exponent); mbedtls_rsa_context rsa; mbedtls_rsa_init(&rsa); uint8_t index = 0; ret = mbedtls_rsa_gen_key(&rsa, random_gen, &index, key_size, exponent); if (ret != 0) { - mbedtls_rsa_free(&rsa); + mbedtls_rsa_free(&rsa); return SW_EXEC_ERROR(); } - if ((res_APDU_size = asn1_cvc_aut(&rsa, HSM_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) { + if ((res_APDU_size = + asn1_cvc_aut(&rsa, HSM_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) { return SW_EXEC_ERROR(); } - ret = store_keys(&rsa, HSM_KEY_RSA, key_id); - if (ret != CCID_OK) { + ret = store_keys(&rsa, HSM_KEY_RSA, key_id); + if (ret != CCID_OK) { mbedtls_rsa_free(&rsa); return SW_EXEC_ERROR(); } mbedtls_rsa_free(&rsa); - } - else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256,MIN(oid_len,10)) == 0) { //ECC + } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, MIN(oid_len, 10)) == 0) { //ECC size_t prime_len; uint8_t *prime = NULL; - if (asn1_find_tag(p, tout, 0x81, &prime_len, &prime) != true) + if (asn1_find_tag(p, tout, 0x81, &prime_len, &prime) != true) { return SW_WRONG_DATA(); + } mbedtls_ecp_group_id ec_id = ec_get_curve_from_prime(prime, prime_len); - printf("KEYPAIR ECC %d\r\n",ec_id); + printf("KEYPAIR ECC %d\r\n", ec_id); if (ec_id == MBEDTLS_ECP_DP_NONE) { return SW_FUNC_NOT_SUPPORTED(); } @@ -99,15 +105,19 @@ int cmd_keypair_gen() { if (p91[n] == ALGO_EC_DH_XKEK) { size_t l92 = 0; uint8_t *p92 = NULL; - if (!asn1_find_tag(apdu.data, apdu.nc, 0x92, &l92, &p92) || p92 == NULL || l92 == 0) + if (!asn1_find_tag(apdu.data, apdu.nc, 0x92, &l92, + &p92) || p92 == NULL || l92 == 0) { return SW_WRONG_DATA(); - if (p92[0] > MAX_KEY_DOMAINS) + } + if (p92[0] > MAX_KEY_DOMAINS) { return SW_WRONG_DATA(); + } file_t *tf_xkek = search_dynamic_file(EF_XKEK+p92[0]); - if (!tf_xkek) + if (!tf_xkek) { return SW_WRONG_DATA(); + } ext_len = 2+2+strlen(OID_ID_KEY_DOMAIN_UID)+2+file_get_size(tf_xkek); - ext = (uint8_t *)calloc(1, ext_len); + ext = (uint8_t *) calloc(1, ext_len); uint8_t *pe = ext; *pe++ = 0x73; *pe++ = ext_len-2; @@ -121,33 +131,39 @@ int cmd_keypair_gen() { } } } - if ((res_APDU_size = asn1_cvc_aut(&ecdsa, HSM_KEY_EC, res_APDU, 4096, ext, ext_len)) == 0) { - if (ext) + if ((res_APDU_size = + asn1_cvc_aut(&ecdsa, HSM_KEY_EC, res_APDU, 4096, ext, ext_len)) == 0) { + if (ext) { free(ext); + } mbedtls_ecdsa_free(&ecdsa); return SW_EXEC_ERROR(); } - if (ext) + if (ext) { free(ext); + } ret = store_keys(&ecdsa, HSM_KEY_EC, key_id); mbedtls_ecdsa_free(&ecdsa); - if (ret != CCID_OK) { + if (ret != CCID_OK) { return SW_EXEC_ERROR(); } } } - } - else + } else { return SW_WRONG_DATA(); - if (find_and_store_meta_key(key_id) != CCID_OK) + } + if (find_and_store_meta_key(key_id) != CCID_OK) { return SW_EXEC_ERROR(); + } file_t *fpk = file_new((EE_CERTIFICATE_PREFIX << 8) | key_id); ret = flash_write_data_to_file(fpk, res_APDU, res_APDU_size); - if (ret != 0) + if (ret != 0) { return SW_EXEC_ERROR(); - //if (apdu.ne == 0) - // apdu.ne = res_APDU_size; + } + if (apdu.ne == 0) { + apdu.ne = res_APDU_size; + } low_flash_available(); return SW_OK(); } diff --git a/src/hsm/cmd_list_keys.c b/src/hsm/cmd_list_keys.c index 4d70e98..41f9169 100644 --- a/src/hsm/cmd_list_keys.c +++ b/src/hsm/cmd_list_keys.c @@ -33,16 +33,14 @@ int cmd_list_keys() //first CC for (int i = 0; i < dynamic_files; i++) { file_t *f = &dynamic_file[i]; - if ((f->fid & 0xff00) == (KEY_PREFIX << 8)) - { + if ((f->fid & 0xff00) == (KEY_PREFIX << 8)) { res_APDU[res_APDU_size++] = KEY_PREFIX; res_APDU[res_APDU_size++] = f->fid & 0xff; } } for (int i = 0; i < dynamic_files; i++) { file_t *f = &dynamic_file[i]; - if ((f->fid & 0xff00) == (PRKD_PREFIX << 8)) - { + if ((f->fid & 0xff00) == (PRKD_PREFIX << 8)) { res_APDU[res_APDU_size++] = PRKD_PREFIX; res_APDU[res_APDU_size++] = f->fid & 0xff; } diff --git a/src/hsm/cmd_mse.c b/src/hsm/cmd_mse.c index d0e3a69..501b0ec 100644 --- a/src/hsm/cmd_mse.c +++ b/src/hsm/cmd_mse.c @@ -24,11 +24,13 @@ file_t *ef_puk_aut = NULL; -int cmd_mse() { +int cmd_mse() +{ int p1 = P1(apdu); int p2 = P2(apdu); - if (p2 != 0xA4 && p2 != 0xA6 && p2 != 0xAA && p2 != 0xB4 && p2 != 0xB6 && p2 != 0xB8) + if (p2 != 0xA4 && p2 != 0xA6 && p2 != 0xAA && p2 != 0xB4 && p2 != 0xB6 && p2 != 0xB8) { return SW_INCORRECT_P1P2(); + } if (p1 & 0x1) { //SET uint16_t tag = 0x0; uint8_t *tag_data = NULL, *p = NULL; @@ -36,28 +38,32 @@ int cmd_mse() { while (walk_tlv(apdu.data, apdu.nc, &p, &tag, &tag_len, &tag_data)) { if (tag == 0x80) { if (p2 == 0xA4) { - if (tag_len == 10 && memcmp(tag_data, OID_ID_CA_ECDH_AES_CBC_CMAC_128, tag_len) == 0) + if (tag_len == 10 && + memcmp(tag_data, OID_ID_CA_ECDH_AES_CBC_CMAC_128, tag_len) == 0) { sm_set_protocol(MSE_AES); + } } - } - else if (tag == 0x83) { + } else if (tag == 0x83) { if (tag_len == 1) { - } - else { + } else { if (p2 == 0xB6) { - if (puk_store_select_chr(tag_data) == CCID_OK) + if (puk_store_select_chr(tag_data) == CCID_OK) { return SW_OK(); - } - else if (p2 == 0xA4) { /* Aut */ + } + } else if (p2 == 0xA4) { /* Aut */ for (int i = 0; i < MAX_PUK; i++) { file_t *ef = search_dynamic_file(EF_PUK+i); - if (!ef) + if (!ef) { break; - if (!file_has_data(ef)) + } + if (!file_has_data(ef)) { break; + } size_t chr_len = 0; - const uint8_t *chr = cvc_get_chr(file_get_data(ef), file_get_size(ef), &chr_len); + const uint8_t *chr = cvc_get_chr(file_get_data(ef), + file_get_size(ef), + &chr_len); if (memcmp(chr, tag_data, chr_len) == 0) { ef_puk_aut = ef; return SW_OK(); @@ -68,8 +74,8 @@ int cmd_mse() { } } } - } - else + } else { return SW_INCORRECT_P1P2(); + } return SW_OK(); } diff --git a/src/hsm/cmd_pso.c b/src/hsm/cmd_pso.c index 48be4fb..f1f0d3e 100644 --- a/src/hsm/cmd_pso.c +++ b/src/hsm/cmd_pso.c @@ -23,13 +23,16 @@ extern int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy); extern PUK *current_puk; -int cmd_pso() { +int cmd_pso() +{ uint8_t p1 = P1(apdu), p2 = P2(apdu); if (p1 == 0x0 && (p2 == 0x92 || p2 == 0xAE || p2 == 0xBE)) { /* Verify certificate */ - if (apdu.nc == 0) + if (apdu.nc == 0) { return SW_WRONG_LENGTH(); - if (current_puk == NULL) + } + if (current_puk == NULL) { return SW_REFERENCE_NOT_FOUND(); + } if (apdu.data[0] != 0x7F || apdu.data[1] != 0x21) { uint8_t tlv_len = 2+format_tlv_len(apdu.nc, NULL); memmove(apdu.data+tlv_len, apdu.data, apdu.nc); @@ -39,10 +42,11 @@ int cmd_pso() { } int r = cvc_verify(apdu.data, apdu.nc, current_puk->cvcert, current_puk->cvcert_len); if (r != CCID_OK) { - if (r == CCID_WRONG_DATA) + if (r == CCID_WRONG_DATA) { return SW_DATA_INVALID(); - else if (r == CCID_WRONG_SIGNATURE) + } else if (r == CCID_WRONG_SIGNATURE) { return SW_CONDITIONS_NOT_SATISFIED(); + } return SW_EXEC_ERROR(); } for (int i = 0; i < 0xfe; i++) { @@ -51,27 +55,32 @@ int cmd_pso() { if (!ca_ef) { ca_ef = file_new(fid); flash_write_data_to_file(ca_ef, apdu.data, apdu.nc); - if (add_cert_puk_store(file_get_data(ca_ef), file_get_size(ca_ef), false) != CCID_OK) + if (add_cert_puk_store(file_get_data(ca_ef), file_get_size(ca_ef), + false) != CCID_OK) { return SW_FILE_FULL(); + } size_t chr_len = 0; const uint8_t *chr = cvc_get_chr(apdu.data, apdu.nc, &chr_len); - if (chr == NULL) + if (chr == NULL) { return SW_WRONG_DATA(); + } size_t puk_len = 0, puk_bin_len = 0; const uint8_t *puk = cvc_get_pub(apdu.data, apdu.nc, &puk_len), *puk_bin = NULL; - if (puk == NULL) + if (puk == NULL) { return SW_WRONG_DATA(); + } size_t oid_len = 0; const uint8_t *oid = cvc_get_field(puk, puk_len, &oid_len, 0x6); - if (oid == NULL) + if (oid == NULL) { return SW_WRONG_DATA(); + } if (memcmp(oid, OID_ID_TA_RSA, 9) == 0) { //RSA puk_bin = cvc_get_field(puk, puk_len, &puk_bin_len, 0x81); - if (!puk_bin) + if (!puk_bin) { return SW_WRONG_DATA(); - } - else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC + } + } else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC mbedtls_ecp_group_id ec_id = cvc_inherite_ec_group(apdu.data, apdu.nc); mbedtls_ecp_group grp; mbedtls_ecp_group_init(&grp); @@ -89,21 +98,18 @@ int cmd_pso() { } puk_bin = t86; puk_bin_len = t86_len; - } - else if (mbedtls_ecp_get_type(&grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) { + } else if (mbedtls_ecp_get_type(&grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) { if (t86[0] == 0x2 || t86[0] == 0x3) { if (t86_len != plen+1) { mbedtls_ecp_group_free(&grp); return SW_WRONG_DATA(); } - } - else if (t86[0] == 0x4) { + } else if (t86[0] == 0x4) { if (t86_len != 2*plen+1) { mbedtls_ecp_group_free(&grp); return SW_WRONG_DATA(); } - } - else { + } else { mbedtls_ecp_group_free(&grp); return SW_WRONG_DATA(); } @@ -111,26 +117,41 @@ int cmd_pso() { puk_bin_len = plen; } mbedtls_ecp_group_free(&grp); - if (!puk_bin) + if (!puk_bin) { return SW_WRONG_DATA(); + } } file_t *cd_ef = file_new((CD_PREFIX << 8) | i); - size_t cd_len = asn1_build_cert_description(chr, chr_len, puk_bin, puk_bin_len, fid, NULL, 0); - if (cd_len == 0) + size_t cd_len = asn1_build_cert_description(chr, + chr_len, + puk_bin, + puk_bin_len, + fid, + NULL, + 0); + if (cd_len == 0) { return SW_EXEC_ERROR(); - uint8_t *buf = (uint8_t *)calloc(cd_len, sizeof(uint8_t)); - int r = asn1_build_cert_description(chr, chr_len, puk_bin, puk_bin_len, fid, buf, cd_len); + } + uint8_t *buf = (uint8_t *) calloc(cd_len, sizeof(uint8_t)); + int r = asn1_build_cert_description(chr, + chr_len, + puk_bin, + puk_bin_len, + fid, + buf, + cd_len); flash_write_data_to_file(cd_ef, buf, cd_len); free(buf); - if (r == 0) + if (r == 0) { return SW_EXEC_ERROR(); + } low_flash_available(); break; } } return SW_OK(); - } - else + } else { return SW_INCORRECT_P1P2(); + } return SW_OK(); } diff --git a/src/hsm/cmd_puk_auth.c b/src/hsm/cmd_puk_auth.c index 47e6250..6240acc 100644 --- a/src/hsm/cmd_puk_auth.c +++ b/src/hsm/cmd_puk_auth.c @@ -19,53 +19,62 @@ #include "files.h" #include "cvc.h" -int cmd_puk_auth() { +int cmd_puk_auth() +{ uint8_t p1 = P1(apdu), p2 = P2(apdu); file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF); - if (!file_has_data(ef_puk)) + if (!file_has_data(ef_puk)) { return SW_FILE_NOT_FOUND(); + } uint8_t *puk_data = file_get_data(ef_puk); if (apdu.nc > 0) { if (p1 == 0x0 || p1 == 0x1) { file_t *ef = NULL; if (p1 == 0x0) { /* Add */ - if (p2 != 0x0) + if (p2 != 0x0) { return SW_INCORRECT_P1P2(); + } for (int i = 0; i < puk_data[0]; i++) { ef = search_dynamic_file(EF_PUK+i); - if (!ef) /* Never should not happen */ + if (!ef) { /* Never should not happen */ return SW_MEMORY_FAILURE(); - if (!file_has_data(ef)) /* found first empty slot */ + } + if (!file_has_data(ef)) { /* found first empty slot */ break; + } } - uint8_t *tmp = (uint8_t *)calloc(file_get_size(ef_puk), sizeof(uint8_t)); + uint8_t *tmp = (uint8_t *) calloc(file_get_size(ef_puk), sizeof(uint8_t)); memcpy(tmp, puk_data, file_get_size(ef_puk)); tmp[1] = puk_data[1]-1; flash_write_data_to_file(ef_puk, tmp, file_get_size(ef_puk)); puk_data = file_get_data(ef_puk); free(tmp); - } - else if (p1 == 0x1) { /* Replace */ - if (p2 >= puk_data[0]) + } else if (p1 == 0x1) { /* Replace */ + if (p2 >= puk_data[0]) { return SW_INCORRECT_P1P2(); + } ef = search_dynamic_file(EF_PUK+p2); - if (!ef) /* Never should not happen */ + if (!ef) { /* Never should not happen */ return SW_MEMORY_FAILURE(); + } } flash_write_data_to_file(ef, apdu.data, apdu.nc); low_flash_available(); - } - else + } else { return SW_INCORRECT_P1P2(); + } } if (p1 == 0x2) { - if (p2 >= puk_data[0]) + if (p2 >= puk_data[0]) { return SW_INCORRECT_P1P2(); + } file_t *ef = search_dynamic_file(EF_PUK+p2); - if (!ef) + if (!ef) { return SW_INCORRECT_P1P2(); - if (!file_has_data(ef)) + } + if (!file_has_data(ef)) { return SW_REFERENCE_NOT_FOUND(); + } size_t chr_len = 0; const uint8_t *chr = cvc_get_chr(file_get_data(ef), file_get_size(ef), &chr_len); if (chr) { @@ -73,12 +82,12 @@ int cmd_puk_auth() { res_APDU_size = chr_len; } return set_res_sw(0x90, puk_status[p2]); - } - else { + } else { memcpy(res_APDU, puk_data, 3); res_APDU[3] = 0; - for (int i = 0; i < puk_data[0]; i++) + for (int i = 0; i < puk_data[0]; i++) { res_APDU[3] += puk_status[i]; + } res_APDU_size = 4; } return SW_OK(); diff --git a/src/hsm/cmd_read_binary.c b/src/hsm/cmd_read_binary.c index 48e2af8..d6d6bd9 100644 --- a/src/hsm/cmd_read_binary.c +++ b/src/hsm/cmd_read_binary.c @@ -17,42 +17,46 @@ #include "sc_hsm.h" -int cmd_read_binary() { +int cmd_read_binary() +{ uint16_t fid = 0x0; uint32_t offset = 0; uint8_t ins = INS(apdu), p1 = P1(apdu), p2 = P2(apdu); const file_t *ef = NULL; - if ((ins & 0x1) == 0) - { + if ((ins & 0x1) == 0) { if ((p1 & 0x80) != 0) { - if (!(ef = search_by_fid(p1&0x1f, NULL, SPECIFY_EF))) - return SW_FILE_NOT_FOUND (); + if (!(ef = search_by_fid(p1&0x1f, NULL, SPECIFY_EF))) { + return SW_FILE_NOT_FOUND(); + } offset = p2; - } - else { + } else { offset = make_uint16_t(p1, p2) & 0x7fff; ef = currentEF; } - } - else { + } else { if (p1 == 0 && (p2 & 0xE0) == 0 && (p2 & 0x1f) != 0 && (p2 & 0x1f) != 0x1f) { - if (!(ef = search_by_fid(p2&0x1f, NULL, SPECIFY_EF))) - return SW_FILE_NOT_FOUND (); - } - else { + if (!(ef = search_by_fid(p2&0x1f, NULL, SPECIFY_EF))) { + return SW_FILE_NOT_FOUND(); + } + } else { uint16_t file_id = make_uint16_t(p1, p2); // & 0x7fff; - if (file_id == 0x0) + if (file_id == 0x0) { ef = currentEF; - else if (!(ef = search_by_fid(file_id, NULL, SPECIFY_EF)) && !(ef = search_dynamic_file(file_id))) - return SW_FILE_NOT_FOUND (); + } else if (!(ef = + search_by_fid(file_id, NULL, + SPECIFY_EF)) && !(ef = search_dynamic_file(file_id))) { + return SW_FILE_NOT_FOUND(); + } - if (apdu.data[0] != 0x54) + if (apdu.data[0] != 0x54) { return SW_WRONG_DATA(); + } offset = 0; - for (int d = 0; d < apdu.data[1]; d++) + for (int d = 0; d < apdu.data[1]; d++) { offset |= apdu.data[2+d]<<(apdu.data[1]-1-d)*8; + } } } @@ -61,26 +65,29 @@ int cmd_read_binary() { } if (ef->data) { if ((ef->type & FILE_DATA_FUNC) == FILE_DATA_FUNC) { - uint16_t data_len = ((int (*)(const file_t *, int))(ef->data))((const file_t *)ef, 1); //already copies content to res_APDU - if (offset > data_len) + uint16_t data_len = ((int (*)(const file_t *, int))(ef->data))((const file_t *) ef, 1); //already copies content to res_APDU + if (offset > data_len) { return SW_WRONG_P1P2(); + } uint16_t maxle = data_len-offset; - if (apdu.ne > maxle) + if (apdu.ne > maxle) { apdu.ne = maxle; + } if (offset) { memmove(res_APDU, res_APDU+offset, res_APDU_size-offset); //res_APDU += offset; res_APDU_size -= offset; } - } - else { + } else { uint16_t data_len = file_get_size(ef); - if (offset > data_len) + if (offset > data_len) { return SW_WRONG_P1P2(); + } uint16_t maxle = data_len-offset; - if (apdu.ne > maxle) + if (apdu.ne > maxle) { apdu.ne = maxle; + } memcpy(res_APDU, file_get_data(ef)+offset, data_len-offset); res_APDU_size = data_len-offset; } diff --git a/src/hsm/cmd_reset_retry.c b/src/hsm/cmd_reset_retry.c index 131233e..72d89f2 100644 --- a/src/hsm/cmd_reset_retry.c +++ b/src/hsm/cmd_reset_retry.c @@ -19,9 +19,11 @@ #include "sc_hsm.h" #include "kek.h" -int cmd_reset_retry() { - if (P2(apdu) != 0x81) +int cmd_reset_retry() +{ + if (P2(apdu) != 0x81) { return SW_REFERENCE_NOT_FOUND(); + } if (!file_sopin || !file_pin1) { return SW_FILE_NOT_FOUND(); } @@ -29,66 +31,77 @@ int cmd_reset_retry() { return SW_REFERENCE_NOT_FOUND(); } uint16_t opts = get_device_options(); - if (!(opts & HSM_OPT_RRC)) + if (!(opts & HSM_OPT_RRC)) { return SW_COMMAND_NOT_ALLOWED(); + } if (P1(apdu) == 0x0 || P1(apdu) == 0x2) { int newpin_len = 0; if (P1(apdu) == 0x0) { - if (apdu.nc <= 8) + if (apdu.nc <= 8) { return SW_WRONG_LENGTH(); + } uint16_t r = check_pin(file_sopin, apdu.data, 8); - if (r != 0x9000) + if (r != 0x9000) { return r; + } newpin_len = apdu.nc-8; has_session_sopin = true; hash_multi(apdu.data, 8, session_sopin); - } - else if (P1(apdu) == 0x2) { - if (!has_session_sopin) + } else if (P1(apdu) == 0x2) { + if (!has_session_sopin) { return SW_CONDITIONS_NOT_SATISFIED(); - if (apdu.nc > 16) + } + if (apdu.nc > 16) { return SW_WRONG_LENGTH(); + } newpin_len = apdu.nc; } uint8_t dhash[33]; dhash[0] = newpin_len; double_hash_pin(apdu.data+(apdu.nc-newpin_len), newpin_len, dhash+1); flash_write_data_to_file(file_pin1, dhash, sizeof(dhash)); - if (pin_reset_retries(file_pin1, true) != CCID_OK) + if (pin_reset_retries(file_pin1, true) != CCID_OK) { return SW_MEMORY_FAILURE(); + } uint8_t mkek[MKEK_SIZE]; int r = load_mkek(mkek); //loads the MKEK with SO pin - if (r != CCID_OK) + if (r != CCID_OK) { return SW_EXEC_ERROR(); + } hash_multi(apdu.data+(apdu.nc-newpin_len), newpin_len, session_pin); has_session_pin = true; r = store_mkek(mkek); release_mkek(mkek); - if (r != CCID_OK) + if (r != CCID_OK) { return SW_EXEC_ERROR(); + } low_flash_available(); return SW_OK(); - } - else if (P1(apdu) == 0x1 || P1(apdu) == 0x3) { - if (!(opts & HSM_OPT_RRC_RESET_ONLY)) + } else if (P1(apdu) == 0x1 || P1(apdu) == 0x3) { + if (!(opts & HSM_OPT_RRC_RESET_ONLY)) { return SW_COMMAND_NOT_ALLOWED(); + } if (P1(apdu) == 0x1) { - if (apdu.nc != 8) + if (apdu.nc != 8) { return SW_WRONG_LENGTH(); + } uint16_t r = check_pin(file_sopin, apdu.data, 8); - if (r != 0x9000) + if (r != 0x9000) { return r; + } has_session_sopin = true; hash_multi(apdu.data, 8, session_sopin); - } - else if (P1(apdu) == 0x3) { - if (!has_session_sopin) + } else if (P1(apdu) == 0x3) { + if (!has_session_sopin) { return SW_CONDITIONS_NOT_SATISFIED(); - if (apdu.nc != 0) + } + if (apdu.nc != 0) { return SW_WRONG_LENGTH(); + } } - if (pin_reset_retries(file_pin1, true) != CCID_OK) + if (pin_reset_retries(file_pin1, true) != CCID_OK) { return SW_MEMORY_FAILURE(); + } return SW_OK(); } return SW_INCORRECT_P1P2(); diff --git a/src/hsm/cmd_select.c b/src/hsm/cmd_select.c index e9eaa6c..9df87e6 100644 --- a/src/hsm/cmd_select.c +++ b/src/hsm/cmd_select.c @@ -18,17 +18,15 @@ #include "sc_hsm.h" #include "version.h" -void select_file(file_t *pe) { - if (!pe) - { - currentDF = (file_t *)MF; +void select_file(file_t *pe) +{ + if (!pe) { + currentDF = (file_t *) MF; currentEF = NULL; - } - else if (pe->type & FILE_TYPE_INTERNAL_EF) { + } else if (pe->type & FILE_TYPE_INTERNAL_EF) { currentEF = pe; currentDF = &file_entries[pe->parent]; - } - else { + } else { currentDF = pe; } if (currentEF == file_openpgp || currentEF == file_sc_hsm) { @@ -37,7 +35,8 @@ void select_file(file_t *pe) { } } -int cmd_select() { +int cmd_select() +{ uint8_t p1 = P1(apdu); uint8_t p2 = P2(apdu); file_t *pe = NULL; @@ -48,8 +47,9 @@ int cmd_select() { // return SW_INCORRECT_P1P2(); //} - if (apdu.nc >= 2) + if (apdu.nc >= 2) { fid = get_uint16_t(apdu.data, 0); + } //if ((fid & 0xff00) == (KEY_PREFIX << 8)) // fid = (PRKD_PREFIX << 8) | (fid & 0xff); @@ -63,56 +63,51 @@ int cmd_select() { pfx == DCOD_PREFIX || pfx == DATA_PREFIX || pfx == PROT_DATA_PREFIX) { - if (!(pe = search_dynamic_file(fid)) && !(pe = search_by_fid(fid, NULL, SPECIFY_EF))) + if (!(pe = search_dynamic_file(fid)) && !(pe = search_by_fid(fid, NULL, SPECIFY_EF))) { return SW_FILE_NOT_FOUND(); + } } if (!pe) { if (p1 == 0x0) { //Select MF, DF or EF - File identifier or absent if (apdu.nc == 0) { - pe = (file_t *)MF; - //ac_fini(); - } - else if (apdu.nc == 2) { + pe = (file_t *) MF; + //ac_fini(); + } else if (apdu.nc == 2) { if (!(pe = search_by_fid(fid, NULL, SPECIFY_ANY))) { return SW_FILE_NOT_FOUND(); } } - } - else if (p1 == 0x01) { //Select child DF - DF identifier + } else if (p1 == 0x01) { //Select child DF - DF identifier if (!(pe = search_by_fid(fid, currentDF, SPECIFY_DF))) { return SW_FILE_NOT_FOUND(); } - } - else if (p1 == 0x02) { //Select EF under the current DF - EF identifier + } else if (p1 == 0x02) { //Select EF under the current DF - EF identifier if (!(pe = search_by_fid(fid, currentDF, SPECIFY_EF))) { return SW_FILE_NOT_FOUND(); } - } - else if (p1 == 0x03) { //Select parent DF of the current DF - Absent - if (apdu.nc != 0) + } else if (p1 == 0x03) { //Select parent DF of the current DF - Absent + if (apdu.nc != 0) { return SW_FILE_NOT_FOUND(); - } - else if (p1 == 0x04) { //Select by DF name - e.g., [truncated] application identifier + } + } else if (p1 == 0x04) { //Select by DF name - e.g., [truncated] application identifier if (!(pe = search_by_name(apdu.data, apdu.nc))) { return SW_FILE_NOT_FOUND(); } if (card_terminated) { return set_res_sw(0x62, 0x85); } - } - else if (p1 == 0x08) { //Select from the MF - Path without the MF identifier + } else if (p1 == 0x08) { //Select from the MF - Path without the MF identifier if (!(pe = search_by_path(apdu.data, apdu.nc, MF))) { return SW_FILE_NOT_FOUND(); } - } - else if (p1 == 0x09) { //Select from the current DF - Path without the current DF identifier + } else if (p1 == 0x09) { //Select from the current DF - Path without the current DF identifier if (!(pe = search_by_path(apdu.data, apdu.nc, currentDF))) { return SW_FILE_NOT_FOUND(); } } } if ((p2 & 0xfc) == 0x00 || (p2 & 0xfc) == 0x04) { - process_fci(pe,0); + process_fci(pe, 0); if (pe == file_sc_hsm) { res_APDU[res_APDU_size++] = 0x85; res_APDU[res_APDU_size++] = 5; @@ -124,9 +119,9 @@ int cmd_select() { res_APDU[res_APDU_size++] = HSM_VERSION_MINOR; res_APDU[1] = res_APDU_size-2; } - } - else + } else { return SW_INCORRECT_P1P2(); + } select_file(pe); - return SW_OK (); + return SW_OK(); } diff --git a/src/hsm/cmd_session_pin.c b/src/hsm/cmd_session_pin.c index 4f49f24..573a252 100644 --- a/src/hsm/cmd_session_pin.c +++ b/src/hsm/cmd_session_pin.c @@ -19,7 +19,8 @@ #include "random.h" #include "eac.h" -int cmd_session_pin() { +int cmd_session_pin() +{ if (P1(apdu) == 0x01 && P2(apdu) == 0x81) { memcpy(sm_session_pin, random_bytes_get(8), 8); sm_session_pin_len = 8; @@ -27,8 +28,8 @@ int cmd_session_pin() { memcpy(res_APDU, sm_session_pin, sm_session_pin_len); res_APDU_size = sm_session_pin_len; apdu.ne = sm_session_pin_len; - } - else + } else { return SW_INCORRECT_P1P2(); + } return SW_OK(); } diff --git a/src/hsm/cmd_signature.c b/src/hsm/cmd_signature.c index 6f09944..8a94b0a 100644 --- a/src/hsm/cmd_signature.c +++ b/src/hsm/cmd_signature.c @@ -24,94 +24,111 @@ //----- /* From OpenSC */ static const uint8_t hdr_md5[] = { - 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, - 0x0d, 0x02, 0x05, 0x05, 0x00, 0x04, 0x10 + 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, + 0x0d, 0x02, 0x05, 0x05, 0x00, 0x04, 0x10 }; static const uint8_t hdr_sha1[] = { - 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, - 0x05, 0x00, 0x04, 0x14 + 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, + 0x05, 0x00, 0x04, 0x14 }; static const uint8_t hdr_sha256[] = { - 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, - 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20 + 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, + 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20 }; static const uint8_t hdr_sha384[] = { - 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, - 0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30 + 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, + 0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30 }; static const uint8_t hdr_sha512[] = { - 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, - 0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40 + 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, + 0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40 }; static const uint8_t hdr_sha224[] = { - 0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, - 0x03, 0x04, 0x02, 0x04, 0x05, 0x00, 0x04, 0x1c + 0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, + 0x03, 0x04, 0x02, 0x04, 0x05, 0x00, 0x04, 0x1c }; static const uint8_t hdr_ripemd160[] = { - 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x24, 0x03, 0x02, 0x01, - 0x05, 0x00, 0x04, 0x14 + 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x24, 0x03, 0x02, 0x01, + 0x05, 0x00, 0x04, 0x14 }; static const struct digest_info_prefix { - mbedtls_md_type_t algorithm; - const uint8_t * hdr; - size_t hdr_len; - size_t hash_len; + mbedtls_md_type_t algorithm; + const uint8_t *hdr; + size_t hdr_len; + size_t hash_len; } digest_info_prefix[] = { - { MBEDTLS_MD_MD5, hdr_md5, sizeof(hdr_md5), 16 }, - { MBEDTLS_MD_SHA1, hdr_sha1, sizeof(hdr_sha1), 20 }, - { MBEDTLS_MD_SHA256, hdr_sha256, sizeof(hdr_sha256), 32 }, - { MBEDTLS_MD_SHA384, hdr_sha384, sizeof(hdr_sha384), 48 }, - { MBEDTLS_MD_SHA512, hdr_sha512, sizeof(hdr_sha512), 64 }, - { MBEDTLS_MD_SHA224, hdr_sha224, sizeof(hdr_sha224), 28 }, - { MBEDTLS_MD_RIPEMD160,hdr_ripemd160, sizeof(hdr_ripemd160), 20 }, - { 0, NULL, 0, 0 } + { MBEDTLS_MD_MD5, hdr_md5, sizeof(hdr_md5), 16 }, + { MBEDTLS_MD_SHA1, hdr_sha1, sizeof(hdr_sha1), 20 }, + { MBEDTLS_MD_SHA256, hdr_sha256, sizeof(hdr_sha256), 32 }, + { MBEDTLS_MD_SHA384, hdr_sha384, sizeof(hdr_sha384), 48 }, + { MBEDTLS_MD_SHA512, hdr_sha512, sizeof(hdr_sha512), 64 }, + { MBEDTLS_MD_SHA224, hdr_sha224, sizeof(hdr_sha224), 28 }, + { MBEDTLS_MD_RIPEMD160, hdr_ripemd160, sizeof(hdr_ripemd160), 20 }, + { 0, NULL, 0, 0 } }; -int pkcs1_strip_digest_info_prefix(mbedtls_md_type_t *algorithm, const uint8_t *in_dat, size_t in_len, uint8_t *out_dat, size_t *out_len) +int pkcs1_strip_digest_info_prefix(mbedtls_md_type_t *algorithm, + const uint8_t *in_dat, + size_t in_len, + uint8_t *out_dat, + size_t *out_len) { - for (int i = 0; digest_info_prefix[i].algorithm != 0; i++) { - size_t hdr_len = digest_info_prefix[i].hdr_len, hash_len = digest_info_prefix[i].hash_len; - const uint8_t *hdr = digest_info_prefix[i].hdr; - if (in_len == (hdr_len + hash_len) && !memcmp(in_dat, hdr, hdr_len)) { - if (algorithm) - *algorithm = digest_info_prefix[i].algorithm; - if (out_dat == NULL) - return CCID_OK; - if (*out_len < hash_len) - return CCID_WRONG_DATA; - memmove(out_dat, in_dat + hdr_len, hash_len); - *out_len = hash_len; - return CCID_OK; - } - } - return CCID_EXEC_ERROR; + for (int i = 0; digest_info_prefix[i].algorithm != 0; i++) { + size_t hdr_len = digest_info_prefix[i].hdr_len, hash_len = digest_info_prefix[i].hash_len; + const uint8_t *hdr = digest_info_prefix[i].hdr; + if (in_len == (hdr_len + hash_len) && !memcmp(in_dat, hdr, hdr_len)) { + if (algorithm) { + *algorithm = digest_info_prefix[i].algorithm; + } + if (out_dat == NULL) { + return CCID_OK; + } + if (*out_len < hash_len) { + return CCID_WRONG_DATA; + } + memmove(out_dat, in_dat + hdr_len, hash_len); + *out_len = hash_len; + return CCID_OK; + } + } + return CCID_EXEC_ERROR; } //----- -int cmd_signature() { +int cmd_signature() +{ uint8_t key_id = P1(apdu); uint8_t p2 = P2(apdu); mbedtls_md_type_t md = MBEDTLS_MD_NONE; file_t *fkey; - if (!isUserAuthenticated) + if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); - if (!(fkey = search_dynamic_file((KEY_PREFIX << 8) | key_id)) || !file_has_data(fkey)) + } + if (!(fkey = search_dynamic_file((KEY_PREFIX << 8) | key_id)) || !file_has_data(fkey)) { return SW_FILE_NOT_FOUND(); - if (get_key_counter(fkey) == 0) + } + if (get_key_counter(fkey) == 0) { return SW_FILE_FULL(); - if (key_has_purpose(fkey, p2) == false) + } + if (key_has_purpose(fkey, p2) == false) { return SW_CONDITIONS_NOT_SATISFIED(); + } int key_size = file_get_size(fkey); - if (p2 == ALGO_RSA_PKCS1_SHA1 || p2 == ALGO_RSA_PSS_SHA1 || p2 == ALGO_EC_SHA1) + if (p2 == ALGO_RSA_PKCS1_SHA1 || p2 == ALGO_RSA_PSS_SHA1 || p2 == ALGO_EC_SHA1) { md = MBEDTLS_MD_SHA1; - else if (p2 == ALGO_RSA_PKCS1_SHA256 || p2 == ALGO_RSA_PSS_SHA256 || p2 == ALGO_EC_SHA256) + } else if (p2 == ALGO_RSA_PKCS1_SHA256 || p2 == ALGO_RSA_PSS_SHA256 || p2 == ALGO_EC_SHA256) { md = MBEDTLS_MD_SHA256; - else if (p2 == ALGO_EC_SHA224 || p2 == ALGO_RSA_PKCS1_SHA224 || p2 == ALGO_RSA_PSS_SHA224) + } else if (p2 == ALGO_EC_SHA224 || p2 == ALGO_RSA_PKCS1_SHA224 || p2 == ALGO_RSA_PSS_SHA224) { md = MBEDTLS_MD_SHA224; - else if (p2 == ALGO_EC_SHA384 || p2 == ALGO_RSA_PKCS1_SHA384 || p2 == ALGO_RSA_PSS_SHA384) + } else if (p2 == ALGO_EC_SHA384 || p2 == ALGO_RSA_PKCS1_SHA384 || p2 == ALGO_RSA_PSS_SHA384) { md = MBEDTLS_MD_SHA384; - else if (p2 == ALGO_EC_SHA512 || p2 == ALGO_RSA_PKCS1_SHA512 || p2 == ALGO_RSA_PSS_SHA512) + } else if (p2 == ALGO_EC_SHA512 || p2 == ALGO_RSA_PKCS1_SHA512 || p2 == ALGO_RSA_PSS_SHA512) { md = MBEDTLS_MD_SHA512; - if (p2 == ALGO_RSA_PKCS1_SHA1 || p2 == ALGO_RSA_PSS_SHA1 || p2 == ALGO_EC_SHA1 || p2 == ALGO_RSA_PKCS1_SHA256 || p2 == ALGO_RSA_PSS_SHA256 || p2 == ALGO_EC_SHA256 || p2 == ALGO_EC_SHA224 || p2 == ALGO_EC_SHA384 || p2 == ALGO_EC_SHA512 || p2 == ALGO_RSA_PKCS1_SHA224 || p2 == ALGO_RSA_PKCS1_SHA384 || p2 == ALGO_RSA_PKCS1_SHA512 || p2 == ALGO_RSA_PSS_SHA224 || p2 == ALGO_RSA_PSS_SHA384 || p2 == ALGO_RSA_PSS_SHA512) { + } + if (p2 == ALGO_RSA_PKCS1_SHA1 || p2 == ALGO_RSA_PSS_SHA1 || p2 == ALGO_EC_SHA1 || + p2 == ALGO_RSA_PKCS1_SHA256 || p2 == ALGO_RSA_PSS_SHA256 || p2 == ALGO_EC_SHA256 || + p2 == ALGO_EC_SHA224 || p2 == ALGO_EC_SHA384 || p2 == ALGO_EC_SHA512 || + p2 == ALGO_RSA_PKCS1_SHA224 || p2 == ALGO_RSA_PKCS1_SHA384 || p2 == ALGO_RSA_PKCS1_SHA512 || + p2 == ALGO_RSA_PSS_SHA224 || p2 == ALGO_RSA_PSS_SHA384 || p2 == ALGO_RSA_PSS_SHA512) { generic_hash(md, apdu.data, apdu.nc, apdu.data); apdu.nc = mbedtls_md_get_size(mbedtls_md_info_from_type(md)); } @@ -122,19 +139,21 @@ int cmd_signature() { int r = load_private_key_rsa(&ctx, fkey); if (r != CCID_OK) { mbedtls_rsa_free(&ctx); - if (r == CCID_VERIFICATION_FAILED) + if (r == CCID_VERIFICATION_FAILED) { return SW_SECURE_MESSAGE_EXEC_ERROR(); + } return SW_EXEC_ERROR(); } uint8_t *hash = apdu.data; size_t hash_len = apdu.nc; if (p2 == ALGO_RSA_PKCS1) { //DigestInfo attached size_t nc = apdu.nc; - if (pkcs1_strip_digest_info_prefix(&md, apdu.data, apdu.nc, apdu.data, &nc) != CCID_OK) //gets the MD algo id and strips it off + if (pkcs1_strip_digest_info_prefix(&md, apdu.data, apdu.nc, apdu.data, + &nc) != CCID_OK) { //gets the MD algo id and strips it off return SW_EXEC_ERROR(); + } apdu.nc = nc; - } - else { + } else { //sc_asn1_print_tags(apdu.data, apdu.nc); size_t tout = 0, oid_len = 0; uint8_t *p = NULL, *oid = NULL; @@ -147,40 +166,42 @@ int cmd_signature() { asn1_find_tag(p, tout, 0x4, &hash_len, &hash); } if (oid && oid_len > 0) { - if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA1, oid_len) == 0) + if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; - else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA224, oid_len) == 0) + } else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA224, oid_len) == 0) { md = MBEDTLS_MD_SHA224; - else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA256, oid_len) == 0) + } else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; - else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA384, oid_len) == 0) + } else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA384, oid_len) == 0) { md = MBEDTLS_MD_SHA384; - else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA512, oid_len) == 0) + } else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; + } } if (p2 >= ALGO_RSA_PSS && p2 <= ALGO_RSA_PSS_SHA512) { if (p2 == ALGO_RSA_PSS && !oid) { - if (apdu.nc == 20) //default is sha1 + if (apdu.nc == 20) { //default is sha1 md = MBEDTLS_MD_SHA1; - else if (apdu.nc == 28) + } else if (apdu.nc == 28) { md = MBEDTLS_MD_SHA224; - else if (apdu.nc == 32) + } else if (apdu.nc == 32) { md = MBEDTLS_MD_SHA256; - else if (apdu.nc == 48) + } else if (apdu.nc == 48) { md = MBEDTLS_MD_SHA384; - else if (apdu.nc == 64) + } else if (apdu.nc == 64) { md = MBEDTLS_MD_SHA512; + } } mbedtls_rsa_set_padding(&ctx, MBEDTLS_RSA_PKCS_V21, md); } } if (md == MBEDTLS_MD_NONE) { - if (apdu.nc < key_size) //needs padding + if (apdu.nc < key_size) { //needs padding memset(apdu.data+apdu.nc, 0, key_size-apdu.nc); + } r = mbedtls_rsa_private(&ctx, random_gen, NULL, apdu.data, res_APDU); - } - else { - uint8_t *signature = (uint8_t *)calloc(key_size, sizeof(uint8_t)); + } else { + uint8_t *signature = (uint8_t *) calloc(key_size, sizeof(uint8_t)); r = mbedtls_rsa_pkcs1_sign(&ctx, random_gen, NULL, md, hash_len, hash, signature); memcpy(res_APDU, signature, key_size); free(signature); @@ -192,52 +213,55 @@ int cmd_signature() { res_APDU_size = key_size; apdu.ne = key_size; mbedtls_rsa_free(&ctx); - } - else if (p2 >= ALGO_EC_RAW && p2 <= ALGO_EC_SHA512) { + } else if (p2 >= ALGO_EC_RAW && p2 <= ALGO_EC_SHA512) { mbedtls_ecdsa_context ctx; mbedtls_ecdsa_init(&ctx); md = MBEDTLS_MD_SHA256; if (p2 == ALGO_EC_RAW) { - if (apdu.nc == 32) + if (apdu.nc == 32) { md = MBEDTLS_MD_SHA256; - else if (apdu.nc == 20) + } else if (apdu.nc == 20) { md = MBEDTLS_MD_SHA1; - else if (apdu.nc == 28) + } else if (apdu.nc == 28) { md = MBEDTLS_MD_SHA224; - else if (apdu.nc == 48) + } else if (apdu.nc == 48) { md = MBEDTLS_MD_SHA384; - else if (apdu.nc == 64) + } else if (apdu.nc == 64) { md = MBEDTLS_MD_SHA512; + } } - if (p2 == ALGO_EC_SHA1) + if (p2 == ALGO_EC_SHA1) { md = MBEDTLS_MD_SHA1; - else if (p2 == ALGO_EC_SHA224) + } else if (p2 == ALGO_EC_SHA224) { md = MBEDTLS_MD_SHA224; - else if (p2 == ALGO_EC_SHA256) + } else if (p2 == ALGO_EC_SHA256) { md = MBEDTLS_MD_SHA256; - else if (p2 == ALGO_EC_SHA384) + } else if (p2 == ALGO_EC_SHA384) { md = MBEDTLS_MD_SHA384; - else if (p2 == ALGO_EC_SHA512) + } else if (p2 == ALGO_EC_SHA512) { md = MBEDTLS_MD_SHA512; + } int r = load_private_key_ecdsa(&ctx, fkey); if (r != CCID_OK) { mbedtls_ecdsa_free(&ctx); - if (r == CCID_VERIFICATION_FAILED) + if (r == CCID_VERIFICATION_FAILED) { return SW_SECURE_MESSAGE_EXEC_ERROR(); + } return SW_EXEC_ERROR(); } size_t olen = 0; uint8_t buf[MBEDTLS_ECDSA_MAX_LEN]; - if (mbedtls_ecdsa_write_signature(&ctx, md, apdu.data, apdu.nc, buf, MBEDTLS_ECDSA_MAX_LEN, &olen, random_gen, NULL) != 0) { + if (mbedtls_ecdsa_write_signature(&ctx, md, apdu.data, apdu.nc, buf, MBEDTLS_ECDSA_MAX_LEN, + &olen, random_gen, NULL) != 0) { mbedtls_ecdsa_free(&ctx); return SW_EXEC_ERROR(); } memcpy(res_APDU, buf, olen); res_APDU_size = olen; mbedtls_ecdsa_free(&ctx); - } - else + } else { return SW_INCORRECT_P1P2(); + } decrement_key_counter(fkey); return SW_OK(); } diff --git a/src/hsm/cmd_update_ef.c b/src/hsm/cmd_update_ef.c index 8514457..59e2a60 100644 --- a/src/hsm/cmd_update_ef.c +++ b/src/hsm/cmd_update_ef.c @@ -20,32 +20,38 @@ extern void select_file(file_t *pe); -int cmd_update_ef() { +int cmd_update_ef() +{ uint8_t p1 = P1(apdu), p2 = P2(apdu); uint16_t fid = (p1 << 8) | p2; uint8_t *data = NULL; uint16_t offset = 0; uint16_t data_len = 0; file_t *ef = NULL; - if (!isUserAuthenticated) + if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); - if (fid == 0x0) + } + if (fid == 0x0) { ef = currentEF; - else if (p1 != EE_CERTIFICATE_PREFIX && p1 != PRKD_PREFIX && p1 != CA_CERTIFICATE_PREFIX && p1 != CD_PREFIX && p1 != DATA_PREFIX && p1 != DCOD_PREFIX && p1 != PROT_DATA_PREFIX) + } else if (p1 != EE_CERTIFICATE_PREFIX && p1 != PRKD_PREFIX && p1 != CA_CERTIFICATE_PREFIX && + p1 != CD_PREFIX && p1 != DATA_PREFIX && p1 != DCOD_PREFIX && + p1 != PROT_DATA_PREFIX) { return SW_INCORRECT_P1P2(); + } - if (ef && !authenticate_action(ef, ACL_OP_UPDATE_ERASE)) + if (ef && !authenticate_action(ef, ACL_OP_UPDATE_ERASE)) { return SW_SECURITY_STATUS_NOT_SATISFIED(); + } uint16_t tag = 0x0; uint8_t *tag_data = NULL, *p = NULL; size_t tag_len = 0; while (walk_tlv(apdu.data, apdu.nc, &p, &tag, &tag_len, &tag_data)) { if (tag == 0x54) { //ofset tag - for (int i = 1; i <= tag_len; i++) + for (int i = 1; i <= tag_len; i++) { offset |= (*tag_data++ << (8*(tag_len-i))); - } - else if (tag == 0x53) { //data + } + } else if (tag == 0x53) { //data data_len = tag_len; data = tag_data; } @@ -55,30 +61,34 @@ int cmd_update_ef() { //if ((fid & 0xff00) == (EE_CERTIFICATE_PREFIX << 8)) // add_file_to_chain(ef, &ef_pukdf); select_file(ef); - } - else { - if (fid == 0x0 && !ef) + } else { + if (fid == 0x0 && !ef) { return SW_FILE_NOT_FOUND(); - else if (fid != 0x0 && !(ef = search_by_fid(fid, NULL, SPECIFY_EF)) && !(ef = search_dynamic_file(fid))) { //if does not exist, create it + } else if (fid != 0x0 && + !(ef = + search_by_fid(fid, NULL, + SPECIFY_EF)) && !(ef = search_dynamic_file(fid))) { //if does not exist, create it //return SW_FILE_NOT_FOUND(); ef = file_new(fid); } if (offset == 0) { int r = flash_write_data_to_file(ef, data, data_len); - if (r != CCID_OK) + if (r != CCID_OK) { return SW_MEMORY_FAILURE(); - } - else { - if (!file_has_data(ef)) + } + } else { + if (!file_has_data(ef)) { return SW_DATA_INVALID(); + } - uint8_t *data_merge = (uint8_t *)calloc(1, offset+data_len); + uint8_t *data_merge = (uint8_t *) calloc(1, offset+data_len); memcpy(data_merge, file_get_data(ef), offset); memcpy(data_merge+offset, data, data_len); int r = flash_write_data_to_file(ef, data_merge, offset+data_len); free(data_merge); - if (r != CCID_OK) + if (r != CCID_OK) { return SW_MEMORY_FAILURE(); + } } low_flash_available(); } diff --git a/src/hsm/cmd_verify.c b/src/hsm/cmd_verify.c index 7a21611..32b2b3b 100644 --- a/src/hsm/cmd_verify.c +++ b/src/hsm/cmd_verify.c @@ -17,41 +17,48 @@ #include "sc_hsm.h" -int cmd_verify() { +int cmd_verify() +{ uint8_t p1 = P1(apdu); uint8_t p2 = P2(apdu); - if (p1 != 0x0 || (p2 & 0x60) != 0x0) + if (p1 != 0x0 || (p2 & 0x60) != 0x0) { return SW_WRONG_P1P2(); + } if (p2 == 0x81) { //UserPin uint16_t opts = get_device_options(); - if (opts & HSM_OPT_TRANSPORT_PIN) + if (opts & HSM_OPT_TRANSPORT_PIN) { return SW_DATA_INVALID(); - if (has_session_pin && apdu.nc == 0) + } + if (has_session_pin && apdu.nc == 0) { return SW_OK(); - if (*file_get_data(file_pin1) == 0 && pka_enabled() == false) //not initialized + } + if (*file_get_data(file_pin1) == 0 && pka_enabled() == false) { //not initialized return SW_REFERENCE_NOT_FOUND(); + } if (apdu.nc > 0) { return check_pin(file_pin1, apdu.data, apdu.nc); } - if (file_read_uint8(file_get_data(file_retries_pin1)) == 0) + if (file_read_uint8(file_get_data(file_retries_pin1)) == 0) { return SW_PIN_BLOCKED(); + } return set_res_sw(0x63, 0xc0 | file_read_uint8(file_get_data(file_retries_pin1))); - } - else if (p2 == 0x88) { //SOPin - if (file_read_uint8(file_get_data(file_sopin)) == 0) //not initialized + } else if (p2 == 0x88) { //SOPin + if (file_read_uint8(file_get_data(file_sopin)) == 0) { //not initialized return SW_REFERENCE_NOT_FOUND(); + } if (apdu.nc > 0) { return check_pin(file_sopin, apdu.data, apdu.nc); } - if (file_read_uint8(file_get_data(file_retries_sopin)) == 0) + if (file_read_uint8(file_get_data(file_retries_sopin)) == 0) { return SW_PIN_BLOCKED(); - if (has_session_sopin) + } + if (has_session_sopin) { return SW_OK(); + } return set_res_sw(0x63, 0xc0 | file_read_uint8(file_get_data(file_retries_sopin))); - } - else if (p2 == 0x85) { + } else if (p2 == 0x85) { return SW_OK(); } return SW_REFERENCE_NOT_FOUND(); diff --git a/src/hsm/cvc.c b/src/hsm/cvc.c index 8b042e8..3f64ffe 100644 --- a/src/hsm/cvc.c +++ b/src/hsm/cvc.c @@ -31,125 +31,178 @@ extern const uint8_t *dev_name; extern size_t dev_name_len; -size_t asn1_cvc_public_key_rsa(mbedtls_rsa_context *rsa, uint8_t *buf, size_t buf_len) { +size_t asn1_cvc_public_key_rsa(mbedtls_rsa_context *rsa, uint8_t *buf, size_t buf_len) +{ const uint8_t oid_rsa[] = { 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x02, 0x01, 0x02 }; size_t n_size = mbedtls_mpi_size(&rsa->N), e_size = mbedtls_mpi_size(&rsa->E); size_t ntot_size = asn1_len_tag(0x81, n_size), etot_size = asn1_len_tag(0x82, e_size); size_t oid_len = asn1_len_tag(0x6, sizeof(oid_rsa)); size_t tot_len = asn1_len_tag(0x7f49, oid_len+ntot_size+etot_size); - if (buf == NULL || buf_len == 0) + if (buf == NULL || buf_len == 0) { return tot_len; - if (buf_len < tot_len) + } + if (buf_len < tot_len) { return 0; + } uint8_t *p = buf; memcpy(p, "\x7F\x49", 2); p += 2; p += format_tlv_len(oid_len+ntot_size+etot_size, p); //oid - *p++ = 0x6; p += format_tlv_len(sizeof(oid_rsa), p); memcpy(p, oid_rsa, sizeof(oid_rsa)); p += sizeof(oid_rsa); + *p++ = 0x6; p += format_tlv_len(sizeof(oid_rsa), p); memcpy(p, oid_rsa, sizeof(oid_rsa)); + p += sizeof(oid_rsa); //n - *p++ = 0x81; p += format_tlv_len(n_size, p); mbedtls_mpi_write_binary(&rsa->N, p, n_size); p += n_size; + *p++ = 0x81; p += format_tlv_len(n_size, p); mbedtls_mpi_write_binary(&rsa->N, p, n_size); + p += n_size; //n - *p++ = 0x82; p += format_tlv_len(e_size, p); mbedtls_mpi_write_binary(&rsa->E, p, e_size); p += e_size; + *p++ = 0x82; p += format_tlv_len(e_size, p); mbedtls_mpi_write_binary(&rsa->E, p, e_size); + p += e_size; return tot_len; } const uint8_t *pointA[] = { NULL, - (uint8_t *)"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC", - (uint8_t *)"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE", - (uint8_t *)"\xFF\xFF\xFF\xFF\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC", - (uint8_t *)"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFC", - (uint8_t *)"\x01\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC", + (uint8_t *) + "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC", + (uint8_t *) + "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE", + (uint8_t *) + "\xFF\xFF\xFF\xFF\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC", + (uint8_t *) + "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFC", + (uint8_t *) + "\x01\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC", }; -size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, size_t buf_len) { +size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, size_t buf_len) +{ uint8_t Y_buf[MBEDTLS_ECP_MAX_PT_LEN]; const uint8_t oid_ecdsa[] = { 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x02, 0x02, 0x03 }; size_t p_size = mbedtls_mpi_size(&ecdsa->grp.P), a_size = mbedtls_mpi_size(&ecdsa->grp.A); - size_t b_size = mbedtls_mpi_size(&ecdsa->grp.B), g_size = 1+mbedtls_mpi_size(&ecdsa->grp.G.X)+mbedtls_mpi_size(&ecdsa->grp.G.X); + size_t b_size = mbedtls_mpi_size(&ecdsa->grp.B), + g_size = 1+mbedtls_mpi_size(&ecdsa->grp.G.X)+mbedtls_mpi_size(&ecdsa->grp.G.X); size_t o_size = mbedtls_mpi_size(&ecdsa->grp.N), y_size = 0; - mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &y_size, Y_buf, sizeof(Y_buf)); + mbedtls_ecp_point_write_binary(&ecdsa->grp, + &ecdsa->Q, + MBEDTLS_ECP_PF_UNCOMPRESSED, + &y_size, + Y_buf, + sizeof(Y_buf)); size_t c_size = 1; - size_t ptot_size = asn1_len_tag(0x81, p_size), atot_size = asn1_len_tag(0x82, a_size ? a_size : (pointA[ecdsa->grp.id] && ecdsa->grp.id < 6 ? p_size : 1)); + size_t ptot_size = asn1_len_tag(0x81, p_size), atot_size = asn1_len_tag(0x82, + a_size ? a_size : ( + pointA[ecdsa->grp.id + ] && + ecdsa->grp.id < + 6 ? p_size : 1)); size_t btot_size = asn1_len_tag(0x83, b_size), gtot_size = asn1_len_tag(0x84, g_size); size_t otot_size = asn1_len_tag(0x85, o_size), ytot_size = asn1_len_tag(0x86, y_size); size_t ctot_size = asn1_len_tag(0x87, c_size); size_t oid_len = asn1_len_tag(0x6, sizeof(oid_ecdsa)); - size_t tot_len = asn1_len_tag(0x7f49, oid_len+ptot_size+atot_size+btot_size+gtot_size+otot_size+ytot_size+ctot_size); - if (buf == NULL || buf_len == 0) + size_t tot_len = asn1_len_tag(0x7f49, + oid_len+ptot_size+atot_size+btot_size+gtot_size+otot_size+ytot_size+ + ctot_size); + if (buf == NULL || buf_len == 0) { return tot_len; - if (buf_len < tot_len) + } + if (buf_len < tot_len) { return 0; + } uint8_t *p = buf; memcpy(p, "\x7F\x49", 2); p += 2; - p += format_tlv_len(oid_len+ptot_size+atot_size+btot_size+gtot_size+otot_size+ytot_size+ctot_size, p); + p += format_tlv_len( + oid_len+ptot_size+atot_size+btot_size+gtot_size+otot_size+ytot_size+ctot_size, + p); //oid - *p++ = 0x6; p += format_tlv_len(sizeof(oid_ecdsa), p); memcpy(p, oid_ecdsa, sizeof(oid_ecdsa)); p += sizeof(oid_ecdsa); + *p++ = 0x6; p += format_tlv_len(sizeof(oid_ecdsa), p); memcpy(p, oid_ecdsa, sizeof(oid_ecdsa)); + p += sizeof(oid_ecdsa); //p - *p++ = 0x81; p += format_tlv_len(p_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.P, p, p_size); p += p_size; + *p++ = 0x81; p += format_tlv_len(p_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.P, p, p_size); + p += p_size; //A if (a_size) { - *p++ = 0x82; p += format_tlv_len(a_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.A, p, a_size); p += a_size; - } - else { //mbedtls does not set point A for some curves + *p++ = 0x82; p += format_tlv_len(a_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.A, + p, + a_size); p += a_size; + } else { //mbedtls does not set point A for some curves if (pointA[ecdsa->grp.id] && ecdsa->grp.id < 6) { - *p++ = 0x82; p += format_tlv_len(p_size, p); memcpy(p, pointA[ecdsa->grp.id], p_size); p += p_size; - } - else { + *p++ = 0x82; p += format_tlv_len(p_size, p); memcpy(p, pointA[ecdsa->grp.id], p_size); + p += p_size; + } else { *p++ = 0x82; p += format_tlv_len(1, p); *p++ = 0x0; } } //B - *p++ = 0x83; p += format_tlv_len(b_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.B, p, b_size); p += b_size; + *p++ = 0x83; p += format_tlv_len(b_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.B, p, b_size); + p += b_size; //G size_t g_new_size = 0; - *p++ = 0x84; p += format_tlv_len(g_size, p); mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->grp.G, MBEDTLS_ECP_PF_UNCOMPRESSED, &g_new_size, p, g_size); p += g_size; + *p++ = 0x84; p += format_tlv_len(g_size, p); mbedtls_ecp_point_write_binary(&ecdsa->grp, + &ecdsa->grp.G, + MBEDTLS_ECP_PF_UNCOMPRESSED, + &g_new_size, + p, + g_size); + p += g_size; //order - *p++ = 0x85; p += format_tlv_len(o_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.N, p, o_size); p += o_size; + *p++ = 0x85; p += format_tlv_len(o_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.N, p, o_size); + p += o_size; //Y *p++ = 0x86; p += format_tlv_len(y_size, p); memcpy(p, Y_buf, y_size); p += y_size; //cofactor *p++ = 0x87; p += format_tlv_len(c_size, p); - if (ecdsa->grp.id == MBEDTLS_ECP_DP_CURVE448) + if (ecdsa->grp.id == MBEDTLS_ECP_DP_CURVE448) { *p++ = 4; - else if (ecdsa->grp.id == MBEDTLS_ECP_DP_CURVE25519) + } else if (ecdsa->grp.id == MBEDTLS_ECP_DP_CURVE25519) { *p++ = 8; - else + } else { *p++ = 1; + } return tot_len; } -size_t asn1_cvc_cert_body(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf_len, const uint8_t *ext, size_t ext_len) { +size_t asn1_cvc_cert_body(void *rsa_ecdsa, + uint8_t key_type, + uint8_t *buf, + size_t buf_len, + const uint8_t *ext, + size_t ext_len) +{ size_t pubkey_size = 0; - if (key_type == HSM_KEY_RSA) + if (key_type == HSM_KEY_RSA) { pubkey_size = asn1_cvc_public_key_rsa(rsa_ecdsa, NULL, 0); - else if (key_type == HSM_KEY_EC) + } else if (key_type == HSM_KEY_EC) { pubkey_size = asn1_cvc_public_key_ecdsa(rsa_ecdsa, NULL, 0); + } size_t cpi_size = 4; size_t ext_size = 0; - if (ext && ext_len > 0) + if (ext && ext_len > 0) { ext_size = asn1_len_tag(0x65, ext_len); + } uint8_t *car = NULL, *chr = NULL; size_t lencar = 0, lenchr = 0; - if (asn1_find_tag(apdu.data, apdu.nc, 0x42, &lencar, &car) == false || lencar == 0 || car == NULL) { - car = (uint8_t *)dev_name; + if (asn1_find_tag(apdu.data, apdu.nc, 0x42, &lencar, + &car) == false || lencar == 0 || car == NULL) { + car = (uint8_t *) dev_name; lencar = dev_name_len; } - if (asn1_find_tag(apdu.data, apdu.nc, 0x5f20, &lenchr, &chr) == false || lenchr == 0 || chr == NULL) { - chr = (uint8_t *)dev_name; + if (asn1_find_tag(apdu.data, apdu.nc, 0x5f20, &lenchr, + &chr) == false || lenchr == 0 || chr == NULL) { + chr = (uint8_t *) dev_name; lenchr = dev_name_len; } size_t car_size = asn1_len_tag(0x42, lencar), chr_size = asn1_len_tag(0x5f20, lenchr); size_t tot_len = asn1_len_tag(0x7f4e, cpi_size+car_size+pubkey_size+chr_size+ext_size); - if (buf_len == 0 || buf == NULL) + if (buf_len == 0 || buf == NULL) { return tot_len; - if (buf_len < tot_len) + } + if (buf_len < tot_len) { return 0; + } uint8_t *p = buf; memcpy(p, "\x7F\x4E", 2); p += 2; p += format_tlv_len(cpi_size+car_size+pubkey_size+chr_size+ext_size, p); @@ -158,10 +211,11 @@ size_t asn1_cvc_cert_body(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_ //car *p++ = 0x42; p += format_tlv_len(lencar, p); memcpy(p, car, lencar); p += lencar; //pubkey - if (key_type == HSM_KEY_RSA) + if (key_type == HSM_KEY_RSA) { p += asn1_cvc_public_key_rsa(rsa_ecdsa, p, pubkey_size); - else if (key_type == HSM_KEY_EC) + } else if (key_type == HSM_KEY_EC) { p += asn1_cvc_public_key_ecdsa(rsa_ecdsa, p, pubkey_size); + } //chr *p++ = 0x5f; *p++ = 0x20; p += format_tlv_len(lenchr, p); memcpy(p, chr, lenchr); p += lenchr; if (ext && ext_len > 0) { @@ -173,18 +227,31 @@ size_t asn1_cvc_cert_body(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_ return tot_len; } -size_t asn1_cvc_cert(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf_len, const uint8_t *ext, size_t ext_len) { +size_t asn1_cvc_cert(void *rsa_ecdsa, + uint8_t key_type, + uint8_t *buf, + size_t buf_len, + const uint8_t *ext, + size_t ext_len) +{ size_t key_size = 0; - if (key_type == HSM_KEY_RSA) - key_size = mbedtls_mpi_size(&((mbedtls_rsa_context *)rsa_ecdsa)->N); - else if (key_type == HSM_KEY_EC) - key_size = 2*(int)((mbedtls_ecp_curve_info_from_grp_id(((mbedtls_ecdsa_context *)rsa_ecdsa)->grp.id)->bit_size + 7)/8); - size_t body_size = asn1_cvc_cert_body(rsa_ecdsa, key_type, NULL, 0, ext, ext_len), sig_size = asn1_len_tag(0x5f37, key_size); + if (key_type == HSM_KEY_RSA) { + key_size = mbedtls_mpi_size(&((mbedtls_rsa_context *) rsa_ecdsa)->N); + } else if (key_type == HSM_KEY_EC) { + key_size = 2* + (int) ((mbedtls_ecp_curve_info_from_grp_id(((mbedtls_ecdsa_context *) rsa_ecdsa) + ->grp.id)-> + bit_size + 7)/8); + } + size_t body_size = asn1_cvc_cert_body(rsa_ecdsa, key_type, NULL, 0, ext, ext_len), + sig_size = asn1_len_tag(0x5f37, key_size); size_t tot_len = asn1_len_tag(0x7f21, body_size+sig_size); - if (buf_len == 0 || buf == NULL) + if (buf_len == 0 || buf == NULL) { return tot_len; - if (buf_len < tot_len) + } + if (buf_len < tot_len) { return 0; + } uint8_t *p = buf, *body = NULL; memcpy(p, "\x7F\x21", 2); p += 2; p += format_tlv_len(body_size+sig_size, p); @@ -195,22 +262,23 @@ size_t asn1_cvc_cert(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf memcpy(p, "\x5F\x37", 2); p += 2; p += format_tlv_len(key_size, p); if (key_type == HSM_KEY_RSA) { - if (mbedtls_rsa_rsassa_pkcs1_v15_sign(rsa_ecdsa, random_gen, NULL, MBEDTLS_MD_SHA256, 32, hsh, p) != 0) + if (mbedtls_rsa_rsassa_pkcs1_v15_sign(rsa_ecdsa, random_gen, NULL, MBEDTLS_MD_SHA256, 32, + hsh, p) != 0) { memset(p, 0, key_size); + } p += key_size; - } - else if (key_type == HSM_KEY_EC) { + } else if (key_type == HSM_KEY_EC) { mbedtls_mpi r, s; int ret = 0; - mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *)rsa_ecdsa; + mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) rsa_ecdsa; mbedtls_mpi_init(&r); mbedtls_mpi_init(&s); - ret = mbedtls_ecdsa_sign(&ecdsa->grp, &r, &s, &ecdsa->d, hsh, sizeof(hsh), random_gen, NULL); + ret = + mbedtls_ecdsa_sign(&ecdsa->grp, &r, &s, &ecdsa->d, hsh, sizeof(hsh), random_gen, NULL); if (ret == 0) { mbedtls_mpi_write_binary(&r, p, key_size/2); p += key_size/2; mbedtls_mpi_write_binary(&s, p, key_size/2); p += key_size/2; - } - else { + } else { memset(p, 0, key_size); p += key_size; } @@ -220,14 +288,21 @@ size_t asn1_cvc_cert(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf return p-buf; } -size_t asn1_cvc_aut(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf_len, const uint8_t *ext, size_t ext_len) { +size_t asn1_cvc_aut(void *rsa_ecdsa, + uint8_t key_type, + uint8_t *buf, + size_t buf_len, + const uint8_t *ext, + size_t ext_len) +{ size_t cvcert_size = asn1_cvc_cert(rsa_ecdsa, key_type, NULL, 0, ext, ext_len); size_t outcar_len = dev_name_len; const uint8_t *outcar = dev_name; size_t outcar_size = asn1_len_tag(0x42, outcar_len); file_t *fkey = search_by_fid(EF_KEY_DEV, NULL, SPECIFY_EF); - if (!fkey) + if (!fkey) { return 0; + } mbedtls_ecdsa_context ectx; mbedtls_ecdsa_init(&ectx); if (load_private_key_ecdsa(&ectx, fkey) != CCID_OK) { @@ -235,11 +310,15 @@ size_t asn1_cvc_aut(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf_ return 0; } int ret = 0, key_size = 2*mbedtls_mpi_size(&ectx.d); - size_t outsig_size = asn1_len_tag(0x5f37, key_size), tot_len = asn1_len_tag(0x67, cvcert_size+outcar_size+outsig_size); - if (buf_len == 0 || buf == NULL) + size_t outsig_size = asn1_len_tag(0x5f37, key_size), tot_len = asn1_len_tag(0x67, + cvcert_size+outcar_size+ + outsig_size); + if (buf_len == 0 || buf == NULL) { return tot_len; - if (buf_len < tot_len) + } + if (buf_len < tot_len) { return 0; + } uint8_t *p = buf; *p++ = 0x67; p += format_tlv_len(cvcert_size+outcar_size+outsig_size, p); @@ -269,16 +348,27 @@ size_t asn1_cvc_aut(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf_ return p-buf; } -size_t asn1_build_cert_description(const uint8_t *label, size_t label_len, const uint8_t *puk, size_t puk_len, uint16_t fid, uint8_t *buf, size_t buf_len) { +size_t asn1_build_cert_description(const uint8_t *label, + size_t label_len, + const uint8_t *puk, + size_t puk_len, + uint16_t fid, + uint8_t *buf, + size_t buf_len) +{ size_t opt_len = 2; size_t seq1_size = asn1_len_tag(0x30, asn1_len_tag(0xC, label_len)+asn1_len_tag(0x3, opt_len)); size_t seq2_size = asn1_len_tag(0x30, asn1_len_tag(0x4, 20)); /* SHA1 is 20 bytes length */ - size_t seq3_size = asn1_len_tag(0xA1, asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, sizeof(uint16_t))))); + size_t seq3_size = + asn1_len_tag(0xA1, + asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, sizeof(uint16_t))))); size_t tot_len = asn1_len_tag(0x30, seq1_size+seq2_size+seq3_size); - if (buf_len == 0 || buf == NULL) + if (buf_len == 0 || buf == NULL) { return tot_len; - if (buf_len < tot_len) + } + if (buf_len < tot_len) { return 0; + } uint8_t *p = buf; *p++ = 0x30; p += format_tlv_len(seq1_size+seq2_size+seq3_size, p); @@ -301,7 +391,8 @@ size_t asn1_build_cert_description(const uint8_t *label, size_t label_len, const //Seq 3 *p++ = 0xA1; - p += format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, sizeof(uint16_t)))), p); + p += format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, sizeof(uint16_t)))), + p); *p++ = 0x30; p += format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x4, sizeof(uint16_t))), p); *p++ = 0x30; @@ -313,15 +404,29 @@ size_t asn1_build_cert_description(const uint8_t *label, size_t label_len, const return p-buf; } -size_t asn1_build_prkd_generic(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, const uint8_t *seq, size_t seq_len, uint8_t *buf, size_t buf_len) { +size_t asn1_build_prkd_generic(const uint8_t *label, + size_t label_len, + const uint8_t *keyid, + size_t keyid_len, + size_t keysize, + const uint8_t *seq, + size_t seq_len, + uint8_t *buf, + size_t buf_len) +{ size_t seq1_size = asn1_len_tag(0x30, asn1_len_tag(0xC, label_len)); size_t seq2_size = asn1_len_tag(0x30, asn1_len_tag(0x4, keyid_len)+asn1_len_tag(0x3, seq_len)); - size_t seq3_size = asn1_len_tag(0xA1, asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, 0))+asn1_len_tag(0x2,2))); + size_t seq3_size = + asn1_len_tag(0xA1, + asn1_len_tag(0x30, + asn1_len_tag(0x30, asn1_len_tag(0x4, 0))+asn1_len_tag(0x2, 2))); size_t tot_len = asn1_len_tag(0xA0, seq1_size+seq2_size+seq3_size); - if (buf_len == 0 || buf == NULL) + if (buf_len == 0 || buf == NULL) { return tot_len; - if (buf_len < tot_len) + } + if (buf_len < tot_len) { return 0; + } uint8_t *p = buf; *p++ = 0xA0; p += format_tlv_len(seq1_size+seq2_size+seq3_size, p); @@ -344,9 +449,12 @@ size_t asn1_build_prkd_generic(const uint8_t *label, size_t label_len, const uin //Seq 3 *p++ = 0xA1; - p += format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, 0))+asn1_len_tag(0x2,2)), p); + p += + format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, 0))+asn1_len_tag(0x2, + 2)), + p); *p++ = 0x30; - p += format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x4, 0))+asn1_len_tag(0x2,2), p); + p += format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x4, 0))+asn1_len_tag(0x2, 2), p); *p++ = 0x30; p += format_tlv_len(asn1_len_tag(0x4, 0), p); *p++ = 0x4; @@ -358,65 +466,106 @@ size_t asn1_build_prkd_generic(const uint8_t *label, size_t label_len, const uin return p-buf; } -size_t asn1_build_prkd_ecc(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, uint8_t *buf, size_t buf_len) { - return asn1_build_prkd_generic(label, label_len, keyid, keyid_len, keysize, (const uint8_t *)"\x07\x20\x80", 3, buf, buf_len); +size_t asn1_build_prkd_ecc(const uint8_t *label, + size_t label_len, + const uint8_t *keyid, + size_t keyid_len, + size_t keysize, + uint8_t *buf, + size_t buf_len) +{ + return asn1_build_prkd_generic(label, + label_len, + keyid, + keyid_len, + keysize, + (const uint8_t *) "\x07\x20\x80", + 3, + buf, + buf_len); } -size_t asn1_build_prkd_rsa(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, uint8_t *buf, size_t buf_len) { - return asn1_build_prkd_generic(label, label_len, keyid, keyid_len, keysize, (const uint8_t *)"\x02\x74", 2, buf, buf_len); +size_t asn1_build_prkd_rsa(const uint8_t *label, + size_t label_len, + const uint8_t *keyid, + size_t keyid_len, + size_t keysize, + uint8_t *buf, + size_t buf_len) +{ + return asn1_build_prkd_generic(label, + label_len, + keyid, + keyid_len, + keysize, + (const uint8_t *) "\x02\x74", + 2, + buf, + buf_len); } -const uint8_t *cvc_get_field(const uint8_t *data, size_t len, size_t *olen, uint16_t tag) { +const uint8_t *cvc_get_field(const uint8_t *data, size_t len, size_t *olen, uint16_t tag) +{ uint8_t *rdata = NULL; - if (data == NULL || len == 0) + if (data == NULL || len == 0) { return NULL; - if (asn1_find_tag(data, len, tag, olen, &rdata) == false) + } + if (asn1_find_tag(data, len, tag, olen, &rdata) == false) { return NULL; + } return rdata; } -const uint8_t *cvc_get_body(const uint8_t *data, size_t len, size_t *olen) { +const uint8_t *cvc_get_body(const uint8_t *data, size_t len, size_t *olen) +{ const uint8_t *bkdata = data; - if ((data = cvc_get_field(data, len, olen, 0x67)) == NULL) /* Check for CSR */ + if ((data = cvc_get_field(data, len, olen, 0x67)) == NULL) { /* Check for CSR */ data = bkdata; + } if ((data = cvc_get_field(data, len, olen, 0x7F21)) != NULL) { return cvc_get_field(data, len, olen, 0x7F4E); } return NULL; } -const uint8_t *cvc_get_sig(const uint8_t *data, size_t len, size_t *olen) { +const uint8_t *cvc_get_sig(const uint8_t *data, size_t len, size_t *olen) +{ const uint8_t *bkdata = data; - if ((data = cvc_get_field(data, len, olen, 0x67)) == NULL) /* Check for CSR */ + if ((data = cvc_get_field(data, len, olen, 0x67)) == NULL) { /* Check for CSR */ data = bkdata; + } if ((data = cvc_get_field(data, len, olen, 0x7F21)) != NULL) { return cvc_get_field(data, len, olen, 0x5F37); } return NULL; } -const uint8_t *cvc_get_car(const uint8_t *data, size_t len, size_t *olen) { +const uint8_t *cvc_get_car(const uint8_t *data, size_t len, size_t *olen) +{ if ((data = cvc_get_body(data, len, olen)) != NULL) { return cvc_get_field(data, len, olen, 0x42); } return NULL; } -const uint8_t *cvc_get_chr(const uint8_t *data, size_t len, size_t *olen) { +const uint8_t *cvc_get_chr(const uint8_t *data, size_t len, size_t *olen) +{ if ((data = cvc_get_body(data, len, olen)) != NULL) { return cvc_get_field(data, len, olen, 0x5F20); } return NULL; } -const uint8_t *cvc_get_pub(const uint8_t *data, size_t len, size_t *olen) { +const uint8_t *cvc_get_pub(const uint8_t *data, size_t len, size_t *olen) +{ if ((data = cvc_get_body(data, len, olen)) != NULL) { return cvc_get_field(data, len, olen, 0x7F49); } return NULL; } -const uint8_t *cvc_get_ext(const uint8_t *data, size_t len, size_t *olen) { +const uint8_t *cvc_get_ext(const uint8_t *data, size_t len, size_t *olen) +{ if ((data = cvc_get_body(data, len, olen)) != NULL) { return cvc_get_field(data, len, olen, 0x65); } @@ -426,15 +575,18 @@ const uint8_t *cvc_get_ext(const uint8_t *data, size_t len, size_t *olen) { extern PUK puk_store[MAX_PUK_STORE_ENTRIES]; extern int puk_store_entries; -int puk_store_index(const uint8_t *chr, size_t chr_len) { +int puk_store_index(const uint8_t *chr, size_t chr_len) +{ for (int i = 0; i < puk_store_entries; i++) { - if (memcmp(puk_store[i].chr, chr, chr_len) == 0) + if (memcmp(puk_store[i].chr, chr, chr_len) == 0) { return i; + } } return -1; } -mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len) { +mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len) +{ size_t chr_len = 0, car_len = 0; const uint8_t *chr = NULL, *car = NULL; int eq = -1; @@ -447,55 +599,67 @@ mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len) { if (idx != -1) { ca = puk_store[idx].cvcert; ca_len = puk_store[idx].cvcert_len; - } - else + } else { ca = NULL; + } } } while (car && chr && eq != 0); size_t ca_puk_len = 0; const uint8_t *ca_puk = cvc_get_pub(ca, ca_len, &ca_puk_len); - if (!ca_puk) + if (!ca_puk) { return MBEDTLS_ECP_DP_NONE; + } size_t t81_len = 0; const uint8_t *t81 = cvc_get_field(ca_puk, ca_puk_len, &t81_len, 0x81); - if (!t81) + if (!t81) { return MBEDTLS_ECP_DP_NONE; + } return ec_get_curve_from_prime(t81, t81_len); } -int puk_verify(const uint8_t *sig, size_t sig_len, const uint8_t *hash, size_t hash_len, const uint8_t *ca, size_t ca_len) { +int puk_verify(const uint8_t *sig, + size_t sig_len, + const uint8_t *hash, + size_t hash_len, + const uint8_t *ca, + size_t ca_len) +{ size_t puk_len = 0; const uint8_t *puk = cvc_get_pub(ca, ca_len, &puk_len); - if (!puk) + if (!puk) { return CCID_WRONG_DATA; + } size_t oid_len = 0; const uint8_t *oid = cvc_get_field(puk, puk_len, &oid_len, 0x6); - if (!oid) + if (!oid) { return CCID_WRONG_DATA; + } if (memcmp(oid, OID_ID_TA_RSA, 9) == 0) { //RSA size_t t81_len = 0, t82_len = 0; - const uint8_t *t81 = cvc_get_field(puk, puk_len, &t81_len, 0x81), *t82 = cvc_get_field(puk, puk_len, &t81_len, 0x82); - if (!t81 || !t82) + const uint8_t *t81 = cvc_get_field(puk, puk_len, &t81_len, 0x81), *t82 = cvc_get_field(puk, + puk_len, + &t81_len, + 0x82); + if (!t81 || !t82) { return CCID_WRONG_DATA; + } mbedtls_rsa_context rsa; mbedtls_rsa_init(&rsa); mbedtls_md_type_t md = MBEDTLS_MD_NONE; - if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_1, oid_len) == 0) + if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; - else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; - else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; - else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_1, oid_len) == 0) { + } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; mbedtls_rsa_set_padding(&rsa, MBEDTLS_RSA_PKCS_V21, md); - } - else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_256, oid_len) == 0) { + } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; mbedtls_rsa_set_padding(&rsa, MBEDTLS_RSA_PKCS_V21, md); - } - else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_512, oid_len) == 0) { + } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; mbedtls_rsa_set_padding(&rsa, MBEDTLS_RSA_PKCS_V21, md); } @@ -525,31 +689,35 @@ int puk_verify(const uint8_t *sig, size_t sig_len, const uint8_t *hash, size_t h } r = mbedtls_rsa_pkcs1_verify(&rsa, md, hash_len, hash, sig); mbedtls_rsa_free(&rsa); - if (r != 0) + if (r != 0) { return CCID_WRONG_SIGNATURE; - } - else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC + } + } else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC mbedtls_md_type_t md = MBEDTLS_MD_NONE; - if (memcmp(oid, OID_ID_TA_ECDSA_SHA_1, oid_len) == 0) + if (memcmp(oid, OID_ID_TA_ECDSA_SHA_1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; - else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0) { md = MBEDTLS_MD_SHA224; - else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; - else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0) { md = MBEDTLS_MD_SHA384; - else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; - if (md == MBEDTLS_MD_NONE) + } + if (md == MBEDTLS_MD_NONE) { return CCID_WRONG_DATA; + } size_t t86_len = 0; const uint8_t *t86 = cvc_get_field(puk, puk_len, &t86_len, 0x86); - if (!t86) + if (!t86) { return CCID_WRONG_DATA; + } mbedtls_ecp_group_id ec_id = cvc_inherite_ec_group(ca, ca_len); - if (ec_id == MBEDTLS_ECP_DP_NONE) + if (ec_id == MBEDTLS_ECP_DP_NONE) { return CCID_WRONG_DATA; + } mbedtls_ecdsa_context ecdsa; mbedtls_ecdsa_init(&ecdsa); int ret = mbedtls_ecp_group_load(&ecdsa.grp, ec_id); @@ -588,64 +756,74 @@ int puk_verify(const uint8_t *sig, size_t sig_len, const uint8_t *hash, size_t h mbedtls_mpi_free(&r); mbedtls_mpi_free(&s); mbedtls_ecdsa_free(&ecdsa); - if (ret != 0) + if (ret != 0) { return CCID_WRONG_SIGNATURE; + } } return CCID_OK; } -int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t ca_len) { +int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t ca_len) +{ size_t puk_len = 0; const uint8_t *puk = cvc_get_pub(ca, ca_len, &puk_len); - if (!puk) + if (!puk) { return CCID_WRONG_DATA; + } size_t oid_len = 0, cv_body_len = 0, sig_len = 0; const uint8_t *oid = cvc_get_field(puk, puk_len, &oid_len, 0x6); const uint8_t *cv_body = cvc_get_body(cert, cert_len, &cv_body_len); const uint8_t *sig = cvc_get_sig(cert, cert_len, &sig_len); - if (!sig) + if (!sig) { return CCID_WRONG_DATA; - if (!cv_body) + } + if (!cv_body) { return CCID_WRONG_DATA; - if (!oid) + } + if (!oid) { return CCID_WRONG_DATA; + } mbedtls_md_type_t md = MBEDTLS_MD_NONE; if (memcmp(oid, OID_ID_TA_RSA, 9) == 0) { //RSA - if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_1, oid_len) == 0) + if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; - else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; - else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; - else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_1, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; - else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_256, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; - else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_512, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; - } - else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC - if (memcmp(oid, OID_ID_TA_ECDSA_SHA_1, oid_len) == 0) + } + } else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC + if (memcmp(oid, OID_ID_TA_ECDSA_SHA_1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; - else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0) { md = MBEDTLS_MD_SHA224; - else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; - else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0) { md = MBEDTLS_MD_SHA384; - else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0) + } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; + } } - if (md == MBEDTLS_MD_NONE) + if (md == MBEDTLS_MD_NONE) { return CCID_WRONG_DATA; + } const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md); uint8_t hash[64], hash_len = mbedtls_md_get_size(md_info); uint8_t tlv_body = 2+format_tlv_len(cv_body_len, NULL); int r = mbedtls_md(md_info, cv_body-tlv_body, cv_body_len+tlv_body, hash); - if (r != 0) + if (r != 0) { return CCID_EXEC_ERROR; + } r = puk_verify(sig, sig_len, hash, hash_len, ca, ca_len); - if (r != 0) + if (r != 0) { return CCID_WRONG_SIGNATURE; + } return CCID_OK; } diff --git a/src/hsm/cvc.h b/src/hsm/cvc.h index e87e224..1ef1f3b 100644 --- a/src/hsm/cvc.h +++ b/src/hsm/cvc.h @@ -40,9 +40,25 @@ typedef struct PUK { #define MAX_PUK_STORE_ENTRIES 4 -extern size_t asn1_cvc_cert(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf_len, const uint8_t *ext, size_t ext_len); -extern size_t asn1_cvc_aut(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf_len, const uint8_t *ext, size_t ext_len); -extern size_t asn1_build_cert_description(const uint8_t *label, size_t label_len, const uint8_t *puk, size_t puk_len, uint16_t fid, uint8_t *buf, size_t buf_len); +extern size_t asn1_cvc_cert(void *rsa_ecdsa, + uint8_t key_type, + uint8_t *buf, + size_t buf_len, + const uint8_t *ext, + size_t ext_len); +extern size_t asn1_cvc_aut(void *rsa_ecdsa, + uint8_t key_type, + uint8_t *buf, + size_t buf_len, + const uint8_t *ext, + size_t ext_len); +extern size_t asn1_build_cert_description(const uint8_t *label, + size_t label_len, + const uint8_t *puk, + size_t puk_len, + uint16_t fid, + uint8_t *buf, + size_t buf_len); extern const uint8_t *cvc_get_field(const uint8_t *data, size_t len, size_t *olen, uint16_t tag); extern const uint8_t *cvc_get_car(const uint8_t *data, size_t len, size_t *olen); extern const uint8_t *cvc_get_chr(const uint8_t *data, size_t len, size_t *olen); @@ -50,7 +66,24 @@ extern const uint8_t *cvc_get_pub(const uint8_t *data, size_t len, size_t *olen) extern const uint8_t *cvc_get_ext(const uint8_t *data, size_t len, size_t *olen); extern int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t ca_len); extern mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len); -extern int puk_verify(const uint8_t *sig, size_t sig_len, const uint8_t *hash, size_t hash_len, const uint8_t *ca, size_t ca_len); -extern size_t asn1_build_prkd_ecc(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, uint8_t *buf, size_t buf_len); -extern size_t asn1_build_prkd_rsa(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, uint8_t *buf, size_t buf_len); +extern int puk_verify(const uint8_t *sig, + size_t sig_len, + const uint8_t *hash, + size_t hash_len, + const uint8_t *ca, + size_t ca_len); +extern size_t asn1_build_prkd_ecc(const uint8_t *label, + size_t label_len, + const uint8_t *keyid, + size_t keyid_len, + size_t keysize, + uint8_t *buf, + size_t buf_len); +extern size_t asn1_build_prkd_rsa(const uint8_t *label, + size_t label_len, + const uint8_t *keyid, + size_t keyid_len, + size_t keysize, + uint8_t *buf, + size_t buf_len); #endif diff --git a/src/hsm/files.c b/src/hsm/files.c index 327d469..aa63e00 100644 --- a/src/hsm/files.c +++ b/src/hsm/files.c @@ -21,39 +21,88 @@ extern const uint8_t sc_hsm_aid[]; extern int parse_token_info(const file_t *f, int mode); file_t file_entries[] = { - /* 0 */ { .fid = 0x3f00 , .parent = 0xff, .name = NULL, .type = FILE_TYPE_DF, .data = NULL, .ef_structure = 0, .acl = {0} }, // MF - /* 1 */ { .fid = 0x2f00 , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.DIR - /* 2 */ { .fid = 0x2f01 , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.ATR - /* 3 */ { .fid = EF_TERMCA , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.GDO - /* 4 */ { .fid = 0x2f03 , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF | FILE_DATA_FUNC,.data = (uint8_t *)parse_token_info, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.TokenInfo - /* 5 */ { .fid = 0x5015 , .parent = 0, .name = NULL, .type = FILE_TYPE_DF, .data = NULL, .ef_structure = 0, .acl = {0} }, //DF.PKCS15 - /* 6 */ { .fid = 0x5031 , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.ODF - /* 7 */ { .fid = 0x5032 , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.TokenInfo - /* 8 */ { .fid = 0x5033 , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.UnusedSpace - /* 9 */ { .fid = 0x1081 , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //PIN (PIN1) - /* 10 */ { .fid = 0x1082 , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //max retries PIN (PIN1) - /* 11 */ { .fid = 0x1083 , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //retries PIN (PIN1) - /* 12 */ { .fid = 0x1088 , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //PIN (SOPIN) - /* 13 */ { .fid = 0x1089 , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //max retries PIN (SOPIN) - /* 14 */ { .fid = 0x108A , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //retries PIN (SOPIN) - /* 15 */ { .fid = EF_DEVOPS , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //Device options - /* 16 */ { .fid = EF_PRKDFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.PrKDFs - /* 17 */ { .fid = EF_PUKDFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.PuKDFs - /* 18 */ { .fid = EF_CDFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.CDFs - /* 19 */ { .fid = EF_AODFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.AODFs - /* 20 */ { .fid = EF_DODFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.DODFs - /* 21 */ { .fid = EF_SKDFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.SKDFs - /* 22 */ { .fid = EF_KEY_DOMAIN, .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //Key domain options - /* 23 */ { .fid = EF_META , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //EF.CDFs - /* 24 */ { .fid = EF_PUKAUT, .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //Public Key Authentication - /* 25 */ { .fid = EF_KEY_DEV, .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //Device Key - /* 26 */ { .fid = EF_PRKD_DEV, .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //PrKD Device - /* 27 */ { .fid = EF_EE_DEV, .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //End Entity Certificate Device - /* 28 */ { .fid = EF_MKEK , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //MKEK - /* 29 */ { .fid = EF_MKEK_SO , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //MKEK with SO-PIN + /* 0 */ { .fid = 0x3f00, .parent = 0xff, .name = NULL, .type = FILE_TYPE_DF, .data = NULL, + .ef_structure = 0, .acl = { 0 } }, // MF + /* 1 */ { .fid = 0x2f00, .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.DIR + /* 2 */ { .fid = 0x2f01, .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.ATR + /* 3 */ { .fid = EF_TERMCA, .parent = 0, .name = NULL, + .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.GDO + /* 4 */ { .fid = 0x2f03, .parent = 5, .name = NULL, + .type = FILE_TYPE_WORKING_EF | FILE_DATA_FUNC, .data = (uint8_t *) parse_token_info, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.TokenInfo + /* 5 */ { .fid = 0x5015, .parent = 0, .name = NULL, .type = FILE_TYPE_DF, .data = NULL, + .ef_structure = 0, .acl = { 0 } }, //DF.PKCS15 + /* 6 */ { .fid = 0x5031, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.ODF + /* 7 */ { .fid = 0x5032, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.TokenInfo + /* 8 */ { .fid = 0x5033, .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.UnusedSpace + /* 9 */ { .fid = 0x1081, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //PIN (PIN1) + /* 10 */ { .fid = 0x1082, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //max retries PIN (PIN1) + /* 11 */ { .fid = 0x1083, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //retries PIN (PIN1) + /* 12 */ { .fid = 0x1088, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //PIN (SOPIN) + /* 13 */ { .fid = 0x1089, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //max retries PIN (SOPIN) + /* 14 */ { .fid = 0x108A, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //retries PIN (SOPIN) + /* 15 */ { .fid = EF_DEVOPS, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //Device options + /* 16 */ { .fid = EF_PRKDFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, + .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.PrKDFs + /* 17 */ { .fid = EF_PUKDFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, + .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.PuKDFs + /* 18 */ { .fid = EF_CDFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, + .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.CDFs + /* 19 */ { .fid = EF_AODFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, + .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.AODFs + /* 20 */ { .fid = EF_DODFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, + .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.DODFs + /* 21 */ { .fid = EF_SKDFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, + .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, //EF.SKDFs + /* 22 */ { .fid = EF_KEY_DOMAIN, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //Key domain options + /* 23 */ { .fid = EF_META, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //EF.CDFs + /* 24 */ { .fid = EF_PUKAUT, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //Public Key Authentication + /* 25 */ { .fid = EF_KEY_DEV, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //Device Key + /* 26 */ { .fid = EF_PRKD_DEV, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //PrKD Device + /* 27 */ { .fid = EF_EE_DEV, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //End Entity Certificate Device + /* 28 */ { .fid = EF_MKEK, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //MKEK + /* 29 */ { .fid = EF_MKEK_SO, .parent = 5, .name = NULL, + .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, + .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, //MKEK with SO-PIN ///* 30 */ { .fid = 0x0000, .parent = 0, .name = openpgpcard_aid, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, - /* 31 */ { .fid = 0x0000, .parent = 5, .name = sc_hsm_aid, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, - /* 32 */ { .fid = 0x0000, .parent = 0xff, .name = NULL, .type = FILE_TYPE_UNKNOWN, .data = NULL, .ef_structure = 0, .acl = {0} } //end + /* 31 */ { .fid = 0x0000, .parent = 5, .name = sc_hsm_aid, .type = FILE_TYPE_WORKING_EF, + .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } }, + /* 32 */ { .fid = 0x0000, .parent = 0xff, .name = NULL, .type = FILE_TYPE_UNKNOWN, .data = NULL, + .ef_structure = 0, .acl = { 0 } } //end }; const file_t *MF = &file_entries[0]; @@ -63,4 +112,4 @@ const file_t *file_sc_hsm = &file_entries[sizeof(file_entries)/sizeof(file_t)-2] file_t *file_pin1 = NULL; file_t *file_retries_pin1 = NULL; file_t *file_sopin = NULL; -file_t *file_retries_sopin = NULL; \ No newline at end of file +file_t *file_retries_sopin = NULL; diff --git a/src/hsm/files.h b/src/hsm/files.h index 6090d55..e33a4d0 100644 --- a/src/hsm/files.h +++ b/src/hsm/files.h @@ -47,4 +47,4 @@ extern file_t *file_retries_pin1; extern file_t *file_sopin; extern file_t *file_retries_sopin; -#endif \ No newline at end of file +#endif diff --git a/src/hsm/kek.c b/src/hsm/kek.c index 2c1f260..a12ee51 100644 --- a/src/hsm/kek.c +++ b/src/hsm/kek.c @@ -44,15 +44,18 @@ uint32_t crc32c(const uint8_t *buf, size_t len) uint32_t crc = ~0; while (len--) { crc ^= *buf++; - for (int k = 0; k < 8; k++) + for (int k = 0; k < 8; k++) { crc = (crc >> 1) ^ (POLY & (0 - (crc & 1))); + } } return ~crc; } -int load_mkek(uint8_t *mkek) { - if (has_session_pin == false && has_session_sopin == false) +int load_mkek(uint8_t *mkek) +{ + if (has_session_pin == false && has_session_sopin == false) { return CCID_NO_LOGIN; + } const uint8_t *pin = NULL; if (pin == NULL && has_session_pin == true) { file_t *tf = search_by_fid(EF_MKEK, NULL, SPECIFY_EF); @@ -68,56 +71,73 @@ int load_mkek(uint8_t *mkek) { pin = session_sopin; } } - if (pin == NULL) //Should never happen + if (pin == NULL) { //Should never happen return CCID_EXEC_ERROR; + } if (has_mkek_mask) { for (int i = 0; i < MKEK_KEY_SIZE; i++) { MKEK_KEY(mkek)[i] ^= mkek_mask[i]; } } - int ret = aes_decrypt_cfb_256(pin, MKEK_IV(mkek), MKEK_KEY(mkek), MKEK_KEY_SIZE+MKEK_KEY_CS_SIZE); - if (ret != 0) + int ret = + aes_decrypt_cfb_256(pin, MKEK_IV(mkek), MKEK_KEY(mkek), MKEK_KEY_SIZE+MKEK_KEY_CS_SIZE); + if (ret != 0) { return CCID_EXEC_ERROR; - if (crc32c(MKEK_KEY(mkek), MKEK_KEY_SIZE) != *(uint32_t *)MKEK_CHECKSUM(mkek)) + } + if (crc32c(MKEK_KEY(mkek), MKEK_KEY_SIZE) != *(uint32_t *) MKEK_CHECKSUM(mkek)) { return CCID_WRONG_DKEK; + } return CCID_OK; } -mse_t mse = {.init = false}; +mse_t mse = { .init = false }; -int mse_decrypt_ct(uint8_t *data, size_t len) { +int mse_decrypt_ct(uint8_t *data, size_t len) +{ mbedtls_chachapoly_context chatx; mbedtls_chachapoly_init(&chatx); mbedtls_chachapoly_setkey(&chatx, mse.key_enc + 12); - int ret = mbedtls_chachapoly_auth_decrypt(&chatx, len - 16, mse.key_enc, mse.Qpt, 65, data + len - 16, data, data); + int ret = mbedtls_chachapoly_auth_decrypt(&chatx, + len - 16, + mse.key_enc, + mse.Qpt, + 65, + data + len - 16, + data, + data); mbedtls_chachapoly_free(&chatx); return ret; } -int load_dkek(uint8_t id, uint8_t *dkek) { +int load_dkek(uint8_t id, uint8_t *dkek) +{ file_t *tf = search_dynamic_file(EF_DKEK+id); - if (!tf) + if (!tf) { return CCID_ERR_FILE_NOT_FOUND; + } memcpy(dkek, file_get_data(tf), DKEK_KEY_SIZE); return mkek_decrypt(dkek, DKEK_KEY_SIZE); } -void release_mkek(uint8_t *mkek) { +void release_mkek(uint8_t *mkek) +{ mbedtls_platform_zeroize(mkek, MKEK_SIZE); } -int store_mkek(const uint8_t *mkek) { - if (has_session_pin == false && has_session_sopin == false) +int store_mkek(const uint8_t *mkek) +{ + if (has_session_pin == false && has_session_sopin == false) { return CCID_NO_LOGIN; + } uint8_t tmp_mkek[MKEK_SIZE]; if (mkek == NULL) { const uint8_t *rd = random_bytes_get(MKEK_IV_SIZE+MKEK_KEY_SIZE); memcpy(tmp_mkek, rd, MKEK_IV_SIZE+MKEK_KEY_SIZE); - } - else + } else { memcpy(tmp_mkek, mkek, MKEK_SIZE); - *(uint32_t*)MKEK_CHECKSUM(tmp_mkek) = crc32c(MKEK_KEY(tmp_mkek), MKEK_KEY_SIZE); + } + *(uint32_t *) MKEK_CHECKSUM(tmp_mkek) = crc32c(MKEK_KEY(tmp_mkek), MKEK_KEY_SIZE); if (has_session_pin) { uint8_t tmp_mkek_pin[MKEK_SIZE]; memcpy(tmp_mkek_pin, tmp_mkek, MKEK_SIZE); @@ -127,7 +147,10 @@ int store_mkek(const uint8_t *mkek) { release_mkek(tmp_mkek_pin); return CCID_ERR_FILE_NOT_FOUND; } - aes_encrypt_cfb_256(session_pin, MKEK_IV(tmp_mkek_pin), MKEK_KEY(tmp_mkek_pin), MKEK_KEY_SIZE+MKEK_KEY_CS_SIZE); + aes_encrypt_cfb_256(session_pin, + MKEK_IV(tmp_mkek_pin), + MKEK_KEY(tmp_mkek_pin), + MKEK_KEY_SIZE+MKEK_KEY_CS_SIZE); flash_write_data_to_file(tf, tmp_mkek_pin, MKEK_SIZE); release_mkek(tmp_mkek_pin); } @@ -140,7 +163,10 @@ int store_mkek(const uint8_t *mkek) { release_mkek(tmp_mkek_sopin); return CCID_ERR_FILE_NOT_FOUND; } - aes_encrypt_cfb_256(session_sopin, MKEK_IV(tmp_mkek_sopin), MKEK_KEY(tmp_mkek_sopin), MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE); + aes_encrypt_cfb_256(session_sopin, + MKEK_IV(tmp_mkek_sopin), + MKEK_KEY(tmp_mkek_sopin), + MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE); flash_write_data_to_file(tf, tmp_mkek_sopin, MKEK_SIZE); release_mkek(tmp_mkek_sopin); } @@ -149,106 +175,133 @@ int store_mkek(const uint8_t *mkek) { return CCID_OK; } -int store_dkek_key(uint8_t id, uint8_t *dkek) { +int store_dkek_key(uint8_t id, uint8_t *dkek) +{ file_t *tf = search_dynamic_file(EF_DKEK+id); - if (!tf) + if (!tf) { return CCID_ERR_FILE_NOT_FOUND; + } int r = mkek_encrypt(dkek, DKEK_KEY_SIZE); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } flash_write_data_to_file(tf, dkek, DKEK_KEY_SIZE); low_flash_available(); return CCID_OK; } -int save_dkek_key(uint8_t id, const uint8_t *key) { +int save_dkek_key(uint8_t id, const uint8_t *key) +{ uint8_t dkek[DKEK_KEY_SIZE]; if (!key) { file_t *tf = search_dynamic_file(EF_DKEK+id); - if (!tf) + if (!tf) { return CCID_ERR_FILE_NOT_FOUND; + } memcpy(dkek, file_get_data(tf), DKEK_KEY_SIZE); - } - else + } else { memcpy(dkek, key, DKEK_KEY_SIZE); + } return store_dkek_key(id, dkek); } -int import_dkek_share(uint8_t id, const uint8_t *share) { +int import_dkek_share(uint8_t id, const uint8_t *share) +{ uint8_t tmp_dkek[DKEK_KEY_SIZE]; file_t *tf = search_dynamic_file(EF_DKEK+id); - if (!tf) + if (!tf) { return CCID_ERR_FILE_NOT_FOUND; + } memset(tmp_dkek, 0, sizeof(tmp_dkek)); - if (file_get_size(tf) == DKEK_KEY_SIZE) - memcpy(tmp_dkek, file_get_data(tf),DKEK_KEY_SIZE); - for (int i = 0; i < DKEK_KEY_SIZE; i++) + if (file_get_size(tf) == DKEK_KEY_SIZE) { + memcpy(tmp_dkek, file_get_data(tf), DKEK_KEY_SIZE); + } + for (int i = 0; i < DKEK_KEY_SIZE; i++) { tmp_dkek[i] ^= share[i]; + } flash_write_data_to_file(tf, tmp_dkek, DKEK_KEY_SIZE); low_flash_available(); return CCID_OK; } -int dkek_kcv(uint8_t id, uint8_t *kcv) { //kcv 8 bytes +int dkek_kcv(uint8_t id, uint8_t *kcv) //kcv 8 bytes +{ uint8_t hsh[32], dkek[DKEK_KEY_SIZE]; memset(kcv, 0, 8); memset(hsh, 0, sizeof(hsh)); int r = load_dkek(id, dkek); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } hash256(dkek, DKEK_KEY_SIZE, hsh); mbedtls_platform_zeroize(dkek, sizeof(dkek)); memcpy(kcv, hsh, 8); return CCID_OK; } -int dkek_kenc(uint8_t id, uint8_t *kenc) { //kenc 32 bytes +int dkek_kenc(uint8_t id, uint8_t *kenc) //kenc 32 bytes +{ uint8_t dkek[DKEK_KEY_SIZE+4]; memset(kenc, 0, 32); int r = load_dkek(id, dkek); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } memcpy(dkek+DKEK_KEY_SIZE, "\x0\x0\x0\x1", 4); hash256(dkek, sizeof(dkek), kenc); mbedtls_platform_zeroize(dkek, sizeof(dkek)); return CCID_OK; } -int dkek_kmac(uint8_t id, uint8_t *kmac) { //kmac 32 bytes +int dkek_kmac(uint8_t id, uint8_t *kmac) //kmac 32 bytes +{ uint8_t dkek[DKEK_KEY_SIZE+4]; memset(kmac, 0, 32); int r = load_dkek(id, dkek); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } memcpy(dkek+DKEK_KEY_SIZE, "\x0\x0\x0\x2", 4); hash256(dkek, DKEK_KEY_SIZE+4, kmac); mbedtls_platform_zeroize(dkek, sizeof(dkek)); return CCID_OK; } -int mkek_encrypt(uint8_t *data, size_t len) { +int mkek_encrypt(uint8_t *data, size_t len) +{ int r; uint8_t mkek[MKEK_SIZE+4]; - if ((r = load_mkek(mkek)) != CCID_OK) + if ((r = load_mkek(mkek)) != CCID_OK) { return r; + } r = aes_encrypt_cfb_256(MKEK_KEY(mkek), MKEK_IV(mkek), data, len); release_mkek(mkek); return r; } -int mkek_decrypt(uint8_t *data, size_t len) { +int mkek_decrypt(uint8_t *data, size_t len) +{ int r; uint8_t mkek[MKEK_SIZE+4]; - if ((r = load_mkek(mkek)) != CCID_OK) + if ((r = load_mkek(mkek)) != CCID_OK) { return r; + } r = aes_decrypt_cfb_256(MKEK_KEY(mkek), MKEK_IV(mkek), data, len); release_mkek(mkek); return r; } -int dkek_encode_key(uint8_t id, void *key_ctx, int key_type, uint8_t *out, size_t *out_len, const uint8_t *allowed, size_t allowed_len) { - if (!(key_type & HSM_KEY_RSA) && !(key_type & HSM_KEY_EC) && !(key_type & HSM_KEY_AES)) +int dkek_encode_key(uint8_t id, + void *key_ctx, + int key_type, + uint8_t *out, + size_t *out_len, + const uint8_t *allowed, + size_t allowed_len) +{ + if (!(key_type & HSM_KEY_RSA) && !(key_type & HSM_KEY_EC) && !(key_type & HSM_KEY_AES)) { return CCID_WRONG_DATA; + } uint8_t kb[8+2*4+2*4096/8+3+13]; //worst case: RSA-4096 (plus, 13 bytes padding) memset(kb, 0, sizeof(kb)); @@ -258,84 +311,104 @@ int dkek_encode_key(uint8_t id, void *key_ctx, int key_type, uint8_t *out, size_ uint8_t kenc[32]; memset(kenc, 0, sizeof(kenc)); r = dkek_kenc(id, kenc); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } uint8_t kcv[8]; memset(kcv, 0, sizeof(kcv)); r = dkek_kcv(id, kcv); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } uint8_t kmac[32]; memset(kmac, 0, sizeof(kmac)); r = dkek_kmac(id, kmac); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } if (key_type & HSM_KEY_AES) { - if (key_type & HSM_KEY_AES_128) + if (key_type & HSM_KEY_AES_128) { kb_len = 16; - else if (key_type & HSM_KEY_AES_192) + } else if (key_type & HSM_KEY_AES_192) { kb_len = 24; - else if (key_type & HSM_KEY_AES_256) + } else if (key_type & HSM_KEY_AES_256) { kb_len = 32; + } - if (kb_len != 16 && kb_len != 24 && kb_len != 32) + if (kb_len != 16 && kb_len != 24 && kb_len != 32) { return CCID_WRONG_DATA; - if (*out_len < 8+1+10+6+4+(2+32+14)+16) + } + if (*out_len < 8+1+10+6+4+(2+32+14)+16) { return CCID_WRONG_LENGTH; + } put_uint16_t(kb_len, kb+8); memcpy(kb+10, key_ctx, kb_len); kb_len += 2; - algo = (uint8_t *)"\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01"; //2.16.840.1.101.3.4.1 (2+8) + algo = (uint8_t *) "\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01"; //2.16.840.1.101.3.4.1 (2+8) algo_len = 10; - } - else if (key_type & HSM_KEY_RSA) { - if (*out_len < 8+1+12+6+(8+2*4+2*4096/8+3+13)+16) //13 bytes pading + } else if (key_type & HSM_KEY_RSA) { + if (*out_len < 8+1+12+6+(8+2*4+2*4096/8+3+13)+16) { //13 bytes pading return CCID_WRONG_LENGTH; - mbedtls_rsa_context *rsa = (mbedtls_rsa_context *)key_ctx; + } + mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) key_ctx; kb_len = 0; put_uint16_t(mbedtls_rsa_get_len(rsa)*8, kb+8+kb_len); kb_len += 2; put_uint16_t(mbedtls_mpi_size(&rsa->D), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&rsa->D, kb+8+kb_len, mbedtls_mpi_size(&rsa->D)); kb_len += mbedtls_mpi_size(&rsa->D); + mbedtls_mpi_write_binary(&rsa->D, kb+8+kb_len, mbedtls_mpi_size(&rsa->D)); + kb_len += mbedtls_mpi_size(&rsa->D); put_uint16_t(mbedtls_mpi_size(&rsa->N), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&rsa->N, kb+8+kb_len, mbedtls_mpi_size(&rsa->N)); kb_len += mbedtls_mpi_size(&rsa->N); + mbedtls_mpi_write_binary(&rsa->N, kb+8+kb_len, mbedtls_mpi_size(&rsa->N)); + kb_len += mbedtls_mpi_size(&rsa->N); put_uint16_t(mbedtls_mpi_size(&rsa->E), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&rsa->E, kb+8+kb_len, mbedtls_mpi_size(&rsa->E)); kb_len += mbedtls_mpi_size(&rsa->E); + mbedtls_mpi_write_binary(&rsa->E, kb+8+kb_len, mbedtls_mpi_size(&rsa->E)); + kb_len += mbedtls_mpi_size(&rsa->E); - algo = (uint8_t *)"\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02"; + algo = (uint8_t *) "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02"; algo_len = 12; - } - else if (key_type & HSM_KEY_EC) { - if (*out_len < 8+1+12+6+(8+2*8+9*66+2+4)+16) //4 bytes pading + } else if (key_type & HSM_KEY_EC) { + if (*out_len < 8+1+12+6+(8+2*8+9*66+2+4)+16) { //4 bytes pading return CCID_WRONG_LENGTH; - mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *)key_ctx; + } + mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx; kb_len = 0; put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.P)*8, kb+8+kb_len); kb_len += 2; put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.A), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&ecdsa->grp.A, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.A)); kb_len += mbedtls_mpi_size(&ecdsa->grp.A); + mbedtls_mpi_write_binary(&ecdsa->grp.A, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.A)); + kb_len += mbedtls_mpi_size(&ecdsa->grp.A); put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.B), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&ecdsa->grp.B, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.B)); kb_len += mbedtls_mpi_size(&ecdsa->grp.B); + mbedtls_mpi_write_binary(&ecdsa->grp.B, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.B)); + kb_len += mbedtls_mpi_size(&ecdsa->grp.B); put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.P), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&ecdsa->grp.P, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.P)); kb_len += mbedtls_mpi_size(&ecdsa->grp.P); + mbedtls_mpi_write_binary(&ecdsa->grp.P, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.P)); + kb_len += mbedtls_mpi_size(&ecdsa->grp.P); put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.N), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&ecdsa->grp.N, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.N)); kb_len += mbedtls_mpi_size(&ecdsa->grp.N); - put_uint16_t(1+mbedtls_mpi_size(&ecdsa->grp.G.X)+mbedtls_mpi_size(&ecdsa->grp.G.Y), kb+8+kb_len); kb_len += 2; + mbedtls_mpi_write_binary(&ecdsa->grp.N, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.N)); + kb_len += mbedtls_mpi_size(&ecdsa->grp.N); + put_uint16_t(1+mbedtls_mpi_size(&ecdsa->grp.G.X)+mbedtls_mpi_size(&ecdsa->grp.G.Y), + kb+8+kb_len); kb_len += 2; kb[8+kb_len++] = 0x4; - mbedtls_mpi_write_binary(&ecdsa->grp.G.X, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.G.X)); kb_len += mbedtls_mpi_size(&ecdsa->grp.G.X); - mbedtls_mpi_write_binary(&ecdsa->grp.G.Y, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.G.Y)); kb_len += mbedtls_mpi_size(&ecdsa->grp.G.Y); + mbedtls_mpi_write_binary(&ecdsa->grp.G.X, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.G.X)); + kb_len += mbedtls_mpi_size(&ecdsa->grp.G.X); + mbedtls_mpi_write_binary(&ecdsa->grp.G.Y, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.G.Y)); + kb_len += mbedtls_mpi_size(&ecdsa->grp.G.Y); put_uint16_t(mbedtls_mpi_size(&ecdsa->d), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&ecdsa->d, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->d)); kb_len += mbedtls_mpi_size(&ecdsa->d); - put_uint16_t(1+mbedtls_mpi_size(&ecdsa->Q.X)+mbedtls_mpi_size(&ecdsa->Q.Y), kb+8+kb_len); kb_len += 2; + mbedtls_mpi_write_binary(&ecdsa->d, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->d)); + kb_len += mbedtls_mpi_size(&ecdsa->d); + put_uint16_t(1+mbedtls_mpi_size(&ecdsa->Q.X)+mbedtls_mpi_size(&ecdsa->Q.Y), kb+8+kb_len); + kb_len += 2; kb[8+kb_len++] = 0x4; - mbedtls_mpi_write_binary(&ecdsa->Q.X, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->Q.X)); kb_len += mbedtls_mpi_size(&ecdsa->Q.X); - mbedtls_mpi_write_binary(&ecdsa->Q.Y, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->Q.Y)); kb_len += mbedtls_mpi_size(&ecdsa->Q.Y); + mbedtls_mpi_write_binary(&ecdsa->Q.X, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->Q.X)); + kb_len += mbedtls_mpi_size(&ecdsa->Q.X); + mbedtls_mpi_write_binary(&ecdsa->Q.Y, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->Q.Y)); + kb_len += mbedtls_mpi_size(&ecdsa->Q.Y); - algo = (uint8_t *)"\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03"; + algo = (uint8_t *) "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03"; algo_len = 12; } memset(out, 0, *out_len); @@ -344,107 +417,142 @@ int dkek_encode_key(uint8_t id, void *key_ctx, int key_type, uint8_t *out, size_ memcpy(out+*out_len, kcv, 8); *out_len += 8; - if (key_type & HSM_KEY_AES) + if (key_type & HSM_KEY_AES) { out[*out_len] = 15; - else if (key_type & HSM_KEY_RSA) + } else if (key_type & HSM_KEY_RSA) { out[*out_len] = 5; - else if (key_type & HSM_KEY_EC) + } else if (key_type & HSM_KEY_EC) { out[*out_len] = 12; + } *out_len += 1; if (algo) { memcpy(out+*out_len, algo, algo_len); *out_len += algo_len; - } - else + } else { *out_len += 2; + } if (allowed && allowed_len > 0) { put_uint16_t(allowed_len, out+*out_len); *out_len += 2; memcpy(out+*out_len, allowed, allowed_len); *out_len += allowed_len; - } - else + } else { *out_len += 2; + } //add 4 zeros *out_len += 4; memcpy(kb, random_bytes_get(8), 8); kb_len += 8; //8 random bytes - int kb_len_pad = ((int)(kb_len/16))*16; - if (kb_len % 16 > 0) - kb_len_pad = ((int)(kb_len/16)+1)*16; + int kb_len_pad = ((int) (kb_len/16))*16; + if (kb_len % 16 > 0) { + kb_len_pad = ((int) (kb_len/16)+1)*16; + } //key already copied at kb+10 if (kb_len < kb_len_pad) { kb[kb_len] = 0x80; } r = aes_encrypt(kenc, NULL, 256, HSM_AES_MODE_CBC, kb, kb_len_pad); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } memcpy(out+*out_len, kb, kb_len_pad); *out_len += kb_len_pad; - r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB), kmac, 256, out, *out_len, out+*out_len); + r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB), + kmac, + 256, + out, + *out_len, + out+*out_len); *out_len += 16; - if (r != 0) + if (r != 0) { return r; + } return CCID_OK; } -int dkek_type_key(const uint8_t *in) { - if (in[8] == 5 || in[8] == 6) +int dkek_type_key(const uint8_t *in) +{ + if (in[8] == 5 || in[8] == 6) { return HSM_KEY_RSA; - else if (in[8] == 12) + } else if (in[8] == 12) { return HSM_KEY_EC; - else if (in[8] == 15) + } else if (in[8] == 15) { return HSM_KEY_AES; + } return 0x0; } -int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len, int *key_size_out, uint8_t **allowed, size_t *allowed_len) { +int dkek_decode_key(uint8_t id, + void *key_ctx, + const uint8_t *in, + size_t in_len, + int *key_size_out, + uint8_t **allowed, + size_t *allowed_len) +{ uint8_t kcv[8]; int r = 0; memset(kcv, 0, sizeof(kcv)); r = dkek_kcv(id, kcv); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } uint8_t kmac[32]; memset(kmac, 0, sizeof(kmac)); r = dkek_kmac(id, kmac); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } uint8_t kenc[32]; memset(kenc, 0, sizeof(kenc)); r = dkek_kenc(id, kenc); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } - if (memcmp(kcv, in, 8) != 0) + if (memcmp(kcv, in, 8) != 0) { return CCID_WRONG_DKEK; + } uint8_t signature[16]; - r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB), kmac, 256, in, in_len-16, signature); - if (r != 0) + r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB), + kmac, + 256, + in, + in_len-16, + signature); + if (r != 0) { return CCID_WRONG_SIGNATURE; - if (memcmp(signature, in+in_len-16, 16) != 0) + } + if (memcmp(signature, in+in_len-16, 16) != 0) { return CCID_WRONG_SIGNATURE; + } int key_type = in[8]; - if (key_type != 5 && key_type != 6 && key_type != 12 && key_type != 15) + if (key_type != 5 && key_type != 6 && key_type != 12 && key_type != 15) { return CCID_WRONG_DATA; + } - if ((key_type == 5 || key_type == 6) && memcmp(in+9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02", 12) != 0) + if ((key_type == 5 || key_type == 6) && + memcmp(in+9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02", 12) != 0) { return CCID_WRONG_DATA; + } - if (key_type == 12 && memcmp(in+9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03", 12) != 0) + if (key_type == 12 && + memcmp(in+9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03", 12) != 0) { return CCID_WRONG_DATA; + } - if (key_type == 15 && memcmp(in+9, "\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01", 10) != 0) + if (key_type == 15 && memcmp(in+9, "\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01", 10) != 0) { return CCID_WRONG_DATA; + } size_t ofs = 9; @@ -454,7 +562,7 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len, //Allowed algorithms len = get_uint16_t(in, ofs); - *allowed = (uint8_t *)(in+ofs+2); + *allowed = (uint8_t *) (in+ofs+2); *allowed_len = len; ofs += len+2; @@ -466,21 +574,24 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len, len = get_uint16_t(in, ofs); ofs += len+2; - if ((in_len-16-ofs) % 16 != 0) + if ((in_len-16-ofs) % 16 != 0) { return CCID_WRONG_PADDING; + } uint8_t kb[8+2*4+2*4096/8+3+13]; //worst case: RSA-4096 (plus, 13 bytes padding) memset(kb, 0, sizeof(kb)); memcpy(kb, in+ofs, in_len-16-ofs); r = aes_decrypt(kenc, NULL, 256, HSM_AES_MODE_CBC, kb, in_len-16-ofs); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } int key_size = get_uint16_t(kb, 8); - if (key_size_out) + if (key_size_out) { *key_size_out = key_size; + } ofs = 10; if (key_type == 5 || key_type == 6) { - mbedtls_rsa_context *rsa = (mbedtls_rsa_context *)key_ctx; + mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) key_ctx; mbedtls_rsa_init(rsa); if (key_type == 5) { len = get_uint16_t(kb, ofs); ofs += 2; @@ -496,8 +607,7 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len, mbedtls_rsa_free(rsa); return CCID_WRONG_DATA; } - } - else if (key_type == 6) { + } else if (key_type == 6) { //DP-1 len = get_uint16_t(kb, ofs); ofs += len+2; @@ -537,8 +647,7 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len, mbedtls_rsa_free(rsa); return CCID_EXEC_ERROR; } - } - else if (key_type == 6) { + } else if (key_type == 6) { r = mbedtls_rsa_import(rsa, NULL, &rsa->P, &rsa->Q, NULL, &rsa->E); if (r != 0) { mbedtls_rsa_free(rsa); @@ -556,9 +665,8 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len, mbedtls_rsa_free(rsa); return CCID_EXEC_ERROR; } - } - else if (key_type == 12) { - mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *)key_ctx; + } else if (key_type == 12) { + mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx; mbedtls_ecdsa_init(ecdsa); //A @@ -603,8 +711,7 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len, mbedtls_ecdsa_free(ecdsa); return CCID_EXEC_ERROR; } - } - else if (key_type == 15) { + } else if (key_type == 15) { memcpy(key_ctx, kb+ofs, key_size); } return CCID_OK; diff --git a/src/hsm/kek.h b/src/hsm/kek.h index f7b48e0..9f5e22c 100644 --- a/src/hsm/kek.h +++ b/src/hsm/kek.h @@ -33,9 +33,21 @@ extern int import_dkek_share(uint8_t, const uint8_t *share); extern int dkek_kcv(uint8_t, uint8_t *kcv); extern int mkek_encrypt(uint8_t *data, size_t len); extern int mkek_decrypt(uint8_t *data, size_t len); -extern int dkek_encode_key(uint8_t, void *key_ctx, int key_type, uint8_t *out, size_t *out_len, const uint8_t *, size_t); +extern int dkek_encode_key(uint8_t, + void *key_ctx, + int key_type, + uint8_t *out, + size_t *out_len, + const uint8_t *, + size_t); extern int dkek_type_key(const uint8_t *in); -extern int dkek_decode_key(uint8_t, void *key_ctx, const uint8_t *in, size_t in_len, int *key_size_out, uint8_t **, size_t *); +extern int dkek_decode_key(uint8_t, + void *key_ctx, + const uint8_t *in, + size_t in_len, + int *key_size_out, + uint8_t **, + size_t *); #define MAX_DKEK_ENCODE_KEY_BUFFER (8+1+12+6+(8+2*4+2*4096/8+3+13)+16) diff --git a/src/hsm/sc_hsm.c b/src/hsm/sc_hsm.c index bc46711..d74db76 100644 --- a/src/hsm/sc_hsm.c +++ b/src/hsm/sc_hsm.c @@ -29,12 +29,13 @@ const uint8_t sc_hsm_aid[] = { 11, - 0xE8,0x2B,0x06,0x01,0x04,0x01,0x81,0xC3,0x1F,0x02,0x01 + 0xE8, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x81, 0xC3, 0x1F, 0x02, 0x01 }; const uint8_t atr_sc_hsm[] = { 24, - 0x3B,0xFE,0x18,0x00,0x00,0x81,0x31,0xFE,0x45,0x80,0x31,0x81,0x54,0x48,0x53,0x4D,0x31,0x73,0x80,0x21,0x40,0x81,0x07,0xFA + 0x3B, 0xFE, 0x18, 0x00, 0x00, 0x81, 0x31, 0xFE, 0x45, 0x80, 0x31, 0x81, 0x54, 0x48, 0x53, 0x4D, + 0x31, 0x73, 0x80, 0x21, 0x40, 0x81, 0x07, 0xFA }; uint8_t session_pin[32], session_sopin[32]; @@ -77,8 +78,9 @@ extern int cmd_pso(); extern const uint8_t *ccid_atr; -app_t *sc_hsm_select_aid(app_t *a, const uint8_t *aid, uint8_t aid_len) { - if (!memcmp(aid, sc_hsm_aid+1, MIN(aid_len,sc_hsm_aid[0]))) { +app_t *sc_hsm_select_aid(app_t *a, const uint8_t *aid, uint8_t aid_len) +{ + if (!memcmp(aid, sc_hsm_aid+1, MIN(aid_len, sc_hsm_aid[0]))) { a->aid = sc_hsm_aid; a->process_apdu = sc_hsm_process_apdu; a->unload = sc_hsm_unload; @@ -88,12 +90,14 @@ app_t *sc_hsm_select_aid(app_t *a, const uint8_t *aid, uint8_t aid_len) { return NULL; } -void __attribute__ ((constructor)) sc_hsm_ctor() { +void __attribute__((constructor)) sc_hsm_ctor() +{ ccid_atr = atr_sc_hsm; register_app(sc_hsm_select_aid); } -void scan_files() { +void scan_files() +{ file_pin1 = search_by_fid(0x1081, NULL, SPECIFY_EF); if (file_pin1) { if (!file_pin1->data) { @@ -101,8 +105,7 @@ void scan_files() { const uint8_t empty[33] = { 0 }; flash_write_data_to_file(file_pin1, empty, sizeof(empty)); } - } - else { + } else { printf("FATAL ERROR: PIN1 not found in memory!\r\n"); } file_sopin = search_by_fid(0x1088, NULL, SPECIFY_EF); @@ -112,8 +115,7 @@ void scan_files() { const uint8_t empty[33] = { 0 }; flash_write_data_to_file(file_sopin, empty, sizeof(empty)); } - } - else { + } else { printf("FATAL ERROR: SOPIN not found in memory!\r\n"); } file_retries_pin1 = search_by_fid(0x1083, NULL, SPECIFY_EF); @@ -123,8 +125,7 @@ void scan_files() { const uint8_t retries = 3; flash_write_data_to_file(file_retries_pin1, &retries, sizeof(uint8_t)); } - } - else { + } else { printf("FATAL ERROR: Retries PIN1 not found in memory!\r\n"); } file_retries_sopin = search_by_fid(0x108A, NULL, SPECIFY_EF); @@ -134,8 +135,7 @@ void scan_files() { const uint8_t retries = 15; flash_write_data_to_file(file_retries_sopin, &retries, sizeof(uint8_t)); } - } - else { + } else { printf("FATAL ERROR: Retries SOPIN not found in memory!\r\n"); } file_t *tf = NULL; @@ -147,8 +147,7 @@ void scan_files() { const uint8_t retries = 3; flash_write_data_to_file(tf, &retries, sizeof(uint8_t)); } - } - else { + } else { printf("FATAL ERROR: Max Retries PIN1 not found in memory!\r\n"); } tf = search_by_fid(0x1089, NULL, SPECIFY_EF); @@ -158,14 +157,14 @@ void scan_files() { const uint8_t retries = 15; flash_write_data_to_file(tf, &retries, sizeof(uint8_t)); } - } - else { + } else { printf("FATAL ERROR: Retries SOPIN not found in memory!\r\n"); } low_flash_available(); } -void scan_all() { +void scan_all() +{ scan_flash(); scan_files(); } @@ -175,30 +174,40 @@ int puk_store_entries = 0; PUK *current_puk = NULL; uint8_t puk_status[MAX_PUK]; -int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy) { - if (data == NULL || data_len == 0) +int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy) +{ + if (data == NULL || data_len == 0) { return CCID_ERR_NULL_PARAM; - if (puk_store_entries == MAX_PUK_STORE_ENTRIES) + } + if (puk_store_entries == MAX_PUK_STORE_ENTRIES) { return CCID_ERR_MEMORY_FATAL; + } puk_store[puk_store_entries].copied = copy; if (copy == true) { - uint8_t *tmp = (uint8_t *)calloc(data_len, sizeof(uint8_t)); + uint8_t *tmp = (uint8_t *) calloc(data_len, sizeof(uint8_t)); memcpy(tmp, data, data_len); puk_store[puk_store_entries].cvcert = tmp; - } - else + } else { puk_store[puk_store_entries].cvcert = data; + } puk_store[puk_store_entries].cvcert_len = data_len; - puk_store[puk_store_entries].chr = cvc_get_chr(puk_store[puk_store_entries].cvcert, data_len, &puk_store[puk_store_entries].chr_len); - puk_store[puk_store_entries].car = cvc_get_car(puk_store[puk_store_entries].cvcert, data_len, &puk_store[puk_store_entries].car_len); - puk_store[puk_store_entries].puk = cvc_get_pub(puk_store[puk_store_entries].cvcert, data_len, &puk_store[puk_store_entries].puk_len); + puk_store[puk_store_entries].chr = cvc_get_chr(puk_store[puk_store_entries].cvcert, + data_len, + &puk_store[puk_store_entries].chr_len); + puk_store[puk_store_entries].car = cvc_get_car(puk_store[puk_store_entries].cvcert, + data_len, + &puk_store[puk_store_entries].car_len); + puk_store[puk_store_entries].puk = cvc_get_pub(puk_store[puk_store_entries].cvcert, + data_len, + &puk_store[puk_store_entries].puk_len); puk_store_entries++; return CCID_OK; } -int puk_store_select_chr(const uint8_t *chr) { +int puk_store_select_chr(const uint8_t *chr) +{ for (int i = 0; i < puk_store_entries; i++) { if (memcmp(puk_store[i].chr, chr, puk_store[i].chr_len) == 0) { current_puk = &puk_store[i]; @@ -208,48 +217,56 @@ int puk_store_select_chr(const uint8_t *chr) { return CCID_ERR_FILE_NOT_FOUND; } -void init_sc_hsm() { +void init_sc_hsm() +{ scan_all(); has_session_pin = has_session_sopin = false; isUserAuthenticated = false; cmd_select(); if (puk_store_entries > 0) { /* From previous session */ for (int i = 0; i < puk_store_entries; i++) { - if (puk_store[i].copied == true) - free((uint8_t *)puk_store[i].cvcert); + if (puk_store[i].copied == true) { + free((uint8_t *) puk_store[i].cvcert); + } } } memset(puk_store, 0, sizeof(puk_store)); puk_store_entries = 0; file_t *fterm = search_by_fid(EF_TERMCA, NULL, SPECIFY_EF); - if (fterm) + if (fterm) { add_cert_puk_store(file_get_data(fterm), file_get_size(fterm), false); + } for (int i = 0; i < 0xfe; i++) { file_t *ef = search_dynamic_file((CA_CERTIFICATE_PREFIX << 8) | i); - if (ef && file_get_size(ef) > 0) + if (ef && file_get_size(ef) > 0) { add_cert_puk_store(file_get_data(ef), file_get_size(ef), false); + } } dev_name = cvc_get_chr(file_get_data(fterm), file_get_size(fterm), &dev_name_len); memset(puk_status, 0, sizeof(puk_status)); } -int sc_hsm_unload() { +int sc_hsm_unload() +{ has_session_pin = has_session_sopin = false; isUserAuthenticated = false; sm_session_pin_len = 0; return CCID_OK; } -uint16_t get_device_options() { +uint16_t get_device_options() +{ file_t *ef = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF); - if (file_has_data(ef)) + if (file_has_data(ef)) { return (file_read_uint8(file_get_data(ef)) << 8) | file_read_uint8(file_get_data(ef)+1); + } return 0x0; } extern uint32_t board_button_read(void); -bool wait_button_pressed() { +bool wait_button_pressed() +{ uint32_t val = EV_PRESS_BUTTON; #ifndef ENABLE_EMULATION uint16_t opts = get_device_options(); @@ -257,14 +274,14 @@ bool wait_button_pressed() { queue_try_add(&card_to_usb_q, &val); do { queue_remove_blocking(&usb_to_card_q, &val); - } - while (val != EV_BUTTON_PRESSED && val != EV_BUTTON_TIMEOUT); + } while (val != EV_BUTTON_PRESSED && val != EV_BUTTON_TIMEOUT); } #endif return val == EV_BUTTON_TIMEOUT; } -int parse_token_info(const file_t *f, int mode) { +int parse_token_info(const file_t *f, int mode) +{ char *label = "SmartCard-HSM"; char *manu = "Pol Henarejos"; if (mode == 1) { @@ -273,12 +290,12 @@ int parse_token_info(const file_t *f, int mode) { *p++ = 0; //set later *p++ = 0x2; *p++ = 1; *p++ = HSM_VERSION_MAJOR; #ifndef ENABLE_EMULATION - *p++ = 0x4; *p++ = 8; pico_get_unique_board_id((pico_unique_board_id_t *)p); p += 8; + *p++ = 0x4; *p++ = 8; pico_get_unique_board_id((pico_unique_board_id_t *) p); p += 8; #else *p++ = 0x4; *p++ = 8; memset(p, 0, 8); p += 8; #endif - *p++ = 0xC; *p++ = strlen(manu); strcpy((char *)p, manu); p += strlen(manu); - *p++ = 0x80; *p++ = strlen(label); strcpy((char *)p, label); p += strlen(label); + *p++ = 0xC; *p++ = strlen(manu); strcpy((char *) p, manu); p += strlen(manu); + *p++ = 0x80; *p++ = strlen(label); strcpy((char *) p, label); p += strlen(label); *p++ = 0x3; *p++ = 2; *p++ = 4; *p++ = 0x30; res_APDU_size = p-res_APDU; res_APDU[1] = res_APDU_size-2; @@ -286,95 +303,113 @@ int parse_token_info(const file_t *f, int mode) { return 2+(2+1)+(2+8)+(2+strlen(manu))+(2+strlen(label))+(2+2); } -int pin_reset_retries(const file_t *pin, bool force) { - if (!pin) +int pin_reset_retries(const file_t *pin, bool force) +{ + if (!pin) { return CCID_ERR_NULL_PARAM; + } const file_t *max = search_by_fid(pin->fid+1, NULL, SPECIFY_EF); const file_t *act = search_by_fid(pin->fid+2, NULL, SPECIFY_EF); - if (!max || !act) + if (!max || !act) { return CCID_ERR_FILE_NOT_FOUND; + } uint8_t retries = file_read_uint8(file_get_data(act)); - if (retries == 0 && force == false) //blocked + if (retries == 0 && force == false) { //blocked return CCID_ERR_BLOCKED; + } retries = file_read_uint8(file_get_data(max)); - int r = flash_write_data_to_file((file_t *)act, &retries, sizeof(retries)); + int r = flash_write_data_to_file((file_t *) act, &retries, sizeof(retries)); low_flash_available(); return r; } -int pin_wrong_retry(const file_t *pin) { - if (!pin) +int pin_wrong_retry(const file_t *pin) +{ + if (!pin) { return CCID_ERR_NULL_PARAM; + } const file_t *act = search_by_fid(pin->fid+2, NULL, SPECIFY_EF); - if (!act) + if (!act) { return CCID_ERR_FILE_NOT_FOUND; + } uint8_t retries = file_read_uint8(file_get_data(act)); if (retries > 0) { retries -= 1; - int r = flash_write_data_to_file((file_t *)act, &retries, sizeof(retries)); - if (r != CCID_OK) + int r = flash_write_data_to_file((file_t *) act, &retries, sizeof(retries)); + if (r != CCID_OK) { return r; + } low_flash_available(); - if (retries == 0) + if (retries == 0) { return CCID_ERR_BLOCKED; + } return retries; } return CCID_ERR_BLOCKED; } -bool pka_enabled() { +bool pka_enabled() +{ file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF); return file_has_data(ef_puk) && file_read_uint8(file_get_data(ef_puk)) > 0; } -int check_pin(const file_t *pin, const uint8_t *data, size_t len) { - if (!file_has_data((file_t *)pin)) { +int check_pin(const file_t *pin, const uint8_t *data, size_t len) +{ + if (!file_has_data((file_t *) pin)) { return SW_REFERENCE_NOT_FOUND(); } - if (pka_enabled() == false) + if (pka_enabled() == false) { isUserAuthenticated = false; + } has_session_pin = has_session_sopin = false; if (is_secured_apdu() && sm_session_pin_len > 0 && pin == file_pin1) { if (len == sm_session_pin_len && memcmp(data, sm_session_pin, len) != 0) { int retries; - if ((retries = pin_wrong_retry(pin)) < CCID_OK) + if ((retries = pin_wrong_retry(pin)) < CCID_OK) { return SW_PIN_BLOCKED(); + } return set_res_sw(0x63, 0xc0 | retries); } - } - else { + } else { uint8_t dhash[32]; double_hash_pin(data, len, dhash); - if (sizeof(dhash) != file_get_size(pin)-1) //1 byte for pin len + if (sizeof(dhash) != file_get_size(pin)-1) { //1 byte for pin len return SW_CONDITIONS_NOT_SATISFIED(); + } if (memcmp(file_get_data(pin)+1, dhash, sizeof(dhash)) != 0) { int retries; - if ((retries = pin_wrong_retry(pin)) < CCID_OK) + if ((retries = pin_wrong_retry(pin)) < CCID_OK) { return SW_PIN_BLOCKED(); + } return set_res_sw(0x63, 0xc0 | retries); } } int r = pin_reset_retries(pin, false); - if (r == CCID_ERR_BLOCKED) + if (r == CCID_ERR_BLOCKED) { return SW_PIN_BLOCKED(); - if (r != CCID_OK) + } + if (r != CCID_OK) { return SW_MEMORY_FAILURE(); - if (pka_enabled() == false) + } + if (pka_enabled() == false) { isUserAuthenticated = true; + } if (pin == file_pin1) { hash_multi(data, len, session_pin); has_session_pin = true; - } - else if (pin == file_sopin) { + } else if (pin == file_sopin) { hash_multi(data, len, session_sopin); has_session_sopin = true; } return SW_OK(); } -const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len) { - if (ef == NULL) +const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len) +{ + if (ef == NULL) { return NULL; + } uint8_t *meta_data = NULL; uint8_t meta_size = meta_find(ef->fid, &meta_data); if (meta_size > 0 && meta_data != NULL) { @@ -389,42 +424,49 @@ const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len) { return NULL; } -uint32_t get_key_counter(file_t *fkey) { +uint32_t get_key_counter(file_t *fkey) +{ size_t tag_len = 0; const uint8_t *meta_tag = get_meta_tag(fkey, 0x90, &tag_len); - if (meta_tag) + if (meta_tag) { return (meta_tag[0] << 24) | (meta_tag[1] << 16) | (meta_tag[2] << 8) | meta_tag[3]; + } return 0xffffffff; } -bool key_has_purpose(file_t *ef, uint8_t purpose) { +bool key_has_purpose(file_t *ef, uint8_t purpose) +{ size_t tag_len = 0; const uint8_t *meta_tag = get_meta_tag(ef, 0x91, &tag_len); if (meta_tag) { for (int i = 0; i < tag_len; i++) { - if (meta_tag[i] == purpose) + if (meta_tag[i] == purpose) { return true; + } } return false; } return true; } -uint32_t decrement_key_counter(file_t *fkey) { - if (!fkey) +uint32_t decrement_key_counter(file_t *fkey) +{ + if (!fkey) { return 0xffffff; + } uint8_t *meta_data = NULL; uint8_t meta_size = meta_find(fkey->fid, &meta_data); if (meta_size > 0 && meta_data != NULL) { uint16_t tag = 0x0; uint8_t *tag_data = NULL, *p = NULL; size_t tag_len = 0; - uint8_t *cmeta = (uint8_t *)calloc(1, meta_size); + uint8_t *cmeta = (uint8_t *) calloc(1, meta_size); /* We cannot modify meta_data, as it comes from flash memory. It must be cpied to an aux buffer */ memcpy(cmeta, meta_data, meta_size); while (walk_tlv(cmeta, meta_size, &p, &tag, &tag_len, &tag_data)) { if (tag == 0x90) { //ofset tag - uint32_t val = (tag_data[0] << 24) | (tag_data[1] << 16) | (tag_data[2] << 8) | tag_data[3]; + uint32_t val = + (tag_data[0] << 24) | (tag_data[1] << 16) | (tag_data[2] << 8) | tag_data[3]; val--; tag_data[0] = (val >> 24) & 0xff; tag_data[1] = (val >> 16) & 0xff; @@ -433,8 +475,9 @@ uint32_t decrement_key_counter(file_t *fkey) { int r = meta_add(fkey->fid, cmeta, meta_size); free(cmeta); - if (r != 0) + if (r != 0) { return 0xffffffff; + } low_flash_available(); return val; } @@ -445,50 +488,53 @@ uint32_t decrement_key_counter(file_t *fkey) { } //Stores the private and public keys in flash -int store_keys(void *key_ctx, int type, uint8_t key_id) { +int store_keys(void *key_ctx, int type, uint8_t key_id) +{ int r, key_size = 0; uint8_t kdata[4096/8]; //worst case if (type == HSM_KEY_RSA) { - mbedtls_rsa_context *rsa = (mbedtls_rsa_context *)key_ctx; + mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) key_ctx; key_size = mbedtls_mpi_size(&rsa->P)+mbedtls_mpi_size(&rsa->Q); mbedtls_mpi_write_binary(&rsa->P, kdata, key_size/2); mbedtls_mpi_write_binary(&rsa->Q, kdata+key_size/2, key_size/2); - } - else if (type == HSM_KEY_EC) { - mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *)key_ctx; + } else if (type == HSM_KEY_EC) { + mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx; key_size = mbedtls_mpi_size(&ecdsa->d); kdata[0] = ecdsa->grp.id & 0xff; mbedtls_mpi_write_binary(&ecdsa->d, kdata+1, key_size); key_size++; - } - else if (type & HSM_KEY_AES) { - if (type == HSM_KEY_AES_128) + } else if (type & HSM_KEY_AES) { + if (type == HSM_KEY_AES_128) { key_size = 16; - else if (type == HSM_KEY_AES_192) + } else if (type == HSM_KEY_AES_192) { key_size = 24; - else if (type == HSM_KEY_AES_256) + } else if (type == HSM_KEY_AES_256) { key_size = 32; + } memcpy(kdata, key_ctx, key_size); - } - else + } else { return CCID_WRONG_DATA; + } file_t *fpk = file_new((KEY_PREFIX << 8) | key_id); - if (!fpk) + if (!fpk) { return CCID_ERR_MEMORY_FATAL; + } r = mkek_encrypt(kdata, key_size); if (r != CCID_OK) { return r; } r = flash_write_data_to_file(fpk, kdata, key_size); - if (r != CCID_OK) + if (r != CCID_OK) { return r; + } low_flash_available(); return CCID_OK; } -int find_and_store_meta_key(uint8_t key_id) { - size_t lt[4] = { 0,0,0,0 }, meta_size = 0; - uint8_t *pt[4] = { NULL,NULL,NULL,NULL }; +int find_and_store_meta_key(uint8_t key_id) +{ + size_t lt[4] = { 0, 0, 0, 0 }, meta_size = 0; + uint8_t *pt[4] = { NULL, NULL, NULL, NULL }; uint8_t t90[4] = { 0xFF, 0xFF, 0xFF, 0xFE }; for (int t = 0; t < 4; t++) { uint8_t *ptt = NULL; @@ -508,7 +554,7 @@ int find_and_store_meta_key(uint8_t key_id) { } } if (meta_size) { - uint8_t *meta = (uint8_t *)calloc(1, meta_size), *m = meta; + uint8_t *meta = (uint8_t *) calloc(1, meta_size), *m = meta; for (int t = 0; t < 4; t++) { if (lt[t] > 0 && pt[t] != NULL) { *m++ = 0x90+t; @@ -519,15 +565,18 @@ int find_and_store_meta_key(uint8_t key_id) { } int r = meta_add((KEY_PREFIX << 8) | key_id, meta, meta_size); free(meta); - if (r != 0) + if (r != 0) { return CCID_EXEC_ERROR; + } } return CCID_OK; } -int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey) { - if (wait_button_pressed() == true) //timeout +int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey) +{ + if (wait_button_pressed() == true) { //timeout return CCID_VERIFICATION_FAILED; + } int key_size = file_get_size(fkey); uint8_t kdata[4096/8]; @@ -568,9 +617,11 @@ int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey) { return CCID_OK; } -int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey) { - if (wait_button_pressed() == true) //timeout +int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey) +{ + if (wait_button_pressed() == true) { //timeout return CCID_VERIFICATION_FAILED; + } int key_size = file_get_size(fkey); uint8_t kdata[67]; //Worst case, 521 bit + 1byte @@ -611,8 +662,8 @@ int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey) { #define INS_EXTERNAL_AUTHENTICATE 0x82 #define INS_CHALLENGE 0x84 #define INS_GENERAL_AUTHENTICATE 0x86 -#define INS_SELECT_FILE 0xA4 -#define INS_READ_BINARY 0xB0 +#define INS_SELECT_FILE 0xA4 +#define INS_READ_BINARY 0xB0 #define INS_READ_BINARY_ODD 0xB1 #define INS_UPDATE_EF 0xD7 #define INS_DELETE_FILE 0xE4 @@ -645,13 +696,15 @@ static const cmd_t cmds[] = { { INS_PUK_AUTH, cmd_puk_auth }, { INS_PSO, cmd_pso }, { INS_EXTERNAL_AUTHENTICATE, cmd_external_authenticate }, - { 0x00, 0x0} + { 0x00, 0x0 } }; -int sc_hsm_process_apdu() { +int sc_hsm_process_apdu() +{ int r = sm_unwrap(); - if (r != CCID_OK) + if (r != CCID_OK) { return SW_DATA_INVALID(); + } for (const cmd_t *cmd = cmds; cmd->ins != 0x00; cmd++) { if (cmd->ins == INS(apdu)) { int r = cmd->cmd_handler(); diff --git a/src/hsm/sc_hsm.h b/src/hsm/sc_hsm.h index 93ce9f8..3211d4a 100644 --- a/src/hsm/sc_hsm.h +++ b/src/hsm/sc_hsm.h @@ -31,31 +31,31 @@ extern const uint8_t sc_hsm_aid[]; -#define ALGO_RSA_RAW 0x20 /* RSA signature with external padding */ -#define ALGO_RSA_DECRYPT 0x21 /* RSA raw decrypt */ +#define ALGO_RSA_RAW 0x20 /* RSA signature with external padding */ +#define ALGO_RSA_DECRYPT 0x21 /* RSA raw decrypt */ #define ALGO_RSA_DECRYPT_PKCS1 0x22 #define ALGO_RSA_DECRYPT_OEP 0x23 -#define ALGO_RSA_PKCS1 0x30 /* RSA signature with DigestInfo input and PKCS#1 V1.5 padding */ -#define ALGO_RSA_PKCS1_SHA1 0x31 /* RSA signature with SHA-1 hash and PKCS#1 V1.5 padding */ +#define ALGO_RSA_PKCS1 0x30 /* RSA signature with DigestInfo input and PKCS#1 V1.5 padding */ +#define ALGO_RSA_PKCS1_SHA1 0x31 /* RSA signature with SHA-1 hash and PKCS#1 V1.5 padding */ #define ALGO_RSA_PKCS1_SHA224 0x32 -#define ALGO_RSA_PKCS1_SHA256 0x33 /* RSA signature with SHA-256 hash and PKCS#1 V1.5 padding */ +#define ALGO_RSA_PKCS1_SHA256 0x33 /* RSA signature with SHA-256 hash and PKCS#1 V1.5 padding */ #define ALGO_RSA_PKCS1_SHA384 0x34 #define ALGO_RSA_PKCS1_SHA512 0x35 -#define ALGO_RSA_PSS 0x40 /* RSA signature with external hash and PKCS#1 PSS padding*/ -#define ALGO_RSA_PSS_SHA1 0x41 /* RSA signature with SHA-1 hash and PKCS#1 PSS padding */ +#define ALGO_RSA_PSS 0x40 /* RSA signature with external hash and PKCS#1 PSS padding*/ +#define ALGO_RSA_PSS_SHA1 0x41 /* RSA signature with SHA-1 hash and PKCS#1 PSS padding */ #define ALGO_RSA_PSS_SHA224 0x42 -#define ALGO_RSA_PSS_SHA256 0x43 /* RSA signature with SHA-256 hash and PKCS#1 PSS padding */ +#define ALGO_RSA_PSS_SHA256 0x43 /* RSA signature with SHA-256 hash and PKCS#1 PSS padding */ #define ALGO_RSA_PSS_SHA384 0x44 #define ALGO_RSA_PSS_SHA512 0x45 -#define ALGO_EC_RAW 0x70 /* ECDSA signature with hash input */ -#define ALGO_EC_SHA1 0x71 /* ECDSA signature with SHA-1 hash */ -#define ALGO_EC_SHA224 0x72 /* ECDSA signature with SHA-224 hash */ -#define ALGO_EC_SHA256 0x73 /* ECDSA signature with SHA-256 hash */ +#define ALGO_EC_RAW 0x70 /* ECDSA signature with hash input */ +#define ALGO_EC_SHA1 0x71 /* ECDSA signature with SHA-1 hash */ +#define ALGO_EC_SHA224 0x72 /* ECDSA signature with SHA-224 hash */ +#define ALGO_EC_SHA256 0x73 /* ECDSA signature with SHA-256 hash */ #define ALGO_EC_SHA384 0x74 #define ALGO_EC_SHA512 0x75 -#define ALGO_EC_DH 0x80 /* ECDH key derivation */ +#define ALGO_EC_DH 0x80 /* ECDH key derivation */ #define ALGO_EC_DH_AUTPUK 0x83 #define ALGO_EC_DH_XKEK 0x84 @@ -63,14 +63,14 @@ extern const uint8_t sc_hsm_aid[]; #define ALGO_UNWRAP 0x93 #define ALGO_REPLACE 0x94 -#define ALGO_EC_DERIVE 0x98 /* Derive EC key from EC key */ +#define ALGO_EC_DERIVE 0x98 /* Derive EC key from EC key */ -#define ALGO_AES_CBC_ENCRYPT 0x10 -#define ALGO_AES_CBC_DECRYPT 0x11 -#define ALGO_AES_CMAC 0x18 +#define ALGO_AES_CBC_ENCRYPT 0x10 +#define ALGO_AES_CBC_DECRYPT 0x11 +#define ALGO_AES_CMAC 0x18 #define ALGO_EXT_CIPHER_ENCRYPT 0x51 /* Extended ciphering Encrypt */ #define ALGO_EXT_CIPHER_DECRYPT 0x52 /* Extended ciphering Decrypt */ -#define ALGO_AES_DERIVE 0x99 +#define ALGO_AES_DERIVE 0x99 #define HSM_OPT_RRC 0x0001 #define HSM_OPT_TRANSPORT_PIN 0x0002 @@ -83,14 +83,14 @@ extern const uint8_t sc_hsm_aid[]; #define HSM_OPT_KEY_COUNTER_ALL 0x0200 #define HSM_OPT_SECURE_LOCK 0x0400 -#define PRKD_PREFIX 0xC4 /* Hi byte in file identifier for PKCS#15 PRKD objects */ -#define CD_PREFIX 0xC8 /* Hi byte in file identifier for PKCS#15 CD objects */ -#define DCOD_PREFIX 0xC9 /* Hi byte in file identifier for PKCS#15 DCOD objects */ -#define CA_CERTIFICATE_PREFIX 0xCA /* Hi byte in file identifier for CA certificates */ -#define KEY_PREFIX 0xCC /* Hi byte in file identifier for key objects */ -#define PROT_DATA_PREFIX 0xCD /* Hi byte in file identifier for PIN protected data objects */ -#define EE_CERTIFICATE_PREFIX 0xCE /* Hi byte in file identifier for EE certificates */ -#define DATA_PREFIX 0xCF /* Hi byte in file identifier for readable data objects */ +#define PRKD_PREFIX 0xC4 /* Hi byte in file identifier for PKCS#15 PRKD objects */ +#define CD_PREFIX 0xC8 /* Hi byte in file identifier for PKCS#15 CD objects */ +#define DCOD_PREFIX 0xC9 /* Hi byte in file identifier for PKCS#15 DCOD objects */ +#define CA_CERTIFICATE_PREFIX 0xCA /* Hi byte in file identifier for CA certificates */ +#define KEY_PREFIX 0xCC /* Hi byte in file identifier for key objects */ +#define PROT_DATA_PREFIX 0xCD /* Hi byte in file identifier for PIN protected data objects */ +#define EE_CERTIFICATE_PREFIX 0xCE /* Hi byte in file identifier for EE certificates */ +#define DATA_PREFIX 0xCF /* Hi byte in file identifier for readable data objects */ #define P15_KEYTYPE_RSA 0x30 #define P15_KEYTYPE_ECC 0xA0 @@ -124,4 +124,4 @@ extern int find_and_store_meta_key(uint8_t key_id); extern uint32_t get_key_counter(file_t *fkey); extern uint32_t decrement_key_counter(file_t *fkey); -#endif \ No newline at end of file +#endif diff --git a/src/hsm/version.h b/src/hsm/version.h index 851b084..86583c7 100644 --- a/src/hsm/version.h +++ b/src/hsm/version.h @@ -24,4 +24,3 @@ #define HSM_VERSION_MINOR (HSM_VERSION & 0xff) #endif - From e7495d11f232759f059cdbc75ebbd8130d361773 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 14 Feb 2023 23:25:13 +0100 Subject: [PATCH 65/84] Moving pointer. Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 15a2c96..12bdcbd 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 15a2c96854941154dc53aa93bc1ed8f105e3935a +Subproject commit 12bdcbd1f91f5b5763ad66b212be897ae9eb87a8 From cd6e280f4fb01e3dab64a9c21db8612f82867193 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 15 Feb 2023 00:10:35 +0100 Subject: [PATCH 66/84] Switching to new style. Signed-off-by: Pol Henarejos --- .uncrustify.cfg | 317 ++++++++++++++++++++++++++++ pico-hsm-sdk | 2 +- src/hsm/cmd_challenge.c | 3 +- src/hsm/cmd_change_pin.c | 17 +- src/hsm/cmd_cipher_sym.c | 100 +++++---- src/hsm/cmd_decrypt_asym.c | 30 +-- src/hsm/cmd_delete_file.c | 6 +- src/hsm/cmd_derive_asym.c | 11 +- src/hsm/cmd_external_authenticate.c | 11 +- src/hsm/cmd_extras.c | 29 ++- src/hsm/cmd_general_authenticate.c | 19 +- src/hsm/cmd_initialize.c | 47 +++-- src/hsm/cmd_key_domain.c | 74 ++++--- src/hsm/cmd_key_gen.c | 15 +- src/hsm/cmd_key_unwrap.c | 20 +- src/hsm/cmd_key_wrap.c | 15 +- src/hsm/cmd_keypair_gen.c | 16 +- src/hsm/cmd_list_keys.c | 3 +- src/hsm/cmd_mse.c | 17 +- src/hsm/cmd_pso.c | 33 +-- src/hsm/cmd_puk_auth.c | 20 +- src/hsm/cmd_read_binary.c | 38 ++-- src/hsm/cmd_reset_retry.c | 18 +- src/hsm/cmd_select.c | 38 ++-- src/hsm/cmd_session_pin.c | 6 +- src/hsm/cmd_signature.c | 80 ++++--- src/hsm/cmd_update_ef.c | 36 ++-- src/hsm/cmd_verify.c | 9 +- src/hsm/cvc.c | 233 ++++++++++---------- src/hsm/files.c | 6 +- src/hsm/kek.c | 274 ++++++++++++------------ src/hsm/kek.h | 8 +- src/hsm/sc_hsm.c | 158 +++++++------- 33 files changed, 1067 insertions(+), 642 deletions(-) create mode 100644 .uncrustify.cfg diff --git a/.uncrustify.cfg b/.uncrustify.cfg new file mode 100644 index 0000000..05d449f --- /dev/null +++ b/.uncrustify.cfg @@ -0,0 +1,317 @@ +# +# Uncrustify Configuration File +# File Created With UncrustifyX 0.4.3 (252) +# + +# Code-Modifying +# -------------- + +## Braces + +# Braces on single-line do statement +mod_full_brace_do = add # string (add/force/ignore/remove) + +# Braces on single-line else statement +mod_full_brace_if = add # string (add/force/ignore/remove) + +# Braces on single-line for statement +mod_full_brace_for = add # string (add/force/ignore/remove) + +# Braces on single-line while statement +mod_full_brace_while = add # string (add/force/ignore/remove) + +## Parentheses + +# Remove unnecessary parentheses on return statement +mod_paren_on_return = remove # string (add/force/ignore/remove) + +# Comments +# -------- + +## Other + +# Remove leading spaces from multi-line comments +cmt_multi_check_last = false # boolean (false/true) + +# General +# ------- + +## Other + +# Input tab size +input_tab_size = 4 # number + +# Indentation +# ----------- + +## Indentation Size + +# Indentation column size +indent_columns = 4 # number + +# Indentation size between case and switch +indent_switch_case = 4 # number + +## Other + +# Align strings broken by backslash +indent_align_string = true # boolean (false/true) + +# Indent with tabs +indent_with_tabs = 0 # number + +# Line-Splitting +# -------------- + +## Splitting + +# Code width +code_width = 100 # number + +# Split long for statements at semicolons +ls_for_split_full = true # boolean (false/true) + +# Split long function prototypes/calls at commas +ls_func_split_full = true # boolean (false/true) + +# Newlines +# -------- + +## Newline Between + +# Newline between assignment and open brace +nl_assign_brace = remove # string (add/force/ignore/remove) + +# Newline between close brace and else +nl_brace_else = add # string (add/force/ignore/remove) + +# Newline between close brace and while +nl_brace_while = remove # string (add/force/ignore/remove) + +# Newline between do and open brace +nl_do_brace = remove # string (add/force/ignore/remove) + +# Newline between else and open brace +nl_else_brace = remove # string (add/force/ignore/remove) + +# Newline between enum and open brace +nl_enum_brace = remove # string (add/force/ignore/remove) + +# Newline between for and open brace +nl_for_brace = remove # string (add/force/ignore/remove) + +# Newline between function call and open brace +nl_fcall_brace = add # string (add/force/ignore/remove) + +# Newline between function signature and open brace +nl_fdef_brace = remove # string (add/force/ignore/remove) + +# Newline between if and open brace +nl_if_brace = remove # string (add/force/ignore/remove) + +# Newline between struct and open brace +nl_struct_brace = remove # string (add/force/ignore/remove) + +# Newline between switch and open brace +nl_switch_brace = remove # string (add/force/ignore/remove) + +# Newline between union and open brace +nl_union_brace = remove # string (add/force/ignore/remove) + +# Newline between while and open brace +nl_while_brace = remove # string (add/force/ignore/remove) + +## Other + +# Newline count at end of file +nl_end_of_file_min = 1 # number + +# Newlines at end of file +nl_end_of_file = add # string (add/force/ignore/remove) + +# Newlines at start of file +nl_start_of_file = remove # string (add/force/ignore/remove) + +# Spacing +# ------- + +## Space After + +# Space after address-of operator +sp_addr = remove # string (add/force/ignore/remove) + +# Space after cast +sp_after_cast = add # string (add/force/ignore/remove) + +# Space after comma +sp_after_comma = add # string (add/force/ignore/remove) + +# Space after dereference operator +sp_deref = remove # string (add/force/ignore/remove) + +# Space after final semicolon in empty for statement +sp_after_semi_for_empty = remove # string (add/force/ignore/remove) + +# Space after invert operator +sp_inv = remove # string (add/force/ignore/remove) + +# Space after not operator +sp_not = remove # string (add/force/ignore/remove) + +# Space after pointer star +sp_after_ptr_star = remove # string (add/force/ignore/remove) + +# Space after pointer star followed by function +sp_after_ptr_star_func = remove # string (add/force/ignore/remove) + +# Space after semicolon +sp_after_semi = add # string (add/force/ignore/remove) + +# Space after semicolon in non-empty for statements +sp_after_semi_for = add # string (add/force/ignore/remove) + +# Space after sign in assignment +sp_sign = remove # string (add/force/ignore/remove) + +# Space after type +sp_after_type = add # string (add/force/ignore/remove) + +## Space Around + +# Space around arithmetic operators +sp_arith = add # string (add/force/ignore/remove) + +# Space around assignment operator +sp_assign = add # string (add/force/ignore/remove) + +# Space around boolean operators +sp_bool = add # string (add/force/ignore/remove) + +# Space around compare operators +sp_compare = add # string (add/force/ignore/remove) + +# Space around increment/decrement operators +sp_incdec = remove # string (add/force/ignore/remove) + +# Space around member operators +sp_member = remove # string (add/force/ignore/remove) + +# Space around preprocessor concatenation operator +sp_pp_concat = ignore # string (add/force/ignore/remove) + +# Space around ternary condition colon +sp_cond_colon = add # string (add/force/ignore/remove) + +# Space around ternary condition question mark +sp_cond_question = add # string (add/force/ignore/remove) + +## Space Before + +# Space before backslash-newline at end of line +sp_before_nl_cont = add # string (add/force/ignore/remove) + +# Space before case colon +sp_before_case_colon = remove # string (add/force/ignore/remove) + +# Space before comma +sp_before_comma = remove # string (add/force/ignore/remove) + +# Space before if/for/switch/while open parenthesis +sp_before_sparen = force # string (add/force/ignore/remove) + +# Space before pointer star +sp_before_ptr_star = add # string (add/force/ignore/remove) + +# Space before semicolon +sp_before_semi = remove # string (add/force/ignore/remove) + +# Space before semicolon in empty for statement +sp_before_semi_for_empty = remove # string (add/force/ignore/remove) + +# Space before semicolon in for statements +sp_before_semi_for = remove # string (add/force/ignore/remove) + +## Space Between + +# Space between __attribute__ and open parenthesis +sp_attribute_paren = remove # string (add/force/ignore/remove) + +# Space between close brace and else +sp_brace_else = remove # string (add/force/ignore/remove) + +# Space between close brace and typedef name +sp_brace_typedef = force # string (add/force/ignore/remove) + +# Space between closing parenthesis and open brace +sp_fparen_brace = add # string (add/force/ignore/remove) + +# Space between defined and open parenthesis +sp_defined_paren = remove # string (add/force/ignore/remove) + +# Space between else and open brace +sp_else_brace = force # string (add/force/ignore/remove) + +# Space between function name and open parenthesis +sp_func_call_paren = remove # string (add/force/ignore/remove) + +# Space between function name and open parenthesis in declaration +sp_func_proto_paren = remove # string (add/force/ignore/remove) + +# Space between function name and open parenthesis in function definition +sp_func_def_paren = remove # string (add/force/ignore/remove) + +# Space between if/for/switch/while close parenthesis and open brace +sp_sparen_brace = force # string (add/force/ignore/remove) + +# Space between macro and value +sp_macro = add # string (add/force/ignore/remove) + +# Space between macro function close parenthesis and value +sp_macro_func = add # string (add/force/ignore/remove) + +# Space between nested parentheses +sp_paren_paren = remove # string (add/force/ignore/remove) + +# Space between pointer stars +sp_between_ptr_star = remove # string (add/force/ignore/remove) + +# Space between preprocessor else and comment +sp_endif_cmt = add # string (add/force/ignore/remove) + +# Space between return type and function name +sp_type_func = add # string (add/force/ignore/remove) + +# Space between sizeof and open parenthesis +sp_sizeof_paren = remove # string (add/force/ignore/remove) + +## Space Inside + +# Space inside braces +sp_inside_braces = add # string (add/force/ignore/remove) + +# Space inside cast parentheses +sp_inside_paren_cast = remove # string (add/force/ignore/remove) + +# Space inside empty function parentheses +sp_inside_fparens = remove # string (add/force/ignore/remove) + +# Space inside enum braces +sp_inside_braces_enum = add # string (add/force/ignore/remove) + +# Space inside function parentheses +sp_inside_fparen = remove # string (add/force/ignore/remove) + +# Space inside if-condition parentheses +sp_inside_sparen = remove # string (add/force/ignore/remove) + +# Space inside non-empty square brackets +sp_inside_square = remove # string (add/force/ignore/remove) + +# Space inside parentheses +sp_inside_paren = remove # string (add/force/ignore/remove) + +# Space inside parentheses in function type +sp_inside_tparen = remove # string (add/force/ignore/remove) + +# Space inside struct/union braces +sp_inside_braces_struct = add # string (add/force/ignore/remove) \ No newline at end of file diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 12bdcbd..43ef33d 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 12bdcbd1f91f5b5763ad66b212be897ae9eb87a8 +Subproject commit 43ef33d60b43ddeed5878ded08df37001636d811 diff --git a/src/hsm/cmd_challenge.c b/src/hsm/cmd_challenge.c index 6d9fd31..a9bb1b7 100644 --- a/src/hsm/cmd_challenge.c +++ b/src/hsm/cmd_challenge.c @@ -21,8 +21,7 @@ uint8_t challenge[256]; uint8_t challenge_len = 0; -int cmd_challenge() -{ +int cmd_challenge() { uint8_t *rb = (uint8_t *) random_bytes_get(apdu.ne); if (!rb) { return SW_WRONG_LENGTH(); diff --git a/src/hsm/cmd_change_pin.c b/src/hsm/cmd_change_pin.c index 4c84add..cff6b75 100644 --- a/src/hsm/cmd_change_pin.c +++ b/src/hsm/cmd_change_pin.c @@ -19,14 +19,14 @@ #include "sc_hsm.h" #include "kek.h" -int cmd_change_pin() -{ +int cmd_change_pin() { if (P1(apdu) == 0x0) { if (P2(apdu) == 0x81 || P2(apdu) == 0x88) { file_t *file_pin = NULL; if (P2(apdu) == 0x81) { file_pin = file_pin1; - } else if (P2(apdu) == 0x88) { + } + else if (P2(apdu) == 0x88) { file_pin = file_sopin; } if (!file_pin) { @@ -48,10 +48,11 @@ int cmd_change_pin() //encrypt MKEK with new pin if (P2(apdu) == 0x81) { - hash_multi(apdu.data+pin_len, apdu.nc-pin_len, session_pin); + hash_multi(apdu.data + pin_len, apdu.nc - pin_len, session_pin); has_session_pin = true; - } else if (P2(apdu) == 0x88) { - hash_multi(apdu.data+pin_len, apdu.nc-pin_len, session_sopin); + } + else if (P2(apdu) == 0x88) { + hash_multi(apdu.data + pin_len, apdu.nc - pin_len, session_sopin); has_session_sopin = true; } r = store_mkek(mkek); @@ -60,8 +61,8 @@ int cmd_change_pin() return SW_EXEC_ERROR(); } uint8_t dhash[33]; - dhash[0] = apdu.nc-pin_len; - double_hash_pin(apdu.data+pin_len, apdu.nc-pin_len, dhash+1); + dhash[0] = apdu.nc - pin_len; + double_hash_pin(apdu.data + pin_len, apdu.nc - pin_len, dhash + 1); flash_write_data_to_file(file_pin, dhash, sizeof(dhash)); low_flash_available(); return SW_OK(); diff --git a/src/hsm/cmd_cipher_sym.c b/src/hsm/cmd_cipher_sym.c index 6a46e75..9df60fc 100644 --- a/src/hsm/cmd_cipher_sym.c +++ b/src/hsm/cmd_cipher_sym.c @@ -38,8 +38,7 @@ static int pkcs5_parse_pbkdf2_params(const mbedtls_asn1_buf *params, mbedtls_asn1_buf *salt, int *iterations, - int *keylen, mbedtls_md_type_t *md_type) -{ + int *keylen, mbedtls_md_type_t *md_type) { int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; mbedtls_asn1_buf prf_alg_oid; unsigned char *p = params->p; @@ -107,8 +106,7 @@ int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, size_t shared_info_len, uint8_t *shared_info, size_t output_len, - uint8_t *output) -{ + uint8_t *output) { mbedtls_md_context_t md_ctx; const mbedtls_md_info_t *md_info = NULL; int hashlen = 0, exit_code = MBEDTLS_ERR_MD_BAD_INPUT_DATA; @@ -126,13 +124,13 @@ int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, return exit_code; } - if (input_len + shared_info_len + 4 >= (1ULL<<61)-1) { + if (input_len + shared_info_len + 4 >= (1ULL << 61) - 1) { return exit_code; } // keydatalen equals output_len hashlen = md_info->size; - if (output_len >= hashlen * ((1ULL<<32)-1)) { + if (output_len >= hashlen * ((1ULL << 32) - 1)) { return exit_code; } @@ -159,8 +157,7 @@ int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, return 0; } -int cmd_cipher_sym() -{ +int cmd_cipher_sym() { int key_id = P1(apdu); int algo = P2(apdu); if (!isUserAuthenticated) { @@ -191,7 +188,7 @@ int cmd_cipher_sym() uint8_t tmp_iv[IV_SIZE]; memset(tmp_iv, 0, sizeof(tmp_iv)); if (algo == ALGO_AES_CBC_ENCRYPT) { - int r = mbedtls_aes_setkey_enc(&aes, kdata, key_size*8); + int r = mbedtls_aes_setkey_enc(&aes, kdata, key_size * 8); if (r != 0) { mbedtls_platform_zeroize(kdata, sizeof(kdata)); mbedtls_aes_free(&aes); @@ -208,8 +205,9 @@ int cmd_cipher_sym() mbedtls_aes_free(&aes); return SW_EXEC_ERROR(); } - } else if (algo == ALGO_AES_CBC_DECRYPT) { - int r = mbedtls_aes_setkey_dec(&aes, kdata, key_size*8); + } + else if (algo == ALGO_AES_CBC_DECRYPT) { + int r = mbedtls_aes_setkey_dec(&aes, kdata, key_size * 8); if (r != 0) { mbedtls_platform_zeroize(kdata, sizeof(kdata)); mbedtls_aes_free(&aes); @@ -229,25 +227,30 @@ int cmd_cipher_sym() } res_APDU_size = apdu.nc; mbedtls_aes_free(&aes); - } else if (algo == ALGO_AES_CMAC) { + } + else if (algo == ALGO_AES_CMAC) { const mbedtls_cipher_info_t *cipher_info; if (key_size == 16) { cipher_info = mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_128_ECB); - } else if (key_size == 24) { + } + else if (key_size == 24) { cipher_info = mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_192_ECB); - } else if (key_size == 32) { + } + else if (key_size == 32) { cipher_info = mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB); - } else { + } + else { mbedtls_platform_zeroize(kdata, sizeof(kdata)); return SW_WRONG_DATA(); } - int r = mbedtls_cipher_cmac(cipher_info, kdata, key_size*8, apdu.data, apdu.nc, res_APDU); + int r = mbedtls_cipher_cmac(cipher_info, kdata, key_size * 8, apdu.data, apdu.nc, res_APDU); mbedtls_platform_zeroize(kdata, sizeof(kdata)); if (r != 0) { return SW_EXEC_ERROR(); } res_APDU_size = 16; - } else if (algo == ALGO_AES_DERIVE) { + } + else if (algo == ALGO_AES_DERIVE) { int r = mbedtls_hkdf(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), NULL, 0, @@ -262,7 +265,8 @@ int cmd_cipher_sym() return SW_EXEC_ERROR(); } res_APDU_size = apdu.nc; - } else if (algo == ALGO_EXT_CIPHER_ENCRYPT || algo == ALGO_EXT_CIPHER_DECRYPT) { + } + else if (algo == ALGO_EXT_CIPHER_ENCRYPT || algo == ALGO_EXT_CIPHER_DECRYPT) { size_t oid_len = 0, aad_len = 0, iv_len = 0, enc_len = 0; uint8_t *oid = NULL, *aad = NULL, *iv = NULL, *enc = NULL; if (!asn1_find_tag(apdu.data, apdu.nc, 0x6, &oid_len, @@ -292,7 +296,8 @@ int cmd_cipher_sym() enc, res_APDU, res_APDU + enc_len); - } else if (algo == ALGO_EXT_CIPHER_DECRYPT) { + } + else if (algo == ALGO_EXT_CIPHER_DECRYPT) { r = mbedtls_chachapoly_auth_decrypt(&ctx, enc_len - 16, iv ? iv : tmp_iv, @@ -309,20 +314,26 @@ int cmd_cipher_sym() } if (algo == ALGO_EXT_CIPHER_ENCRYPT) { res_APDU_size = enc_len + 16; - } else if (algo == ALGO_EXT_CIPHER_DECRYPT) { + } + else if (algo == ALGO_EXT_CIPHER_DECRYPT) { res_APDU_size = enc_len - 16; } - } else if (memcmp(oid, OID_DIGEST, 7) == 0) { + } + else if (memcmp(oid, OID_DIGEST, 7) == 0) { const mbedtls_md_info_t *md_info = NULL; if (memcmp(oid, OID_HMAC_SHA1, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1); - } else if (memcmp(oid, OID_HMAC_SHA224, oid_len) == 0) { + } + else if (memcmp(oid, OID_HMAC_SHA224, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA224); - } else if (memcmp(oid, OID_HMAC_SHA256, oid_len) == 0) { + } + else if (memcmp(oid, OID_HMAC_SHA256, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256); - } else if (memcmp(oid, OID_HMAC_SHA384, oid_len) == 0) { + } + else if (memcmp(oid, OID_HMAC_SHA384, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384); - } else if (memcmp(oid, OID_HMAC_SHA512, oid_len) == 0) { + } + else if (memcmp(oid, OID_HMAC_SHA512, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512); } if (md_info == NULL) { @@ -334,16 +345,19 @@ int cmd_cipher_sym() return SW_EXEC_ERROR(); } res_APDU_size = md_info->size; - } else if (memcmp(oid, OID_HKDF_SHA256, - oid_len) == 0 || - memcmp(oid, OID_HKDF_SHA384, - oid_len) == 0 || memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) { + } + else if (memcmp(oid, OID_HKDF_SHA256, + oid_len) == 0 || + memcmp(oid, OID_HKDF_SHA384, + oid_len) == 0 || memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) { const mbedtls_md_info_t *md_info = NULL; if (memcmp(oid, OID_HKDF_SHA256, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256); - } else if (memcmp(oid, OID_HKDF_SHA384, oid_len) == 0) { + } + else if (memcmp(oid, OID_HKDF_SHA384, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384); - } else if (memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) { + } + else if (memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) { md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512); } int r = mbedtls_hkdf(md_info, @@ -361,7 +375,8 @@ int cmd_cipher_sym() return SW_EXEC_ERROR(); } res_APDU_size = apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : mbedtls_md_get_size(md_info); - } else if (memcmp(oid, OID_PKCS5_PBKDF2, oid_len) == 0) { + } + else if (memcmp(oid, OID_PKCS5_PBKDF2, oid_len) == 0) { int iterations = 0, keylen = 0; mbedtls_asn1_buf salt, params = @@ -396,7 +411,8 @@ int cmd_cipher_sym() return SW_EXEC_ERROR(); } res_APDU_size = keylen ? keylen : (apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32); - } else if (memcmp(oid, OID_PKCS5_PBES2, oid_len) == 0) { + } + else if (memcmp(oid, OID_PKCS5_PBES2, oid_len) == 0) { mbedtls_asn1_buf params = { .p = aad, .len = aad_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) }; int r = mbedtls_pkcs5_pbes2(¶ms, @@ -411,17 +427,22 @@ int cmd_cipher_sym() return SW_WRONG_DATA(); } res_APDU_size = enc_len; - } else if (memcmp(oid, OID_KDF_X963, oid_len) == 0) { + } + else if (memcmp(oid, OID_KDF_X963, oid_len) == 0) { mbedtls_md_type_t md_type = MBEDTLS_MD_SHA1; if (memcmp(enc, OID_HMAC_SHA1, enc_len) == 0) { md_type = MBEDTLS_MD_SHA1; - } else if (memcmp(enc, OID_HMAC_SHA224, enc_len) == 0) { + } + else if (memcmp(enc, OID_HMAC_SHA224, enc_len) == 0) { md_type = MBEDTLS_MD_SHA224; - } else if (memcmp(enc, OID_HMAC_SHA256, enc_len) == 0) { + } + else if (memcmp(enc, OID_HMAC_SHA256, enc_len) == 0) { md_type = MBEDTLS_MD_SHA256; - } else if (memcmp(enc, OID_HMAC_SHA384, enc_len) == 0) { + } + else if (memcmp(enc, OID_HMAC_SHA384, enc_len) == 0) { md_type = MBEDTLS_MD_SHA384; - } else if (memcmp(enc, OID_HMAC_SHA512, enc_len) == 0) { + } + else if (memcmp(enc, OID_HMAC_SHA512, enc_len) == 0) { md_type = MBEDTLS_MD_SHA512; } int r = mbedtls_ansi_x936_kdf(md_type, @@ -437,7 +458,8 @@ int cmd_cipher_sym() } res_APDU_size = apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32; } - } else { + } + else { mbedtls_platform_zeroize(kdata, sizeof(kdata)); return SW_WRONG_P1P2(); } diff --git a/src/hsm/cmd_decrypt_asym.c b/src/hsm/cmd_decrypt_asym.c index 73ff62c..eb9a596 100644 --- a/src/hsm/cmd_decrypt_asym.c +++ b/src/hsm/cmd_decrypt_asym.c @@ -26,8 +26,7 @@ #include "random.h" #include "oid.h" -int cmd_decrypt_asym() -{ +int cmd_decrypt_asym() { int key_id = P1(apdu); uint8_t p2 = P2(apdu); if (!isUserAuthenticated) { @@ -59,7 +58,7 @@ int cmd_decrypt_asym() } int key_size = file_get_size(ef); if (apdu.nc < key_size) { //needs padding - memset(apdu.data+apdu.nc, 0, key_size-apdu.nc); + memset(apdu.data + apdu.nc, 0, key_size - apdu.nc); } if (p2 == ALGO_RSA_DECRYPT_PKCS1 || p2 == ALGO_RSA_DECRYPT_OEP) { size_t olen = apdu.nc; @@ -67,7 +66,8 @@ int cmd_decrypt_asym() if (r == 0) { res_APDU_size = olen; } - } else { + } + else { r = mbedtls_rsa_private(&ctx, random_gen, NULL, apdu.data, res_APDU); if (r == 0) { res_APDU_size = key_size; @@ -78,7 +78,8 @@ int cmd_decrypt_asym() return SW_EXEC_ERROR(); } mbedtls_rsa_free(&ctx); - } else if (p2 == ALGO_EC_DH || p2 == ALGO_EC_DH_XKEK) { + } + else if (p2 == ALGO_EC_DH || p2 == ALGO_EC_DH_XKEK) { mbedtls_ecdh_context ctx; if (wait_button_pressed() == true) { //timeout return SW_SECURE_MESSAGE_EXEC_ERROR(); @@ -101,7 +102,7 @@ int cmd_decrypt_asym() free(kdata); return SW_DATA_INVALID(); } - r = mbedtls_mpi_read_binary(&ctx.ctx.mbed_ecdh.d, kdata+1, key_size-1); + r = mbedtls_mpi_read_binary(&ctx.ctx.mbed_ecdh.d, kdata + 1, key_size - 1); mbedtls_platform_zeroize(kdata, key_size); free(kdata); if (r != 0) { @@ -110,15 +111,16 @@ int cmd_decrypt_asym() } r = -1; if (p2 == ALGO_EC_DH) { - r = mbedtls_ecdh_read_public(&ctx, apdu.data-1, apdu.nc+1); - } else if (p2 == ALGO_EC_DH_XKEK) { + r = mbedtls_ecdh_read_public(&ctx, apdu.data - 1, apdu.nc + 1); + } + else if (p2 == ALGO_EC_DH_XKEK) { size_t pub_len = 0; const uint8_t *pub = cvc_get_pub(apdu.data, apdu.nc, &pub_len); if (pub) { size_t t86_len = 0; const uint8_t *t86 = cvc_get_field(pub, pub_len, &t86_len, 0x86); if (t86) { - r = mbedtls_ecdh_read_public(&ctx, t86-1, t86_len+1); + r = mbedtls_ecdh_read_public(&ctx, t86 - 1, t86_len + 1); } } } @@ -136,7 +138,8 @@ int cmd_decrypt_asym() } if (p2 == ALGO_EC_DH) { res_APDU_size = olen; - } else { + } + else { res_APDU_size = 0; size_t ext_len = 0; const uint8_t *ext = NULL; @@ -167,11 +170,11 @@ int cmd_decrypt_asym() return SW_WRONG_DATA(); } for (int n = 0; n < MAX_KEY_DOMAINS; n++) { - file_t *tf = search_dynamic_file(EF_XKEK+n); + file_t *tf = search_dynamic_file(EF_XKEK + n); if (tf) { if (file_get_size(tf) == kdom_uid_len && memcmp(file_get_data(tf), kdom_uid, kdom_uid_len) == 0) { - file_new(EF_DKEK+n); + file_new(EF_DKEK + n); if (store_dkek_key(n, res_APDU) != CCID_OK) { return SW_EXEC_ERROR(); } @@ -181,7 +184,8 @@ int cmd_decrypt_asym() } return SW_REFERENCE_NOT_FOUND(); } - } else { + } + else { return SW_WRONG_P1P2(); } decrement_key_counter(ef); diff --git a/src/hsm/cmd_delete_file.c b/src/hsm/cmd_delete_file.c index 8659f48..90a9616 100644 --- a/src/hsm/cmd_delete_file.c +++ b/src/hsm/cmd_delete_file.c @@ -17,8 +17,7 @@ #include "sc_hsm.h" -int cmd_delete_file() -{ +int cmd_delete_file() { file_t *ef = NULL; if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); @@ -29,7 +28,8 @@ int cmd_delete_file() if (!(ef = search_dynamic_file(ef->fid))) { return SW_FILE_NOT_FOUND(); } - } else { + } + else { uint16_t fid = (apdu.data[0] << 8) | apdu.data[1]; if (!(ef = search_dynamic_file(fid))) { return SW_FILE_NOT_FOUND(); diff --git a/src/hsm/cmd_derive_asym.c b/src/hsm/cmd_derive_asym.c index 8bf604e..700a5f1 100644 --- a/src/hsm/cmd_derive_asym.c +++ b/src/hsm/cmd_derive_asym.c @@ -28,8 +28,7 @@ static inline int mbedtls_mpi_add_mod(const mbedtls_ecp_group *grp, mbedtls_mpi *X, const mbedtls_mpi *A, - const mbedtls_mpi *B) -{ + const mbedtls_mpi *B) { int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(X, A, B)); MOD_ADD(*X); @@ -37,8 +36,7 @@ cleanup: return ret; } -int cmd_derive_asym() -{ +int cmd_derive_asym() { uint8_t key_id = P1(apdu); uint8_t dest_id = P2(apdu); file_t *fkey; @@ -70,7 +68,7 @@ int cmd_derive_asym() mbedtls_mpi a, nd; mbedtls_mpi_init(&a); mbedtls_mpi_init(&nd); - r = mbedtls_mpi_read_binary(&a, apdu.data+1, apdu.nc-1); + r = mbedtls_mpi_read_binary(&a, apdu.data + 1, apdu.nc - 1); if (r != 0) { mbedtls_ecdsa_free(&ctx); mbedtls_mpi_free(&a); @@ -96,7 +94,8 @@ int cmd_derive_asym() return SW_EXEC_ERROR(); } mbedtls_ecdsa_free(&ctx); - } else { + } + else { return SW_WRONG_DATA(); } return SW_OK(); diff --git a/src/hsm/cmd_external_authenticate.c b/src/hsm/cmd_external_authenticate.c index 5bbccaa..0cf3795 100644 --- a/src/hsm/cmd_external_authenticate.c +++ b/src/hsm/cmd_external_authenticate.c @@ -24,8 +24,7 @@ extern file_t *ef_puk_aut; extern uint8_t challenge[256]; extern uint8_t challenge_len; -int cmd_external_authenticate() -{ +int cmd_external_authenticate() { if (P1(apdu) != 0x0 || P2(apdu) != 0x0) { return SW_INCORRECT_P1P2(); } @@ -40,10 +39,10 @@ int cmd_external_authenticate() return SW_FILE_NOT_FOUND(); } uint8_t *puk_data = file_get_data(ef_puk); - uint8_t *input = (uint8_t *) calloc(dev_name_len+challenge_len, sizeof(uint8_t)), hash[32]; + uint8_t *input = (uint8_t *) calloc(dev_name_len + challenge_len, sizeof(uint8_t)), hash[32]; memcpy(input, dev_name, dev_name_len); - memcpy(input+dev_name_len, challenge, challenge_len); - hash256(input, dev_name_len+challenge_len, hash); + memcpy(input + dev_name_len, challenge, challenge_len); + hash256(input, dev_name_len + challenge_len, hash); int r = puk_verify(apdu.data, apdu.nc, @@ -55,7 +54,7 @@ int cmd_external_authenticate() if (r != 0) { return SW_CONDITIONS_NOT_SATISFIED(); } - puk_status[ef_puk_aut->fid & (MAX_PUK-1)] = 1; + puk_status[ef_puk_aut->fid & (MAX_PUK - 1)] = 1; uint8_t auts = 0; for (int i = 0; i < puk_data[0]; i++) { auts += puk_status[i]; diff --git a/src/hsm/cmd_extras.c b/src/hsm/cmd_extras.c index b04d5f0..e0f26ba 100644 --- a/src/hsm/cmd_extras.c +++ b/src/hsm/cmd_extras.c @@ -27,8 +27,7 @@ #include "mbedtls/hkdf.h" #include "mbedtls/chachapoly.h" -int cmd_extras() -{ +int cmd_extras() { if (P1(apdu) == 0xA) { //datetime operations if (P2(apdu) != 0x0) { return SW_INCORRECT_P1P2(); @@ -48,7 +47,8 @@ int cmd_extras() res_APDU[res_APDU_size++] = dt.min; res_APDU[res_APDU_size++] = dt.sec; #endif - } else { + } + else { if (apdu.nc != 8) { return SW_WRONG_LENGTH(); } @@ -66,7 +66,8 @@ int cmd_extras() } #endif } - } else if (P1(apdu) == 0x6) { //dynamic options + } + else if (P1(apdu) == 0x6) { //dynamic options if (P2(apdu) != 0x0) { return SW_INCORRECT_P1P2(); } @@ -77,13 +78,15 @@ int cmd_extras() if (apdu.nc == 0) { res_APDU[res_APDU_size++] = opts >> 8; res_APDU[res_APDU_size++] = opts & 0xff; - } else { + } + else { uint8_t newopts[] = { apdu.data[0], (opts & 0xff) }; file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF); flash_write_data_to_file(tf, newopts, sizeof(newopts)); low_flash_available(); } - } else if (P1(apdu) == 0x3A) { // secure lock + } + else if (P1(apdu) == 0x3A) { // secure lock if (apdu.nc == 0) { return SW_WRONG_LENGTH(); } @@ -147,7 +150,8 @@ int cmd_extras() } mse.init = true; res_APDU_size = olen; - } else if (P2(apdu) == 0x02 || P2(apdu) == 0x03 || P2(apdu) == 0x04) { + } + else if (P2(apdu) == 0x02 || P2(apdu) == 0x03 || P2(apdu) == 0x04) { if (mse.init == false) { return SW_COMMAND_NOT_ALLOWED(); } @@ -162,7 +166,7 @@ int cmd_extras() if ((P2(apdu) == 0x02 && !(opts & HSM_OPT_SECURE_LOCK)) || (P2(apdu) == 0x04 && (opts & HSM_OPT_SECURE_LOCK))) { uint16_t tfids[] = { EF_MKEK, EF_MKEK_SO }; - for (int t = 0; t < sizeof(tfids)/sizeof(uint16_t); t++) { + for (int t = 0; t < sizeof(tfids) / sizeof(uint16_t); t++) { file_t *tf = search_by_fid(tfids[t], NULL, SPECIFY_EF); if (tf) { uint8_t *tmp = (uint8_t *) calloc(1, file_get_size(tf)); @@ -177,18 +181,21 @@ int cmd_extras() } if (P2(apdu) == 0x02) { newopts[0] |= HSM_OPT_SECURE_LOCK >> 8; - } else if (P2(apdu) == 0x04) { + } + else if (P2(apdu) == 0x04) { newopts[0] &= ~HSM_OPT_SECURE_LOCK >> 8; } file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF); flash_write_data_to_file(tf, newopts, sizeof(newopts)); low_flash_available(); - } else if (P2(apdu) == 0x03) { + } + else if (P2(apdu) == 0x03) { memcpy(mkek_mask, apdu.data, apdu.nc); has_mkek_mask = true; } } - } else { + } + else { return SW_INCORRECT_P1P2(); } return SW_OK(); diff --git a/src/hsm/cmd_general_authenticate.c b/src/hsm/cmd_general_authenticate.c index 7933fe5..af41cb0 100644 --- a/src/hsm/cmd_general_authenticate.c +++ b/src/hsm/cmd_general_authenticate.c @@ -24,8 +24,7 @@ #include "eac.h" #include "files.h" -int cmd_general_authenticate() -{ +int cmd_general_authenticate() { if (P1(apdu) == 0x0 && P2(apdu) == 0x0) { if (apdu.data[0] == 0x7C) { int r = 0; @@ -34,10 +33,10 @@ int cmd_general_authenticate() uint16_t tag = 0x0; uint8_t *tag_data = NULL, *p = NULL; size_t tag_len = 0; - while (walk_tlv(apdu.data+2, apdu.nc-2, &p, &tag, &tag_len, &tag_data)) { + while (walk_tlv(apdu.data + 2, apdu.nc - 2, &p, &tag, &tag_len, &tag_data)) { if (tag == 0x80) { - pubkey = tag_data-1; //mbedtls ecdh starts reading one pos before - pubkey_len = tag_len+1; + pubkey = tag_data - 1; //mbedtls ecdh starts reading one pos before + pubkey_len = tag_len + 1; } } file_t *fkey = search_by_fid(EF_KEY_DEV, NULL, SPECIFY_EF); @@ -86,24 +85,24 @@ int cmd_general_authenticate() sm_derive_all_keys(derived, olen); - uint8_t *t = (uint8_t *) calloc(1, pubkey_len+16); + uint8_t *t = (uint8_t *) calloc(1, pubkey_len + 16); memcpy(t, "\x7F\x49\x4F\x06\x0A", 5); if (sm_get_protocol() == MSE_AES) { - memcpy(t+5, OID_ID_CA_ECDH_AES_CBC_CMAC_128, 10); + memcpy(t + 5, OID_ID_CA_ECDH_AES_CBC_CMAC_128, 10); } t[15] = 0x86; - memcpy(t+16, pubkey, pubkey_len); + memcpy(t + 16, pubkey, pubkey_len); res_APDU[res_APDU_size++] = 0x7C; res_APDU[res_APDU_size++] = 20; res_APDU[res_APDU_size++] = 0x81; res_APDU[res_APDU_size++] = 8; - memcpy(res_APDU+res_APDU_size, sm_get_nonce(), 8); + memcpy(res_APDU + res_APDU_size, sm_get_nonce(), 8); res_APDU_size += 8; res_APDU[res_APDU_size++] = 0x82; res_APDU[res_APDU_size++] = 8; - r = sm_sign(t, pubkey_len+16, res_APDU+res_APDU_size); + r = sm_sign(t, pubkey_len + 16, res_APDU + res_APDU_size); free(t); if (r != CCID_OK) { diff --git a/src/hsm/cmd_initialize.c b/src/hsm/cmd_initialize.c index 9b1c6f2..ce10a72 100644 --- a/src/hsm/cmd_initialize.c +++ b/src/hsm/cmd_initialize.c @@ -27,20 +27,18 @@ extern void scan_all(); extern char __StackLimit; -int heapLeft() -{ +int heapLeft() { #ifndef ENABLE_EMULATION char *p = malloc(256); // try to avoid undue fragmentation int left = &__StackLimit - p; free(p); #else - int left = 1024*1024; + int left = 1024 * 1024; #endif return left; } -int cmd_initialize() -{ +int cmd_initialize() { if (apdu.nc > 0) { uint8_t mkek[MKEK_SIZE]; int ret_mkek = load_mkek(mkek); //Try loading MKEK with previous session @@ -54,25 +52,28 @@ int cmd_initialize() if (tag == 0x80) { //options file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF); flash_write_data_to_file(tf, tag_data, tag_len); - } else if (tag == 0x81) { //user pin + } + else if (tag == 0x81) { //user pin if (file_pin1 && file_pin1->data) { uint8_t dhash[33]; dhash[0] = tag_len; - double_hash_pin(tag_data, tag_len, dhash+1); + double_hash_pin(tag_data, tag_len, dhash + 1); flash_write_data_to_file(file_pin1, dhash, sizeof(dhash)); hash_multi(tag_data, tag_len, session_pin); has_session_pin = true; } - } else if (tag == 0x82) { //sopin pin + } + else if (tag == 0x82) { //sopin pin if (file_sopin && file_sopin->data) { uint8_t dhash[33]; dhash[0] = tag_len; - double_hash_pin(tag_data, tag_len, dhash+1); + double_hash_pin(tag_data, tag_len, dhash + 1); flash_write_data_to_file(file_sopin, dhash, sizeof(dhash)); hash_multi(tag_data, tag_len, session_sopin); has_session_sopin = true; } - } else if (tag == 0x91) { //retries user pin + } + else if (tag == 0x91) { //retries user pin file_t *tf = search_by_fid(0x1082, NULL, SPECIFY_EF); if (tf && tf->data) { flash_write_data_to_file(tf, tag_data, tag_len); @@ -80,7 +81,8 @@ int cmd_initialize() if (file_retries_pin1 && file_retries_pin1->data) { flash_write_data_to_file(file_retries_pin1, tag_data, tag_len); } - } else if (tag == 0x92) { + } + else if (tag == 0x92) { dkeks = tag_data; file_t *tf = file_new(EF_DKEK); if (!tf) { @@ -88,7 +90,8 @@ int cmd_initialize() return SW_MEMORY_FAILURE(); } flash_write_data_to_file(tf, NULL, 0); - } else if (tag == 0x93) { + } + else if (tag == 0x93) { file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF); if (!ef_puk) { release_mkek(mkek); @@ -101,14 +104,15 @@ int cmd_initialize() pk_status[2] = tag_data[1]; flash_write_data_to_file(ef_puk, pk_status, sizeof(pk_status)); for (int i = 0; i < puks; i++) { - file_t *tf = file_new(EF_PUK+i); + file_t *tf = file_new(EF_PUK + i); if (!tf) { release_mkek(mkek); return SW_MEMORY_FAILURE(); } flash_write_data_to_file(tf, NULL, 0); } - } else if (tag == 0x97) { + } + else if (tag == 0x97) { kds = tag_data; /* for (int i = 0; i < MIN(*kds,MAX_KEY_DOMAINS); i++) { @@ -139,7 +143,8 @@ int cmd_initialize() if (flash_write_data_to_file(tf_kd, (const uint8_t *) &d, sizeof(d)) != CCID_OK) { return SW_EXEC_ERROR(); } - } else { + } + else { int r = save_dkek_key(0, random_bytes_get(32)); if (r != CCID_OK) { return SW_EXEC_ERROR(); @@ -149,16 +154,17 @@ int cmd_initialize() return SW_EXEC_ERROR(); } } - } else { + } + else { uint16_t d = 0x0000; if (flash_write_data_to_file(tf_kd, (const uint8_t *) &d, sizeof(d)) != CCID_OK) { return SW_EXEC_ERROR(); } } if (kds) { - uint8_t t[MAX_KEY_DOMAINS*2], k = MIN(*kds, MAX_KEY_DOMAINS); - memset(t, 0xff, 2*k); - if (flash_write_data_to_file(tf_kd, t, 2*k) != CCID_OK) { + uint8_t t[MAX_KEY_DOMAINS * 2], k = MIN(*kds, MAX_KEY_DOMAINS); + memset(t, 0xff, 2 * k); + if (flash_write_data_to_file(tf_kd, t, 2 * k) != CCID_OK) { return SW_EXEC_ERROR(); } } @@ -215,7 +221,8 @@ int cmd_initialize() return SW_EXEC_ERROR(); } low_flash_available(); - } else { //free memory bytes request + } + else { //free memory bytes request int heap_left = heapLeft(); res_APDU[0] = ((heap_left >> 24) & 0xff); res_APDU[1] = ((heap_left >> 16) & 0xff); diff --git a/src/hsm/cmd_key_domain.c b/src/hsm/cmd_key_domain.c index aa28317..32ab0b1 100644 --- a/src/hsm/cmd_key_domain.c +++ b/src/hsm/cmd_key_domain.c @@ -21,8 +21,7 @@ #include "kek.h" #include "files.h" -uint8_t get_key_domain(file_t *fkey) -{ +uint8_t get_key_domain(file_t *fkey) { size_t tag_len = 0; const uint8_t *meta_tag = get_meta_tag(fkey, 0x92, &tag_len); if (meta_tag) { @@ -31,8 +30,7 @@ uint8_t get_key_domain(file_t *fkey) return 0xff; } -int cmd_key_domain() -{ +int cmd_key_domain() { //if (dkeks == 0) // return SW_COMMAND_NOT_ALLOWED(); uint8_t p1 = P1(apdu), p2 = P2(apdu); @@ -51,11 +49,11 @@ int cmd_key_domain() if (tf_kd_size == 0) { return SW_WRONG_P1P2(); } - uint8_t *kdata = file_get_data(tf_kd), dkeks = kdata ? kdata[2*p2] : 0, - current_dkeks = kdata ? kdata[2*p2+1] : 0; + uint8_t *kdata = file_get_data(tf_kd), dkeks = kdata ? kdata[2 * p2] : 0, + current_dkeks = kdata ? kdata[2 * p2 + 1] : 0; if (p1 == 0x0) { //dkek import if (apdu.nc > 0) { - file_t *tf = file_new(EF_DKEK+p2); + file_t *tf = file_new(EF_DKEK + p2); if (!tf) { return SW_MEMORY_FAILURE(); } @@ -73,23 +71,25 @@ int cmd_key_domain() return SW_FILE_NOT_FOUND(); } } - uint8_t t[MAX_KEY_DOMAINS*2]; + uint8_t t[MAX_KEY_DOMAINS * 2]; memcpy(t, kdata, tf_kd_size); - t[2*p2+1] = current_dkeks; + t[2 * p2 + 1] = current_dkeks; if (flash_write_data_to_file(tf_kd, t, tf_kd_size) != CCID_OK) { return SW_EXEC_ERROR(); } low_flash_available(); - } else { - file_t *tf = search_dynamic_file(EF_XKEK+p2); - if (2*p2 >= tf_kd_size) { + } + else { + file_t *tf = search_dynamic_file(EF_XKEK + p2); + if (2 * p2 >= tf_kd_size) { return SW_INCORRECT_P1P2(); } if (current_dkeks == 0xff && !tf) { //XKEK have always 0xff return SW_REFERENCE_NOT_FOUND(); } } - } else if (p1 == 0x1 || p1 == 0x3 || p1 == 0x4) { //key domain setup + } + else if (p1 == 0x1 || p1 == 0x3 || p1 == 0x4) { //key domain setup if (p1 == 0x1 && apdu.nc != 1) { return SW_WRONG_LENGTH(); } @@ -100,27 +100,29 @@ int cmd_key_domain() } } } - uint8_t t[MAX_KEY_DOMAINS*2]; + uint8_t t[MAX_KEY_DOMAINS * 2]; memcpy(t, kdata, tf_kd_size); if (p1 == 0x1) { - t[2*p2] = dkeks = apdu.data[0]; - t[2*p2+1] = current_dkeks = 0; - } else if (p1 == 0x3) { - t[2*p2] = dkeks = 0xff; - t[2*p2+1] = 0xff; - } else if (p1 == 0x4) { - t[2*p2+1] = current_dkeks = 0; + t[2 * p2] = dkeks = apdu.data[0]; + t[2 * p2 + 1] = current_dkeks = 0; + } + else if (p1 == 0x3) { + t[2 * p2] = dkeks = 0xff; + t[2 * p2 + 1] = 0xff; + } + else if (p1 == 0x4) { + t[2 * p2 + 1] = current_dkeks = 0; } if (flash_write_data_to_file(tf_kd, t, tf_kd_size) != CCID_OK) { return SW_EXEC_ERROR(); } file_t *tf = NULL; - if ((tf = search_dynamic_file(EF_DKEK+p2))) { + if ((tf = search_dynamic_file(EF_DKEK + p2))) { if (delete_file(tf) != CCID_OK) { return SW_EXEC_ERROR(); } } - if (p1 == 0x3 && (tf = search_dynamic_file(EF_XKEK+p2))) { + if (p1 == 0x3 && (tf = search_dynamic_file(EF_XKEK + p2))) { if (delete_file(tf) != CCID_OK) { return SW_EXEC_ERROR(); } @@ -129,7 +131,8 @@ int cmd_key_domain() if (p1 == 0x3) { return SW_REFERENCE_NOT_FOUND(); } - } else if (p1 == 0x2) { //XKEK Key Domain creation + } + else if (p1 == 0x2) { //XKEK Key Domain creation if (apdu.nc > 0) { size_t pub_len = 0; file_t *fterm = search_by_fid(EF_TERMCA, NULL, SPECIFY_EF); @@ -150,16 +153,16 @@ int cmd_key_domain() if (!t54) { return SW_WRONG_DATA(); } - uint8_t hash[32], *input = (uint8_t *) calloc(1, (t86_len-1)/2+1); + uint8_t hash[32], *input = (uint8_t *) calloc(1, (t86_len - 1) / 2 + 1); input[0] = 0x54; - memcpy(input+1, t86+1, (t86_len-1)/2); - hash256(input, (t86_len-1)/2+1, hash); + memcpy(input + 1, t86 + 1, (t86_len - 1) / 2); + hash256(input, (t86_len - 1) / 2 + 1, hash); free(input); int r = puk_verify(t54, t54_len, hash, 32, apdu.data, apdu.nc); if (r != 0) { return SW_CONDITIONS_NOT_SATISFIED(); } - file_t *tf = file_new(EF_XKEK+p2); + file_t *tf = file_new(EF_XKEK + p2); if (!tf) { return SW_MEMORY_FAILURE(); } @@ -170,22 +173,23 @@ int cmd_key_domain() size_t t86_len = 0; const uint8_t *t86 = cvc_get_field(pub, pub_len, &t86_len, 0x86); if (t86) { - flash_write_data_to_file(tf, t86+1, t86_len-1); + flash_write_data_to_file(tf, t86 + 1, t86_len - 1); low_flash_available(); } } } - } else { + } + else { return SW_INCORRECT_P1P2(); } memset(res_APDU, 0, 10); res_APDU[0] = dkeks; - res_APDU[1] = dkeks > current_dkeks ? dkeks-current_dkeks : 0; - dkek_kcv(p2, res_APDU+2); - res_APDU_size = 2+8; - file_t *tf = search_dynamic_file(EF_XKEK+p2); + res_APDU[1] = dkeks > current_dkeks ? dkeks - current_dkeks : 0; + dkek_kcv(p2, res_APDU + 2); + res_APDU_size = 2 + 8; + file_t *tf = search_dynamic_file(EF_XKEK + p2); if (tf) { - memcpy(res_APDU+10, file_get_data(tf), file_get_size(tf)); + memcpy(res_APDU + 10, file_get_data(tf), file_get_size(tf)); res_APDU_size += file_get_size(tf); } return SW_OK(); diff --git a/src/hsm/cmd_key_gen.c b/src/hsm/cmd_key_gen.c index 9551895..aa7c4a0 100644 --- a/src/hsm/cmd_key_gen.c +++ b/src/hsm/cmd_key_gen.c @@ -19,8 +19,7 @@ #include "sc_hsm.h" #include "random.h" -int cmd_key_gen() -{ +int cmd_key_gen() { uint8_t key_id = P1(apdu); uint8_t p2 = P2(apdu); uint8_t key_size = 32; @@ -30,9 +29,11 @@ int cmd_key_gen() } if (p2 == 0xB2) { key_size = 32; - } else if (p2 == 0xB1) { + } + else if (p2 == 0xB1) { key_size = 24; - } else if (p2 == 0xB0) { + } + else if (p2 == 0xB0) { key_size = 16; } //at this moment, we do not use the template, as only CBC is supported by the driver (encrypt, decrypt and CMAC) @@ -41,9 +42,11 @@ int cmd_key_gen() int aes_type = 0x0; if (key_size == 16) { aes_type = HSM_KEY_AES_128; - } else if (key_size == 24) { + } + else if (key_size == 24) { aes_type = HSM_KEY_AES_192; - } else if (key_size == 32) { + } + else if (key_size == 32) { aes_type = HSM_KEY_AES_256; } r = store_keys(aes_key, aes_type, key_id); diff --git a/src/hsm/cmd_key_unwrap.c b/src/hsm/cmd_key_unwrap.c index 82167a5..e67e36d 100644 --- a/src/hsm/cmd_key_unwrap.c +++ b/src/hsm/cmd_key_unwrap.c @@ -20,8 +20,7 @@ #include "kek.h" #include "cvc.h" -int cmd_key_unwrap() -{ +int cmd_key_unwrap() { int key_id = P1(apdu), r = 0; if (P2(apdu) != 0x93) { return SW_WRONG_P1P2(); @@ -54,7 +53,8 @@ int cmd_key_unwrap() if (r != CCID_OK) { return SW_EXEC_ERROR(); } - } else if (key_type == HSM_KEY_EC) { + } + else if (key_type == HSM_KEY_EC) { mbedtls_ecdsa_context ctx; mbedtls_ecdsa_init(&ctx); do { @@ -73,7 +73,8 @@ int cmd_key_unwrap() if (r != CCID_OK) { return SW_EXEC_ERROR(); } - } else if (key_type == HSM_KEY_AES) { + } + else if (key_type == HSM_KEY_AES) { uint8_t aes_key[32]; int key_size = 0, aes_type = 0; do { @@ -90,11 +91,14 @@ int cmd_key_unwrap() } if (key_size == 32) { aes_type = HSM_KEY_AES_256; - } else if (key_size == 24) { + } + else if (key_size == 24) { aes_type = HSM_KEY_AES_192; - } else if (key_size == 16) { + } + else if (key_size == 16) { aes_type = HSM_KEY_AES_128; - } else { + } + else { return SW_EXEC_ERROR(); } r = store_keys(aes_key, aes_type, key_id); @@ -103,7 +107,7 @@ int cmd_key_unwrap() } } if ((allowed != NULL && allowed_len > 0) || kdom >= 0) { - size_t meta_len = (allowed_len > 0 ? 2+allowed_len : 0) + (kdom >= 0 ? 3 : 0); + size_t meta_len = (allowed_len > 0 ? 2 + allowed_len : 0) + (kdom >= 0 ? 3 : 0); uint8_t *meta = (uint8_t *) calloc(1, meta_len), *m = meta; if (allowed_len > 0) { *m++ = 0x91; diff --git a/src/hsm/cmd_key_wrap.c b/src/hsm/cmd_key_wrap.c index 3c90e5b..86b2c3d 100644 --- a/src/hsm/cmd_key_wrap.c +++ b/src/hsm/cmd_key_wrap.c @@ -22,8 +22,7 @@ extern uint8_t get_key_domain(file_t *fkey); -int cmd_key_wrap() -{ +int cmd_key_wrap() { int key_id = P1(apdu), r = 0; if (P2(apdu) != 0x92) { return SW_WRONG_P1P2(); @@ -61,7 +60,8 @@ int cmd_key_wrap() } r = dkek_encode_key(kdom, &ctx, HSM_KEY_RSA, res_APDU, &wrap_len, meta_tag, tag_len); mbedtls_rsa_free(&ctx); - } else if (*dprkd == P15_KEYTYPE_ECC) { + } + else if (*dprkd == P15_KEYTYPE_ECC) { mbedtls_ecdsa_context ctx; mbedtls_ecdsa_init(&ctx); r = load_private_key_ecdsa(&ctx, ef); @@ -74,7 +74,8 @@ int cmd_key_wrap() } r = dkek_encode_key(kdom, &ctx, HSM_KEY_EC, res_APDU, &wrap_len, meta_tag, tag_len); mbedtls_ecdsa_free(&ctx); - } else if (*dprkd == P15_KEYTYPE_AES) { + } + else if (*dprkd == P15_KEYTYPE_AES) { uint8_t kdata[32]; //maximum AES key size if (wait_button_pressed() == true) { //timeout return SW_SECURE_MESSAGE_EXEC_ERROR(); @@ -87,9 +88,11 @@ int cmd_key_wrap() } if (key_size == 32) { aes_type = HSM_KEY_AES_256; - } else if (key_size == 24) { + } + else if (key_size == 24) { aes_type = HSM_KEY_AES_192; - } else if (key_size == 16) { + } + else if (key_size == 16) { aes_type = HSM_KEY_AES_128; } r = dkek_encode_key(kdom, kdata, aes_type, res_APDU, &wrap_len, meta_tag, tag_len); diff --git a/src/hsm/cmd_keypair_gen.c b/src/hsm/cmd_keypair_gen.c index 8422868..638b950 100644 --- a/src/hsm/cmd_keypair_gen.c +++ b/src/hsm/cmd_keypair_gen.c @@ -24,8 +24,7 @@ #include "random.h" #include "kek.h" -int cmd_keypair_gen() -{ +int cmd_keypair_gen() { uint8_t key_id = P1(apdu); if (!isUserAuthenticated) { return SW_SECURITY_STATUS_NOT_SATISFIED(); @@ -79,7 +78,8 @@ int cmd_keypair_gen() return SW_EXEC_ERROR(); } mbedtls_rsa_free(&rsa); - } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, MIN(oid_len, 10)) == 0) { //ECC + } + else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, MIN(oid_len, 10)) == 0) { //ECC size_t prime_len; uint8_t *prime = NULL; if (asn1_find_tag(p, tout, 0x81, &prime_len, &prime) != true) { @@ -112,15 +112,16 @@ int cmd_keypair_gen() if (p92[0] > MAX_KEY_DOMAINS) { return SW_WRONG_DATA(); } - file_t *tf_xkek = search_dynamic_file(EF_XKEK+p92[0]); + file_t *tf_xkek = search_dynamic_file(EF_XKEK + p92[0]); if (!tf_xkek) { return SW_WRONG_DATA(); } - ext_len = 2+2+strlen(OID_ID_KEY_DOMAIN_UID)+2+file_get_size(tf_xkek); + ext_len = 2 + 2 + strlen(OID_ID_KEY_DOMAIN_UID) + 2 + file_get_size( + tf_xkek); ext = (uint8_t *) calloc(1, ext_len); uint8_t *pe = ext; *pe++ = 0x73; - *pe++ = ext_len-2; + *pe++ = ext_len - 2; *pe++ = 0x6; *pe++ = strlen(OID_ID_KEY_DOMAIN_UID); memcpy(pe, OID_ID_KEY_DOMAIN_UID, strlen(OID_ID_KEY_DOMAIN_UID)); @@ -150,7 +151,8 @@ int cmd_keypair_gen() } } - } else { + } + else { return SW_WRONG_DATA(); } if (find_and_store_meta_key(key_id) != CCID_OK) { diff --git a/src/hsm/cmd_list_keys.c b/src/hsm/cmd_list_keys.c index 41f9169..ef92c6f 100644 --- a/src/hsm/cmd_list_keys.c +++ b/src/hsm/cmd_list_keys.c @@ -18,8 +18,7 @@ #include "sc_hsm.h" #include "files.h" -int cmd_list_keys() -{ +int cmd_list_keys() { /* First we send DEV private key */ /* Both below conditions should be always TRUE */ if (search_by_fid(EF_PRKD_DEV, NULL, SPECIFY_EF)) { diff --git a/src/hsm/cmd_mse.c b/src/hsm/cmd_mse.c index 501b0ec..700f224 100644 --- a/src/hsm/cmd_mse.c +++ b/src/hsm/cmd_mse.c @@ -24,8 +24,7 @@ file_t *ef_puk_aut = NULL; -int cmd_mse() -{ +int cmd_mse() { int p1 = P1(apdu); int p2 = P2(apdu); if (p2 != 0xA4 && p2 != 0xA6 && p2 != 0xAA && p2 != 0xB4 && p2 != 0xB6 && p2 != 0xB8) { @@ -43,17 +42,20 @@ int cmd_mse() sm_set_protocol(MSE_AES); } } - } else if (tag == 0x83) { + } + else if (tag == 0x83) { if (tag_len == 1) { - } else { + } + else { if (p2 == 0xB6) { if (puk_store_select_chr(tag_data) == CCID_OK) { return SW_OK(); } - } else if (p2 == 0xA4) { /* Aut */ + } + else if (p2 == 0xA4) { /* Aut */ for (int i = 0; i < MAX_PUK; i++) { - file_t *ef = search_dynamic_file(EF_PUK+i); + file_t *ef = search_dynamic_file(EF_PUK + i); if (!ef) { break; } @@ -74,7 +76,8 @@ int cmd_mse() } } } - } else { + } + else { return SW_INCORRECT_P1P2(); } return SW_OK(); diff --git a/src/hsm/cmd_pso.c b/src/hsm/cmd_pso.c index f1f0d3e..e06a3dd 100644 --- a/src/hsm/cmd_pso.c +++ b/src/hsm/cmd_pso.c @@ -23,8 +23,7 @@ extern int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy); extern PUK *current_puk; -int cmd_pso() -{ +int cmd_pso() { uint8_t p1 = P1(apdu), p2 = P2(apdu); if (p1 == 0x0 && (p2 == 0x92 || p2 == 0xAE || p2 == 0xBE)) { /* Verify certificate */ if (apdu.nc == 0) { @@ -34,17 +33,18 @@ int cmd_pso() return SW_REFERENCE_NOT_FOUND(); } if (apdu.data[0] != 0x7F || apdu.data[1] != 0x21) { - uint8_t tlv_len = 2+format_tlv_len(apdu.nc, NULL); - memmove(apdu.data+tlv_len, apdu.data, apdu.nc); + uint8_t tlv_len = 2 + format_tlv_len(apdu.nc, NULL); + memmove(apdu.data + tlv_len, apdu.data, apdu.nc); memcpy(apdu.data, "\x7F\x21", 2); - format_tlv_len(apdu.nc, apdu.data+2); + format_tlv_len(apdu.nc, apdu.data + 2); apdu.nc += tlv_len; } int r = cvc_verify(apdu.data, apdu.nc, current_puk->cvcert, current_puk->cvcert_len); if (r != CCID_OK) { if (r == CCID_WRONG_DATA) { return SW_DATA_INVALID(); - } else if (r == CCID_WRONG_SIGNATURE) { + } + else if (r == CCID_WRONG_SIGNATURE) { return SW_CONDITIONS_NOT_SATISFIED(); } return SW_EXEC_ERROR(); @@ -80,7 +80,8 @@ int cmd_pso() if (!puk_bin) { return SW_WRONG_DATA(); } - } else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC + } + else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC mbedtls_ecp_group_id ec_id = cvc_inherite_ec_group(apdu.data, apdu.nc); mbedtls_ecp_group grp; mbedtls_ecp_group_init(&grp); @@ -98,22 +99,25 @@ int cmd_pso() } puk_bin = t86; puk_bin_len = t86_len; - } else if (mbedtls_ecp_get_type(&grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) { + } + else if (mbedtls_ecp_get_type(&grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) { if (t86[0] == 0x2 || t86[0] == 0x3) { - if (t86_len != plen+1) { + if (t86_len != plen + 1) { mbedtls_ecp_group_free(&grp); return SW_WRONG_DATA(); } - } else if (t86[0] == 0x4) { - if (t86_len != 2*plen+1) { + } + else if (t86[0] == 0x4) { + if (t86_len != 2 * plen + 1) { mbedtls_ecp_group_free(&grp); return SW_WRONG_DATA(); } - } else { + } + else { mbedtls_ecp_group_free(&grp); return SW_WRONG_DATA(); } - puk_bin = t86+1; + puk_bin = t86 + 1; puk_bin_len = plen; } mbedtls_ecp_group_free(&grp); @@ -150,7 +154,8 @@ int cmd_pso() } } return SW_OK(); - } else { + } + else { return SW_INCORRECT_P1P2(); } return SW_OK(); diff --git a/src/hsm/cmd_puk_auth.c b/src/hsm/cmd_puk_auth.c index 6240acc..da8c89f 100644 --- a/src/hsm/cmd_puk_auth.c +++ b/src/hsm/cmd_puk_auth.c @@ -19,8 +19,7 @@ #include "files.h" #include "cvc.h" -int cmd_puk_auth() -{ +int cmd_puk_auth() { uint8_t p1 = P1(apdu), p2 = P2(apdu); file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF); if (!file_has_data(ef_puk)) { @@ -35,7 +34,7 @@ int cmd_puk_auth() return SW_INCORRECT_P1P2(); } for (int i = 0; i < puk_data[0]; i++) { - ef = search_dynamic_file(EF_PUK+i); + ef = search_dynamic_file(EF_PUK + i); if (!ef) { /* Never should not happen */ return SW_MEMORY_FAILURE(); } @@ -45,22 +44,24 @@ int cmd_puk_auth() } uint8_t *tmp = (uint8_t *) calloc(file_get_size(ef_puk), sizeof(uint8_t)); memcpy(tmp, puk_data, file_get_size(ef_puk)); - tmp[1] = puk_data[1]-1; + tmp[1] = puk_data[1] - 1; flash_write_data_to_file(ef_puk, tmp, file_get_size(ef_puk)); puk_data = file_get_data(ef_puk); free(tmp); - } else if (p1 == 0x1) { /* Replace */ + } + else if (p1 == 0x1) { /* Replace */ if (p2 >= puk_data[0]) { return SW_INCORRECT_P1P2(); } - ef = search_dynamic_file(EF_PUK+p2); + ef = search_dynamic_file(EF_PUK + p2); if (!ef) { /* Never should not happen */ return SW_MEMORY_FAILURE(); } } flash_write_data_to_file(ef, apdu.data, apdu.nc); low_flash_available(); - } else { + } + else { return SW_INCORRECT_P1P2(); } } @@ -68,7 +69,7 @@ int cmd_puk_auth() if (p2 >= puk_data[0]) { return SW_INCORRECT_P1P2(); } - file_t *ef = search_dynamic_file(EF_PUK+p2); + file_t *ef = search_dynamic_file(EF_PUK + p2); if (!ef) { return SW_INCORRECT_P1P2(); } @@ -82,7 +83,8 @@ int cmd_puk_auth() res_APDU_size = chr_len; } return set_res_sw(0x90, puk_status[p2]); - } else { + } + else { memcpy(res_APDU, puk_data, 3); res_APDU[3] = 0; for (int i = 0; i < puk_data[0]; i++) { diff --git a/src/hsm/cmd_read_binary.c b/src/hsm/cmd_read_binary.c index d6d6bd9..9b3738f 100644 --- a/src/hsm/cmd_read_binary.c +++ b/src/hsm/cmd_read_binary.c @@ -17,8 +17,7 @@ #include "sc_hsm.h" -int cmd_read_binary() -{ +int cmd_read_binary() { uint16_t fid = 0x0; uint32_t offset = 0; uint8_t ins = INS(apdu), p1 = P1(apdu), p2 = P2(apdu); @@ -26,26 +25,30 @@ int cmd_read_binary() if ((ins & 0x1) == 0) { if ((p1 & 0x80) != 0) { - if (!(ef = search_by_fid(p1&0x1f, NULL, SPECIFY_EF))) { + if (!(ef = search_by_fid(p1 & 0x1f, NULL, SPECIFY_EF))) { return SW_FILE_NOT_FOUND(); } offset = p2; - } else { + } + else { offset = make_uint16_t(p1, p2) & 0x7fff; ef = currentEF; } - } else { + } + else { if (p1 == 0 && (p2 & 0xE0) == 0 && (p2 & 0x1f) != 0 && (p2 & 0x1f) != 0x1f) { - if (!(ef = search_by_fid(p2&0x1f, NULL, SPECIFY_EF))) { + if (!(ef = search_by_fid(p2 & 0x1f, NULL, SPECIFY_EF))) { return SW_FILE_NOT_FOUND(); } - } else { + } + else { uint16_t file_id = make_uint16_t(p1, p2); // & 0x7fff; if (file_id == 0x0) { ef = currentEF; - } else if (!(ef = - search_by_fid(file_id, NULL, - SPECIFY_EF)) && !(ef = search_dynamic_file(file_id))) { + } + else if (!(ef = + search_by_fid(file_id, NULL, + SPECIFY_EF)) && !(ef = search_dynamic_file(file_id))) { return SW_FILE_NOT_FOUND(); } @@ -55,7 +58,7 @@ int cmd_read_binary() offset = 0; for (int d = 0; d < apdu.data[1]; d++) { - offset |= apdu.data[2+d]<<(apdu.data[1]-1-d)*8; + offset |= apdu.data[2 + d] << (apdu.data[1] - 1 - d) * 8; } } } @@ -69,27 +72,28 @@ int cmd_read_binary() if (offset > data_len) { return SW_WRONG_P1P2(); } - uint16_t maxle = data_len-offset; + uint16_t maxle = data_len - offset; if (apdu.ne > maxle) { apdu.ne = maxle; } if (offset) { - memmove(res_APDU, res_APDU+offset, res_APDU_size-offset); + memmove(res_APDU, res_APDU + offset, res_APDU_size - offset); //res_APDU += offset; res_APDU_size -= offset; } - } else { + } + else { uint16_t data_len = file_get_size(ef); if (offset > data_len) { return SW_WRONG_P1P2(); } - uint16_t maxle = data_len-offset; + uint16_t maxle = data_len - offset; if (apdu.ne > maxle) { apdu.ne = maxle; } - memcpy(res_APDU, file_get_data(ef)+offset, data_len-offset); - res_APDU_size = data_len-offset; + memcpy(res_APDU, file_get_data(ef) + offset, data_len - offset); + res_APDU_size = data_len - offset; } } diff --git a/src/hsm/cmd_reset_retry.c b/src/hsm/cmd_reset_retry.c index 72d89f2..0522fda 100644 --- a/src/hsm/cmd_reset_retry.c +++ b/src/hsm/cmd_reset_retry.c @@ -19,8 +19,7 @@ #include "sc_hsm.h" #include "kek.h" -int cmd_reset_retry() -{ +int cmd_reset_retry() { if (P2(apdu) != 0x81) { return SW_REFERENCE_NOT_FOUND(); } @@ -44,10 +43,11 @@ int cmd_reset_retry() if (r != 0x9000) { return r; } - newpin_len = apdu.nc-8; + newpin_len = apdu.nc - 8; has_session_sopin = true; hash_multi(apdu.data, 8, session_sopin); - } else if (P1(apdu) == 0x2) { + } + else if (P1(apdu) == 0x2) { if (!has_session_sopin) { return SW_CONDITIONS_NOT_SATISFIED(); } @@ -58,7 +58,7 @@ int cmd_reset_retry() } uint8_t dhash[33]; dhash[0] = newpin_len; - double_hash_pin(apdu.data+(apdu.nc-newpin_len), newpin_len, dhash+1); + double_hash_pin(apdu.data + (apdu.nc - newpin_len), newpin_len, dhash + 1); flash_write_data_to_file(file_pin1, dhash, sizeof(dhash)); if (pin_reset_retries(file_pin1, true) != CCID_OK) { return SW_MEMORY_FAILURE(); @@ -68,7 +68,7 @@ int cmd_reset_retry() if (r != CCID_OK) { return SW_EXEC_ERROR(); } - hash_multi(apdu.data+(apdu.nc-newpin_len), newpin_len, session_pin); + hash_multi(apdu.data + (apdu.nc - newpin_len), newpin_len, session_pin); has_session_pin = true; r = store_mkek(mkek); release_mkek(mkek); @@ -77,7 +77,8 @@ int cmd_reset_retry() } low_flash_available(); return SW_OK(); - } else if (P1(apdu) == 0x1 || P1(apdu) == 0x3) { + } + else if (P1(apdu) == 0x1 || P1(apdu) == 0x3) { if (!(opts & HSM_OPT_RRC_RESET_ONLY)) { return SW_COMMAND_NOT_ALLOWED(); } @@ -91,7 +92,8 @@ int cmd_reset_retry() } has_session_sopin = true; hash_multi(apdu.data, 8, session_sopin); - } else if (P1(apdu) == 0x3) { + } + else if (P1(apdu) == 0x3) { if (!has_session_sopin) { return SW_CONDITIONS_NOT_SATISFIED(); } diff --git a/src/hsm/cmd_select.c b/src/hsm/cmd_select.c index 9df87e6..6353466 100644 --- a/src/hsm/cmd_select.c +++ b/src/hsm/cmd_select.c @@ -18,15 +18,16 @@ #include "sc_hsm.h" #include "version.h" -void select_file(file_t *pe) -{ +void select_file(file_t *pe) { if (!pe) { currentDF = (file_t *) MF; currentEF = NULL; - } else if (pe->type & FILE_TYPE_INTERNAL_EF) { + } + else if (pe->type & FILE_TYPE_INTERNAL_EF) { currentEF = pe; currentDF = &file_entries[pe->parent]; - } else { + } + else { currentDF = pe; } if (currentEF == file_openpgp || currentEF == file_sc_hsm) { @@ -35,8 +36,7 @@ void select_file(file_t *pe) } } -int cmd_select() -{ +int cmd_select() { uint8_t p1 = P1(apdu); uint8_t p2 = P2(apdu); file_t *pe = NULL; @@ -72,35 +72,42 @@ int cmd_select() if (apdu.nc == 0) { pe = (file_t *) MF; //ac_fini(); - } else if (apdu.nc == 2) { + } + else if (apdu.nc == 2) { if (!(pe = search_by_fid(fid, NULL, SPECIFY_ANY))) { return SW_FILE_NOT_FOUND(); } } - } else if (p1 == 0x01) { //Select child DF - DF identifier + } + else if (p1 == 0x01) { //Select child DF - DF identifier if (!(pe = search_by_fid(fid, currentDF, SPECIFY_DF))) { return SW_FILE_NOT_FOUND(); } - } else if (p1 == 0x02) { //Select EF under the current DF - EF identifier + } + else if (p1 == 0x02) { //Select EF under the current DF - EF identifier if (!(pe = search_by_fid(fid, currentDF, SPECIFY_EF))) { return SW_FILE_NOT_FOUND(); } - } else if (p1 == 0x03) { //Select parent DF of the current DF - Absent + } + else if (p1 == 0x03) { //Select parent DF of the current DF - Absent if (apdu.nc != 0) { return SW_FILE_NOT_FOUND(); } - } else if (p1 == 0x04) { //Select by DF name - e.g., [truncated] application identifier + } + else if (p1 == 0x04) { //Select by DF name - e.g., [truncated] application identifier if (!(pe = search_by_name(apdu.data, apdu.nc))) { return SW_FILE_NOT_FOUND(); } if (card_terminated) { return set_res_sw(0x62, 0x85); } - } else if (p1 == 0x08) { //Select from the MF - Path without the MF identifier + } + else if (p1 == 0x08) { //Select from the MF - Path without the MF identifier if (!(pe = search_by_path(apdu.data, apdu.nc, MF))) { return SW_FILE_NOT_FOUND(); } - } else if (p1 == 0x09) { //Select from the current DF - Path without the current DF identifier + } + else if (p1 == 0x09) { //Select from the current DF - Path without the current DF identifier if (!(pe = search_by_path(apdu.data, apdu.nc, currentDF))) { return SW_FILE_NOT_FOUND(); } @@ -117,9 +124,10 @@ int cmd_select() res_APDU[res_APDU_size++] = 0xFF; res_APDU[res_APDU_size++] = HSM_VERSION_MAJOR; res_APDU[res_APDU_size++] = HSM_VERSION_MINOR; - res_APDU[1] = res_APDU_size-2; + res_APDU[1] = res_APDU_size - 2; } - } else { + } + else { return SW_INCORRECT_P1P2(); } select_file(pe); diff --git a/src/hsm/cmd_session_pin.c b/src/hsm/cmd_session_pin.c index 573a252..8209186 100644 --- a/src/hsm/cmd_session_pin.c +++ b/src/hsm/cmd_session_pin.c @@ -19,8 +19,7 @@ #include "random.h" #include "eac.h" -int cmd_session_pin() -{ +int cmd_session_pin() { if (P1(apdu) == 0x01 && P2(apdu) == 0x81) { memcpy(sm_session_pin, random_bytes_get(8), 8); sm_session_pin_len = 8; @@ -28,7 +27,8 @@ int cmd_session_pin() memcpy(res_APDU, sm_session_pin, sm_session_pin_len); res_APDU_size = sm_session_pin_len; apdu.ne = sm_session_pin_len; - } else { + } + else { return SW_INCORRECT_P1P2(); } return SW_OK(); diff --git a/src/hsm/cmd_signature.c b/src/hsm/cmd_signature.c index 8a94b0a..044e747 100644 --- a/src/hsm/cmd_signature.c +++ b/src/hsm/cmd_signature.c @@ -70,8 +70,7 @@ int pkcs1_strip_digest_info_prefix(mbedtls_md_type_t *algorithm, const uint8_t *in_dat, size_t in_len, uint8_t *out_dat, - size_t *out_len) -{ + size_t *out_len) { for (int i = 0; digest_info_prefix[i].algorithm != 0; i++) { size_t hdr_len = digest_info_prefix[i].hdr_len, hash_len = digest_info_prefix[i].hash_len; const uint8_t *hdr = digest_info_prefix[i].hdr; @@ -94,8 +93,7 @@ int pkcs1_strip_digest_info_prefix(mbedtls_md_type_t *algorithm, } //----- -int cmd_signature() -{ +int cmd_signature() { uint8_t key_id = P1(apdu); uint8_t p2 = P2(apdu); mbedtls_md_type_t md = MBEDTLS_MD_NONE; @@ -115,13 +113,17 @@ int cmd_signature() int key_size = file_get_size(fkey); if (p2 == ALGO_RSA_PKCS1_SHA1 || p2 == ALGO_RSA_PSS_SHA1 || p2 == ALGO_EC_SHA1) { md = MBEDTLS_MD_SHA1; - } else if (p2 == ALGO_RSA_PKCS1_SHA256 || p2 == ALGO_RSA_PSS_SHA256 || p2 == ALGO_EC_SHA256) { + } + else if (p2 == ALGO_RSA_PKCS1_SHA256 || p2 == ALGO_RSA_PSS_SHA256 || p2 == ALGO_EC_SHA256) { md = MBEDTLS_MD_SHA256; - } else if (p2 == ALGO_EC_SHA224 || p2 == ALGO_RSA_PKCS1_SHA224 || p2 == ALGO_RSA_PSS_SHA224) { + } + else if (p2 == ALGO_EC_SHA224 || p2 == ALGO_RSA_PKCS1_SHA224 || p2 == ALGO_RSA_PSS_SHA224) { md = MBEDTLS_MD_SHA224; - } else if (p2 == ALGO_EC_SHA384 || p2 == ALGO_RSA_PKCS1_SHA384 || p2 == ALGO_RSA_PSS_SHA384) { + } + else if (p2 == ALGO_EC_SHA384 || p2 == ALGO_RSA_PKCS1_SHA384 || p2 == ALGO_RSA_PSS_SHA384) { md = MBEDTLS_MD_SHA384; - } else if (p2 == ALGO_EC_SHA512 || p2 == ALGO_RSA_PKCS1_SHA512 || p2 == ALGO_RSA_PSS_SHA512) { + } + else if (p2 == ALGO_EC_SHA512 || p2 == ALGO_RSA_PKCS1_SHA512 || p2 == ALGO_RSA_PSS_SHA512) { md = MBEDTLS_MD_SHA512; } if (p2 == ALGO_RSA_PKCS1_SHA1 || p2 == ALGO_RSA_PSS_SHA1 || p2 == ALGO_EC_SHA1 || @@ -153,7 +155,8 @@ int cmd_signature() return SW_EXEC_ERROR(); } apdu.nc = nc; - } else { + } + else { //sc_asn1_print_tags(apdu.data, apdu.nc); size_t tout = 0, oid_len = 0; uint8_t *p = NULL, *oid = NULL; @@ -168,13 +171,17 @@ int cmd_signature() if (oid && oid_len > 0) { if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; - } else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA224, oid_len) == 0) { + } + else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA224, oid_len) == 0) { md = MBEDTLS_MD_SHA224; - } else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA256, oid_len) == 0) { + } + else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; - } else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA384, oid_len) == 0) { + } + else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA384, oid_len) == 0) { md = MBEDTLS_MD_SHA384; - } else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA512, oid_len) == 0) { + } + else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; } } @@ -182,13 +189,17 @@ int cmd_signature() if (p2 == ALGO_RSA_PSS && !oid) { if (apdu.nc == 20) { //default is sha1 md = MBEDTLS_MD_SHA1; - } else if (apdu.nc == 28) { + } + else if (apdu.nc == 28) { md = MBEDTLS_MD_SHA224; - } else if (apdu.nc == 32) { + } + else if (apdu.nc == 32) { md = MBEDTLS_MD_SHA256; - } else if (apdu.nc == 48) { + } + else if (apdu.nc == 48) { md = MBEDTLS_MD_SHA384; - } else if (apdu.nc == 64) { + } + else if (apdu.nc == 64) { md = MBEDTLS_MD_SHA512; } } @@ -197,10 +208,11 @@ int cmd_signature() } if (md == MBEDTLS_MD_NONE) { if (apdu.nc < key_size) { //needs padding - memset(apdu.data+apdu.nc, 0, key_size-apdu.nc); + memset(apdu.data + apdu.nc, 0, key_size - apdu.nc); } r = mbedtls_rsa_private(&ctx, random_gen, NULL, apdu.data, res_APDU); - } else { + } + else { uint8_t *signature = (uint8_t *) calloc(key_size, sizeof(uint8_t)); r = mbedtls_rsa_pkcs1_sign(&ctx, random_gen, NULL, md, hash_len, hash, signature); memcpy(res_APDU, signature, key_size); @@ -213,32 +225,41 @@ int cmd_signature() res_APDU_size = key_size; apdu.ne = key_size; mbedtls_rsa_free(&ctx); - } else if (p2 >= ALGO_EC_RAW && p2 <= ALGO_EC_SHA512) { + } + else if (p2 >= ALGO_EC_RAW && p2 <= ALGO_EC_SHA512) { mbedtls_ecdsa_context ctx; mbedtls_ecdsa_init(&ctx); md = MBEDTLS_MD_SHA256; if (p2 == ALGO_EC_RAW) { if (apdu.nc == 32) { md = MBEDTLS_MD_SHA256; - } else if (apdu.nc == 20) { + } + else if (apdu.nc == 20) { md = MBEDTLS_MD_SHA1; - } else if (apdu.nc == 28) { + } + else if (apdu.nc == 28) { md = MBEDTLS_MD_SHA224; - } else if (apdu.nc == 48) { + } + else if (apdu.nc == 48) { md = MBEDTLS_MD_SHA384; - } else if (apdu.nc == 64) { + } + else if (apdu.nc == 64) { md = MBEDTLS_MD_SHA512; } } if (p2 == ALGO_EC_SHA1) { md = MBEDTLS_MD_SHA1; - } else if (p2 == ALGO_EC_SHA224) { + } + else if (p2 == ALGO_EC_SHA224) { md = MBEDTLS_MD_SHA224; - } else if (p2 == ALGO_EC_SHA256) { + } + else if (p2 == ALGO_EC_SHA256) { md = MBEDTLS_MD_SHA256; - } else if (p2 == ALGO_EC_SHA384) { + } + else if (p2 == ALGO_EC_SHA384) { md = MBEDTLS_MD_SHA384; - } else if (p2 == ALGO_EC_SHA512) { + } + else if (p2 == ALGO_EC_SHA512) { md = MBEDTLS_MD_SHA512; } int r = load_private_key_ecdsa(&ctx, fkey); @@ -259,7 +280,8 @@ int cmd_signature() memcpy(res_APDU, buf, olen); res_APDU_size = olen; mbedtls_ecdsa_free(&ctx); - } else { + } + else { return SW_INCORRECT_P1P2(); } decrement_key_counter(fkey); diff --git a/src/hsm/cmd_update_ef.c b/src/hsm/cmd_update_ef.c index 59e2a60..747309b 100644 --- a/src/hsm/cmd_update_ef.c +++ b/src/hsm/cmd_update_ef.c @@ -20,8 +20,7 @@ extern void select_file(file_t *pe); -int cmd_update_ef() -{ +int cmd_update_ef() { uint8_t p1 = P1(apdu), p2 = P2(apdu); uint16_t fid = (p1 << 8) | p2; uint8_t *data = NULL; @@ -33,9 +32,10 @@ int cmd_update_ef() } if (fid == 0x0) { ef = currentEF; - } else if (p1 != EE_CERTIFICATE_PREFIX && p1 != PRKD_PREFIX && p1 != CA_CERTIFICATE_PREFIX && - p1 != CD_PREFIX && p1 != DATA_PREFIX && p1 != DCOD_PREFIX && - p1 != PROT_DATA_PREFIX) { + } + else if (p1 != EE_CERTIFICATE_PREFIX && p1 != PRKD_PREFIX && p1 != CA_CERTIFICATE_PREFIX && + p1 != CD_PREFIX && p1 != DATA_PREFIX && p1 != DCOD_PREFIX && + p1 != PROT_DATA_PREFIX) { return SW_INCORRECT_P1P2(); } @@ -49,9 +49,10 @@ int cmd_update_ef() while (walk_tlv(apdu.data, apdu.nc, &p, &tag, &tag_len, &tag_data)) { if (tag == 0x54) { //ofset tag for (int i = 1; i <= tag_len; i++) { - offset |= (*tag_data++ << (8*(tag_len-i))); + offset |= (*tag_data++ << (8 * (tag_len - i))); } - } else if (tag == 0x53) { //data + } + else if (tag == 0x53) { //data data_len = tag_len; data = tag_data; } @@ -61,13 +62,15 @@ int cmd_update_ef() //if ((fid & 0xff00) == (EE_CERTIFICATE_PREFIX << 8)) // add_file_to_chain(ef, &ef_pukdf); select_file(ef); - } else { + } + else { if (fid == 0x0 && !ef) { return SW_FILE_NOT_FOUND(); - } else if (fid != 0x0 && - !(ef = - search_by_fid(fid, NULL, - SPECIFY_EF)) && !(ef = search_dynamic_file(fid))) { //if does not exist, create it + } + else if (fid != 0x0 && + !(ef = + search_by_fid(fid, NULL, + SPECIFY_EF)) && !(ef = search_dynamic_file(fid))) { //if does not exist, create it //return SW_FILE_NOT_FOUND(); ef = file_new(fid); } @@ -76,15 +79,16 @@ int cmd_update_ef() if (r != CCID_OK) { return SW_MEMORY_FAILURE(); } - } else { + } + else { if (!file_has_data(ef)) { return SW_DATA_INVALID(); } - uint8_t *data_merge = (uint8_t *) calloc(1, offset+data_len); + uint8_t *data_merge = (uint8_t *) calloc(1, offset + data_len); memcpy(data_merge, file_get_data(ef), offset); - memcpy(data_merge+offset, data, data_len); - int r = flash_write_data_to_file(ef, data_merge, offset+data_len); + memcpy(data_merge + offset, data, data_len); + int r = flash_write_data_to_file(ef, data_merge, offset + data_len); free(data_merge); if (r != CCID_OK) { return SW_MEMORY_FAILURE(); diff --git a/src/hsm/cmd_verify.c b/src/hsm/cmd_verify.c index 32b2b3b..7211ed8 100644 --- a/src/hsm/cmd_verify.c +++ b/src/hsm/cmd_verify.c @@ -17,8 +17,7 @@ #include "sc_hsm.h" -int cmd_verify() -{ +int cmd_verify() { uint8_t p1 = P1(apdu); uint8_t p2 = P2(apdu); @@ -44,7 +43,8 @@ int cmd_verify() return SW_PIN_BLOCKED(); } return set_res_sw(0x63, 0xc0 | file_read_uint8(file_get_data(file_retries_pin1))); - } else if (p2 == 0x88) { //SOPin + } + else if (p2 == 0x88) { //SOPin if (file_read_uint8(file_get_data(file_sopin)) == 0) { //not initialized return SW_REFERENCE_NOT_FOUND(); } @@ -58,7 +58,8 @@ int cmd_verify() return SW_OK(); } return set_res_sw(0x63, 0xc0 | file_read_uint8(file_get_data(file_retries_sopin))); - } else if (p2 == 0x85) { + } + else if (p2 == 0x85) { return SW_OK(); } return SW_REFERENCE_NOT_FOUND(); diff --git a/src/hsm/cvc.c b/src/hsm/cvc.c index 3f64ffe..77621b5 100644 --- a/src/hsm/cvc.c +++ b/src/hsm/cvc.c @@ -31,13 +31,12 @@ extern const uint8_t *dev_name; extern size_t dev_name_len; -size_t asn1_cvc_public_key_rsa(mbedtls_rsa_context *rsa, uint8_t *buf, size_t buf_len) -{ +size_t asn1_cvc_public_key_rsa(mbedtls_rsa_context *rsa, uint8_t *buf, size_t buf_len) { const uint8_t oid_rsa[] = { 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x02, 0x01, 0x02 }; size_t n_size = mbedtls_mpi_size(&rsa->N), e_size = mbedtls_mpi_size(&rsa->E); size_t ntot_size = asn1_len_tag(0x81, n_size), etot_size = asn1_len_tag(0x82, e_size); size_t oid_len = asn1_len_tag(0x6, sizeof(oid_rsa)); - size_t tot_len = asn1_len_tag(0x7f49, oid_len+ntot_size+etot_size); + size_t tot_len = asn1_len_tag(0x7f49, oid_len + ntot_size + etot_size); if (buf == NULL || buf_len == 0) { return tot_len; } @@ -46,7 +45,7 @@ size_t asn1_cvc_public_key_rsa(mbedtls_rsa_context *rsa, uint8_t *buf, size_t bu } uint8_t *p = buf; memcpy(p, "\x7F\x49", 2); p += 2; - p += format_tlv_len(oid_len+ntot_size+etot_size, p); + p += format_tlv_len(oid_len + ntot_size + etot_size, p); //oid *p++ = 0x6; p += format_tlv_len(sizeof(oid_rsa), p); memcpy(p, oid_rsa, sizeof(oid_rsa)); p += sizeof(oid_rsa); @@ -73,13 +72,12 @@ const uint8_t *pointA[] = { "\x01\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC", }; -size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, size_t buf_len) -{ +size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, size_t buf_len) { uint8_t Y_buf[MBEDTLS_ECP_MAX_PT_LEN]; const uint8_t oid_ecdsa[] = { 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x02, 0x02, 0x03 }; size_t p_size = mbedtls_mpi_size(&ecdsa->grp.P), a_size = mbedtls_mpi_size(&ecdsa->grp.A); size_t b_size = mbedtls_mpi_size(&ecdsa->grp.B), - g_size = 1+mbedtls_mpi_size(&ecdsa->grp.G.X)+mbedtls_mpi_size(&ecdsa->grp.G.X); + g_size = 1 + mbedtls_mpi_size(&ecdsa->grp.G.X) + mbedtls_mpi_size(&ecdsa->grp.G.X); size_t o_size = mbedtls_mpi_size(&ecdsa->grp.N), y_size = 0; mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->Q, @@ -99,7 +97,7 @@ size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, siz size_t ctot_size = asn1_len_tag(0x87, c_size); size_t oid_len = asn1_len_tag(0x6, sizeof(oid_ecdsa)); size_t tot_len = asn1_len_tag(0x7f49, - oid_len+ptot_size+atot_size+btot_size+gtot_size+otot_size+ytot_size+ + oid_len + ptot_size + atot_size + btot_size + gtot_size + otot_size + ytot_size + ctot_size); if (buf == NULL || buf_len == 0) { return tot_len; @@ -110,7 +108,7 @@ size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, siz uint8_t *p = buf; memcpy(p, "\x7F\x49", 2); p += 2; p += format_tlv_len( - oid_len+ptot_size+atot_size+btot_size+gtot_size+otot_size+ytot_size+ctot_size, + oid_len + ptot_size + atot_size + btot_size + gtot_size + otot_size + ytot_size + ctot_size, p); //oid *p++ = 0x6; p += format_tlv_len(sizeof(oid_ecdsa), p); memcpy(p, oid_ecdsa, sizeof(oid_ecdsa)); @@ -123,11 +121,13 @@ size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, siz *p++ = 0x82; p += format_tlv_len(a_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.A, p, a_size); p += a_size; - } else { //mbedtls does not set point A for some curves + } + else { //mbedtls does not set point A for some curves if (pointA[ecdsa->grp.id] && ecdsa->grp.id < 6) { *p++ = 0x82; p += format_tlv_len(p_size, p); memcpy(p, pointA[ecdsa->grp.id], p_size); p += p_size; - } else { + } + else { *p++ = 0x82; p += format_tlv_len(1, p); *p++ = 0x0; } @@ -153,9 +153,11 @@ size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, siz *p++ = 0x87; p += format_tlv_len(c_size, p); if (ecdsa->grp.id == MBEDTLS_ECP_DP_CURVE448) { *p++ = 4; - } else if (ecdsa->grp.id == MBEDTLS_ECP_DP_CURVE25519) { + } + else if (ecdsa->grp.id == MBEDTLS_ECP_DP_CURVE25519) { *p++ = 8; - } else { + } + else { *p++ = 1; } return tot_len; @@ -166,12 +168,12 @@ size_t asn1_cvc_cert_body(void *rsa_ecdsa, uint8_t *buf, size_t buf_len, const uint8_t *ext, - size_t ext_len) -{ + size_t ext_len) { size_t pubkey_size = 0; if (key_type == HSM_KEY_RSA) { pubkey_size = asn1_cvc_public_key_rsa(rsa_ecdsa, NULL, 0); - } else if (key_type == HSM_KEY_EC) { + } + else if (key_type == HSM_KEY_EC) { pubkey_size = asn1_cvc_public_key_ecdsa(rsa_ecdsa, NULL, 0); } size_t cpi_size = 4; @@ -195,7 +197,7 @@ size_t asn1_cvc_cert_body(void *rsa_ecdsa, } size_t car_size = asn1_len_tag(0x42, lencar), chr_size = asn1_len_tag(0x5f20, lenchr); - size_t tot_len = asn1_len_tag(0x7f4e, cpi_size+car_size+pubkey_size+chr_size+ext_size); + size_t tot_len = asn1_len_tag(0x7f4e, cpi_size + car_size + pubkey_size + chr_size + ext_size); if (buf_len == 0 || buf == NULL) { return tot_len; @@ -205,7 +207,7 @@ size_t asn1_cvc_cert_body(void *rsa_ecdsa, } uint8_t *p = buf; memcpy(p, "\x7F\x4E", 2); p += 2; - p += format_tlv_len(cpi_size+car_size+pubkey_size+chr_size+ext_size, p); + p += format_tlv_len(cpi_size + car_size + pubkey_size + chr_size + ext_size, p); //cpi *p++ = 0x5f; *p++ = 0x29; *p++ = 1; *p++ = 0; //car @@ -213,7 +215,8 @@ size_t asn1_cvc_cert_body(void *rsa_ecdsa, //pubkey if (key_type == HSM_KEY_RSA) { p += asn1_cvc_public_key_rsa(rsa_ecdsa, p, pubkey_size); - } else if (key_type == HSM_KEY_EC) { + } + else if (key_type == HSM_KEY_EC) { p += asn1_cvc_public_key_ecdsa(rsa_ecdsa, p, pubkey_size); } //chr @@ -232,20 +235,20 @@ size_t asn1_cvc_cert(void *rsa_ecdsa, uint8_t *buf, size_t buf_len, const uint8_t *ext, - size_t ext_len) -{ + size_t ext_len) { size_t key_size = 0; if (key_type == HSM_KEY_RSA) { key_size = mbedtls_mpi_size(&((mbedtls_rsa_context *) rsa_ecdsa)->N); - } else if (key_type == HSM_KEY_EC) { - key_size = 2* + } + else if (key_type == HSM_KEY_EC) { + key_size = 2 * (int) ((mbedtls_ecp_curve_info_from_grp_id(((mbedtls_ecdsa_context *) rsa_ecdsa) ->grp.id)-> - bit_size + 7)/8); + bit_size + 7) / 8); } size_t body_size = asn1_cvc_cert_body(rsa_ecdsa, key_type, NULL, 0, ext, ext_len), sig_size = asn1_len_tag(0x5f37, key_size); - size_t tot_len = asn1_len_tag(0x7f21, body_size+sig_size); + size_t tot_len = asn1_len_tag(0x7f21, body_size + sig_size); if (buf_len == 0 || buf == NULL) { return tot_len; } @@ -254,7 +257,7 @@ size_t asn1_cvc_cert(void *rsa_ecdsa, } uint8_t *p = buf, *body = NULL; memcpy(p, "\x7F\x21", 2); p += 2; - p += format_tlv_len(body_size+sig_size, p); + p += format_tlv_len(body_size + sig_size, p); body = p; p += asn1_cvc_cert_body(rsa_ecdsa, key_type, p, body_size, ext, ext_len); uint8_t hsh[32]; @@ -267,7 +270,8 @@ size_t asn1_cvc_cert(void *rsa_ecdsa, memset(p, 0, key_size); } p += key_size; - } else if (key_type == HSM_KEY_EC) { + } + else if (key_type == HSM_KEY_EC) { mbedtls_mpi r, s; int ret = 0; mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) rsa_ecdsa; @@ -276,16 +280,17 @@ size_t asn1_cvc_cert(void *rsa_ecdsa, ret = mbedtls_ecdsa_sign(&ecdsa->grp, &r, &s, &ecdsa->d, hsh, sizeof(hsh), random_gen, NULL); if (ret == 0) { - mbedtls_mpi_write_binary(&r, p, key_size/2); p += key_size/2; - mbedtls_mpi_write_binary(&s, p, key_size/2); p += key_size/2; - } else { + mbedtls_mpi_write_binary(&r, p, key_size / 2); p += key_size / 2; + mbedtls_mpi_write_binary(&s, p, key_size / 2); p += key_size / 2; + } + else { memset(p, 0, key_size); p += key_size; } mbedtls_mpi_free(&r); mbedtls_mpi_free(&s); } - return p-buf; + return p - buf; } size_t asn1_cvc_aut(void *rsa_ecdsa, @@ -293,8 +298,7 @@ size_t asn1_cvc_aut(void *rsa_ecdsa, uint8_t *buf, size_t buf_len, const uint8_t *ext, - size_t ext_len) -{ + size_t ext_len) { size_t cvcert_size = asn1_cvc_cert(rsa_ecdsa, key_type, NULL, 0, ext, ext_len); size_t outcar_len = dev_name_len; const uint8_t *outcar = dev_name; @@ -309,9 +313,9 @@ size_t asn1_cvc_aut(void *rsa_ecdsa, mbedtls_ecdsa_free(&ectx); return 0; } - int ret = 0, key_size = 2*mbedtls_mpi_size(&ectx.d); + int ret = 0, key_size = 2 * mbedtls_mpi_size(&ectx.d); size_t outsig_size = asn1_len_tag(0x5f37, key_size), tot_len = asn1_len_tag(0x67, - cvcert_size+outcar_size+ + cvcert_size + outcar_size + outsig_size); if (buf_len == 0 || buf == NULL) { return tot_len; @@ -321,7 +325,7 @@ size_t asn1_cvc_aut(void *rsa_ecdsa, } uint8_t *p = buf; *p++ = 0x67; - p += format_tlv_len(cvcert_size+outcar_size+outsig_size, p); + p += format_tlv_len(cvcert_size + outcar_size + outsig_size, p); uint8_t *body = p; //cvcert p += asn1_cvc_cert(rsa_ecdsa, key_type, p, cvcert_size, ext, ext_len); @@ -330,7 +334,7 @@ size_t asn1_cvc_aut(void *rsa_ecdsa, uint8_t hsh[32]; memcpy(p, "\x5f\x37", 2); p += 2; p += format_tlv_len(key_size, p); - hash256(body, cvcert_size+outcar_size, hsh); + hash256(body, cvcert_size + outcar_size, hsh); mbedtls_mpi r, s; mbedtls_mpi_init(&r); mbedtls_mpi_init(&s); @@ -345,7 +349,7 @@ size_t asn1_cvc_aut(void *rsa_ecdsa, mbedtls_mpi_write_binary(&s, p, mbedtls_mpi_size(&s)); p += mbedtls_mpi_size(&s); mbedtls_mpi_free(&r); mbedtls_mpi_free(&s); - return p-buf; + return p - buf; } size_t asn1_build_cert_description(const uint8_t *label, @@ -354,15 +358,15 @@ size_t asn1_build_cert_description(const uint8_t *label, size_t puk_len, uint16_t fid, uint8_t *buf, - size_t buf_len) -{ + size_t buf_len) { size_t opt_len = 2; - size_t seq1_size = asn1_len_tag(0x30, asn1_len_tag(0xC, label_len)+asn1_len_tag(0x3, opt_len)); + size_t seq1_size = + asn1_len_tag(0x30, asn1_len_tag(0xC, label_len) + asn1_len_tag(0x3, opt_len)); size_t seq2_size = asn1_len_tag(0x30, asn1_len_tag(0x4, 20)); /* SHA1 is 20 bytes length */ size_t seq3_size = asn1_len_tag(0xA1, asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, sizeof(uint16_t))))); - size_t tot_len = asn1_len_tag(0x30, seq1_size+seq2_size+seq3_size); + size_t tot_len = asn1_len_tag(0x30, seq1_size + seq2_size + seq3_size); if (buf_len == 0 || buf == NULL) { return tot_len; } @@ -371,10 +375,10 @@ size_t asn1_build_cert_description(const uint8_t *label, } uint8_t *p = buf; *p++ = 0x30; - p += format_tlv_len(seq1_size+seq2_size+seq3_size, p); + p += format_tlv_len(seq1_size + seq2_size + seq3_size, p); //Seq 1 *p++ = 0x30; - p += format_tlv_len(asn1_len_tag(0xC, label_len)+asn1_len_tag(0x3, opt_len), p); + p += format_tlv_len(asn1_len_tag(0xC, label_len) + asn1_len_tag(0x3, opt_len), p); *p++ = 0xC; p += format_tlv_len(label_len, p); memcpy(p, label, label_len); p += label_len; @@ -401,7 +405,7 @@ size_t asn1_build_cert_description(const uint8_t *label, p += format_tlv_len(sizeof(uint16_t), p); *p++ = fid >> 8; *p++ = fid & 0xff; - return p-buf; + return p - buf; } size_t asn1_build_prkd_generic(const uint8_t *label, @@ -412,15 +416,15 @@ size_t asn1_build_prkd_generic(const uint8_t *label, const uint8_t *seq, size_t seq_len, uint8_t *buf, - size_t buf_len) -{ + size_t buf_len) { size_t seq1_size = asn1_len_tag(0x30, asn1_len_tag(0xC, label_len)); - size_t seq2_size = asn1_len_tag(0x30, asn1_len_tag(0x4, keyid_len)+asn1_len_tag(0x3, seq_len)); + size_t seq2_size = + asn1_len_tag(0x30, asn1_len_tag(0x4, keyid_len) + asn1_len_tag(0x3, seq_len)); size_t seq3_size = asn1_len_tag(0xA1, asn1_len_tag(0x30, - asn1_len_tag(0x30, asn1_len_tag(0x4, 0))+asn1_len_tag(0x2, 2))); - size_t tot_len = asn1_len_tag(0xA0, seq1_size+seq2_size+seq3_size); + asn1_len_tag(0x30, asn1_len_tag(0x4, 0)) + asn1_len_tag(0x2, 2))); + size_t tot_len = asn1_len_tag(0xA0, seq1_size + seq2_size + seq3_size); if (buf_len == 0 || buf == NULL) { return tot_len; } @@ -429,7 +433,7 @@ size_t asn1_build_prkd_generic(const uint8_t *label, } uint8_t *p = buf; *p++ = 0xA0; - p += format_tlv_len(seq1_size+seq2_size+seq3_size, p); + p += format_tlv_len(seq1_size + seq2_size + seq3_size, p); //Seq 1 *p++ = 0x30; p += format_tlv_len(asn1_len_tag(0xC, label_len), p); @@ -439,7 +443,7 @@ size_t asn1_build_prkd_generic(const uint8_t *label, //Seq 2 *p++ = 0x30; - p += format_tlv_len(asn1_len_tag(0x4, keyid_len)+asn1_len_tag(0x3, seq_len), p); + p += format_tlv_len(asn1_len_tag(0x4, keyid_len) + asn1_len_tag(0x3, seq_len), p); *p++ = 0x4; p += format_tlv_len(keyid_len, p); memcpy(p, keyid, keyid_len); p += keyid_len; @@ -450,11 +454,12 @@ size_t asn1_build_prkd_generic(const uint8_t *label, //Seq 3 *p++ = 0xA1; p += - format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, 0))+asn1_len_tag(0x2, - 2)), + format_tlv_len(asn1_len_tag(0x30, + asn1_len_tag(0x30, asn1_len_tag(0x4, 0)) + asn1_len_tag(0x2, + 2)), p); *p++ = 0x30; - p += format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x4, 0))+asn1_len_tag(0x2, 2), p); + p += format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x4, 0)) + asn1_len_tag(0x2, 2), p); *p++ = 0x30; p += format_tlv_len(asn1_len_tag(0x4, 0), p); *p++ = 0x4; @@ -463,7 +468,7 @@ size_t asn1_build_prkd_generic(const uint8_t *label, p += format_tlv_len(2, p); *p++ = (keysize >> 8) & 0xff; *p++ = keysize & 0xff; - return p-buf; + return p - buf; } size_t asn1_build_prkd_ecc(const uint8_t *label, @@ -472,8 +477,7 @@ size_t asn1_build_prkd_ecc(const uint8_t *label, size_t keyid_len, size_t keysize, uint8_t *buf, - size_t buf_len) -{ + size_t buf_len) { return asn1_build_prkd_generic(label, label_len, keyid, @@ -491,8 +495,7 @@ size_t asn1_build_prkd_rsa(const uint8_t *label, size_t keyid_len, size_t keysize, uint8_t *buf, - size_t buf_len) -{ + size_t buf_len) { return asn1_build_prkd_generic(label, label_len, keyid, @@ -504,8 +507,7 @@ size_t asn1_build_prkd_rsa(const uint8_t *label, buf_len); } -const uint8_t *cvc_get_field(const uint8_t *data, size_t len, size_t *olen, uint16_t tag) -{ +const uint8_t *cvc_get_field(const uint8_t *data, size_t len, size_t *olen, uint16_t tag) { uint8_t *rdata = NULL; if (data == NULL || len == 0) { return NULL; @@ -516,8 +518,7 @@ const uint8_t *cvc_get_field(const uint8_t *data, size_t len, size_t *olen, uint return rdata; } -const uint8_t *cvc_get_body(const uint8_t *data, size_t len, size_t *olen) -{ +const uint8_t *cvc_get_body(const uint8_t *data, size_t len, size_t *olen) { const uint8_t *bkdata = data; if ((data = cvc_get_field(data, len, olen, 0x67)) == NULL) { /* Check for CSR */ data = bkdata; @@ -528,8 +529,7 @@ const uint8_t *cvc_get_body(const uint8_t *data, size_t len, size_t *olen) return NULL; } -const uint8_t *cvc_get_sig(const uint8_t *data, size_t len, size_t *olen) -{ +const uint8_t *cvc_get_sig(const uint8_t *data, size_t len, size_t *olen) { const uint8_t *bkdata = data; if ((data = cvc_get_field(data, len, olen, 0x67)) == NULL) { /* Check for CSR */ data = bkdata; @@ -540,32 +540,28 @@ const uint8_t *cvc_get_sig(const uint8_t *data, size_t len, size_t *olen) return NULL; } -const uint8_t *cvc_get_car(const uint8_t *data, size_t len, size_t *olen) -{ +const uint8_t *cvc_get_car(const uint8_t *data, size_t len, size_t *olen) { if ((data = cvc_get_body(data, len, olen)) != NULL) { return cvc_get_field(data, len, olen, 0x42); } return NULL; } -const uint8_t *cvc_get_chr(const uint8_t *data, size_t len, size_t *olen) -{ +const uint8_t *cvc_get_chr(const uint8_t *data, size_t len, size_t *olen) { if ((data = cvc_get_body(data, len, olen)) != NULL) { return cvc_get_field(data, len, olen, 0x5F20); } return NULL; } -const uint8_t *cvc_get_pub(const uint8_t *data, size_t len, size_t *olen) -{ +const uint8_t *cvc_get_pub(const uint8_t *data, size_t len, size_t *olen) { if ((data = cvc_get_body(data, len, olen)) != NULL) { return cvc_get_field(data, len, olen, 0x7F49); } return NULL; } -const uint8_t *cvc_get_ext(const uint8_t *data, size_t len, size_t *olen) -{ +const uint8_t *cvc_get_ext(const uint8_t *data, size_t len, size_t *olen) { if ((data = cvc_get_body(data, len, olen)) != NULL) { return cvc_get_field(data, len, olen, 0x65); } @@ -575,8 +571,7 @@ const uint8_t *cvc_get_ext(const uint8_t *data, size_t len, size_t *olen) extern PUK puk_store[MAX_PUK_STORE_ENTRIES]; extern int puk_store_entries; -int puk_store_index(const uint8_t *chr, size_t chr_len) -{ +int puk_store_index(const uint8_t *chr, size_t chr_len) { for (int i = 0; i < puk_store_entries; i++) { if (memcmp(puk_store[i].chr, chr, chr_len) == 0) { return i; @@ -585,8 +580,7 @@ int puk_store_index(const uint8_t *chr, size_t chr_len) return -1; } -mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len) -{ +mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len) { size_t chr_len = 0, car_len = 0; const uint8_t *chr = NULL, *car = NULL; int eq = -1; @@ -599,7 +593,8 @@ mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len) if (idx != -1) { ca = puk_store[idx].cvcert; ca_len = puk_store[idx].cvcert_len; - } else { + } + else { ca = NULL; } } @@ -623,8 +618,7 @@ int puk_verify(const uint8_t *sig, const uint8_t *hash, size_t hash_len, const uint8_t *ca, - size_t ca_len) -{ + size_t ca_len) { size_t puk_len = 0; const uint8_t *puk = cvc_get_pub(ca, ca_len, &puk_len); if (!puk) { @@ -649,17 +643,22 @@ int puk_verify(const uint8_t *sig, mbedtls_md_type_t md = MBEDTLS_MD_NONE; if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; - } else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; - } else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; - } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_1, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; mbedtls_rsa_set_padding(&rsa, MBEDTLS_RSA_PKCS_V21, md); - } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_256, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; mbedtls_rsa_set_padding(&rsa, MBEDTLS_RSA_PKCS_V21, md); - } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_512, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; mbedtls_rsa_set_padding(&rsa, MBEDTLS_RSA_PKCS_V21, md); } @@ -692,17 +691,22 @@ int puk_verify(const uint8_t *sig, if (r != 0) { return CCID_WRONG_SIGNATURE; } - } else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC + } + else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC mbedtls_md_type_t md = MBEDTLS_MD_NONE; if (memcmp(oid, OID_ID_TA_ECDSA_SHA_1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; - } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0) { md = MBEDTLS_MD_SHA224; - } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; - } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0) { md = MBEDTLS_MD_SHA384; - } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; } if (md == MBEDTLS_MD_NONE) { @@ -738,14 +742,14 @@ int puk_verify(const uint8_t *sig, mbedtls_mpi r, s; mbedtls_mpi_init(&r); mbedtls_mpi_init(&s); - ret = mbedtls_mpi_read_binary(&r, sig, sig_len/2); + ret = mbedtls_mpi_read_binary(&r, sig, sig_len / 2); if (ret != 0) { mbedtls_mpi_free(&r); mbedtls_mpi_free(&s); mbedtls_ecdsa_free(&ecdsa); return CCID_EXEC_ERROR; } - ret = mbedtls_mpi_read_binary(&s, sig+sig_len/2, sig_len/2); + ret = mbedtls_mpi_read_binary(&s, sig + sig_len / 2, sig_len / 2); if (ret != 0) { mbedtls_mpi_free(&r); mbedtls_mpi_free(&s); @@ -763,8 +767,7 @@ int puk_verify(const uint8_t *sig, return CCID_OK; } -int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t ca_len) -{ +int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t ca_len) { size_t puk_len = 0; const uint8_t *puk = cvc_get_pub(ca, ca_len, &puk_len); if (!puk) { @@ -787,27 +790,37 @@ int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t c if (memcmp(oid, OID_ID_TA_RSA, 9) == 0) { //RSA if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; - } else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; - } else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0) { - md = MBEDTLS_MD_SHA512; - } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_1, oid_len) == 0) { - md = MBEDTLS_MD_SHA1; - } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_256, oid_len) == 0) { - md = MBEDTLS_MD_SHA256; - } else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_512, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; } - } else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC + else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_1, oid_len) == 0) { + md = MBEDTLS_MD_SHA1; + } + else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_256, oid_len) == 0) { + md = MBEDTLS_MD_SHA256; + } + else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_512, oid_len) == 0) { + md = MBEDTLS_MD_SHA512; + } + } + else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC if (memcmp(oid, OID_ID_TA_ECDSA_SHA_1, oid_len) == 0) { md = MBEDTLS_MD_SHA1; - } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0) { md = MBEDTLS_MD_SHA224; - } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0) { md = MBEDTLS_MD_SHA256; - } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0) { md = MBEDTLS_MD_SHA384; - } else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0) { + } + else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0) { md = MBEDTLS_MD_SHA512; } } @@ -816,8 +829,8 @@ int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t c } const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md); uint8_t hash[64], hash_len = mbedtls_md_get_size(md_info); - uint8_t tlv_body = 2+format_tlv_len(cv_body_len, NULL); - int r = mbedtls_md(md_info, cv_body-tlv_body, cv_body_len+tlv_body, hash); + uint8_t tlv_body = 2 + format_tlv_len(cv_body_len, NULL); + int r = mbedtls_md(md_info, cv_body - tlv_body, cv_body_len + tlv_body, hash); if (r != 0) { return CCID_EXEC_ERROR; } diff --git a/src/hsm/files.c b/src/hsm/files.c index aa63e00..f863ab1 100644 --- a/src/hsm/files.c +++ b/src/hsm/files.c @@ -106,9 +106,9 @@ file_t file_entries[] = { }; const file_t *MF = &file_entries[0]; -const file_t *file_last = &file_entries[sizeof(file_entries)/sizeof(file_t)-1]; -const file_t *file_openpgp = &file_entries[sizeof(file_entries)/sizeof(file_t)-3]; -const file_t *file_sc_hsm = &file_entries[sizeof(file_entries)/sizeof(file_t)-2]; +const file_t *file_last = &file_entries[sizeof(file_entries) / sizeof(file_t) - 1]; +const file_t *file_openpgp = &file_entries[sizeof(file_entries) / sizeof(file_t) - 3]; +const file_t *file_sc_hsm = &file_entries[sizeof(file_entries) / sizeof(file_t) - 2]; file_t *file_pin1 = NULL; file_t *file_retries_pin1 = NULL; file_t *file_sopin = NULL; diff --git a/src/hsm/kek.c b/src/hsm/kek.c index a12ee51..bce0ae2 100644 --- a/src/hsm/kek.c +++ b/src/hsm/kek.c @@ -39,8 +39,7 @@ bool has_mkek_mask = false; #define POLY 0xedb88320 -uint32_t crc32c(const uint8_t *buf, size_t len) -{ +uint32_t crc32c(const uint8_t *buf, size_t len) { uint32_t crc = ~0; while (len--) { crc ^= *buf++; @@ -51,8 +50,7 @@ uint32_t crc32c(const uint8_t *buf, size_t len) return ~crc; } -int load_mkek(uint8_t *mkek) -{ +int load_mkek(uint8_t *mkek) { if (has_session_pin == false && has_session_sopin == false) { return CCID_NO_LOGIN; } @@ -81,7 +79,7 @@ int load_mkek(uint8_t *mkek) } } int ret = - aes_decrypt_cfb_256(pin, MKEK_IV(mkek), MKEK_KEY(mkek), MKEK_KEY_SIZE+MKEK_KEY_CS_SIZE); + aes_decrypt_cfb_256(pin, MKEK_IV(mkek), MKEK_KEY(mkek), MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE); if (ret != 0) { return CCID_EXEC_ERROR; } @@ -93,8 +91,7 @@ int load_mkek(uint8_t *mkek) mse_t mse = { .init = false }; -int mse_decrypt_ct(uint8_t *data, size_t len) -{ +int mse_decrypt_ct(uint8_t *data, size_t len) { mbedtls_chachapoly_context chatx; mbedtls_chachapoly_init(&chatx); mbedtls_chachapoly_setkey(&chatx, mse.key_enc + 12); @@ -110,9 +107,8 @@ int mse_decrypt_ct(uint8_t *data, size_t len) return ret; } -int load_dkek(uint8_t id, uint8_t *dkek) -{ - file_t *tf = search_dynamic_file(EF_DKEK+id); +int load_dkek(uint8_t id, uint8_t *dkek) { + file_t *tf = search_dynamic_file(EF_DKEK + id); if (!tf) { return CCID_ERR_FILE_NOT_FOUND; } @@ -120,21 +116,20 @@ int load_dkek(uint8_t id, uint8_t *dkek) return mkek_decrypt(dkek, DKEK_KEY_SIZE); } -void release_mkek(uint8_t *mkek) -{ +void release_mkek(uint8_t *mkek) { mbedtls_platform_zeroize(mkek, MKEK_SIZE); } -int store_mkek(const uint8_t *mkek) -{ +int store_mkek(const uint8_t *mkek) { if (has_session_pin == false && has_session_sopin == false) { return CCID_NO_LOGIN; } uint8_t tmp_mkek[MKEK_SIZE]; if (mkek == NULL) { - const uint8_t *rd = random_bytes_get(MKEK_IV_SIZE+MKEK_KEY_SIZE); - memcpy(tmp_mkek, rd, MKEK_IV_SIZE+MKEK_KEY_SIZE); - } else { + const uint8_t *rd = random_bytes_get(MKEK_IV_SIZE + MKEK_KEY_SIZE); + memcpy(tmp_mkek, rd, MKEK_IV_SIZE + MKEK_KEY_SIZE); + } + else { memcpy(tmp_mkek, mkek, MKEK_SIZE); } *(uint32_t *) MKEK_CHECKSUM(tmp_mkek) = crc32c(MKEK_KEY(tmp_mkek), MKEK_KEY_SIZE); @@ -150,7 +145,7 @@ int store_mkek(const uint8_t *mkek) aes_encrypt_cfb_256(session_pin, MKEK_IV(tmp_mkek_pin), MKEK_KEY(tmp_mkek_pin), - MKEK_KEY_SIZE+MKEK_KEY_CS_SIZE); + MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE); flash_write_data_to_file(tf, tmp_mkek_pin, MKEK_SIZE); release_mkek(tmp_mkek_pin); } @@ -175,9 +170,8 @@ int store_mkek(const uint8_t *mkek) return CCID_OK; } -int store_dkek_key(uint8_t id, uint8_t *dkek) -{ - file_t *tf = search_dynamic_file(EF_DKEK+id); +int store_dkek_key(uint8_t id, uint8_t *dkek) { + file_t *tf = search_dynamic_file(EF_DKEK + id); if (!tf) { return CCID_ERR_FILE_NOT_FOUND; } @@ -190,25 +184,24 @@ int store_dkek_key(uint8_t id, uint8_t *dkek) return CCID_OK; } -int save_dkek_key(uint8_t id, const uint8_t *key) -{ +int save_dkek_key(uint8_t id, const uint8_t *key) { uint8_t dkek[DKEK_KEY_SIZE]; if (!key) { - file_t *tf = search_dynamic_file(EF_DKEK+id); + file_t *tf = search_dynamic_file(EF_DKEK + id); if (!tf) { return CCID_ERR_FILE_NOT_FOUND; } memcpy(dkek, file_get_data(tf), DKEK_KEY_SIZE); - } else { + } + else { memcpy(dkek, key, DKEK_KEY_SIZE); } return store_dkek_key(id, dkek); } -int import_dkek_share(uint8_t id, const uint8_t *share) -{ +int import_dkek_share(uint8_t id, const uint8_t *share) { uint8_t tmp_dkek[DKEK_KEY_SIZE]; - file_t *tf = search_dynamic_file(EF_DKEK+id); + file_t *tf = search_dynamic_file(EF_DKEK + id); if (!tf) { return CCID_ERR_FILE_NOT_FOUND; } @@ -224,8 +217,7 @@ int import_dkek_share(uint8_t id, const uint8_t *share) return CCID_OK; } -int dkek_kcv(uint8_t id, uint8_t *kcv) //kcv 8 bytes -{ +int dkek_kcv(uint8_t id, uint8_t *kcv) { //kcv 8 bytes uint8_t hsh[32], dkek[DKEK_KEY_SIZE]; memset(kcv, 0, 8); memset(hsh, 0, sizeof(hsh)); @@ -239,38 +231,35 @@ int dkek_kcv(uint8_t id, uint8_t *kcv) //kcv 8 bytes return CCID_OK; } -int dkek_kenc(uint8_t id, uint8_t *kenc) //kenc 32 bytes -{ - uint8_t dkek[DKEK_KEY_SIZE+4]; +int dkek_kenc(uint8_t id, uint8_t *kenc) { //kenc 32 bytes + uint8_t dkek[DKEK_KEY_SIZE + 4]; memset(kenc, 0, 32); int r = load_dkek(id, dkek); if (r != CCID_OK) { return r; } - memcpy(dkek+DKEK_KEY_SIZE, "\x0\x0\x0\x1", 4); + memcpy(dkek + DKEK_KEY_SIZE, "\x0\x0\x0\x1", 4); hash256(dkek, sizeof(dkek), kenc); mbedtls_platform_zeroize(dkek, sizeof(dkek)); return CCID_OK; } -int dkek_kmac(uint8_t id, uint8_t *kmac) //kmac 32 bytes -{ - uint8_t dkek[DKEK_KEY_SIZE+4]; +int dkek_kmac(uint8_t id, uint8_t *kmac) { //kmac 32 bytes + uint8_t dkek[DKEK_KEY_SIZE + 4]; memset(kmac, 0, 32); int r = load_dkek(id, dkek); if (r != CCID_OK) { return r; } - memcpy(dkek+DKEK_KEY_SIZE, "\x0\x0\x0\x2", 4); - hash256(dkek, DKEK_KEY_SIZE+4, kmac); + memcpy(dkek + DKEK_KEY_SIZE, "\x0\x0\x0\x2", 4); + hash256(dkek, DKEK_KEY_SIZE + 4, kmac); mbedtls_platform_zeroize(dkek, sizeof(dkek)); return CCID_OK; } -int mkek_encrypt(uint8_t *data, size_t len) -{ +int mkek_encrypt(uint8_t *data, size_t len) { int r; - uint8_t mkek[MKEK_SIZE+4]; + uint8_t mkek[MKEK_SIZE + 4]; if ((r = load_mkek(mkek)) != CCID_OK) { return r; } @@ -279,10 +268,9 @@ int mkek_encrypt(uint8_t *data, size_t len) return r; } -int mkek_decrypt(uint8_t *data, size_t len) -{ +int mkek_decrypt(uint8_t *data, size_t len) { int r; - uint8_t mkek[MKEK_SIZE+4]; + uint8_t mkek[MKEK_SIZE + 4]; if ((r = load_mkek(mkek)) != CCID_OK) { return r; } @@ -297,13 +285,12 @@ int dkek_encode_key(uint8_t id, uint8_t *out, size_t *out_len, const uint8_t *allowed, - size_t allowed_len) -{ + size_t allowed_len) { if (!(key_type & HSM_KEY_RSA) && !(key_type & HSM_KEY_EC) && !(key_type & HSM_KEY_AES)) { return CCID_WRONG_DATA; } - uint8_t kb[8+2*4+2*4096/8+3+13]; //worst case: RSA-4096 (plus, 13 bytes padding) + uint8_t kb[8 + 2 * 4 + 2 * 4096 / 8 + 3 + 13]; //worst case: RSA-4096 (plus, 13 bytes padding) memset(kb, 0, sizeof(kb)); int kb_len = 0, r = 0; uint8_t *algo = NULL; @@ -332,80 +319,87 @@ int dkek_encode_key(uint8_t id, if (key_type & HSM_KEY_AES) { if (key_type & HSM_KEY_AES_128) { kb_len = 16; - } else if (key_type & HSM_KEY_AES_192) { + } + else if (key_type & HSM_KEY_AES_192) { kb_len = 24; - } else if (key_type & HSM_KEY_AES_256) { + } + else if (key_type & HSM_KEY_AES_256) { kb_len = 32; } if (kb_len != 16 && kb_len != 24 && kb_len != 32) { return CCID_WRONG_DATA; } - if (*out_len < 8+1+10+6+4+(2+32+14)+16) { + if (*out_len < 8 + 1 + 10 + 6 + 4 + (2 + 32 + 14) + 16) { return CCID_WRONG_LENGTH; } - put_uint16_t(kb_len, kb+8); - memcpy(kb+10, key_ctx, kb_len); + put_uint16_t(kb_len, kb + 8); + memcpy(kb + 10, key_ctx, kb_len); kb_len += 2; algo = (uint8_t *) "\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01"; //2.16.840.1.101.3.4.1 (2+8) algo_len = 10; - } else if (key_type & HSM_KEY_RSA) { - if (*out_len < 8+1+12+6+(8+2*4+2*4096/8+3+13)+16) { //13 bytes pading + } + else if (key_type & HSM_KEY_RSA) { + if (*out_len < 8 + 1 + 12 + 6 + (8 + 2 * 4 + 2 * 4096 / 8 + 3 + 13) + 16) { //13 bytes pading return CCID_WRONG_LENGTH; } mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) key_ctx; kb_len = 0; - put_uint16_t(mbedtls_rsa_get_len(rsa)*8, kb+8+kb_len); kb_len += 2; + put_uint16_t(mbedtls_rsa_get_len(rsa) * 8, kb + 8 + kb_len); kb_len += 2; - put_uint16_t(mbedtls_mpi_size(&rsa->D), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&rsa->D, kb+8+kb_len, mbedtls_mpi_size(&rsa->D)); + put_uint16_t(mbedtls_mpi_size(&rsa->D), kb + 8 + kb_len); kb_len += 2; + mbedtls_mpi_write_binary(&rsa->D, kb + 8 + kb_len, mbedtls_mpi_size(&rsa->D)); kb_len += mbedtls_mpi_size(&rsa->D); - put_uint16_t(mbedtls_mpi_size(&rsa->N), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&rsa->N, kb+8+kb_len, mbedtls_mpi_size(&rsa->N)); + put_uint16_t(mbedtls_mpi_size(&rsa->N), kb + 8 + kb_len); kb_len += 2; + mbedtls_mpi_write_binary(&rsa->N, kb + 8 + kb_len, mbedtls_mpi_size(&rsa->N)); kb_len += mbedtls_mpi_size(&rsa->N); - put_uint16_t(mbedtls_mpi_size(&rsa->E), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&rsa->E, kb+8+kb_len, mbedtls_mpi_size(&rsa->E)); + put_uint16_t(mbedtls_mpi_size(&rsa->E), kb + 8 + kb_len); kb_len += 2; + mbedtls_mpi_write_binary(&rsa->E, kb + 8 + kb_len, mbedtls_mpi_size(&rsa->E)); kb_len += mbedtls_mpi_size(&rsa->E); algo = (uint8_t *) "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02"; algo_len = 12; - } else if (key_type & HSM_KEY_EC) { - if (*out_len < 8+1+12+6+(8+2*8+9*66+2+4)+16) { //4 bytes pading + } + else if (key_type & HSM_KEY_EC) { + if (*out_len < 8 + 1 + 12 + 6 + (8 + 2 * 8 + 9 * 66 + 2 + 4) + 16) { //4 bytes pading return CCID_WRONG_LENGTH; } mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx; kb_len = 0; - put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.P)*8, kb+8+kb_len); kb_len += 2; - put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.A), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&ecdsa->grp.A, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.A)); + put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.P) * 8, kb + 8 + kb_len); kb_len += 2; + put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.A), kb + 8 + kb_len); kb_len += 2; + mbedtls_mpi_write_binary(&ecdsa->grp.A, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->grp.A)); kb_len += mbedtls_mpi_size(&ecdsa->grp.A); - put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.B), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&ecdsa->grp.B, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.B)); + put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.B), kb + 8 + kb_len); kb_len += 2; + mbedtls_mpi_write_binary(&ecdsa->grp.B, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->grp.B)); kb_len += mbedtls_mpi_size(&ecdsa->grp.B); - put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.P), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&ecdsa->grp.P, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.P)); + put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.P), kb + 8 + kb_len); kb_len += 2; + mbedtls_mpi_write_binary(&ecdsa->grp.P, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->grp.P)); kb_len += mbedtls_mpi_size(&ecdsa->grp.P); - put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.N), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&ecdsa->grp.N, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.N)); + put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.N), kb + 8 + kb_len); kb_len += 2; + mbedtls_mpi_write_binary(&ecdsa->grp.N, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->grp.N)); kb_len += mbedtls_mpi_size(&ecdsa->grp.N); - put_uint16_t(1+mbedtls_mpi_size(&ecdsa->grp.G.X)+mbedtls_mpi_size(&ecdsa->grp.G.Y), - kb+8+kb_len); kb_len += 2; - kb[8+kb_len++] = 0x4; - mbedtls_mpi_write_binary(&ecdsa->grp.G.X, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.G.X)); + put_uint16_t(1 + mbedtls_mpi_size(&ecdsa->grp.G.X) + mbedtls_mpi_size(&ecdsa->grp.G.Y), + kb + 8 + kb_len); kb_len += 2; + kb[8 + kb_len++] = 0x4; + mbedtls_mpi_write_binary(&ecdsa->grp.G.X, kb + 8 + kb_len, + mbedtls_mpi_size(&ecdsa->grp.G.X)); kb_len += mbedtls_mpi_size(&ecdsa->grp.G.X); - mbedtls_mpi_write_binary(&ecdsa->grp.G.Y, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.G.Y)); + mbedtls_mpi_write_binary(&ecdsa->grp.G.Y, kb + 8 + kb_len, + mbedtls_mpi_size(&ecdsa->grp.G.Y)); kb_len += mbedtls_mpi_size(&ecdsa->grp.G.Y); - put_uint16_t(mbedtls_mpi_size(&ecdsa->d), kb+8+kb_len); kb_len += 2; - mbedtls_mpi_write_binary(&ecdsa->d, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->d)); + put_uint16_t(mbedtls_mpi_size(&ecdsa->d), kb + 8 + kb_len); kb_len += 2; + mbedtls_mpi_write_binary(&ecdsa->d, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->d)); kb_len += mbedtls_mpi_size(&ecdsa->d); - put_uint16_t(1+mbedtls_mpi_size(&ecdsa->Q.X)+mbedtls_mpi_size(&ecdsa->Q.Y), kb+8+kb_len); + put_uint16_t(1 + mbedtls_mpi_size(&ecdsa->Q.X) + mbedtls_mpi_size(&ecdsa->Q.Y), + kb + 8 + kb_len); kb_len += 2; - kb[8+kb_len++] = 0x4; - mbedtls_mpi_write_binary(&ecdsa->Q.X, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->Q.X)); + kb[8 + kb_len++] = 0x4; + mbedtls_mpi_write_binary(&ecdsa->Q.X, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->Q.X)); kb_len += mbedtls_mpi_size(&ecdsa->Q.X); - mbedtls_mpi_write_binary(&ecdsa->Q.Y, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->Q.Y)); + mbedtls_mpi_write_binary(&ecdsa->Q.Y, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->Q.Y)); kb_len += mbedtls_mpi_size(&ecdsa->Q.Y); algo = (uint8_t *) "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03"; @@ -414,30 +408,34 @@ int dkek_encode_key(uint8_t id, memset(out, 0, *out_len); *out_len = 0; - memcpy(out+*out_len, kcv, 8); + memcpy(out + *out_len, kcv, 8); *out_len += 8; if (key_type & HSM_KEY_AES) { out[*out_len] = 15; - } else if (key_type & HSM_KEY_RSA) { + } + else if (key_type & HSM_KEY_RSA) { out[*out_len] = 5; - } else if (key_type & HSM_KEY_EC) { + } + else if (key_type & HSM_KEY_EC) { out[*out_len] = 12; } *out_len += 1; if (algo) { - memcpy(out+*out_len, algo, algo_len); + memcpy(out + *out_len, algo, algo_len); *out_len += algo_len; - } else { + } + else { *out_len += 2; } if (allowed && allowed_len > 0) { - put_uint16_t(allowed_len, out+*out_len); *out_len += 2; - memcpy(out+*out_len, allowed, allowed_len); + put_uint16_t(allowed_len, out + *out_len); *out_len += 2; + memcpy(out + *out_len, allowed, allowed_len); *out_len += allowed_len; - } else { + } + else { *out_len += 2; } //add 4 zeros @@ -445,9 +443,9 @@ int dkek_encode_key(uint8_t id, memcpy(kb, random_bytes_get(8), 8); kb_len += 8; //8 random bytes - int kb_len_pad = ((int) (kb_len/16))*16; + int kb_len_pad = ((int) (kb_len / 16)) * 16; if (kb_len % 16 > 0) { - kb_len_pad = ((int) (kb_len/16)+1)*16; + kb_len_pad = ((int) (kb_len / 16) + 1) * 16; } //key already copied at kb+10 if (kb_len < kb_len_pad) { @@ -458,7 +456,7 @@ int dkek_encode_key(uint8_t id, return r; } - memcpy(out+*out_len, kb, kb_len_pad); + memcpy(out + *out_len, kb, kb_len_pad); *out_len += kb_len_pad; r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB), @@ -466,7 +464,7 @@ int dkek_encode_key(uint8_t id, 256, out, *out_len, - out+*out_len); + out + *out_len); *out_len += 16; if (r != 0) { @@ -475,13 +473,14 @@ int dkek_encode_key(uint8_t id, return CCID_OK; } -int dkek_type_key(const uint8_t *in) -{ +int dkek_type_key(const uint8_t *in) { if (in[8] == 5 || in[8] == 6) { return HSM_KEY_RSA; - } else if (in[8] == 12) { + } + else if (in[8] == 12) { return HSM_KEY_EC; - } else if (in[8] == 15) { + } + else if (in[8] == 15) { return HSM_KEY_AES; } return 0x0; @@ -493,8 +492,7 @@ int dkek_decode_key(uint8_t id, size_t in_len, int *key_size_out, uint8_t **allowed, - size_t *allowed_len) -{ + size_t *allowed_len) { uint8_t kcv[8]; int r = 0; memset(kcv, 0, sizeof(kcv)); @@ -526,12 +524,12 @@ int dkek_decode_key(uint8_t id, kmac, 256, in, - in_len-16, + in_len - 16, signature); if (r != 0) { return CCID_WRONG_SIGNATURE; } - if (memcmp(signature, in+in_len-16, 16) != 0) { + if (memcmp(signature, in + in_len - 16, 16) != 0) { return CCID_WRONG_SIGNATURE; } @@ -541,16 +539,16 @@ int dkek_decode_key(uint8_t id, } if ((key_type == 5 || key_type == 6) && - memcmp(in+9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02", 12) != 0) { + memcmp(in + 9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02", 12) != 0) { return CCID_WRONG_DATA; } if (key_type == 12 && - memcmp(in+9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03", 12) != 0) { + memcmp(in + 9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03", 12) != 0) { return CCID_WRONG_DATA; } - if (key_type == 15 && memcmp(in+9, "\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01", 10) != 0) { + if (key_type == 15 && memcmp(in + 9, "\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01", 10) != 0) { return CCID_WRONG_DATA; } @@ -558,29 +556,29 @@ int dkek_decode_key(uint8_t id, //OID size_t len = get_uint16_t(in, ofs); - ofs += len+2; + ofs += len + 2; //Allowed algorithms len = get_uint16_t(in, ofs); - *allowed = (uint8_t *) (in+ofs+2); + *allowed = (uint8_t *) (in + ofs + 2); *allowed_len = len; - ofs += len+2; + ofs += len + 2; //Access conditions len = get_uint16_t(in, ofs); - ofs += len+2; + ofs += len + 2; //Key OID len = get_uint16_t(in, ofs); - ofs += len+2; + ofs += len + 2; - if ((in_len-16-ofs) % 16 != 0) { + if ((in_len - 16 - ofs) % 16 != 0) { return CCID_WRONG_PADDING; } - uint8_t kb[8+2*4+2*4096/8+3+13]; //worst case: RSA-4096 (plus, 13 bytes padding) + uint8_t kb[8 + 2 * 4 + 2 * 4096 / 8 + 3 + 13]; //worst case: RSA-4096 (plus, 13 bytes padding) memset(kb, 0, sizeof(kb)); - memcpy(kb, in+ofs, in_len-16-ofs); - r = aes_decrypt(kenc, NULL, 256, HSM_AES_MODE_CBC, kb, in_len-16-ofs); + memcpy(kb, in + ofs, in_len - 16 - ofs); + r = aes_decrypt(kenc, NULL, 256, HSM_AES_MODE_CBC, kb, in_len - 16 - ofs); if (r != CCID_OK) { return r; } @@ -595,47 +593,48 @@ int dkek_decode_key(uint8_t id, mbedtls_rsa_init(rsa); if (key_type == 5) { len = get_uint16_t(kb, ofs); ofs += 2; - r = mbedtls_mpi_read_binary(&rsa->D, kb+ofs, len); ofs += len; + r = mbedtls_mpi_read_binary(&rsa->D, kb + ofs, len); ofs += len; if (r != 0) { mbedtls_rsa_free(rsa); return CCID_WRONG_DATA; } len = get_uint16_t(kb, ofs); ofs += 2; - r = mbedtls_mpi_read_binary(&rsa->N, kb+ofs, len); ofs += len; + r = mbedtls_mpi_read_binary(&rsa->N, kb + ofs, len); ofs += len; if (r != 0) { mbedtls_rsa_free(rsa); return CCID_WRONG_DATA; } - } else if (key_type == 6) { + } + else if (key_type == 6) { //DP-1 - len = get_uint16_t(kb, ofs); ofs += len+2; + len = get_uint16_t(kb, ofs); ofs += len + 2; //DQ-1 - len = get_uint16_t(kb, ofs); ofs += len+2; + len = get_uint16_t(kb, ofs); ofs += len + 2; len = get_uint16_t(kb, ofs); ofs += 2; - r = mbedtls_mpi_read_binary(&rsa->P, kb+ofs, len); ofs += len; + r = mbedtls_mpi_read_binary(&rsa->P, kb + ofs, len); ofs += len; if (r != 0) { mbedtls_rsa_free(rsa); return CCID_WRONG_DATA; } //PQ - len = get_uint16_t(kb, ofs); ofs += len+2; + len = get_uint16_t(kb, ofs); ofs += len + 2; len = get_uint16_t(kb, ofs); ofs += 2; - r = mbedtls_mpi_read_binary(&rsa->Q, kb+ofs, len); ofs += len; + r = mbedtls_mpi_read_binary(&rsa->Q, kb + ofs, len); ofs += len; if (r != 0) { mbedtls_rsa_free(rsa); return CCID_WRONG_DATA; } //N - len = get_uint16_t(kb, ofs); ofs += len+2; + len = get_uint16_t(kb, ofs); ofs += len + 2; } len = get_uint16_t(kb, ofs); ofs += 2; - r = mbedtls_mpi_read_binary(&rsa->E, kb+ofs, len); ofs += len; + r = mbedtls_mpi_read_binary(&rsa->E, kb + ofs, len); ofs += len; if (r != 0) { mbedtls_rsa_free(rsa); return CCID_WRONG_DATA; @@ -647,7 +646,8 @@ int dkek_decode_key(uint8_t id, mbedtls_rsa_free(rsa); return CCID_EXEC_ERROR; } - } else if (key_type == 6) { + } + else if (key_type == 6) { r = mbedtls_rsa_import(rsa, NULL, &rsa->P, &rsa->Q, NULL, &rsa->E); if (r != 0) { mbedtls_rsa_free(rsa); @@ -665,19 +665,20 @@ int dkek_decode_key(uint8_t id, mbedtls_rsa_free(rsa); return CCID_EXEC_ERROR; } - } else if (key_type == 12) { + } + else if (key_type == 12) { mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx; mbedtls_ecdsa_init(ecdsa); //A - len = get_uint16_t(kb, ofs); ofs += len+2; + len = get_uint16_t(kb, ofs); ofs += len + 2; //B - len = get_uint16_t(kb, ofs); ofs += len+2; + len = get_uint16_t(kb, ofs); ofs += len + 2; //P len = get_uint16_t(kb, ofs); ofs += 2; - mbedtls_ecp_group_id ec_id = ec_get_curve_from_prime(kb+ofs, len); + mbedtls_ecp_group_id ec_id = ec_get_curve_from_prime(kb + ofs, len); if (ec_id == MBEDTLS_ECP_DP_NONE) { mbedtls_ecdsa_free(ecdsa); return CCID_WRONG_DATA; @@ -685,14 +686,14 @@ int dkek_decode_key(uint8_t id, ofs += len; //N - len = get_uint16_t(kb, ofs); ofs += len+2; + len = get_uint16_t(kb, ofs); ofs += len + 2; //G - len = get_uint16_t(kb, ofs); ofs += len+2; + len = get_uint16_t(kb, ofs); ofs += len + 2; //d len = get_uint16_t(kb, ofs); ofs += 2; - r = mbedtls_ecp_read_key(ec_id, ecdsa, kb+ofs, len); + r = mbedtls_ecp_read_key(ec_id, ecdsa, kb + ofs, len); if (r != 0) { mbedtls_ecdsa_free(ecdsa); return CCID_EXEC_ERROR; @@ -711,8 +712,9 @@ int dkek_decode_key(uint8_t id, mbedtls_ecdsa_free(ecdsa); return CCID_EXEC_ERROR; } - } else if (key_type == 15) { - memcpy(key_ctx, kb+ofs, key_size); + } + else if (key_type == 15) { + memcpy(key_ctx, kb + ofs, key_size); } return CCID_OK; } diff --git a/src/hsm/kek.h b/src/hsm/kek.h index 9f5e22c..e6b5ade 100644 --- a/src/hsm/kek.h +++ b/src/hsm/kek.h @@ -49,17 +49,17 @@ extern int dkek_decode_key(uint8_t, uint8_t **, size_t *); -#define MAX_DKEK_ENCODE_KEY_BUFFER (8+1+12+6+(8+2*4+2*4096/8+3+13)+16) +#define MAX_DKEK_ENCODE_KEY_BUFFER (8 + 1 + 12 + 6 + (8 + 2 * 4 + 2 * 4096 / 8 + 3 + 13) + 16) #define MAX_KEY_DOMAINS 16 #define MKEK_IV_SIZE (IV_SIZE) #define MKEK_KEY_SIZE (32) #define MKEK_KEY_CS_SIZE (4) -#define MKEK_SIZE (MKEK_IV_SIZE+MKEK_KEY_SIZE+MKEK_KEY_CS_SIZE) +#define MKEK_SIZE (MKEK_IV_SIZE + MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE) #define MKEK_IV(p) (p) -#define MKEK_KEY(p) (MKEK_IV(p)+MKEK_IV_SIZE) -#define MKEK_CHECKSUM(p) (MKEK_KEY(p)+MKEK_KEY_SIZE) +#define MKEK_KEY(p) (MKEK_IV(p) + MKEK_IV_SIZE) +#define MKEK_CHECKSUM(p) (MKEK_KEY(p) + MKEK_KEY_SIZE) #define DKEK_KEY_SIZE (32) extern uint8_t mkek_mask[MKEK_KEY_SIZE]; diff --git a/src/hsm/sc_hsm.c b/src/hsm/sc_hsm.c index d74db76..0c939b9 100644 --- a/src/hsm/sc_hsm.c +++ b/src/hsm/sc_hsm.c @@ -78,9 +78,8 @@ extern int cmd_pso(); extern const uint8_t *ccid_atr; -app_t *sc_hsm_select_aid(app_t *a, const uint8_t *aid, uint8_t aid_len) -{ - if (!memcmp(aid, sc_hsm_aid+1, MIN(aid_len, sc_hsm_aid[0]))) { +app_t *sc_hsm_select_aid(app_t *a, const uint8_t *aid, uint8_t aid_len) { + if (!memcmp(aid, sc_hsm_aid + 1, MIN(aid_len, sc_hsm_aid[0]))) { a->aid = sc_hsm_aid; a->process_apdu = sc_hsm_process_apdu; a->unload = sc_hsm_unload; @@ -90,14 +89,12 @@ app_t *sc_hsm_select_aid(app_t *a, const uint8_t *aid, uint8_t aid_len) return NULL; } -void __attribute__((constructor)) sc_hsm_ctor() -{ +void __attribute__((constructor)) sc_hsm_ctor() { ccid_atr = atr_sc_hsm; register_app(sc_hsm_select_aid); } -void scan_files() -{ +void scan_files() { file_pin1 = search_by_fid(0x1081, NULL, SPECIFY_EF); if (file_pin1) { if (!file_pin1->data) { @@ -105,7 +102,8 @@ void scan_files() const uint8_t empty[33] = { 0 }; flash_write_data_to_file(file_pin1, empty, sizeof(empty)); } - } else { + } + else { printf("FATAL ERROR: PIN1 not found in memory!\r\n"); } file_sopin = search_by_fid(0x1088, NULL, SPECIFY_EF); @@ -115,7 +113,8 @@ void scan_files() const uint8_t empty[33] = { 0 }; flash_write_data_to_file(file_sopin, empty, sizeof(empty)); } - } else { + } + else { printf("FATAL ERROR: SOPIN not found in memory!\r\n"); } file_retries_pin1 = search_by_fid(0x1083, NULL, SPECIFY_EF); @@ -125,7 +124,8 @@ void scan_files() const uint8_t retries = 3; flash_write_data_to_file(file_retries_pin1, &retries, sizeof(uint8_t)); } - } else { + } + else { printf("FATAL ERROR: Retries PIN1 not found in memory!\r\n"); } file_retries_sopin = search_by_fid(0x108A, NULL, SPECIFY_EF); @@ -135,7 +135,8 @@ void scan_files() const uint8_t retries = 15; flash_write_data_to_file(file_retries_sopin, &retries, sizeof(uint8_t)); } - } else { + } + else { printf("FATAL ERROR: Retries SOPIN not found in memory!\r\n"); } file_t *tf = NULL; @@ -147,7 +148,8 @@ void scan_files() const uint8_t retries = 3; flash_write_data_to_file(tf, &retries, sizeof(uint8_t)); } - } else { + } + else { printf("FATAL ERROR: Max Retries PIN1 not found in memory!\r\n"); } tf = search_by_fid(0x1089, NULL, SPECIFY_EF); @@ -157,14 +159,14 @@ void scan_files() const uint8_t retries = 15; flash_write_data_to_file(tf, &retries, sizeof(uint8_t)); } - } else { + } + else { printf("FATAL ERROR: Retries SOPIN not found in memory!\r\n"); } low_flash_available(); } -void scan_all() -{ +void scan_all() { scan_flash(); scan_files(); } @@ -174,8 +176,7 @@ int puk_store_entries = 0; PUK *current_puk = NULL; uint8_t puk_status[MAX_PUK]; -int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy) -{ +int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy) { if (data == NULL || data_len == 0) { return CCID_ERR_NULL_PARAM; } @@ -188,7 +189,8 @@ int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy) uint8_t *tmp = (uint8_t *) calloc(data_len, sizeof(uint8_t)); memcpy(tmp, data, data_len); puk_store[puk_store_entries].cvcert = tmp; - } else { + } + else { puk_store[puk_store_entries].cvcert = data; } puk_store[puk_store_entries].cvcert_len = data_len; @@ -206,8 +208,7 @@ int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy) return CCID_OK; } -int puk_store_select_chr(const uint8_t *chr) -{ +int puk_store_select_chr(const uint8_t *chr) { for (int i = 0; i < puk_store_entries; i++) { if (memcmp(puk_store[i].chr, chr, puk_store[i].chr_len) == 0) { current_puk = &puk_store[i]; @@ -217,8 +218,7 @@ int puk_store_select_chr(const uint8_t *chr) return CCID_ERR_FILE_NOT_FOUND; } -void init_sc_hsm() -{ +void init_sc_hsm() { scan_all(); has_session_pin = has_session_sopin = false; isUserAuthenticated = false; @@ -246,27 +246,24 @@ void init_sc_hsm() memset(puk_status, 0, sizeof(puk_status)); } -int sc_hsm_unload() -{ +int sc_hsm_unload() { has_session_pin = has_session_sopin = false; isUserAuthenticated = false; sm_session_pin_len = 0; return CCID_OK; } -uint16_t get_device_options() -{ +uint16_t get_device_options() { file_t *ef = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF); if (file_has_data(ef)) { - return (file_read_uint8(file_get_data(ef)) << 8) | file_read_uint8(file_get_data(ef)+1); + return (file_read_uint8(file_get_data(ef)) << 8) | file_read_uint8(file_get_data(ef) + 1); } return 0x0; } extern uint32_t board_button_read(void); -bool wait_button_pressed() -{ +bool wait_button_pressed() { uint32_t val = EV_PRESS_BUTTON; #ifndef ENABLE_EMULATION uint16_t opts = get_device_options(); @@ -280,8 +277,7 @@ bool wait_button_pressed() return val == EV_BUTTON_TIMEOUT; } -int parse_token_info(const file_t *f, int mode) -{ +int parse_token_info(const file_t *f, int mode) { char *label = "SmartCard-HSM"; char *manu = "Pol Henarejos"; if (mode == 1) { @@ -297,19 +293,18 @@ int parse_token_info(const file_t *f, int mode) *p++ = 0xC; *p++ = strlen(manu); strcpy((char *) p, manu); p += strlen(manu); *p++ = 0x80; *p++ = strlen(label); strcpy((char *) p, label); p += strlen(label); *p++ = 0x3; *p++ = 2; *p++ = 4; *p++ = 0x30; - res_APDU_size = p-res_APDU; - res_APDU[1] = res_APDU_size-2; + res_APDU_size = p - res_APDU; + res_APDU[1] = res_APDU_size - 2; } - return 2+(2+1)+(2+8)+(2+strlen(manu))+(2+strlen(label))+(2+2); + return 2 + (2 + 1) + (2 + 8) + (2 + strlen(manu)) + (2 + strlen(label)) + (2 + 2); } -int pin_reset_retries(const file_t *pin, bool force) -{ +int pin_reset_retries(const file_t *pin, bool force) { if (!pin) { return CCID_ERR_NULL_PARAM; } - const file_t *max = search_by_fid(pin->fid+1, NULL, SPECIFY_EF); - const file_t *act = search_by_fid(pin->fid+2, NULL, SPECIFY_EF); + const file_t *max = search_by_fid(pin->fid + 1, NULL, SPECIFY_EF); + const file_t *act = search_by_fid(pin->fid + 2, NULL, SPECIFY_EF); if (!max || !act) { return CCID_ERR_FILE_NOT_FOUND; } @@ -323,12 +318,11 @@ int pin_reset_retries(const file_t *pin, bool force) return r; } -int pin_wrong_retry(const file_t *pin) -{ +int pin_wrong_retry(const file_t *pin) { if (!pin) { return CCID_ERR_NULL_PARAM; } - const file_t *act = search_by_fid(pin->fid+2, NULL, SPECIFY_EF); + const file_t *act = search_by_fid(pin->fid + 2, NULL, SPECIFY_EF); if (!act) { return CCID_ERR_FILE_NOT_FOUND; } @@ -348,14 +342,12 @@ int pin_wrong_retry(const file_t *pin) return CCID_ERR_BLOCKED; } -bool pka_enabled() -{ +bool pka_enabled() { file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF); return file_has_data(ef_puk) && file_read_uint8(file_get_data(ef_puk)) > 0; } -int check_pin(const file_t *pin, const uint8_t *data, size_t len) -{ +int check_pin(const file_t *pin, const uint8_t *data, size_t len) { if (!file_has_data((file_t *) pin)) { return SW_REFERENCE_NOT_FOUND(); } @@ -371,13 +363,14 @@ int check_pin(const file_t *pin, const uint8_t *data, size_t len) } return set_res_sw(0x63, 0xc0 | retries); } - } else { + } + else { uint8_t dhash[32]; double_hash_pin(data, len, dhash); - if (sizeof(dhash) != file_get_size(pin)-1) { //1 byte for pin len + if (sizeof(dhash) != file_get_size(pin) - 1) { //1 byte for pin len return SW_CONDITIONS_NOT_SATISFIED(); } - if (memcmp(file_get_data(pin)+1, dhash, sizeof(dhash)) != 0) { + if (memcmp(file_get_data(pin) + 1, dhash, sizeof(dhash)) != 0) { int retries; if ((retries = pin_wrong_retry(pin)) < CCID_OK) { return SW_PIN_BLOCKED(); @@ -398,15 +391,15 @@ int check_pin(const file_t *pin, const uint8_t *data, size_t len) if (pin == file_pin1) { hash_multi(data, len, session_pin); has_session_pin = true; - } else if (pin == file_sopin) { + } + else if (pin == file_sopin) { hash_multi(data, len, session_sopin); has_session_sopin = true; } return SW_OK(); } -const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len) -{ +const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len) { if (ef == NULL) { return NULL; } @@ -424,8 +417,7 @@ const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len) return NULL; } -uint32_t get_key_counter(file_t *fkey) -{ +uint32_t get_key_counter(file_t *fkey) { size_t tag_len = 0; const uint8_t *meta_tag = get_meta_tag(fkey, 0x90, &tag_len); if (meta_tag) { @@ -434,8 +426,7 @@ uint32_t get_key_counter(file_t *fkey) return 0xffffffff; } -bool key_has_purpose(file_t *ef, uint8_t purpose) -{ +bool key_has_purpose(file_t *ef, uint8_t purpose) { size_t tag_len = 0; const uint8_t *meta_tag = get_meta_tag(ef, 0x91, &tag_len); if (meta_tag) { @@ -449,8 +440,7 @@ bool key_has_purpose(file_t *ef, uint8_t purpose) return true; } -uint32_t decrement_key_counter(file_t *fkey) -{ +uint32_t decrement_key_counter(file_t *fkey) { if (!fkey) { return 0xffffff; } @@ -488,31 +478,35 @@ uint32_t decrement_key_counter(file_t *fkey) } //Stores the private and public keys in flash -int store_keys(void *key_ctx, int type, uint8_t key_id) -{ +int store_keys(void *key_ctx, int type, uint8_t key_id) { int r, key_size = 0; - uint8_t kdata[4096/8]; //worst case + uint8_t kdata[4096 / 8]; //worst case if (type == HSM_KEY_RSA) { mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) key_ctx; - key_size = mbedtls_mpi_size(&rsa->P)+mbedtls_mpi_size(&rsa->Q); - mbedtls_mpi_write_binary(&rsa->P, kdata, key_size/2); - mbedtls_mpi_write_binary(&rsa->Q, kdata+key_size/2, key_size/2); - } else if (type == HSM_KEY_EC) { + key_size = mbedtls_mpi_size(&rsa->P) + mbedtls_mpi_size(&rsa->Q); + mbedtls_mpi_write_binary(&rsa->P, kdata, key_size / 2); + mbedtls_mpi_write_binary(&rsa->Q, kdata + key_size / 2, key_size / 2); + } + else if (type == HSM_KEY_EC) { mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx; key_size = mbedtls_mpi_size(&ecdsa->d); kdata[0] = ecdsa->grp.id & 0xff; - mbedtls_mpi_write_binary(&ecdsa->d, kdata+1, key_size); + mbedtls_mpi_write_binary(&ecdsa->d, kdata + 1, key_size); key_size++; - } else if (type & HSM_KEY_AES) { + } + else if (type & HSM_KEY_AES) { if (type == HSM_KEY_AES_128) { key_size = 16; - } else if (type == HSM_KEY_AES_192) { + } + else if (type == HSM_KEY_AES_192) { key_size = 24; - } else if (type == HSM_KEY_AES_256) { + } + else if (type == HSM_KEY_AES_256) { key_size = 32; } memcpy(kdata, key_ctx, key_size); - } else { + } + else { return CCID_WRONG_DATA; } file_t *fpk = file_new((KEY_PREFIX << 8) | key_id); @@ -531,18 +525,17 @@ int store_keys(void *key_ctx, int type, uint8_t key_id) return CCID_OK; } -int find_and_store_meta_key(uint8_t key_id) -{ +int find_and_store_meta_key(uint8_t key_id) { size_t lt[4] = { 0, 0, 0, 0 }, meta_size = 0; uint8_t *pt[4] = { NULL, NULL, NULL, NULL }; uint8_t t90[4] = { 0xFF, 0xFF, 0xFF, 0xFE }; for (int t = 0; t < 4; t++) { uint8_t *ptt = NULL; size_t ltt = 0; - if (asn1_find_tag(apdu.data, apdu.nc, 0x90+t, <t, &ptt) && ptt != NULL && ltt > 0) { + if (asn1_find_tag(apdu.data, apdu.nc, 0x90 + t, <t, &ptt) && ptt != NULL && ltt > 0) { lt[t] = ltt; pt[t] = ptt; - meta_size += asn1_len_tag(0x90+t, lt[t]); + meta_size += asn1_len_tag(0x90 + t, lt[t]); } } if (lt[0] == 0 && pt[0] == NULL) { @@ -557,7 +550,7 @@ int find_and_store_meta_key(uint8_t key_id) uint8_t *meta = (uint8_t *) calloc(1, meta_size), *m = meta; for (int t = 0; t < 4; t++) { if (lt[t] > 0 && pt[t] != NULL) { - *m++ = 0x90+t; + *m++ = 0x90 + t; m += format_tlv_len(lt[t], m); memcpy(m, pt[t], lt[t]); m += lt[t]; @@ -572,24 +565,23 @@ int find_and_store_meta_key(uint8_t key_id) return CCID_OK; } -int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey) -{ +int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey) { if (wait_button_pressed() == true) { //timeout return CCID_VERIFICATION_FAILED; } int key_size = file_get_size(fkey); - uint8_t kdata[4096/8]; + uint8_t kdata[4096 / 8]; memcpy(kdata, file_get_data(fkey), key_size); if (mkek_decrypt(kdata, key_size) != 0) { return CCID_EXEC_ERROR; } - if (mbedtls_mpi_read_binary(&ctx->P, kdata, key_size/2) != 0) { + if (mbedtls_mpi_read_binary(&ctx->P, kdata, key_size / 2) != 0) { mbedtls_platform_zeroize(kdata, sizeof(kdata)); mbedtls_rsa_free(ctx); return CCID_WRONG_DATA; } - if (mbedtls_mpi_read_binary(&ctx->Q, kdata+key_size/2, key_size/2) != 0) { + if (mbedtls_mpi_read_binary(&ctx->Q, kdata + key_size / 2, key_size / 2) != 0) { mbedtls_platform_zeroize(kdata, sizeof(kdata)); mbedtls_rsa_free(ctx); return CCID_WRONG_DATA; @@ -617,8 +609,7 @@ int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey) return CCID_OK; } -int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey) -{ +int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey) { if (wait_button_pressed() == true) { //timeout return CCID_VERIFICATION_FAILED; } @@ -630,7 +621,7 @@ int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey) return CCID_EXEC_ERROR; } mbedtls_ecp_group_id gid = kdata[0]; - int r = mbedtls_ecp_read_key(gid, ctx, kdata+1, key_size-1); + int r = mbedtls_ecp_read_key(gid, ctx, kdata + 1, key_size - 1); if (r != 0) { mbedtls_platform_zeroize(kdata, sizeof(kdata)); mbedtls_ecdsa_free(ctx); @@ -699,8 +690,7 @@ static const cmd_t cmds[] = { { 0x00, 0x0 } }; -int sc_hsm_process_apdu() -{ +int sc_hsm_process_apdu() { int r = sm_unwrap(); if (r != CCID_OK) { return SW_DATA_INVALID(); From d5b718ca5874666c7de9b2a35affced41cd454dd Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 15 Feb 2023 00:14:37 +0100 Subject: [PATCH 67/84] Move pointer again... Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 43ef33d..31f8994 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 43ef33d60b43ddeed5878ded08df37001636d811 +Subproject commit 31f899416c0cafe2aab220ff356e7eb455cd8096 From 9279773073e1a6dec076c9d5d0fcd1ff4d9f857a Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 15 Feb 2023 19:46:42 +0100 Subject: [PATCH 68/84] Removed printf Signed-off-by: Pol Henarejos --- src/hsm/cmd_key_wrap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/hsm/cmd_key_wrap.c b/src/hsm/cmd_key_wrap.c index 86b2c3d..f58e3f2 100644 --- a/src/hsm/cmd_key_wrap.c +++ b/src/hsm/cmd_key_wrap.c @@ -31,7 +31,6 @@ int cmd_key_wrap() { return SW_SECURITY_STATUS_NOT_SATISFIED(); } file_t *ef = search_dynamic_file((KEY_PREFIX << 8) | key_id); - printf("%d %p\n", key_id, ef); uint8_t kdom = get_key_domain(ef); if (!ef) { return SW_FILE_NOT_FOUND(); From 215fdca9f80e9c31a63f24856975cf8a346bec32 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 15 Feb 2023 19:47:16 +0100 Subject: [PATCH 69/84] Added AES cipher tests. Signed-off-by: Pol Henarejos --- tests/conftest.py | 63 ++++++++++++++++------- tests/pico-hsm/test_020_keypair_gen.py | 9 ++-- tests/pico-hsm/test_021_key_import.py | 8 +++ tests/pico-hsm/test_023_key_generation.py | 30 +++++++++++ tests/pico-hsm/test_030_signature.py | 4 +- tests/pico-hsm/test_040_decrypt.py | 2 +- tests/pico-hsm/test_050_cipher.py | 52 +++++++++++++++++++ tests/utils.py | 9 ++++ 8 files changed, 152 insertions(+), 25 deletions(-) create mode 100644 tests/pico-hsm/test_023_key_generation.py create mode 100644 tests/pico-hsm/test_050_cipher.py diff --git a/tests/conftest.py b/tests/conftest.py index 1bcaa59..ac4f743 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -186,24 +186,38 @@ class Device: return kids return [(resp[i],resp[i+1]) for i in range(0, len(resp), 2)] - def keypair_generation(self, type, param): - a = ASN1().add_tag(0x5f29, bytes([0])).add_tag(0x42, 'UTCA00001'.encode()) - if (type == KeyType.RSA): - if (not 1024 <= param <= 4096): - raise ValueError('RSA bits must be in the range [1024,4096]') - a.add_tag(0x7f49, ASN1().add_oid(oid.ID_TA_RSA_V1_5_SHA_256).add_tag(0x2, param.to_bytes(2, 'big')).encode()) - elif (type == KeyType.ECC): - if (param not in ('secp192r1', 'secp256r1', 'secp384r1', 'secp521r1', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1', 'secp192k1', 'secp256k1')): - raise ValueError('Wrong elliptic curve name') + def key_generation(self, type, param): + if (type in [KeyType.RSA, KeyType.ECC]): + a = ASN1().add_tag(0x5f29, bytes([0])).add_tag(0x42, 'UTCA00001'.encode()) + if (type == KeyType.RSA): + if (not 1024 <= param <= 4096): + raise ValueError('RSA bits must be in the range [1024,4096]') + a.add_tag(0x7f49, ASN1().add_oid(oid.ID_TA_RSA_V1_5_SHA_256).add_tag(0x2, param.to_bytes(2, 'big')).encode()) + elif (type == KeyType.ECC): + if (param not in ('secp192r1', 'secp256r1', 'secp384r1', 'secp521r1', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1', 'secp192k1', 'secp256k1')): + raise ValueError('Bad elliptic curve name') - dom = ec_domain(Device.EcDummy(param)) - pubctx = [dom.P, dom.A, dom.B, dom.G, dom.O, None, dom.F] - a.add_object(0x7f49, oid.ID_TA_ECDSA_SHA_256, pubctx) - a.add_tag(0x5f20, 'UTCDUMMY00001'.encode()) - data = a.encode() + dom = ec_domain(Device.EcDummy(param)) + pubctx = [dom.P, dom.A, dom.B, dom.G, dom.O, None, dom.F] + a.add_object(0x7f49, oid.ID_TA_ECDSA_SHA_256, pubctx) + a.add_tag(0x5f20, 'UTCDUMMY00001'.encode()) + data = a.encode() - keyid = self.get_first_free_id() - self.send(command=0x46, p1=keyid, data=list(data)) + keyid = self.get_first_free_id() + self.send(command=0x46, p1=keyid, data=list(data)) + elif (type == KeyType.AES): + if (param == 128): + p2 = 0xB0 + elif (param == 192): + p2 = 0xB1 + elif (param == 256): + p2 = 0xB2 + else: + raise ValueError('Bad AES key size') + keyid = self.get_first_free_id() + self.send(command=0x48, p1=keyid, p2=p2) + else: + raise ValueError('Bad KeyType') return keyid def delete_file(self, fid): @@ -293,20 +307,26 @@ class Device: kenc = hashlib.sha256((dkek or b'\x00'*32) + b'\x00\x00\x00\x01').digest() kmac = hashlib.sha256((dkek or b'\x00'*32) + b'\x00\x00\x00\x02').digest() data += kcv - pubnum = pkey.public_key().public_numbers() if (isinstance(pkey, rsa.RSAPrivateKey)): data += b'\x05' algo = b'\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02' elif (isinstance(pkey, ec.EllipticCurvePrivateKey)): data += b'\x0C' algo = b'\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03' + elif (isinstance(pkey, bytes)): + data += b'\x0F' + algo = b'\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01' data += algo - data += b'\x00'*6 + if (isinstance(pkey, bytes)): + data += b'\x00\x04\x10\x11\x18\x99' + b'\x00'*4 + else: + data += b'\x00'*6 kb = os.urandom(8) if (isinstance(pkey, rsa.RSAPrivateKey)): kb += int_to_bytes(pkey.key_size, length=2) + pubnum = pkey.public_key().public_numbers() pnum = pkey.private_numbers() kb += int_to_bytes((pnum.d.bit_length()+7)//8, length=2) kb += int_to_bytes(pnum.d) @@ -332,6 +352,9 @@ class Device: p = pkey.public_key().public_bytes(Encoding.X962, PublicFormat.UncompressedPoint) kb += int_to_bytes(len(p), length=2) kb += p + elif (isinstance(pkey, bytes)): + kb += int_to_bytes(len(pkey), length=2) + kb += pkey kb_len_pad = (len(kb)//16)*16 if (len(kb) % 16 > 0): @@ -403,6 +426,10 @@ class Device: def get_challenge(self, length): return self.send(cla=0x80, command=0x84, ne=length) + def cipher(self, algo, keyid, data): + resp = self.send(cla=0x80, command=0x78, p1=keyid, p2=algo.value, data=data) + return resp + @pytest.fixture(scope="session") def device(): diff --git a/tests/pico-hsm/test_020_keypair_gen.py b/tests/pico-hsm/test_020_keypair_gen.py index abff9d1..be0775a 100644 --- a/tests/pico-hsm/test_020_keypair_gen.py +++ b/tests/pico-hsm/test_020_keypair_gen.py @@ -20,12 +20,14 @@ import pytest from utils import KeyType, DOPrefixes +def test_gen_initialize(device): + device.initialize() + @pytest.mark.parametrize( "curve", ['secp192r1', 'secp256r1', 'secp384r1', 'secp521r1', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1', 'secp192k1', 'secp256k1'] ) def test_gen_ecc(device, curve): - device.initialize(retries=3) - keyid = device.keypair_generation(KeyType.ECC, curve) + keyid = device.key_generation(KeyType.ECC, curve) resp = device.list_keys() assert((DOPrefixes.KEY_PREFIX.value, keyid) in resp) device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) @@ -35,8 +37,7 @@ def test_gen_ecc(device, curve): "modulus", [1024, 2048, 4096] ) def test_gen_rsa(device, modulus): - device.initialize(retries=3) - keyid = device.keypair_generation(KeyType.RSA, modulus) + keyid = device.key_generation(KeyType.RSA, modulus) resp = device.list_keys() assert((DOPrefixes.KEY_PREFIX.value, keyid) in resp) device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) diff --git a/tests/pico-hsm/test_021_key_import.py b/tests/pico-hsm/test_021_key_import.py index 5b7a341..b0e0b7f 100644 --- a/tests/pico-hsm/test_021_key_import.py +++ b/tests/pico-hsm/test_021_key_import.py @@ -19,6 +19,7 @@ import pytest import hashlib +import os from utils import KeyType, DOPrefixes from cryptography.hazmat.primitives.asymmetric import rsa, ec from const import DEFAULT_RETRIES, DEFAULT_DKEK_SHARES, DEFAULT_DKEK @@ -55,3 +56,10 @@ def test_import_ecc(device, curve): assert(pubkey.public_numbers() == pkey.public_key().public_numbers()) device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX.value << 8 | keyid) + +@pytest.mark.parametrize( + "size", [128, 192, 256] +) +def test_import_aes(device, size): + pkey = os.urandom(size // 8) + keyid = device.import_key(pkey) diff --git a/tests/pico-hsm/test_023_key_generation.py b/tests/pico-hsm/test_023_key_generation.py new file mode 100644 index 0000000..327081d --- /dev/null +++ b/tests/pico-hsm/test_023_key_generation.py @@ -0,0 +1,30 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +from utils import KeyType, DOPrefixes + +@pytest.mark.parametrize( + "size", [128, 192, 256] +) +def test_gen_aes(device, size): + keyid = device.key_generation(KeyType.AES, size) + resp = device.list_keys() + assert((DOPrefixes.KEY_PREFIX.value, keyid) in resp) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) diff --git a/tests/pico-hsm/test_030_signature.py b/tests/pico-hsm/test_030_signature.py index 887d239..8c8189b 100644 --- a/tests/pico-hsm/test_030_signature.py +++ b/tests/pico-hsm/test_030_signature.py @@ -32,7 +32,7 @@ data = b'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam neque u "scheme", [Algorithm.ALGO_EC_RAW, Algorithm.ALGO_EC_SHA1, Algorithm.ALGO_EC_SHA224, Algorithm.ALGO_EC_SHA256, Algorithm.ALGO_EC_SHA384, Algorithm.ALGO_EC_SHA512] ) def test_signature_ecc(device, curve, scheme): - keyid = device.keypair_generation(KeyType.ECC, curve) + keyid = device.key_generation(KeyType.ECC, curve) pubkey = device.public_key(keyid=keyid, param=curve) if (scheme == Algorithm.ALGO_EC_RAW): datab = hashlib.sha512(data).digest() @@ -49,7 +49,7 @@ def test_signature_ecc(device, curve, scheme): "scheme", [Algorithm.ALGO_RSA_PKCS1_SHA1, Algorithm.ALGO_RSA_PKCS1_SHA224, Algorithm.ALGO_RSA_PKCS1_SHA256, Algorithm.ALGO_RSA_PKCS1_SHA384, Algorithm.ALGO_RSA_PKCS1_SHA512, Algorithm.ALGO_RSA_PSS_SHA1, Algorithm.ALGO_RSA_PSS_SHA224, Algorithm.ALGO_RSA_PSS_SHA256, Algorithm.ALGO_RSA_PSS_SHA384, Algorithm.ALGO_RSA_PSS_SHA512] ) def test_signature_rsa(device, modulus, scheme): - keyid = device.keypair_generation(KeyType.RSA, modulus) + keyid = device.key_generation(KeyType.RSA, modulus) pubkey = device.public_key(keyid=keyid) signature = device.sign(keyid=keyid, scheme=scheme, data=data) device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) diff --git a/tests/pico-hsm/test_040_decrypt.py b/tests/pico-hsm/test_040_decrypt.py index 8890d2e..3f6a3ac 100644 --- a/tests/pico-hsm/test_040_decrypt.py +++ b/tests/pico-hsm/test_040_decrypt.py @@ -38,7 +38,7 @@ data = b'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam neque u ) def test_decrypt_rsa(device, modulus, pad): - keyid = device.keypair_generation(KeyType.RSA, modulus) + keyid = device.key_generation(KeyType.RSA, modulus) pubkey = device.public_key(keyid=keyid) message = data[:(modulus//8)-100] ciphered = pubkey.encrypt(message, pad) diff --git a/tests/pico-hsm/test_050_cipher.py b/tests/pico-hsm/test_050_cipher.py new file mode 100644 index 0000000..24a2f2a --- /dev/null +++ b/tests/pico-hsm/test_050_cipher.py @@ -0,0 +1,52 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +import os +from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes +from utils import Algorithm, DOPrefixes +from const import DEFAULT_DKEK_SHARES, DEFAULT_DKEK + +MESSAGE = b'a secret message' + +def test_prepare_aes(device): + device.initialize(dkek_shares=DEFAULT_DKEK_SHARES) + resp = device.import_dkek(DEFAULT_DKEK) + resp = device.import_dkek(DEFAULT_DKEK) + +@pytest.mark.parametrize( + "size", [128, 192, 256] +) +def test_cipher_aes_cipher(device, size): + pkey = os.urandom(size // 8) + iv = b'\x00'*16 + keyid = device.import_key(pkey) + + cipher = Cipher(algorithms.AES(pkey), modes.CBC(iv)) + encryptor = cipher.encryptor() + ctA = encryptor.update(MESSAGE) + encryptor.finalize() + ctB = device.cipher(Algorithm.ALGO_AES_CBC_ENCRYPT, keyid, MESSAGE) + assert(bytes(ctB) == ctA) + + decryptor = cipher.decryptor() + plA = decryptor.update(ctA) + decryptor.finalize() + plB = device.cipher(Algorithm.ALGO_AES_CBC_DECRYPT, keyid, ctA) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + assert(bytes(plB) == plA) + assert(bytes(plB) == MESSAGE) diff --git a/tests/utils.py b/tests/utils.py index d59505c..25510ff 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -93,8 +93,16 @@ class DOPrefixes(Enum): class KeyType(Enum): RSA = 1 ECC = 2 + AES = 3 class Algorithm(Enum): + ALGO_AES_CBC_ENCRYPT = 0x10 + ALGO_AES_CBC_DECRYPT = 0x11 + ALGO_AES_CMAC = 0x18 + ALGO_EXT_CIPHER_ENCRYPT = 0x51 + ALGO_EXT_CIPHER_DECRYPT = 0x52 + ALGO_AES_DERIVE = 0x99 + ALGO_EC_RAW = 0x70 ALGO_EC_SHA1 = 0x71 ALGO_EC_SHA224 = 0x72 @@ -102,6 +110,7 @@ class Algorithm(Enum): ALGO_EC_SHA384 = 0x74 ALGO_EC_SHA512 = 0x75 ALGO_EC_DH = 0x80 + ALGO_EC_DERIVE = 0x98 ALGO_RSA_RAW = 0x20 ALGO_RSA_DECRYPT = 0x21 From b24e109a3c349c8c2f2b17980b008af1b5228448 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 16 Feb 2023 22:50:53 +0100 Subject: [PATCH 70/84] Fix error message when no card is detected. Signed-off-by: Pol Henarejos --- tools/pico-hsm-tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pico-hsm-tool.py b/tools/pico-hsm-tool.py index 4ddbbe6..390cce1 100644 --- a/tools/pico-hsm-tool.py +++ b/tools/pico-hsm-tool.py @@ -606,7 +606,7 @@ def main(args): card.connection.connect() except CardRequestTimeoutException: - print('time-out: no card inserted during last 10s') + raise Exception('time-out: no card inserted during last 10s') if (args.pin): login(card, args) From 9be176e5230cc31366e8fded5adc6d842a85aaa9 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 16 Feb 2023 22:55:36 +0100 Subject: [PATCH 71/84] Fixes for Pico SDK 1.5 Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 31f8994..e47c541 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 31f899416c0cafe2aab220ff356e7eb455cd8096 +Subproject commit e47c5412cfbc146f0b07b9873d930610bd95447d From 7b62ca53278acef0eb1475c8828114fc6094a3c4 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 16 Feb 2023 23:33:13 +0100 Subject: [PATCH 72/84] Upgrade to mbedtls v3.3.0 --- src/hsm/cmd_cipher_sym.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/hsm/cmd_cipher_sym.c b/src/hsm/cmd_cipher_sym.c index 9df60fc..329f328 100644 --- a/src/hsm/cmd_cipher_sym.c +++ b/src/hsm/cmd_cipher_sym.c @@ -382,7 +382,6 @@ int cmd_cipher_sym() { params = { .p = enc, .len = enc_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) }; mbedtls_md_type_t md_type = MBEDTLS_MD_SHA1; - mbedtls_md_context_t md_ctx; int r = pkcs5_parse_pbkdf2_params(¶ms, &salt, &iterations, &keylen, &md_type); if (r != 0) { @@ -390,13 +389,7 @@ int cmd_cipher_sym() { return SW_WRONG_DATA(); } - mbedtls_md_init(&md_ctx); - if (mbedtls_md_setup(&md_ctx, mbedtls_md_info_from_type(md_type), 1) != 0) { - mbedtls_md_free(&md_ctx); - mbedtls_platform_zeroize(kdata, sizeof(kdata)); - return SW_WRONG_DATA(); - } - r = mbedtls_pkcs5_pbkdf2_hmac(&md_ctx, + r = mbedtls_pkcs5_pbkdf2_hmac_ext(md_type, kdata, key_size, salt.p, @@ -406,7 +399,6 @@ int cmd_cipher_sym() { apdu.ne < 65536 ? apdu.ne : 32), res_APDU); mbedtls_platform_zeroize(kdata, sizeof(kdata)); - mbedtls_md_free(&md_ctx); if (r != 0) { return SW_EXEC_ERROR(); } From 367651fe7505fa1188ce2d3d26b620d52fee5035 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 16 Feb 2023 23:34:13 +0100 Subject: [PATCH 73/84] Upgrade to mbedtls v3.3.0 Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index e47c541..1e1e490 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit e47c5412cfbc146f0b07b9873d930610bd95447d +Subproject commit 1e1e49010a718290baa6d20ed25abc8d197cfe3b From 36e5282d190a7d388a4de3664a7dc3524a84eb7c Mon Sep 17 00:00:00 2001 From: Pol Henarejos <55573252+polhenarejos@users.noreply.github.com> Date: Thu, 16 Feb 2023 23:36:08 +0100 Subject: [PATCH 74/84] Update codeql.yml Enable CodeQL to development branch. --- .github/workflows/codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index efc1988..473273c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ "master" ] + branches: [ "master", "development" ] pull_request: # The branches below must be a subset of the branches above - branches: [ "master" ] + branches: [ "master", "development" ] schedule: - cron: '23 5 * * 4' From 414cab78e3c1930dae3210ff658fb6840cee1c3c Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 16 Feb 2023 23:42:38 +0100 Subject: [PATCH 75/84] Enabling entropy and ctr_drbg for emulation mode. Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 1e1e490..47fab18 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 1e1e49010a718290baa6d20ed25abc8d197cfe3b +Subproject commit 47fab18f96290a40be8ce4e5c5423489f49a2aa3 From 420e55901ca8f919039b056772522f6a6cd1e8eb Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Fri, 17 Feb 2023 22:43:09 +0100 Subject: [PATCH 76/84] Fix HMAC computation. Signed-off-by: Pol Henarejos --- src/hsm/cmd_cipher_sym.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hsm/cmd_cipher_sym.c b/src/hsm/cmd_cipher_sym.c index 329f328..38ee19e 100644 --- a/src/hsm/cmd_cipher_sym.c +++ b/src/hsm/cmd_cipher_sym.c @@ -339,7 +339,7 @@ int cmd_cipher_sym() { if (md_info == NULL) { return SW_WRONG_DATA(); } - int r = mbedtls_md_hmac(md_info, kdata, key_size, apdu.data, apdu.nc, res_APDU); + int r = mbedtls_md_hmac(md_info, kdata, key_size, enc, enc_len, res_APDU); mbedtls_platform_zeroize(kdata, sizeof(kdata)); if (r != 0) { return SW_EXEC_ERROR(); From a1f478239d4dfd18331b311863758c71ce0a79f9 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Fri, 17 Feb 2023 22:43:28 +0100 Subject: [PATCH 77/84] Added HMAC tests. Signed-off-by: Pol Henarejos --- tests/conftest.py | 23 ++++++++++++++--- tests/pico-hsm/test_060_mac.py | 46 ++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 tests/pico-hsm/test_060_mac.py diff --git a/tests/conftest.py b/tests/conftest.py index ac4f743..cc94815 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -301,7 +301,7 @@ class Device: resp = self.send(cla=0x80, command=0x52, p1=0x0, p2=0x0, data=dkek) return resp - def import_key(self, pkey, dkek=None): + def import_key(self, pkey, dkek=None, purposes=None): data = b'' kcv = hashlib.sha256(dkek or b'\x00'*32).digest()[:8] kenc = hashlib.sha256((dkek or b'\x00'*32) + b'\x00\x00\x00\x01').digest() @@ -318,8 +318,10 @@ class Device: algo = b'\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01' data += algo - if (isinstance(pkey, bytes)): - data += b'\x00\x04\x10\x11\x18\x99' + b'\x00'*4 + if (not purposes and isinstance(pkey, bytes)): + purposes = [Algorithm.ALGO_AES_CBC_ENCRYPT.value, Algorithm.ALGO_AES_CBC_DECRYPT.value, Algorithm.ALGO_AES_CMAC.value, Algorithm.ALGO_AES_DERIVE.value, Algorithm.ALGO_EXT_CIPHER_ENCRYPT.value, Algorithm.ALGO_EXT_CIPHER_DECRYPT.value] + if (purposes): + data += b'\x00' + bytes([len(purposes)]) + bytes(purposes) + b'\x00'*4 else: data += b'\x00'*6 @@ -430,6 +432,21 @@ class Device: resp = self.send(cla=0x80, command=0x78, p1=keyid, p2=algo.value, data=data) return resp + def hmac(self, hash, keyid, data): + if (hash == hashes.SHA1): + algo = b'\x2A\x86\x48\x86\xF7\x0D\x02\x07' + elif (hash == hashes.SHA224): + algo = b'\x2A\x86\x48\x86\xF7\x0D\x02\x08' + elif (hash == hashes.SHA256): + algo = b'\x2A\x86\x48\x86\xF7\x0D\x02\x09' + elif (hash == hashes.SHA384): + algo = b'\x2A\x86\x48\x86\xF7\x0D\x02\x0A' + elif (hash == hashes.SHA512): + algo = b'\x2A\x86\x48\x86\xF7\x0D\x02\x0B' + data = [0x06, len(algo)] + list(algo) + [0x81, len(data)] + list(data) + resp = self.send(cla=0x80, command=0x78, p1=keyid, p2=0x51, data=data) + return resp + @pytest.fixture(scope="session") def device(): diff --git a/tests/pico-hsm/test_060_mac.py b/tests/pico-hsm/test_060_mac.py new file mode 100644 index 0000000..549e457 --- /dev/null +++ b/tests/pico-hsm/test_060_mac.py @@ -0,0 +1,46 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +import os +from cryptography.hazmat.primitives import hashes, hmac +from utils import Algorithm, DOPrefixes +from const import DEFAULT_DKEK_SHARES, DEFAULT_DKEK + +MESSAGE = b'a secret message' + +def test_prepare_aes(device): + device.initialize(dkek_shares=DEFAULT_DKEK_SHARES) + resp = device.import_dkek(DEFAULT_DKEK) + resp = device.import_dkek(DEFAULT_DKEK) + +@pytest.mark.parametrize( + "size", [128, 192, 256] +) +@pytest.mark.parametrize( + "algo", [hashes.SHA1, hashes.SHA224, hashes.SHA256, hashes.SHA384, hashes.SHA512] +) +def test_mac_hmac(device, size, algo): + pkey = os.urandom(size // 8) + keyid = device.import_key(pkey) + resA = device.hmac(algo, keyid, MESSAGE) + h = hmac.HMAC(pkey, algo()) + h.update(MESSAGE) + resB = h.finalize() + assert(bytes(resA) == resB) From 0b71bf693dbe32836d6b03df42e9ef1405307ce5 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Fri, 17 Feb 2023 22:46:16 +0100 Subject: [PATCH 78/84] Added CMAC tests. Signed-off-by: Pol Henarejos --- tests/conftest.py | 4 ++++ tests/pico-hsm/test_060_mac.py | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index cc94815..38e872b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -447,6 +447,10 @@ class Device: resp = self.send(cla=0x80, command=0x78, p1=keyid, p2=0x51, data=data) return resp + def cmac(self, keyid, data): + resp = self.send(cla=0x80, command=0x78, p1=keyid, p2=Algorithm.ALGO_AES_CMAC.value, data=data) + return resp + @pytest.fixture(scope="session") def device(): diff --git a/tests/pico-hsm/test_060_mac.py b/tests/pico-hsm/test_060_mac.py index 549e457..e4a75f7 100644 --- a/tests/pico-hsm/test_060_mac.py +++ b/tests/pico-hsm/test_060_mac.py @@ -19,7 +19,8 @@ import pytest import os -from cryptography.hazmat.primitives import hashes, hmac +from cryptography.hazmat.primitives import hashes, hmac, cmac +from cryptography.hazmat.primitives.ciphers import algorithms from utils import Algorithm, DOPrefixes from const import DEFAULT_DKEK_SHARES, DEFAULT_DKEK @@ -44,3 +45,16 @@ def test_mac_hmac(device, size, algo): h.update(MESSAGE) resB = h.finalize() assert(bytes(resA) == resB) + +@pytest.mark.parametrize( + "size", [128, 192, 256] +) +def test_mac_cmac(device, size): + pkey = os.urandom(size // 8) + keyid = device.import_key(pkey) + resA = device.cmac(keyid, MESSAGE) + c = cmac.CMAC(algorithms.AES(pkey)) + c.update(MESSAGE) + resB = c.finalize() + assert(bytes(resA) == resB) + From 20c01eb08d57c23facaa19d875c35a7dda6d78b1 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Fri, 17 Feb 2023 23:54:06 +0100 Subject: [PATCH 79/84] Fix name of x963 function. Signed-off-by: Pol Henarejos --- src/hsm/cmd_cipher_sym.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hsm/cmd_cipher_sym.c b/src/hsm/cmd_cipher_sym.c index 38ee19e..15952c3 100644 --- a/src/hsm/cmd_cipher_sym.c +++ b/src/hsm/cmd_cipher_sym.c @@ -100,7 +100,7 @@ static int pkcs5_parse_pbkdf2_params(const mbedtls_asn1_buf *params, } /* Taken from https://github.com/Mbed-TLS/mbedtls/issues/2335 */ -int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, +int mbedtls_ansi_x963_kdf(mbedtls_md_type_t md_type, size_t input_len, uint8_t *input, size_t shared_info_len, @@ -437,7 +437,7 @@ int cmd_cipher_sym() { else if (memcmp(enc, OID_HMAC_SHA512, enc_len) == 0) { md_type = MBEDTLS_MD_SHA512; } - int r = mbedtls_ansi_x936_kdf(md_type, + int r = mbedtls_ansi_x963_kdf(md_type, key_size, kdata, aad_len, From 61359c7ebd60be12f6828ea02c9e7127917bb99b Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Fri, 17 Feb 2023 23:54:40 +0100 Subject: [PATCH 80/84] Add key derivation tests (HKDF, PBKDF2 and X963). Signed-off-by: Pol Henarejos --- tests/conftest.py | 51 +++++++++++++++++++ tests/pico-hsm/test_060_mac.py | 2 + tests/pico-hsm/test_070_hkdf.py | 81 +++++++++++++++++++++++++++++ tests/pico-hsm/test_071_pbkdf2.py | 85 +++++++++++++++++++++++++++++++ tests/pico-hsm/test_072_x963.py | 76 +++++++++++++++++++++++++++ 5 files changed, 295 insertions(+) create mode 100644 tests/pico-hsm/test_070_hkdf.py create mode 100644 tests/pico-hsm/test_071_pbkdf2.py create mode 100644 tests/pico-hsm/test_072_x963.py diff --git a/tests/conftest.py b/tests/conftest.py index 38e872b..120a767 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -443,6 +443,8 @@ class Device: algo = b'\x2A\x86\x48\x86\xF7\x0D\x02\x0A' elif (hash == hashes.SHA512): algo = b'\x2A\x86\x48\x86\xF7\x0D\x02\x0B' + else: + raise ValueError("Hash not supported") data = [0x06, len(algo)] + list(algo) + [0x81, len(data)] + list(data) resp = self.send(cla=0x80, command=0x78, p1=keyid, p2=0x51, data=data) return resp @@ -451,6 +453,55 @@ class Device: resp = self.send(cla=0x80, command=0x78, p1=keyid, p2=Algorithm.ALGO_AES_CMAC.value, data=data) return resp + def hkdf(self, hash, keyid, data, salt, out_len=None): + if (hash == hashes.SHA256): + algo = b'\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x03\x1D' + elif (hash == hashes.SHA384): + algo = b'\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x03\x1E' + elif (hash == hashes.SHA512): + algo = b'\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x03\x1F' + data = [0x06, len(algo)] + list(algo) + [0x81, len(data)] + list(data) + [0x82, len(salt)] + list(salt) + resp = self.send(cla=0x80, command=0x78, p1=keyid, p2=0x51, data=data, ne=out_len) + return resp + + def pbkdf2(self, hash, keyid, salt, iterations, out_len=None): + oid = b'\x2A\x86\x48\x86\xF7\x0D\x01\x05\x0C' + salt = b'\x04' + bytes([len(salt)]) + salt + iteration = b'\x02' + bytes([len(int_to_bytes(iterations))]) + int_to_bytes(iterations) + prf = b'\x30\x0A\x06\x08\x2A\x86\x48\x86\xF7\x0D\x02' + if (hash == hashes.SHA1): + prf += b'\x07' + elif (hash == hashes.SHA224): + prf += b'\x08' + elif (hash == hashes.SHA256): + prf += b'\x09' + elif (hash == hashes.SHA384): + prf += b'\x0A' + elif (hash == hashes.SHA512): + prf += b'\x0B' + data = list(salt + iteration + prf) + data = [0x06, len(oid)] + list(oid) + [0x81, len(data)] + list(data) + resp = self.send(cla=0x80, command=0x78, p1=keyid, p2=0x51, data=data, ne=out_len) + return resp + + def x963(self, hash, keyid, data, out_len=None): + oid = b'\x2B\x81\x05\x10\x86\x48\x3F' + enc = b'\x2A\x86\x48\x86\xF7\x0D\x02' + if (hash == hashes.SHA1): + enc += b'\x07' + elif (hash == hashes.SHA224): + enc += b'\x08' + elif (hash == hashes.SHA256): + enc += b'\x09' + elif (hash == hashes.SHA384): + enc += b'\x0A' + elif (hash == hashes.SHA512): + enc += b'\x0B' + else: + raise ValueError("Hash not supported") + data = [0x06, len(oid)] + list(oid) + [0x81, len(enc)] + list(enc) + [0x83, len(data)] + list(data) + resp = self.send(cla=0x80, command=0x78, p1=keyid, p2=0x51, data=data, ne=out_len) + return resp @pytest.fixture(scope="session") def device(): diff --git a/tests/pico-hsm/test_060_mac.py b/tests/pico-hsm/test_060_mac.py index e4a75f7..8ba8786 100644 --- a/tests/pico-hsm/test_060_mac.py +++ b/tests/pico-hsm/test_060_mac.py @@ -44,6 +44,7 @@ def test_mac_hmac(device, size, algo): h = hmac.HMAC(pkey, algo()) h.update(MESSAGE) resB = h.finalize() + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) assert(bytes(resA) == resB) @pytest.mark.parametrize( @@ -56,5 +57,6 @@ def test_mac_cmac(device, size): c = cmac.CMAC(algorithms.AES(pkey)) c.update(MESSAGE) resB = c.finalize() + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) assert(bytes(resA) == resB) diff --git a/tests/pico-hsm/test_070_hkdf.py b/tests/pico-hsm/test_070_hkdf.py new file mode 100644 index 0000000..c7af050 --- /dev/null +++ b/tests/pico-hsm/test_070_hkdf.py @@ -0,0 +1,81 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +import os +from cryptography.hazmat.primitives import hashes +from cryptography.hazmat.primitives.kdf.hkdf import HKDF +from cryptography import exceptions +from const import DEFAULT_DKEK_SHARES, DEFAULT_DKEK +from utils import DOPrefixes + +INFO = b'info message' + +def test_prepare_kd(device): + device.initialize(dkek_shares=DEFAULT_DKEK_SHARES) + resp = device.import_dkek(DEFAULT_DKEK) + resp = device.import_dkek(DEFAULT_DKEK) + +@pytest.mark.parametrize( + "size", [128, 192, 256] +) +@pytest.mark.parametrize( + "algo", [hashes.SHA256, hashes.SHA384, hashes.SHA512] +) +@pytest.mark.parametrize( + "out_len", [32, 64, 256, 1024] +) +class TestHKDF: + def test_hkdf_ok(self, device, size, algo, out_len): + pkey = os.urandom(size // 8) + keyid = device.import_key(pkey) + salt = os.urandom(16) + resA = device.hkdf(algo, keyid, INFO, salt, out_len=out_len) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + hkdf = HKDF( + algorithm=algo(), + length=out_len, + salt=salt, + info=INFO, + ) + resB = hkdf.derive(pkey) + assert(bytes(resA) == resB) + hkdf = HKDF( + algorithm=algo(), + length=out_len, + salt=salt, + info=INFO, + ) + hkdf.verify(pkey, bytes(resA)) + + def test_hkdf_fail(self, device, size, algo, out_len): + pkey = os.urandom(size // 8) + keyid = device.import_key(pkey) + salt = os.urandom(16) + resA = device.hkdf(algo, keyid, INFO, salt, out_len=out_len) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + hkdf = HKDF( + algorithm=algo(), + length=out_len, + salt=salt, + info=INFO, + ) + pkey = os.urandom(size // 8) + with pytest.raises(exceptions.InvalidKey): + hkdf.verify(pkey, bytes(resA)) diff --git a/tests/pico-hsm/test_071_pbkdf2.py b/tests/pico-hsm/test_071_pbkdf2.py new file mode 100644 index 0000000..75fe062 --- /dev/null +++ b/tests/pico-hsm/test_071_pbkdf2.py @@ -0,0 +1,85 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +import os +from cryptography.hazmat.primitives import hashes +from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC +from cryptography import exceptions +from const import DEFAULT_DKEK_SHARES, DEFAULT_DKEK +from utils import DOPrefixes + +INFO = b'info message' + +def test_prepare_kd(device): + device.initialize(dkek_shares=DEFAULT_DKEK_SHARES) + resp = device.import_dkek(DEFAULT_DKEK) + resp = device.import_dkek(DEFAULT_DKEK) + +@pytest.mark.parametrize( + "size", [128, 192, 256] +) +@pytest.mark.parametrize( + "algo", [hashes.SHA1, hashes.SHA224, hashes.SHA256, hashes.SHA384, hashes.SHA512] +) +@pytest.mark.parametrize( + "out_len", [32, 64, 256, 1024] +) +@pytest.mark.parametrize( + "iterations", [1024, 2048] +) +class TestPBKDF2: + def test_pbkdf2_ok(self, device, size, algo, out_len, iterations): + pkey = os.urandom(size // 8) + keyid = device.import_key(pkey) + salt = os.urandom(16) + resA = device.pbkdf2(algo, keyid, salt, iterations=iterations, out_len=out_len) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + kdf = PBKDF2HMAC( + algorithm=algo(), + length=out_len, + salt=salt, + iterations=iterations, + ) + resB = kdf.derive(pkey) + assert(bytes(resA) == resB) + kdf = PBKDF2HMAC( + algorithm=algo(), + length=out_len, + salt=salt, + iterations=iterations, + ) + kdf.verify(pkey, bytes(resA)) + + def test_pbkdf2_fail(self, device, size, algo, out_len, iterations): + pkey = os.urandom(size // 8) + keyid = device.import_key(pkey) + salt = os.urandom(16) + resA = device.pbkdf2(algo, keyid, salt, iterations=iterations, out_len=out_len) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + + kdf = PBKDF2HMAC( + algorithm=algo(), + length=out_len, + salt=salt, + iterations=iterations, + ) + pkey = os.urandom(size // 8) + with pytest.raises(exceptions.InvalidKey): + kdf.verify(pkey, bytes(resA)) diff --git a/tests/pico-hsm/test_072_x963.py b/tests/pico-hsm/test_072_x963.py new file mode 100644 index 0000000..f3ccf69 --- /dev/null +++ b/tests/pico-hsm/test_072_x963.py @@ -0,0 +1,76 @@ +""" +/* + * 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 + * 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +""" + +import pytest +import os +from cryptography.hazmat.primitives import hashes +from cryptography.hazmat.primitives.kdf.x963kdf import X963KDF +from cryptography import exceptions +from const import DEFAULT_DKEK_SHARES, DEFAULT_DKEK +from utils import DOPrefixes + +INFO = b'shared message' + +def test_prepare_kd(device): + device.initialize(dkek_shares=DEFAULT_DKEK_SHARES) + resp = device.import_dkek(DEFAULT_DKEK) + resp = device.import_dkek(DEFAULT_DKEK) + +@pytest.mark.parametrize( + "size", [128, 192, 256] +) +@pytest.mark.parametrize( + "algo", [hashes.SHA1, hashes.SHA224, hashes.SHA256, hashes.SHA384, hashes.SHA512] +) +@pytest.mark.parametrize( + "out_len", [32, 64, 256, 1024] +) +class TestX963: + def test_x963_ok(self, device, size, algo, out_len): + pkey = os.urandom(size // 8) + keyid = device.import_key(pkey) + resA = device.x963(algo, keyid, INFO, out_len=out_len) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + xkdf = X963KDF( + algorithm=algo(), + length=out_len, + sharedinfo=INFO, + ) + resB = xkdf.derive(pkey) + assert(bytes(resA) == resB) + xkdf = X963KDF( + algorithm=algo(), + length=out_len, + sharedinfo=INFO, + ) + xkdf.verify(pkey, bytes(resA)) + + def test_x963_fail(self, device, size, algo, out_len): + pkey = os.urandom(size // 8) + keyid = device.import_key(pkey) + resA = device.x963(algo, keyid, INFO, out_len=out_len) + device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid) + xkdf = X963KDF( + algorithm=algo(), + length=out_len, + sharedinfo=INFO, + ) + pkey = os.urandom(size // 8) + with pytest.raises(exceptions.InvalidKey): + xkdf.verify(pkey, bytes(resA)) From 35aec06391484e194ceaf441b295485cb755bf9e Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 20 Feb 2023 13:17:32 +0100 Subject: [PATCH 81/84] Adding support for CCID GET, SET and RESET PARAMS. Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 47fab18..2471b33 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 47fab18f96290a40be8ce4e5c5423489f49a2aa3 +Subproject commit 2471b3308b56a059ac8252f771fa27b6d6e6c640 From fa60ed5049ea2d8a15c05c3e996cd52f23023e07 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Sat, 4 Mar 2023 14:05:51 +0100 Subject: [PATCH 82/84] Update code style. Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- src/hsm/cmd_cipher_sym.c | 16 ++++++++-------- src/hsm/sc_hsm.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 2471b33..3b268a3 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 2471b3308b56a059ac8252f771fa27b6d6e6c640 +Subproject commit 3b268a33eb22309c51cc621dd751ef8909114672 diff --git a/src/hsm/cmd_cipher_sym.c b/src/hsm/cmd_cipher_sym.c index 15952c3..ae77354 100644 --- a/src/hsm/cmd_cipher_sym.c +++ b/src/hsm/cmd_cipher_sym.c @@ -390,14 +390,14 @@ int cmd_cipher_sym() { } r = mbedtls_pkcs5_pbkdf2_hmac_ext(md_type, - kdata, - key_size, - salt.p, - salt.len, - iterations, - keylen ? keylen : (apdu.ne > 0 && - apdu.ne < 65536 ? apdu.ne : 32), - res_APDU); + kdata, + key_size, + salt.p, + salt.len, + iterations, + keylen ? keylen : (apdu.ne > 0 && + apdu.ne < 65536 ? apdu.ne : 32), + res_APDU); mbedtls_platform_zeroize(kdata, sizeof(kdata)); if (r != 0) { return SW_EXEC_ERROR(); diff --git a/src/hsm/sc_hsm.c b/src/hsm/sc_hsm.c index 0c939b9..5fa8f85 100644 --- a/src/hsm/sc_hsm.c +++ b/src/hsm/sc_hsm.c @@ -278,7 +278,7 @@ bool wait_button_pressed() { } int parse_token_info(const file_t *f, int mode) { - char *label = "SmartCard-HSM"; + char *label = "Pico-HSM"; char *manu = "Pol Henarejos"; if (mode == 1) { uint8_t *p = res_APDU; From 1a05d7b51f437a7f3c2b5ce8442c76db25cfc409 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Sat, 4 Mar 2023 14:16:59 +0100 Subject: [PATCH 83/84] Fix conditional interface compilation. Signed-off-by: Pol Henarejos --- pico-hsm-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 3b268a3..599e5ed 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 3b268a33eb22309c51cc621dd751ef8909114672 +Subproject commit 599e5edbd1f710df5dfcad770fed03315d3ea0c5 From d2d038f14d3f1fd132f4cc5ec7e7dd5630262cea Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Sat, 4 Mar 2023 14:35:33 +0100 Subject: [PATCH 84/84] Upgrade to version 3.4 Signed-off-by: Pol Henarejos --- src/hsm/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hsm/version.h b/src/hsm/version.h index 86583c7..8161144 100644 --- a/src/hsm/version.h +++ b/src/hsm/version.h @@ -18,7 +18,7 @@ #ifndef __VERSION_H_ #define __VERSION_H_ -#define HSM_VERSION 0x0302 +#define HSM_VERSION 0x0304 #define HSM_VERSION_MAJOR ((HSM_VERSION >> 8) & 0xff) #define HSM_VERSION_MINOR (HSM_VERSION & 0xff)