Upgrade to version 3.4

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>

.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'
 

.github/workflows/test.yml

@@ -0,0 +1,36 @@
+# 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:
+    - name: Checkout repository and submodules
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - name: Build in container
+      run: ./tests/build-in-docker.sh
+    - name: Start emulation and test
+      run: ./tests/run-test-in-docker.sh

.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)

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
@@ -62,39 +68,38 @@ 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
+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
+        )
+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)
-
+endif()
-#
-#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)

README.md

@@ -13,7 +13,7 @@ RSA key generation in place for 1024, 2048, 3072 and 4096 bits. Private keys nev
 ECDSA key generation in place for different curves, from 192 to 521 bits.
 
 ### > ECC curves
-It supports secp192r1, secp256r1, secp384r1, secp521r1, brainpoolP256r1, brainpoolP384r1, brainpoolP512r1, secp192k1 (insecure), secp256k1 curves.
+It supports secp192r1, secp256r1, secp384r1, secp521r1, brainpoolP256r1, brainpoolP384r1, brainpoolP512r1, secp192k1 (insecure), secp256k1 curves. Also Curve25519 and Curve448.
 
 ### > SHA1, SHA224, SHA256, SHA384, SHA512 digests
 ECDSA and RSA signature can be combined with SHA digest in place.
@@ -111,6 +111,21 @@ Public Key Authentication (PKA) allows to authenticate by using a secondary devi
 
 In PKA, the PIN is used for protecting the DKEK, as classic method with only PIN, and PKA is used for adding an extra security layer. Therefore, this mechanism provides a higher degree of security, since it needs a secondary Pico HSM to authenticate the primary one.
 
+### > Secure Lock
+An extra layer can be added to the device by adding a private key stored on the computer to lock that Pico HSM to the specific computer. The content will be completely encrypted with a private key only available from a specific computer.
+
+### > ChaCha20-Poly1305
+This is a novel fast and efficient symmetric encryption algorithm. Similarly to AES, it can be used to cipher your private data.
+
+### > X25519 and X448
+Both cruves Curve25519 and Curve448 are supported for doing DH X25519 and X448. Remember that cannot be used for signing.
+
+### > Key Derivation Functions: HKDF, PBKDF2 and X963-KDF
+It supports symmetric key derivations from different standards and RFC.
+
+### > HMAC
+It supports performing HMAC from a secret key on a arbitrary data with SHA digest algorithm.
+
 [^1]: PKCS11 modules (`pkcs11-tool` and `sc-tool`) do not support CMAC and key derivation. It must be processed through raw APDU command (`opensc-tool -s`).
 [^2]: Available via SCS3 tool. See [SCS3](/doc/scs3.md "SCS3") for more information.
 [^3]: Imports are available only if the Pico HSM is previously initialized with a DKEK and the DKEK shares are available during the import process.

build_pico_hsm.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 VERSION_MAJOR="3"
-VERSION_MINOR="0"
+VERSION_MINOR="2"
 
 rm -rf release/*
 cd build_release

doc/usage.md

@@ -30,7 +30,7 @@ PIN=648219
 ## Initialization
 The first step is to initialize the HSM. To do so, use the `pico-hsm-tool.py` in `tools` folder:
 ```
-$ python3 pico-hsm-tool initialize --so-pin 3537363231383830 --pin 648219
+$ python3 pico-hsm-tool.py initialize --so-pin 3537363231383830 --pin 648219
 ```
 The PIN number is used to manage all private keys in the device. It supports three attemps. After the third PIN failure, it gets blocked.
 The PIN accepts from 6 to 16 characters.

src/hsm/cmd_challenge.c

@@ -23,8 +23,9 @@ uint8_t challenge_len = 0;
 
 int cmd_challenge() {
     uint8_t *rb = (uint8_t *) random_bytes_get(apdu.ne);
-    if (!rb)
+    if (!rb) {
         return SW_WRONG_LENGTH();
+    }
     memcpy(res_APDU, rb, apdu.ne);
     challenge_len = MIN(apdu.ne, sizeof(challenge));
     memcpy(challenge, rb, challenge_len);

src/hsm/cmd_change_pin.c

@@ -23,10 +23,12 @@ 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,12 +37,14 @@ 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) {
@@ -53,8 +57,9 @@ int cmd_change_pin() {
             }
             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);

src/hsm/cmd_cipher_sym.c

@@ -19,25 +19,160 @@
 #include "mbedtls/aes.h"
 #include "mbedtls/cmac.h"
 #include "mbedtls/hkdf.h"
+#include "mbedtls/chachapoly.h"
+#include "md_wrap.h"
+#include "mbedtls/md.h"
 #include "crypto_utils.h"
 #include "sc_hsm.h"
 #include "kek.h"
+#include "asn1.h"
+#include "oid.h"
+#include "mbedtls/pkcs5.h"
+#include "mbedtls/error.h"
+#include "mbedtls/asn1.h"
+#include "mbedtls/cipher.h"
+#include "mbedtls/oid.h"
+
+/* 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) {
+    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);
+    }
+    /*
+     *  PBKDF2-params ::= SEQUENCE {
+     *    salt              OCTET STRING,
+     *    iterationCount    INTEGER,
+     *    keyLength         INTEGER OPTIONAL
+     *    prf               AlgorithmIdentifier DEFAULT algid-hmacWithSHA1
+     *  }
+     *
+     */
+    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 (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 (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_x963_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;
+    uint8_t counter_buf[4], tmp_output[64]; //worst case
+
+    mbedtls_md_init(&md_ctx);
+
+    md_info = mbedtls_md_info_from_type(md_type);
+
+    if (md_info == NULL) {
+        return exit_code;
+    }
+
+    if (mbedtls_md_setup(&md_ctx, md_info, 0)) {
+        return exit_code;
+    }
+
+    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)) {
+        return exit_code;
+    }
+
+    for (int i = 0, counter = 1; i < output_len; counter++) {
+        mbedtls_md_starts(&md_ctx);
+        mbedtls_md_update(&md_ctx, input, input_len);
+
+        //TODO: be careful with architecture little vs. big
+        counter_buf[0] = (uint8_t) ((counter >> 24) & 0xff);
+        counter_buf[1] = (uint8_t) ((counter >> 16) & 0xff);
+        counter_buf[2] = (uint8_t) ((counter >> 8) & 0xff);
+        counter_buf[3] = (uint8_t) ((counter >> 0) & 0xff);
+
+        mbedtls_md_update(&md_ctx, counter_buf, 4);
+
+        if (shared_info_len > 0 && shared_info != NULL) {
+            mbedtls_md_update(&md_ctx, shared_info, shared_info_len);
+        }
+        mbedtls_md_finish(&md_ctx, tmp_output);
+        memcpy(&output[i], tmp_output, (output_len - i < hashlen) ? output_len - i : hashlen);
+        i += hashlen;
+    }
+    mbedtls_md_free(&md_ctx);
+    return 0;
+}
 
 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)
-        return SW_FILE_NOT_FOUND();
-    if (key_has_purpose(ef, algo) == false)
-        return SW_CONDITIONS_NOT_SATISFIED();
-    if ((apdu.nc % 16) != 0) {
-        return SW_WRONG_LENGTH();
     }
-    if (wait_button_pressed() == true) // timeout
+    file_t *ef = search_dynamic_file((KEY_PREFIX << 8) | key_id);
+    if (!ef) {
+        return SW_FILE_NOT_FOUND();
+    }
+    if (key_has_purpose(ef, algo) == false) {
+        return SW_CONDITIONS_NOT_SATISFIED();
+    }
+    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);
@@ -45,6 +180,9 @@ int cmd_cipher_sym() {
         return SW_EXEC_ERROR();
     }
     if (algo == ALGO_AES_CBC_ENCRYPT || algo == ALGO_AES_CBC_DECRYPT) {
+        if ((apdu.nc % 16) != 0) {
+            return SW_WRONG_LENGTH();
+        }
         mbedtls_aes_context aes;
         mbedtls_aes_init(&aes);
         uint8_t tmp_iv[IV_SIZE];
@@ -56,7 +194,12 @@ 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);
@@ -70,7 +213,12 @@ int cmd_cipher_sym() {
                 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);
@@ -82,29 +230,227 @@ int cmd_cipher_sym() {
     }
     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 {
             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);
+        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) {
+        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) {
+            mbedtls_platform_zeroize(kdata, sizeof(kdata));
+            return SW_WRONG_DATA();
+        }
+        asn1_find_tag(apdu.data, apdu.nc, 0x81, &enc_len, &enc);
+        asn1_find_tag(apdu.data, apdu.nc, 0x82, &iv_len, &iv);
+        asn1_find_tag(apdu.data, apdu.nc, 0x83, &aad_len, &aad);
+        uint8_t tmp_iv[16];
+        memset(tmp_iv, 0, sizeof(tmp_iv));
+        if (memcmp(oid, OID_CHACHA20_POLY1305, oid_len) == 0) {
+            if (algo == ALGO_EXT_CIPHER_DECRYPT && enc_len < 16) {
+                mbedtls_platform_zeroize(kdata, sizeof(kdata));
+                return SW_WRONG_DATA();
+            }
+            int r = 0;
+            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);
+            }
+            mbedtls_platform_zeroize(kdata, sizeof(kdata));
+            mbedtls_chachapoly_free(&ctx);
+            if (r != 0) {
+                return SW_EXEC_ERROR();
+            }
+            if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
+                res_APDU_size = enc_len + 16;
+            }
+            else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
+                res_APDU_size = enc_len - 16;
+            }
+        }
+        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) {
+                md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA224);
+            }
+            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) {
+                md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384);
+            }
+            else if (memcmp(oid, OID_HMAC_SHA512, oid_len) == 0) {
+                md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
+            }
+            if (md_info == NULL) {
+                return SW_WRONG_DATA();
+            }
+            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();
+            }
+            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) {
+            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) {
+                md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384);
+            }
+            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));
+            mbedtls_platform_zeroize(kdata, sizeof(kdata));
+            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) {
+            int iterations = 0, keylen = 0;
+            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;
+
+            int r = pkcs5_parse_pbkdf2_params(&params, &salt, &iterations, &keylen, &md_type);
+            if (r != 0) {
+                mbedtls_platform_zeroize(kdata, sizeof(kdata));
+                return SW_WRONG_DATA();
+            }
+
+            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);
+            mbedtls_platform_zeroize(kdata, sizeof(kdata));
+            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(&params,
+                                        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) {
+            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) {
+                md_type = MBEDTLS_MD_SHA224;
+            }
+            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) {
+                md_type = MBEDTLS_MD_SHA384;
+            }
+            else if (memcmp(enc, OID_HMAC_SHA512, enc_len) == 0) {
+                md_type = MBEDTLS_MD_SHA512;
+            }
+            int r = mbedtls_ansi_x963_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 {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));
         return SW_WRONG_P1P2();

src/hsm/cmd_decrypt_asym.c

@@ -29,41 +29,50 @@
 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_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);
-            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 {
             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();
@@ -72,8 +81,9 @@ int cmd_decrypt_asym() {
     }
     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);
         memcpy(kdata, file_get_data(ef), key_size);
@@ -100,8 +110,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) {
             size_t pub_len = 0;
             const uint8_t *pub = cvc_get_pub(apdu.data, apdu.nc, &pub_len);
@@ -118,20 +129,23 @@ int cmd_decrypt_asym() {
             return SW_DATA_INVALID();
         }
         size_t olen = 0;
-        res_APDU[0] = 0x04;
+        r =
-        r = mbedtls_ecdh_calc_secret(&ctx, &olen, res_APDU+1, MBEDTLS_ECP_MAX_BYTES, random_gen, NULL);
+            mbedtls_ecdh_calc_secret(&ctx, &olen, res_APDU, MBEDTLS_ECP_MAX_BYTES, random_gen,
-        if (r != 0) {
+                                     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+1;
+            res_APDU_size = olen;
+        }
         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;
@@ -139,32 +153,41 @@ 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, 0x6, &oid_len,
-                        if (asn1_find_tag(tag_data, tag_len, 0x80, &kdom_uid_len, &kdom_uid) == false)
+                                      &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+1) != CCID_OK)
+                        if (store_dkek_key(n, res_APDU) != CCID_OK) {
                             return SW_EXEC_ERROR();
+                        }
                         return SW_OK();
                     }
                 }
             }
             return SW_REFERENCE_NOT_FOUND();
         }
-        mbedtls_ecdh_free(&ctx);
     }
-    else
+    else {
         return SW_WRONG_P1P2();
+    }
     decrement_key_counter(ef);
     return SW_OK();
 }

src/hsm/cmd_delete_file.c

@@ -19,22 +19,27 @@
 
 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 {
         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();
 }

src/hsm/cmd_derive_asym.c

@@ -19,7 +19,7 @@
 #include "mbedtls/ecdsa.h"
 #include "crypto_utils.h"
 #include "sc_hsm.h"
-
+#include "cvc.h"
 
 #define MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED -0x006E
 #define MOD_ADD(N)                                                    \
@@ -28,27 +28,30 @@
 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);
 cleanup:
-    return( ret );
+    return ret;
 }
 
 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)) || !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)
+    }
+    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 +60,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;
@@ -72,31 +76,27 @@ int cmd_derive_asym() {
             return SW_DATA_INVALID();
         }
         r = mbedtls_mpi_add_mod(&ctx.grp, &nd, &ctx.d, &a);
+        mbedtls_mpi_free(&a);
         if (r != 0) {
             mbedtls_ecdsa_free(&ctx);
-            mbedtls_mpi_free(&a);
             mbedtls_mpi_free(&nd);
             return SW_EXEC_ERROR();
         }
         r = mbedtls_mpi_copy(&ctx.d, &nd);
+        mbedtls_mpi_free(&nd);
         if (r != 0) {
             mbedtls_ecdsa_free(&ctx);
-            mbedtls_mpi_free(&a);
-            mbedtls_mpi_free(&nd);
             return SW_EXEC_ERROR();
         }
         r = store_keys(&ctx, HSM_KEY_EC, dest_id);
         if (r != CCID_OK) {
             mbedtls_ecdsa_free(&ctx);
-            mbedtls_mpi_free(&a);
-            mbedtls_mpi_free(&nd);
             return SW_EXEC_ERROR();
         }
         mbedtls_ecdsa_free(&ctx);
-        mbedtls_mpi_free(&a);
-        mbedtls_mpi_free(&nd);
     }
-    else
+    else {
         return SW_WRONG_DATA();
+    }
     return SW_OK();
 }

src/hsm/cmd_external_authenticate.c

@@ -25,28 +25,40 @@ extern uint8_t challenge[256];
 extern uint8_t challenge_len;
 
 int cmd_external_authenticate() {
-    if (P1(apdu) != 0x0 || P2(apdu) != 0x0)
+    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 (!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];
     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;
     }

src/hsm/cmd_extras.c

@@ -15,18 +15,29 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#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"
+#include "mbedtls/hkdf.h"
+#include "mbedtls/chachapoly.h"
 
 int cmd_extras() {
-    if (P2(apdu) != 0x0)
-        return SW_INCORRECT_P1P2();
     if (P1(apdu) == 0xA) { //datetime operations
+        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;
@@ -35,10 +46,13 @@ 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)
+            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];
@@ -47,13 +61,19 @@ 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 (apdu.nc > sizeof(uint8_t))
+        if (P2(apdu) != 0x0) {
+            return SW_INCORRECT_P1P2();
+        }
+        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;
@@ -66,7 +86,117 @@ int cmd_extras() {
             low_flash_available();
         }
     }
-    else
+    else if (P1(apdu) == 0x3A) {   // secure lock
+        if (apdu.nc == 0) {
+            return SW_WRONG_LENGTH();
+        }
+        if (P2(apdu) == 0x01) { // Key Agreement
+            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);
+            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);
+            if (ret != 0) {
+                mbedtls_ecdh_free(&hkey);
+                return SW_WRONG_DATA();
+            }
+            memcpy(mse.Qpt, apdu.data, sizeof(mse.Qpt));
+
+            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);
+            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));
+            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);
+            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) {
+                return SW_COMMAND_NOT_ALLOWED();
+            }
+
+            int ret = mse_decrypt_ct(apdu.data, apdu.nc);
+            if (ret != 0) {
+                return SW_WRONG_DATA();
+            }
+            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))) {
+                    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));
+                            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];
+                            }
+                            flash_write_data_to_file(tf, tmp, file_get_size(tf));
+                            free(tmp);
+                        }
+                    }
+                }
+                if (P2(apdu) == 0x02) {
+                    newopts[0] |= HSM_OPT_SECURE_LOCK >> 8;
+                }
+                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) {
+                memcpy(mkek_mask, apdu.data, apdu.nc);
+                has_mkek_mask = true;
+            }
+        }
+    }
+    else {
         return SW_INCORRECT_P1P2();
+    }
     return SW_OK();
 }

src/hsm/cmd_general_authenticate.c

@@ -40,8 +40,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 +72,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();
@@ -80,9 +86,10 @@ int cmd_general_authenticate() {
             sm_derive_all_keys(derived, olen);
 
             uint8_t *t = (uint8_t *) calloc(1, pubkey_len + 16);
-            memcpy(t, "\x7F\x49\x3F\x06\x0A", 5);
+            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 +105,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;
         }
     }

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;
 }
 
@@ -125,8 +129,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();
@@ -135,37 +140,43 @@ 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 {
                 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 {
             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);
             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_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;
@@ -189,16 +200,26 @@ 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";
+            const uint8_t *keyid =
-            size_t prkd_len = asn1_build_prkd_ecc(label, strlen((const char *)label), keyid, 20, 192, res_APDU, 4096);
+                (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

src/hsm/cmd_key_domain.c

@@ -24,8 +24,9 @@
 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;
 }
 
@@ -33,53 +34,72 @@ 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)
+    }
+    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();
+            }
             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);
             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 {
             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
+            }
+            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)
+        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];
         memcpy(t, kdata, tf_kd_size);
         if (p1 == 0x1) {
@@ -93,47 +113,59 @@ int cmd_key_domain() {
         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) {
+            return SW_REFERENCE_NOT_FOUND();
+        }
     }
     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);
             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);
@@ -147,8 +179,9 @@ int cmd_key_domain() {
             }
         }
     }
-    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;

src/hsm/cmd_key_gen.c

@@ -24,29 +24,38 @@ int cmd_key_gen() {
     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();
 }

src/hsm/cmd_key_unwrap.c

@@ -18,18 +18,22 @@
 #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;
-    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);
@@ -41,6 +45,10 @@ int cmd_key_unwrap() {
             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 +65,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();
@@ -66,19 +78,29 @@ int cmd_key_unwrap() {
         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);
+            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();
@@ -99,8 +121,18 @@ 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) {
+            return SW_EXEC_ERROR();
+        }
+        low_flash_available();
+        res_APDU_size = 0;
+    }
     return SW_OK();
 }

src/hsm/cmd_key_wrap.c

@@ -24,19 +24,24 @@ extern uint8_t get_key_domain(file_t *fkey);
 
 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);
     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,8 +52,9 @@ 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);
@@ -60,8 +66,9 @@ int cmd_key_wrap() {
         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);
@@ -69,25 +76,30 @@ int cmd_key_wrap() {
     }
     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();
 }

src/hsm/cmd_keypair_gen.c

@@ -26,13 +26,15 @@
 
 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,7 +57,9 @@ 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;
@@ -64,7 +68,8 @@ int cmd_keypair_gen() {
                     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);
@@ -77,8 +82,9 @@ int cmd_keypair_gen() {
             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);
                 if (ec_id == MBEDTLS_ECP_DP_NONE) {
@@ -99,14 +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_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;
@@ -121,29 +132,40 @@ int cmd_keypair_gen() {
                         }
                     }
                 }
-                if ((res_APDU_size = asn1_cvc_aut(&ecdsa, HSM_KEY_EC, res_APDU, 4096, ext, ext_len)) == 0) {
+                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) {
+                    free(ext);
+                }
                 ret = store_keys(&ecdsa, HSM_KEY_EC, key_id);
-	            if (ret != CCID_OK) {
                 mbedtls_ecdsa_free(&ecdsa);
+                if (ret != CCID_OK) {
                     return SW_EXEC_ERROR();
                 }
-                mbedtls_ecdsa_free(&ecdsa);
             }
 
         }
     }
-    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)
+    }
+    if (apdu.ne == 0) {
         apdu.ne = res_APDU_size;
+    }
     low_flash_available();
     return SW_OK();
 }

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)) {
@@ -31,13 +30,18 @@ int cmd_list_keys()
         res_APDU[res_APDU_size++] = EF_KEY_DEV & 0xff;
     }
     //first CC
+    for (int i = 0; i < dynamic_files; i++) {
+        file_t *f = &dynamic_file[i];
+        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;
-            res_APDU[res_APDU_size++] = KEY_PREFIX;
-            res_APDU[res_APDU_size++] = f->fid & 0xff;
         }
     }
     //second CD

src/hsm/cmd_mse.c

@@ -27,8 +27,9 @@ file_t *ef_puk_aut = NULL;
 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 +37,35 @@ 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) {
                 if (tag_len == 1) {
 
                 }
                 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 */
                         for (int i = 0; i < MAX_PUK; i++) {
                             file_t *ef = search_dynamic_file(EF_PUK + i);
-                            if (!ef)
+                            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);
+                            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();
@@ -69,7 +77,8 @@ int cmd_mse() {
             }
         }
     }
-    else
+    else {
         return SW_INCORRECT_P1P2();
+    }
     return SW_OK();
 }

src/hsm/cmd_pso.c

@@ -26,10 +26,12 @@ extern PUK *current_puk;
 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 +41,12 @@ 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,26 +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
                     mbedtls_ecp_group_id ec_id = cvc_inherite_ec_group(apdu.data, apdu.nc);
                     mbedtls_ecp_group grp;
@@ -111,26 +121,42 @@ 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);
+                size_t cd_len = asn1_build_cert_description(chr,
-                if (cd_len == 0)
+                                                            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);
+                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();
 }

src/hsm/cmd_puk_auth.c

@@ -22,22 +22,26 @@
 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) {
         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 (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));
                 memcpy(tmp, puk_data, file_get_size(ef_puk));
                 tmp[1] = puk_data[1] - 1;
@@ -46,26 +50,32 @@ int cmd_puk_auth() {
                 free(tmp);
             }
             else if (p1 == 0x1) {   /* Replace */
-                if (p2 >= puk_data[0])
+                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 (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);
         if (chr) {
@@ -77,8 +87,9 @@ int cmd_puk_auth() {
     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();

src/hsm/cmd_read_binary.c

@@ -23,11 +23,11 @@ int cmd_read_binary() {
     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)))
+            if (!(ef = search_by_fid(p1 & 0x1f, NULL, SPECIFY_EF))) {
                 return SW_FILE_NOT_FOUND();
+            }
             offset = p2;
         }
         else {
@@ -37,24 +37,31 @@ int cmd_read_binary() {
     }
     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 {
             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)))
+            }
+            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;
             }
         }
+    }
 
     if ((fid >> 8) == KEY_PREFIX || !authenticate_action(ef, ACL_OP_READ_SEARCH)) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
@@ -62,11 +69,13 @@ 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)
+            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;
@@ -75,12 +84,14 @@ int cmd_read_binary() {
         }
         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;
         }

src/hsm/cmd_reset_retry.c

@@ -20,75 +20,90 @@
 #include "kek.h"
 
 int cmd_reset_retry() {
-    if (P2(apdu) != 0x81)
+    if (P2(apdu) != 0x81) {
         return SW_REFERENCE_NOT_FOUND();
+    }
     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();
-    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)
+            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))
+        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)
+            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();

src/hsm/cmd_select.c

@@ -19,8 +19,7 @@
 #include "version.h"
 
 void select_file(file_t *pe) {
-    if (!pe)
+    if (!pe) {
-    {
         currentDF = (file_t *) MF;
         currentEF = 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,9 +63,10 @@ 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) {
@@ -89,9 +90,10 @@ int cmd_select() {
             }
         }
         else if (p1 == 0x03) {   //Select parent DF of the current DF - Absent
-            if (apdu.nc != 0)
+            if (apdu.nc != 0) {
                 return SW_FILE_NOT_FOUND();
             }
+        }
         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();
@@ -125,8 +127,9 @@ int cmd_select() {
             res_APDU[1] = res_APDU_size - 2;
         }
     }
-    else
+    else {
         return SW_INCORRECT_P1P2();
+    }
     select_file(pe);
     return SW_OK();
 }

src/hsm/cmd_session_pin.c

@@ -28,7 +28,8 @@ int cmd_session_pin() {
         res_APDU_size = sm_session_pin_len;
         apdu.ne = sm_session_pin_len;
     }
-    else
+    else {
         return SW_INCORRECT_P1P2();
+    }
     return SW_OK();
 }

src/hsm/cmd_signature.c

@@ -66,18 +66,24 @@ static const struct digest_info_prefix {
     { 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)
+            if (algorithm) {
                 *algorithm = digest_info_prefix[i].algorithm;
-			if (out_dat == NULL)
+            }
+            if (out_dat == NULL) {
                 return CCID_OK;
-			if (*out_len < hash_len)
+            }
+            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;
@@ -92,22 +98,39 @@ int cmd_signature() {
     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)) || !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)
+    }
+    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)
+    }
+    else if (p2 == ALGO_EC_SHA224 || p2 == ALGO_RSA_PKCS1_SHA224 || p2 == ALGO_RSA_PSS_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 || 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) {
+        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) {
         generic_hash(md, apdu.data, apdu.nc, apdu.data);
         apdu.nc = mbedtls_md_get_size(mbedtls_md_info_from_type(md));
     }
@@ -115,20 +138,22 @@ int cmd_signature() {
         mbedtls_rsa_context ctx;
         mbedtls_rsa_init(&ctx);
 
-        int r;
+        int r = load_private_key_rsa(&ctx, fkey);
-        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 {
@@ -144,36 +169,47 @@ 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 {
@@ -195,38 +231,49 @@ int cmd_signature() {
         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;
+        }
-        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)
+            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();
         }
@@ -234,8 +281,9 @@ int cmd_signature() {
         res_APDU_size = olen;
         mbedtls_ecdsa_free(&ctx);
     }
-    else
+    else {
         return SW_INCORRECT_P1P2();
+    }
     decrement_key_counter(fkey);
     return SW_OK();
 }

src/hsm/cmd_update_ef.c

@@ -27,24 +27,31 @@ int cmd_update_ef() {
     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
             data_len = tag_len;
             data = tag_data;
@@ -57,29 +64,36 @@ int cmd_update_ef() {
         select_file(ef);
     }
     else {
-        if (fid == 0x0 && !ef)
+        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 (!ef->data)
+            if (!file_has_data(ef)) {
                 return SW_DATA_INVALID();
+            }
 
             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();
     }
     return SW_OK();

src/hsm/cmd_verify.c

@@ -21,34 +21,42 @@ 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
+        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) {

src/hsm/cvc.c

@@ -37,100 +37,161 @@ size_t asn1_cvc_public_key_rsa(mbedtls_rsa_context *rsa, uint8_t *buf, size_t bu
     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 *)
-    (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",
+    "\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\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 *)
-    (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",
+    "\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 *)"\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\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) {
+    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),
-    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);
+           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));
     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] ? p_size : 0));
+    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);
+    size_t tot_len = asn1_len_tag(0x7f49,
-    if (buf == NULL || buf_len == 0)
+                                  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;
+        *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]) {
+        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;
+            *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(0, p);
+            *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
-    size_t y_new_size = 0;
+    *p++ = 0x86; p += format_tlv_len(y_size, p); memcpy(p, Y_buf, y_size); p += y_size;
-    *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;
     //cofactor
-    *p++ = 0x87; p += format_tlv_len(c_size, p); *p++ = 1;
+    *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) {
+        *p++ = 8;
+    }
+    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) {
+    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) {
+    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;
     }
@@ -138,10 +199,12 @@ size_t asn1_cvc_cert_body(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, 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)
+    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);
@@ -150,10 +213,12 @@ 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) {
@@ -165,18 +230,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)
+    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);
+    else if (key_type == HSM_KEY_EC) {
-    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);
+        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);
@@ -187,8 +265,10 @@ 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,
-            return 0;
+                                              hsh, p) != 0) {
+            memset(p, 0, key_size);
+        }
         p += key_size;
     }
     else if (key_type == HSM_KEY_EC) {
@@ -197,28 +277,36 @@ size_t asn1_cvc_cert(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf
         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 =
-        if (ret != 0) {
+            mbedtls_ecdsa_sign(&ecdsa->grp, &r, &s, &ecdsa->d, hsh, sizeof(hsh), random_gen, NULL);
-            mbedtls_mpi_free(&r);
+        if (ret == 0) {
-            mbedtls_mpi_free(&s);
+            mbedtls_mpi_write_binary(&r, p, key_size / 2); p += key_size / 2;
-            return 0;
+            mbedtls_mpi_write_binary(&s, p, key_size / 2); p += key_size / 2;
+        }
+        else {
+            memset(p, 0, key_size);
+            p += key_size;
         }
-        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_free(&r);
         mbedtls_mpi_free(&s);
     }
     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) {
@@ -226,11 +314,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);
+    size_t outsig_size = asn1_len_tag(0x5f37, key_size), tot_len = asn1_len_tag(0x67,
-    if (buf_len == 0 || buf == NULL)
+                                                                                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);
@@ -260,16 +352,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 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);
@@ -292,7 +395,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;
@@ -304,15 +408,29 @@ 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 =
-    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)));
+        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)
+    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);
@@ -325,17 +443,21 @@ 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);
+    p += format_tlv_len(seq_len, p);
-    memcpy(p, "\x07\x20\x80", 3); p += 3;
+    memcpy(p, seq, seq_len); p += seq_len;
 
     //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++ = 0x30;
@@ -349,19 +471,58 @@ 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)
+    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 *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);
     }
@@ -370,8 +531,9 @@ const uint8_t *cvc_get_body(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);
     }
@@ -411,9 +573,10 @@ extern int puk_store_entries;
 
 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;
 }
 
@@ -431,45 +594,62 @@ mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len) {
                 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);
+        const uint8_t *t81 = cvc_get_field(puk, puk_len, &t81_len, 0x81), *t82 = cvc_get_field(puk,
-        if (!t81 || !t82)
+                                                                                               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) {
             md = MBEDTLS_MD_SHA1;
             mbedtls_rsa_set_padding(&rsa, MBEDTLS_RSA_PKCS_V21, md);
@@ -508,31 +688,40 @@ 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
         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);
@@ -571,64 +760,83 @@ 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) {
     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)
+        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;
 }

src/hsm/cvc.h

@@ -19,7 +19,11 @@
 #define _CVC_H_
 
 #include <stdlib.h>
+#ifndef ENABLE_EMULATION
 #include "pico/stdlib.h"
+#else
+#include <stdbool.h>
+#endif
 #include "mbedtls/ecp.h"
 
 typedef struct PUK {
@@ -36,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_cert(void *rsa_ecdsa,
-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);
+                            uint8_t key_type,
-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);
+                            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);
@@ -46,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 int puk_verify(const uint8_t *sig,
-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);
+                      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

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
+    /*  0 */ { .fid = 0x3f00, .parent = 0xff, .name = NULL, .type = FILE_TYPE_DF, .data = NULL,
-    /*  1 */ { .fid = 0x2f00    , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.DIR
+               .ef_structure = 0, .acl = { 0 } },                                                                                    // MF
-    /*  2 */ { .fid = 0x2f01    , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.ATR
+    /*  1 */ { .fid = 0x2f00, .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL,
-    /*  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
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                         //EF.DIR
-    /*  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
+    /*  2 */ { .fid = 0x2f01, .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL,
-    /*  5 */ { .fid = 0x5015    , .parent = 0, .name = NULL, .type = FILE_TYPE_DF, .data = NULL, .ef_structure = 0, .acl = {0} }, //DF.PKCS15
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                         //EF.ATR
-    /*  6 */ { .fid = 0x5031    , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.ODF
+    /*  3 */ { .fid = EF_TERMCA, .parent = 0, .name = NULL,
-    /*  7 */ { .fid = 0x5032    , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.TokenInfo
+               .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL,
-    /*  8 */ { .fid = 0x5033    , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.UnusedSpace
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                                                             //EF.GDO
-    /*  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)
+    /*  4 */ { .fid = 0x2f03, .parent = 5, .name = NULL,
-    /* 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)
+               .type = FILE_TYPE_WORKING_EF | FILE_DATA_FUNC, .data = (uint8_t *) parse_token_info,
-    /* 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)
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                                                                //EF.TokenInfo
-    /* 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)
+    /*  5 */ { .fid = 0x5015, .parent = 0, .name = NULL, .type = FILE_TYPE_DF, .data = NULL,
-    /* 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)
+               .ef_structure = 0, .acl = { 0 } },                                                                                 //DF.PKCS15
-    /* 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)
+    /*  6 */ { .fid = 0x5031, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL,
-    /* 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
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                         //EF.ODF
-    /* 16 */ { .fid = EF_PRKDFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.PrKDFs
+    /*  7 */ { .fid = 0x5032, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL,
-    /* 17 */ { .fid = EF_PUKDFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.PuKDFs
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                         //EF.TokenInfo
-    /* 18 */ { .fid = EF_CDFS   , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.CDFs
+    /*  8 */ { .fid = 0x5033, .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL,
-    /* 19 */ { .fid = EF_AODFS  , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.AODFs
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                         //EF.UnusedSpace
-    /* 20 */ { .fid = EF_DODFS  , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.DODFs
+    /*  9 */ { .fid = 0x1081, .parent = 5, .name = NULL,
-    /* 21 */ { .fid = EF_SKDFS  , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.SKDFs
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
-    /* 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
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //PIN (PIN1)
-    /* 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
+    /* 10 */ { .fid = 0x1082, .parent = 5, .name = NULL,
-    /* 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
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
-    /* 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
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //max retries PIN (PIN1)
-    /* 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
+    /* 11 */ { .fid = 0x1083, .parent = 5, .name = NULL,
-    /* 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
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
-    /* 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
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //retries PIN (PIN1)
-    /* 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
+    /* 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} },
+    /* 31 */ { .fid = 0x0000, .parent = 5, .name = sc_hsm_aid, .type = FILE_TYPE_WORKING_EF,
-    /* 32 */ { .fid = 0x0000, .parent = 0xff, .name = NULL, .type = FILE_TYPE_UNKNOWN, .data = NULL, .ef_structure = 0, .acl = {0} } //end
+               .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];

src/hsm/kek.c

@@ -18,7 +18,9 @@
 #include <string.h>
 #include "common.h"
 #include "stdlib.h"
+#ifndef ENABLE_EMULATION
 #include "pico/stdlib.h"
+#endif
 #include "kek.h"
 #include "crypto_utils.h"
 #include "random.h"
@@ -27,56 +29,89 @@
 #include "mbedtls/cmac.h"
 #include "mbedtls/rsa.h"
 #include "mbedtls/ecdsa.h"
+#include "mbedtls/chachapoly.h"
 #include "files.h"
 
 extern bool has_session_pin, has_session_sopin;
 extern uint8_t session_pin[32], session_sopin[32];
+uint8_t mkek_mask[MKEK_KEY_SIZE];
+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++;
-        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)
+    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);
-        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;
         }
     }
-    if (pin == NULL) //Should never happen
+    if (pin == NULL) { //Should never happen
         return CCID_EXEC_ERROR;
-    int ret = aes_decrypt_cfb_256(pin, MKEK_IV(mkek), MKEK_KEY(mkek), MKEK_KEY_SIZE+MKEK_KEY_CS_SIZE);
+    }
-    if (ret != 0)
+
+    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) {
         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 };
+
+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);
+    mbedtls_chachapoly_free(&chatx);
+    return ret;
+}
+
 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);
 }
@@ -86,15 +121,17 @@ void release_mkek(uint8_t *mkek) {
 }
 
 int store_mkek(const uint8_t *mkek) {
-    if (has_session_pin == false && has_session_sopin == false)
+    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);
     if (has_session_pin) {
         uint8_t tmp_mkek_pin[MKEK_SIZE];
@@ -105,7 +142,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);
     }
@@ -118,7 +158,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);
     }
@@ -129,11 +172,13 @@ int store_mkek(const uint8_t *mkek) {
 
 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;
@@ -143,25 +188,30 @@ 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) {
     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)
+    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++)
+    }
+    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;
@@ -172,8 +222,9 @@ int dkek_kcv(uint8_t id, uint8_t *kcv) { //kcv 8 bytes
     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);
@@ -184,8 +235,9 @@ 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));
@@ -196,8 +248,9 @@ 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));
@@ -207,8 +260,9 @@ int dkek_kmac(uint8_t id, uint8_t *kmac) { //kmac 32 bytes
 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;
@@ -217,16 +271,24 @@ int mkek_encrypt(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) {
+int dkek_encode_key(uint8_t id,
-    if (!(key_type & HSM_KEY_RSA) && !(key_type & HSM_KEY_EC) && !(key_type & HSM_KEY_AES))
+                    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));
@@ -236,33 +298,41 @@ 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);
@@ -272,46 +342,65 @@ int dkek_encode_key(uint8_t id, void *key_ctx, int key_type, uint8_t *out, size_
         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
+        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_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_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
+        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)); 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);
+        mbedtls_mpi_write_binary(&ecdsa->grp.N, kb + 8 + 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_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.X, kb + 8 + kb_len,
-        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_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);
+        mbedtls_mpi_write_binary(&ecdsa->d, kb + 8 + 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_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.X, kb + 8 + 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);
+        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_len = 12;
@@ -322,107 +411,146 @@ 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)
+    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)
+    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);
+    r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB),
-    if (r != 0)
+                            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;
 
@@ -444,18 +572,21 @@ 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;
@@ -567,6 +698,20 @@ 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;
+
+        //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;
+        }
     }
     else if (key_type == 15) {
         memcpy(key_ctx, kb + ofs, key_size);

src/hsm/kek.h

@@ -18,6 +18,11 @@
 #ifndef _DKEK_H_
 #define _DKEK_H_
 
+#include "crypto_utils.h"
+#ifdef ENABLE_EMULATION
+#include <stdbool.h>
+#endif
+
 extern int load_mkek(uint8_t *);
 extern int store_mkek(const uint8_t *);
 extern int save_dkek_key(uint8_t, const uint8_t *key);
@@ -28,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)
 
@@ -45,4 +62,16 @@ extern int dkek_decode_key(uint8_t, void *key_ctx, const uint8_t *in, size_t in_
 #define MKEK_CHECKSUM(p) (MKEK_KEY(p) + MKEK_KEY_SIZE)
 #define DKEK_KEY_SIZE    (32)
 
+extern uint8_t mkek_mask[MKEK_KEY_SIZE];
+extern bool has_mkek_mask;
+
+typedef struct mse {
+    uint8_t Qpt[65];
+    uint8_t key_enc[12 + 32];
+    bool init;
+} mse_t;
+extern mse_t mse;
+
+extern int mse_decrypt_ct(uint8_t *, size_t);
+
 #endif

src/hsm/oid.h

@@ -18,11 +18,24 @@
 #ifndef _OID_H_
 #define _OID_H_
 
-#include <stdlib.h>
-#include "pico/stdlib.h"
-
 #define OID_BSI_DE                      "\x04\x00\x7F\x00\x07"
 
+#define OID_ECKA                        OID_BSI_DE "\x01\x01\x05"
+#define OID_ECKA_EG                     OID_ECKA "\x01"
+#define OID_ECKA_EG_X963KDF             OID_ECKA_EG "\x01"
+#define OID_ECKA_EG_X963KDF_SHA1        OID_ECKA_EG_X963KDF "\x01"
+#define OID_ECKA_EG_X963KDF_SHA224      OID_ECKA_EG_X963KDF "\x02"
+#define OID_ECKA_EG_X963KDF_SHA256      OID_ECKA_EG_X963KDF "\x03"
+#define OID_ECKA_EG_X963KDF_SHA384      OID_ECKA_EG_X963KDF "\x04"
+#define OID_ECKA_EG_X963KDF_SHA512      OID_ECKA_EG_X963KDF "\x05"
+#define OID_ECKA_DH                     OID_ECKA "\x02"
+#define OID_ECKA_DH_X963KDF             OID_ECKA_DH "\x01"
+#define OID_ECKA_DH_X963KDF_SHA1        OID_ECKA_DH_X963KDF "\x01"
+#define OID_ECKA_DH_X963KDF_SHA224      OID_ECKA_DH_X963KDF "\x02"
+#define OID_ECKA_DH_X963KDF_SHA256      OID_ECKA_DH_X963KDF "\x03"
+#define OID_ECKA_DH_X963KDF_SHA384      OID_ECKA_DH_X963KDF "\x04"
+#define OID_ECKA_DH_X963KDF_SHA512      OID_ECKA_DH_X963KDF "\x05"
+
 #define OID_ID_PK                       OID_BSI_DE "\x02\x02\x01"
 #define OID_ID_PK_DH                    OID_ID_PK "\x01"
 #define OID_ID_PK_ECDH                  OID_ID_PK "\x02"
@@ -103,4 +116,32 @@
 #define OID_CC_FF_PKA                   OID_CC_FORMAT "\x03"
 #define OID_CC_FF_KDA                   OID_CC_FORMAT "\x04"
 
+#define OID_RSADSI                      "\x2A\x86\x48\x86\xF7\x0D"
+
+#define OID_PKCS                        OID_RSADSI "\x01"
+
+#define OID_PKCS_5                      OID_PKCS "\x05"
+#define OID_PKCS5_PBKDF2                OID_PKCS_5 "\x0C"
+#define OID_PKCS5_PBES2                 OID_PKCS_5 "\x0D"
+
+#define OID_PKCS_9                      OID_PKCS "\x09"
+
+#define OID_PKCS9_SMIME_ALG             OID_PKCS_9 "\x10\x03"
+
+#define OID_CHACHA20_POLY1305           OID_PKCS9_SMIME_ALG "\x12"
+#define OID_HKDF_SHA256                 OID_PKCS9_SMIME_ALG "\x1D"
+#define OID_HKDF_SHA384                 OID_PKCS9_SMIME_ALG "\x1E"
+#define OID_HKDF_SHA512                 OID_PKCS9_SMIME_ALG "\x1F"
+
+
+#define OID_DIGEST                      OID_RSADSI "\x02"
+
+#define OID_HMAC_SHA1                   OID_DIGEST "\x07"
+#define OID_HMAC_SHA224                 OID_DIGEST "\x08"
+#define OID_HMAC_SHA256                 OID_DIGEST "\x09"
+#define OID_HMAC_SHA384                 OID_DIGEST "\x0A"
+#define OID_HMAC_SHA512                 OID_DIGEST "\x0B"
+
+#define OID_KDF_X963                    "\x2B\x81\x05\x10\x86\x48\x3F"
+
 #endif

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[] = {
@@ -34,7 +34,8 @@ const uint8_t sc_hsm_aid[] = {
 
 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];
@@ -75,8 +76,10 @@ extern int cmd_session_pin();
 extern int cmd_puk_auth();
 extern int cmd_pso();
 
-app_t *sc_hsm_select_aid(app_t *a) {
+extern const uint8_t *ccid_atr;
-    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;
@@ -174,10 +177,12 @@ 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)
+    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) {
@@ -185,12 +190,19 @@ int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy) {
         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].chr = cvc_get_chr(puk_store[puk_store_entries].cvcert,
-    puk_store[puk_store_entries].car = cvc_get_car(puk_store[puk_store_entries].cvcert, data_len, &puk_store[puk_store_entries].car_len);
+                                                   data_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_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;
@@ -213,20 +225,23 @@ void init_sc_hsm() {
     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)
+            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));
 }
@@ -240,35 +255,41 @@ 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;
 }
 
 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 {
             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) {
-    char *label = "SmartCard-HSM";
+    char *label = "Pico-HSM";
     char *manu = "Pol Henarejos";
     if (mode == 1) {
         uint8_t *p = res_APDU;
         *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;
@@ -279,15 +300,18 @@ int parse_token_info(const file_t *f, int mode) {
 }
 
 int pin_reset_retries(const file_t *pin, bool force) {
-    if (!pin)
+    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));
     low_flash_available();
@@ -295,20 +319,24 @@ int pin_reset_retries(const file_t *pin, bool force) {
 }
 
 int pin_wrong_retry(const file_t *pin) {
-    if (!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)
+        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;
@@ -316,43 +344,50 @@ 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)
+    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 {
         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;
@@ -365,8 +400,9 @@ int check_pin(const file_t *pin, const uint8_t *data, size_t len) {
 }
 
 const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len) {
-    if (ef == NULL)
+    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) {
@@ -384,8 +420,9 @@ const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len) {
 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;
 }
 
@@ -394,17 +431,19 @@ bool key_has_purpose(file_t *ef, uint8_t purpose) {
     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)
+    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) {
@@ -416,7 +455,8 @@ uint32_t decrement_key_counter(file_t *fkey) {
         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;
@@ -425,8 +465,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;
             }
@@ -454,26 +495,32 @@ int store_keys(void *key_ctx, int type, uint8_t key_id) {
         key_size++;
     }
     else if (type & HSM_KEY_AES) {
-        if (type == HSM_KEY_AES_128)
+        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;
 }
@@ -511,15 +558,17 @@ 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
+    if (wait_button_pressed() == true) { //timeout
         return CCID_VERIFICATION_FAILED;
+    }
 
     int key_size = file_get_size(fkey);
     uint8_t kdata[4096 / 8];
@@ -561,8 +610,9 @@ int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey) {
 }
 
 int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey) {
-    if (wait_button_pressed() == true) //timeout
+    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
@@ -581,12 +631,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
@@ -647,7 +691,10 @@ static const cmd_t cmds[] = {
 };
 
 int sc_hsm_process_apdu() {
-    sm_unwrap();
+    int r = sm_unwrap();
+    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();

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"
@@ -66,6 +68,8 @@ extern const uint8_t sc_hsm_aid[];
 #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 HSM_OPT_RRC                 0x0001
@@ -77,6 +81,7 @@ extern const uint8_t sc_hsm_aid[];
 #define HSM_OPT_RRC_RESET_ONLY      0x0020
 #define HSM_OPT_BOOTSEL_BUTTON      0x0100
 #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 */

src/hsm/version.h

@@ -18,10 +18,9 @@
 #ifndef __VERSION_H_
 #define __VERSION_H_
 
-#define HSM_VERSION 0x0300
+#define HSM_VERSION 0x0304
 
 #define HSM_VERSION_MAJOR ((HSM_VERSION >> 8) & 0xff)
 #define HSM_VERSION_MINOR (HSM_VERSION & 0xff)
 
 #endif
-

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}

tests/conftest.py

@@ -0,0 +1,509 @@
+"""
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+import sys
+import pytest
+import os
+from binascii import hexlify
+from utils import APDUResponse, DOPrefixes, KeyType, Algorithm, Padding, int_to_bytes
+from const import *
+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 import hashes, cmac
+    from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+    from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
+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, codes=[]):
+        lc = []
+        dataf = []
+        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:
+            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)
+
+        code = (sw1<<8|sw2)
+        if (sw1 != 0x90):
+            if (sw1 == 0x63 and sw2 & 0xF0 == 0xC0):
+                pass
+            elif (code == 0x6A82):
+                self.select_applet()
+                if (sw1 == 0x90):
+                    response, sw1, sw2 = self.__card.connection.transmit(apdu)
+                    if (sw1 == 0x90):
+                        return response
+            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
+            if (code not in codes):
+                raise APDUResponse(sw1, sw2)
+        if (len(codes) > 1):
+            return response, code
+        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=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):
+            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 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()
+
+            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):
+        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.get_contents(p1=DOPrefixes.EE_CERTIFICATE_PREFIX.value, p2=keyid)
+
+        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)
+
+    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)
+
+    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, 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()
+        kmac = hashlib.sha256((dkek or b'\x00'*32) + b'\x00\x00\x00\x02').digest()
+        data += kcv
+        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
+        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
+
+        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)
+            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
+        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):
+            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()
+        _ = 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
+
+    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])
+
+    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
+
+    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'
+        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
+
+    def cmac(self, keyid, data):
+        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():
+    dev = Device()
+    return dev

tests/const.py

@@ -0,0 +1,26 @@
+"""
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+DEFAULT_PIN = '648219'
+DEFAULT_SOPIN = '57621880'
+DEFAULT_RETRIES = 3
+DEFAULT_DKEK = [0x1] * 32
+DEFAULT_DKEK_SHARES = 2
+
+EF_TERMCA   = 0x2f02

tests/docker/jammy/Dockerfile

@@ -0,0 +1,30 @@
+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 \
+    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 /

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 --rm \
+        --cap-add SYS_PTRACE \
+        --volume $PWD:$PWD \
+        --workdir ${WORKDIR} \
+        -e MAKEFLAGS \
+        ${ENV_ARGS} \
+        ${DOCKER_IMAGE_TAG} \
+        $@
+}

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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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()

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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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)
+

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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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)

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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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)
+

tests/pico-hsm/test_010_pin.py

@@ -0,0 +1,53 @@
+"""
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+import pytest
+from utils import APDUResponse, SWCodes
+from const import DEFAULT_PIN, DEFAULT_RETRIES
+
+WRONG_PIN = '112233'
+RETRIES = DEFAULT_RETRIES
+
+def test_pin_init_retries(device):
+    device.initialize(retries=RETRIES)
+    retries = device.get_login_retries()
+    assert(retries == RETRIES)
+
+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(WRONG_PIN)
+    assert(e.value.sw == SWCodes.SW_PIN_BLOCKED.value)
+
+    device.initialize(retries=RETRIES)
+    retries = device.get_login_retries()
+    assert(retries == RETRIES)
+
+

tests/pico-hsm/test_020_keypair_gen.py

@@ -0,0 +1,45 @@
+"""
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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):
+    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)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX.value << 8 | keyid)
+
+@pytest.mark.parametrize(
+    "modulus", [1024, 2048, 4096]
+)
+def test_gen_rsa(device, 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)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX.value << 8 | keyid)
+

tests/pico-hsm/test_021_key_import.py

@@ -0,0 +1,65 @@
+"""
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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
+
+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)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_import_aes(device, size):
+    pkey = os.urandom(size // 8)
+    keyid = device.import_key(pkey)

tests/pico-hsm/test_022_key_exchange.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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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)

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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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)

tests/pico-hsm/test_030_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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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', '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]
+)
+def test_signature_ecc(device, curve, scheme):
+    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()
+    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,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]
+)
+def test_signature_rsa(device, modulus, scheme):
+    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)
+    device.verify(pubkey, data, signature, scheme)
+

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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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.key_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)
+

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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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)

tests/pico-hsm/test_060_mac.py

@@ -0,0 +1,62 @@
+"""
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+import pytest
+import os
+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
+
+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()
+    device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid)
+    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()
+    device.delete_file(DOPrefixes.KEY_PREFIX.value << 8 | keyid)
+    assert(bytes(resA) == resB)
+

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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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))

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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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))

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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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))

tests/run-test-in-docker.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -eu
+
+source tests/docker_env.sh
+run_in_docker ./tests/start-up-and-test.sh
+

tests/start-up-and-test.sh

@@ -0,0 +1,8 @@
+#!/bin/bash -eu
+
+/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

tests/utils.py

@@ -0,0 +1,138 @@
+"""
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+"""
+
+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
+    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
+    ALGO_EC_SHA256          = 0x73
+    ALGO_EC_SHA384          = 0x74
+    ALGO_EC_SHA512          = 0x75
+    ALGO_EC_DH              = 0x80
+    ALGO_EC_DERIVE          = 0x98
+
+    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
+
+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)

tools/pico-hsm-patch-vidpid.sh

@@ -17,8 +17,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-VERSION_MAJOR="3" #Version of Pico CCID Core
+VERSION_MAJOR="4" #Version of Pico CCID Core
-VERSION_MINOR="4"
+VERSION_MINOR="0"
 
 echo "----------------------------"
 echo "VID/PID patcher for Pico HSM"

tools/pico-hsm-tool.py

@@ -19,46 +19,91 @@
  */
 """
 
+import sys
+try:
     from smartcard.CardType import AnyCardType
     from smartcard.CardRequest import CardRequest
-from smartcard.Exceptions import CardRequestTimeoutException
+    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 cvc.certificates import CVC
     from cvc.asn1 import ASN1
     from cvc.oid import oid2scheme
     from cvc.utils import scheme_rsa
+except ModuleNotFoundError:
+    print('ERROR: cvc module not found! Install pycvc package.\nTry with `pip install pycvc`')
+    sys.exit(-1)
+
+try:
     from cryptography.hazmat.primitives.asymmetric import ec
+    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
+except ModuleNotFoundError:
+    print('ERROR: cryptography module not found! Install cryptography package.\nTry with `pip install cryptography`')
+    sys.exit(-1)
+
+
 import json
 import urllib.request
 import base64
-from binascii import hexlify
+from binascii import hexlify, unhexlify
 import sys
 import argparse
 import os
+import platform
 from datetime import datetime
 from argparse import RawTextHelpFormatter
 
+pin = None
+
 class APDUResponse(Exception):
     def __init__(self, sw1, sw2):
         self.sw1 = sw1
         self.sw2 = sw2
         super().__init__(f'SW:{sw1:02X}{sw2:02X}')
 
+def hexy(a):
+    return [hex(i) for i in a]
 
-def send_apdu(card, command, p1, p2, data=None):
+def send_apdu(card, command, p1, p2, data=None, ne=None):
     lc = []
     dataf = []
     if (data):
         lc = [0x00] + list(len(data).to_bytes(2, 'big'))
         dataf = 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 = [0x00, command]
 
     apdu = apdu + [p1, p2] + lc + dataf + le
+    try:
+        response, sw1, sw2 = card.connection.transmit(apdu)
+    except CardConnectionException:
+        card.connection.reconnect()
         response, sw1, sw2 = card.connection.transmit(apdu)
     if (sw1 != 0x90):
+        if (sw1 == 0x6A and sw2 == 0x82):
+            response, sw1, sw2 = card.connection.transmit([0x00, 0xA4, 0x04, 0x00, 0xB, 0xE8, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x81, 0xC3, 0x1F, 0x02, 0x01, 0x0])
+            if (sw1 == 0x90):
+                response, sw1, sw2 = card.connection.transmit(apdu)
+                if (sw1 == 0x90):
+                    return response
+        elif (sw1 == 0x69 and sw2 == 0x82):
+            response, sw1, sw2 = card.connection.transmit([0x00, 0x20, 0x00, 0x81, len(pin)] + list(pin.encode()) + [0x0])
+            if (sw1 == 0x90):
+                response, sw1, sw2 = card.connection.transmit(apdu)
+                if (sw1 == 0x90):
+                    return response
         raise APDUResponse(sw1, sw2)
     return response
 
@@ -66,7 +111,7 @@ def parse_args():
     parser = argparse.ArgumentParser()
     subparser = parser.add_subparsers(title="commands", dest="command")
     parser_init = subparser.add_parser('initialize', help='Performs the first initialization of the Pico HSM.')
-    parser_init.add_argument('--pin', help='PIN number')
+    parser.add_argument('--pin', help='PIN number')
     parser_init.add_argument('--so-pin', help='SO-PIN number')
 
     parser_attestate = subparser.add_parser('attestate', help='Generates an attestation report for a private key and verifies the private key was generated in the devices or outside.')
@@ -81,12 +126,62 @@ def parse_args():
     parser_pki_init.add_argument('--force', help='Forces the download of certificates.', action='store_true')
 
     parser_rtc = subparser.add_parser('datetime', help='Datetime operations with the integrated Real Time Clock (RTC).')
-    parser_rtc.add_argument('subcommand', choices=['set', 'get'], help='Sets or gets current datetime.')
+    subparser_rtc = parser_rtc.add_subparsers(title='commands', dest='subcommand')
+    parser_rtc_set = subparser_rtc.add_parser('set', help='Sets the current datetime.')
+    parser_rtc_get = subparser_rtc.add_parser('set', help='Gets the current datetime.')
 
     parser_opts = subparser.add_parser('options', help='Manage extra options.', formatter_class=RawTextHelpFormatter)
-    parser_opts.add_argument('subcommand', choices=['set', 'get'], help='Sets or gets option OPT.')
+    subparser_opts = parser_opts.add_subparsers(title='commands', dest='subcommand')
-    parser_opts.add_argument('opt', choices=['button', 'counter'], help='Button: press-to-confirm button.\nCounter: every generated key has an internal counter.')
+    parser_opts_set = subparser_opts.add_parser('set', help='Sets option OPT.')
-    parser_opts.add_argument('onoff', choices=['on', 'off'], help='Toggles state ON or OFF', metavar='ON/OFF', nargs='?')
+    parser_opts_get = subparser_opts.add_parser('get', help='Gets optiont OPT.')
+    parser_opts.add_argument('opt', choices=['button', 'counter'], help='button: press-to-confirm button.\ncounter: every generated key has an internal counter.', metavar='OPT')
+    parser_opts_set.add_argument('onoff', choices=['on', 'off'], help='Toggles state ON or OFF', metavar='ON/OFF', nargs='?')
+
+    parser_secure = subparser.add_parser('secure', help='Manages security of Pico HSM.')
+    subparser_secure = parser_secure.add_subparsers(title='commands', dest='subcommand')
+    parser_opts_enable = subparser_secure.add_parser('enable', help='Enables secure lock.')
+    parser_opts_unlock = subparser_secure.add_parser('unlock', help='Unlocks the secure lock.')
+    parser_opts_disable = subparser_secure.add_parser('disable', help='Disables secure lock.')
+
+    parser_cipher = subparser.add_parser('cipher', help='Implements extended symmetric ciphering with new algorithms and options.\n\tIf no file input/output is specified, stdin/stoud will be used.')
+    subparser_cipher = parser_cipher.add_subparsers(title='commands', dest='subcommand')
+    parser_cipher_encrypt = subparser_cipher.add_parser('encrypt', help='Performs encryption.')
+    parser_cipher_decrypt = subparser_cipher.add_parser('decrypt', help='Performs decryption.')
+    parser_cipher_keygen = subparser_cipher.add_parser('keygen', help='Generates new AES key.')
+    parser_cipher_hmac = subparser_cipher.add_parser('hmac', help='Computes HMAC.')
+    parser_cipher_kdf = subparser_cipher.add_parser('kdf', help='Performs key derivation function on a secret key.')
+    parser_cipher_encrypt.add_argument('--alg', choices=['CHACHAPOLY'], required=True)
+    parser_cipher_encrypt.add_argument('--iteration', help='Iteration count.', required=any(['PBKDF2' in s for s in sys.argv]))
+    parser_cipher_decrypt.add_argument('--alg', choices=['CHACHAPOLY'], required=True)
+    parser_cipher_decrypt.add_argument('--iteration', help='Iteration count.', required=any(['PBKDF2' in s for s in sys.argv]))
+
+    parser_cipher_hmac.add_argument('--alg', choices=['HMAC-SHA1', 'HMAC-SHA224', 'HMAC-SHA256', 'HMAC-SHA384', 'HMAC-SHA512'], help='Selects the algorithm.', required=True)
+    parser_cipher_kdf.add_argument('--alg', choices=['HKDF-SHA256', 'HKDF-SHA384', 'HKDF-SHA512', 'PBKDF2-SHA1', 'PBKDF2-SHA224', 'PBKDF2-SHA256', 'PBKDF2-SHA384', 'PBKDF2-SHA512', 'X963-SHA1', 'X963-SHA224', 'X963-SHA256', 'X963-SHA384', 'X963-SHA512'], help='Selects the algorithm.', required=True)
+    parser_cipher_kdf.add_argument('--output-len', help='Specifies the output length of derived material.')
+    parser_cipher_kdf.add_argument('--iteration', help='Iteration count.', required=any(['PBKDF2' in s for s in sys.argv]))
+
+    parser_cipher.add_argument('--iv', help='Sets the IV/nonce (hex string).')
+    parser_cipher.add_argument('--file-in', help='File to encrypt or decrypt.')
+    parser_cipher.add_argument('--file-out', help='File to write the result.')
+    parser_cipher.add_argument('--aad', help='Specifies the authentication data (it can be a string or hex string. Combine with --hex if necesary).')
+    parser_cipher.add_argument('--hex', help='Parses the AAD parameter as a hex string (for binary data).', action='store_true')
+    parser_cipher.add_argument('-k', '--key', help='The private key index', metavar='KEY_ID', required=True)
+    parser_cipher.add_argument('-s', '--key-size', default=32, help='Size of the key in bytes.')
+
+    parser_x25519 = argparse.ArgumentParser(add_help=False)
+    subparser_x25519 = parser_x25519.add_subparsers(title='commands', dest='subcommand')
+    parser_x25519_keygen = subparser_x25519.add_parser('keygen', help='Generates a keypair for X25519 or X448.')
+    parser_x25519.add_argument('-k', '--key', help='The private key index', metavar='KEY_ID', required=True)
+
+    # Subparsers based on parent
+
+    parser_create = subparser.add_parser("x25519", parents=[parser_x25519],
+                                        help='X25519 key management.')
+    # Add some arguments exclusively for parser_create
+
+    parser_update = subparser.add_parser("x448", parents=[parser_x25519],
+                                        help='X448 key management.')
+    # Add some arguments exclusively for parser_update
 
     args = parser.parse_args()
     return args
@@ -97,7 +192,7 @@ def get_pki_data(url, data=None, method='GET'):
     method = 'GET'
     if (data is not None):
         method = 'POST'
-    req = urllib.request.Request(f"https://www.henarejos.me/pico/pico-hsm/{url}/",
+    req = urllib.request.Request(f"https://www.picokeys.com/pico/pico-hsm/{url}/",
                                 method=method,
                                 data=data,
                                 headers={'User-Agent': user_agent, })
@@ -127,6 +222,14 @@ def pki(card, args):
         else:
             print('Error: no PKI is passed. Use --default to retrieve default PKI.')
 
+def login(card, args):
+    global pin
+    pin = args.pin
+    try:
+        response = send_apdu(card, 0x20, 0x00, 0x81, list(args.pin.encode()))
+    except APDUResponse:
+        pass
+
 def initialize(card, args):
     print('********************************')
     print('*   PLEASE READ IT CAREFULLY   *')
@@ -146,6 +249,7 @@ def initialize(card, args):
             pass
     else:
         pin = b'648219'
+
     if (args.so_pin):
         so_pin = args.so_pin.encode()
         try:
@@ -203,7 +307,7 @@ def attestate(card, args):
         if (a.sw1 == 0x6a and a.sw2 == 0x82):
             print('ERROR: Key not found')
             sys.exit(1)
-    from binascii import hexlify
+
     print(hexlify(bytearray(cert)))
     print(f'Details of key {kid}:\n')
     print(f'  CAR: {(CVC().decode(cert).car()).decode()}')
@@ -266,12 +370,232 @@ def opts(card, args):
     elif (args.subcommand == 'get'):
         print(f'Option {args.opt.upper()} is {"ON" if current & opt else "OFF"}')
 
+class SecureLock:
+    def __init__(self, card):
+        self.card = card
+
+    def mse(self):
+        sk = ec.generate_private_key(ec.SECP256R1())
+        pn = sk.public_key().public_numbers()
+        self.__pb = sk.public_key().public_bytes(Encoding.X962, PublicFormat.UncompressedPoint)
+
+
+        ret = send_apdu(self.card, [0x80, 0x64], 0x3A, 0x01, list(self.__pb))
+
+        pk = ec.EllipticCurvePublicKey.from_encoded_point(ec.SECP256R1(), bytes(ret))
+        shared_key = sk.exchange(ec.ECDH(), pk)
+
+        xkdf = HKDF(
+            algorithm=hashes.SHA256(),
+            length=12+32,
+            salt=None,
+            info=self.__pb
+        )
+        kdf_out = xkdf.derive(shared_key)
+        self.__key_enc = kdf_out[12:]
+        self.__iv = kdf_out[:12]
+
+    def encrypt_chacha(self, data):
+        chacha = ChaCha20Poly1305(self.__key_enc)
+        ct = chacha.encrypt(self.__iv, data, self.__pb)
+        return ct
+
+    def unlock_device(self):
+        ct = self.get_skey()
+        send_apdu(self.card, [0x80, 0x64], 0x3A, 0x03, list(ct))
+
+    def _get_key_device(self):
+        if (platform.system() == 'Windows' or platform.system() == 'Linux'):
+            from secure_key import windows as skey
+        elif (platform.system() == 'Darwin'):
+            from secure_key import macos as skey
+        else:
+            print('ERROR: platform not supported')
+            sys.exit(-1)
+        return skey.get_secure_key()
+
+    def get_skey(self):
+        self.mse()
+        ct = self.encrypt_chacha(self._get_key_device())
+        return ct
+
+    def enable_device_aut(self):
+        ct = self.get_skey()
+        send_apdu(self.card, [0x80, 0x64], 0x3A, 0x02, list(ct))
+
+    def disable_device_aut(self):
+        ct = self.get_skey()
+        send_apdu(self.card, [0x80, 0x64], 0x3A, 0x04, list(ct))
+
+
+def secure(card, args):
+    slck = SecureLock(card)
+    if (args.subcommand == 'enable'):
+        slck.enable_device_aut()
+    elif (args.subcommand == 'unlock'):
+        slck.unlock_device()
+    elif (args.subcommand == 'disable'):
+        slck.disable_device_aut()
+
+
+def cipher(card, args):
+    if (args.subcommand == 'keygen'):
+        ksize = 0xB2
+        if (args.key_size == 24):
+            ksize = 0xB1
+        elif (args.key_size == 16):
+            ksize = 0xB0
+        ret = send_apdu(card, 0x48, int(args.key), ksize)
+
+    else:
+        enc = None
+        aad = None
+        if (args.alg == 'CHACHAPOLY'):
+            oid = b'\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x03\x12'
+        elif (args.alg == 'HMAC-SHA1'):
+            oid = b'\x2A\x86\x48\x86\xF7\x0D\x02\x07'
+        elif (args.alg == 'HMAC-SHA224'):
+            oid = b'\x2A\x86\x48\x86\xF7\x0D\x02\x08'
+        elif (args.alg == 'HMAC-SHA256'):
+            oid = b'\x2A\x86\x48\x86\xF7\x0D\x02\x09'
+        elif (args.alg == 'HMAC-SHA384'):
+            oid = b'\x2A\x86\x48\x86\xF7\x0D\x02\x0A'
+        elif (args.alg == 'HMAC-SHA512'):
+            oid = b'\x2A\x86\x48\x86\xF7\x0D\x02\x0B'
+        elif (args.alg == 'HKDF-SHA256'):
+            oid = b'\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x03\x1D'
+        elif (args.alg == 'HKDF-SHA384'):
+            oid = b'\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x03\x1E'
+        elif (args.alg == 'HKDF-SHA512'):
+            oid = b'\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x03\x1F'
+        elif (args.alg in ['PBKDF2-SHA1', 'PBKDF2-SHA224', 'PBKDF2-SHA256', 'PBKDF2-SHA384', 'PBKDF2-SHA512']):
+            if ('PBKDF2' in args.alg):
+                oid = b'\x2A\x86\x48\x86\xF7\x0D\x01\x05\x0C'
+            salt = b'\x04' + bytes([len(args.iv)//2]) + unhexlify(args.iv)
+            iteration = b'\x02' + bytes([len(int_to_bytes(int(args.iteration)))]) + int_to_bytes(int(args.iteration))
+            prf = b'\x30\x0A\x06\x08\x2A\x86\x48\x86\xF7\x0D\x02'
+            if (args.alg == 'PBKDF2-SHA1'):
+                prf += b'\x07'
+            elif (args.alg == 'PBKDF2-SHA224'):
+                prf += b'\x08'
+            elif (args.alg == 'PBKDF2-SHA256'):
+                prf += b'\x09'
+            elif (args.alg == 'PBKDF2-SHA384'):
+                prf += b'\x0A'
+            elif (args.alg == 'PBKDF2-SHA512'):
+                prf += b'\x0B'
+            enc = list(salt + iteration + prf)
+        elif (args.alg in 'X963-SHA1', 'X963-SHA224', 'X963-SHA256', 'X963-SHA384', 'X963-SHA512'):
+            oid = b'\x2B\x81\x05\x10\x86\x48\x3F'
+            enc = b'\x2A\x86\x48\x86\xF7\x0D\x02'
+            if (args.alg == 'X963-SHA1'):
+                enc += b'\x07'
+            elif (args.alg == 'X963-SHA224'):
+                enc += b'\x08'
+            elif (args.alg == 'X963-SHA256'):
+                enc += b'\x09'
+            elif (args.alg == 'X963-SHA384'):
+                enc += b'\x0A'
+            elif (args.alg == 'X963-SHA512'):
+                enc += b'\x0B'
+        '''
+        # To be finished: it does not work with AES (only supported by HSM)
+        elif (args.alg in ['PBES2-SHA1', 'PBES2-SHA224', 'PBES2-SHA256', 'PBES2-SHA384', 'PBES2-SHA512']):
+            oid = b'\x2A\x86\x48\x86\xF7\x0D\x01\x05\x0D'
+            if (not args.iv):
+                sys.stderr.buffer.write(b'ERROR: --iv required')
+                sys.exit(-1)
+            salt = b'\x04' + bytes([len(args.iv)//2]) + unhexlify(args.iv)
+            iteration = b'\x02' + bytes([len(int_to_bytes(int(args.iteration)))]) + int_to_bytes(int(args.iteration))
+            prf = b'\x30\x0A\x06\x08\x2A\x86\x48\x86\xF7\x0D\x02'
+            if (args.alg == 'PBES2-SHA1'):
+                prf += b'\x07'
+            elif (args.alg == 'PBES2-SHA224'):
+                prf += b'\x08'
+            elif (args.alg == 'PBES2-SHA256'):
+                prf += b'\x09'
+            elif (args.alg == 'PBES2-SHA384'):
+                prf += b'\x0A'
+            elif (args.alg == 'PBES2-SHA512'):
+                prf += b'\x0B'
+            oid_kdf = b'\x06\x09\x2A\x86\x48\x86\xF7\x0D\x01\x05\x0C'
+            aad = hexlify(oid_kdf + b'\x30' + bytes([len(salt)+len(iteration)+len(prf)]) + salt + iteration + prf)
+            args.hex = True
+        '''
+
+        if (args.subcommand[0] == 'e' or args.subcommand == 'hmac' or args.subcommand == 'kdf'):
+            alg = 0x51
+        elif (args.subcommand[0] == 'd'):
+            alg = 0x52
+
+        if (not enc):
+            if (args.file_in):
+                fin = open(args.file_in, 'rb')
+            else:
+                fin = sys.stdin.buffer
+            enc = fin.read()
+            fin.close()
+
+        data = [0x06, len(oid)] + list(oid) + [0x81, len(enc)] + list(enc)
+
+        if (args.iv and not 'PBKDF2' in args.alg and not 'PBES2' in args.alg):
+            data += [0x82, len(args.iv)//2] + list(unhexlify(args.iv))
+        if (not aad):
+            aad = args.aad
+        if (aad):
+            if (args.hex):
+                data += [0x83, len(aad)//2] + list(unhexlify(aad))
+            else:
+                data += [0x83, len(aad)] + list(aad)
+
+        ne = int(args.output_len) if 'output_len' in args and args.output_len else None
+
+        ret = send_apdu(card, [0x80, 0x78], int(args.key), alg, data=data, ne=ne)
+        if (args.file_out):
+            fout = open(args.file_out, 'wb')
+        else:
+            fout = sys.stdout.buffer
+        if (args.hex):
+            fout.write(hexlify(bytes(ret)))
+        else:
+            fout.write(bytes(ret))
+        if (args.file_out):
+            fout.close()
+
+def int_to_bytes(x: int) -> bytes:
+    return x.to_bytes((x.bit_length() + 7) // 8, 'big')
+
+def x25519(card, args):
+    if (args.command == 'x25519'):
+        P = b'\x7f\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\xed'
+        A = int_to_bytes(0x01DB42)
+        N = b'\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x14\xDE\xF9\xDE\xA2\xF7\x9C\xD6\x58\x12\x63\x1A\x5C\xF5\xD3\xED'
+        G = b'\x04\x09\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xd9\xd3\xce\x7e\xa2\xc5\xe9\x29\xb2\x61\x7c\x6d\x7e\x4d\x3d\x92\x4c\xd1\x48\x77\x2c\xdd\x1e\xe0\xb4\x86\xa0\xb8\xa1\x19\xae\x20'
+        h = b'\x08'
+    elif (args.command == 'x448'):
+        P = b'\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\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'
+        A = int_to_bytes(0x98AA)
+        N = b'\x3f\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\x7c\xca\x23\xe9\xc4\x4e\xdb\x49\xae\xd6\x36\x90\x21\x6c\xc2\x72\x8d\xc5\x8f\x55\x23\x78\xc2\x92\xab\x58\x44\xf3'
+        G = b'\x04\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x5b\x7b\x45\x3d\x22\xd7\x6f\xf7\x7a\x67\x50\xb1\xc4\x12\x13\x21\x0d\x43\x46\x23\x7e\x02\xb8\xed\xf6\xf3\x8d\xc2\x5d\xf7\x60\xd0\x45\x55\xf5\x34\x5d\xae\xcb\xce\x6f\x32\x58\x6e\xab\x98\x6c\xf6\xb1\xf5\x95\x12\x5d\x23\x7d'
+        h = b'\x04'
+    oid = b'\x06\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03'
+    p_data = b'\x81' + bytes([len(P)]) + P
+    a_data = b'\x82' + bytes([len(A)]) + A
+    g_data = b'\x84' + bytes([len(G)]) + G
+    n_data = b'\x85' + bytes([len(N)]) + N
+    h_data = b'\x87' + bytes([len(h)]) + h
+
+    cdata =  b'\x5F\x29\x01\x00'
+    cdata += b'\x42\x0C\x55\x54\x44\x55\x4D\x4D\x59\x30\x30\x30\x30\x31'
+    cdata += b'\x7f\x49\x81' + bytes([len(oid)+len(p_data)+len(a_data)+len(g_data)+len(n_data)+len(h_data)]) + oid + p_data + a_data + g_data + n_data + h_data
+    cdata += b'\x5F\x20\x0C\x55\x54\x44\x55\x4D\x4D\x59\x30\x30\x30\x30\x31'
+    ret = send_apdu(card, 0x46, int(args.key), 0x00, list(cdata))
+
 def main(args):
-    print('Pico HSM Tool v1.4')
+    sys.stderr.buffer.write(b'Pico HSM Tool v1.8\n')
-    print('Author: Pol Henarejos')
+    sys.stderr.buffer.write(b'Author: Pol Henarejos\n')
-    print('Report bugs to https://github.com/polhenarejos/pico-hsm/issues')
+    sys.stderr.buffer.write(b'Report bugs to https://github.com/polhenarejos/pico-hsm/issues\n')
-    print('')
+    sys.stderr.buffer.write(b'\n\n')
-    print('')
     cardtype = AnyCardType()
     try:
         # request card insertion
@@ -282,7 +606,10 @@ 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)
 
     # Following commands may raise APDU exception on error
     if (args.command == 'initialize'):
@@ -295,6 +622,13 @@ def main(args):
         rtc(card, args)
     elif (args.command == 'options'):
         opts(card, args)
+    elif (args.command == 'secure'):
+        secure(card, args)
+    elif (args.command == 'cipher'):
+        cipher(card, args)
+    elif (args.command == 'x25519' or args.command == 'x448'):
+        x25519(card, args)
+
 
 def run():
     args = parse_args()

tools/secure_key/macos.py

@@ -0,0 +1,59 @@
+import sys
+import keyring
+
+DOMAIN = "PicoKeys.com"
+USERNAME = "Pico-HSM"
+
+try:
+    import keyring
+    from keyrings.osx_keychain_keys.backend import OSXKeychainKeysBackend, OSXKeychainKeyType, OSXKeyChainKeyClassType
+except:
+    print('ERROR: keyring module not found! Install keyring package.\nTry with `pip install keyrings.osx-keychain-keys`')
+    sys.exit(-1)
+
+try:
+    from cryptography.hazmat.primitives.serialization import Encoding, PrivateFormat, NoEncryption
+except:
+    print('ERROR: cryptography module not found! Install cryptography package.\nTry with `pip install cryptography`')
+    sys.exit(-1)
+
+
+def get_backend(use_secure_enclave=False):
+    backend = OSXKeychainKeysBackend(
+        key_type=OSXKeychainKeyType.EC, # Key type, e.g. RSA, RC, DSA, ...
+        key_class_type=OSXKeyChainKeyClassType.Private, # Private key, Public key, Symmetric-key
+        key_size_in_bits=256,
+        is_permanent=True, # If set, saves the key in keychain; else, returns a transient key
+        use_secure_enclave=use_secure_enclave, # Saves the key in the T2 (TPM) chip, requires a code-signed interpreter
+        access_group=None, # Limits key management and retrieval to set group, requires a code-signed interpreter
+        is_extractable=True # If set, private key is extractable; else, it can't be retrieved, but only operated against
+    )
+    return backend
+
+def generate_secure_key(use_secure_enclave=False):
+    backend = get_backend(use_secure_enclave)
+    backend.set_password(DOMAIN, USERNAME, password=None)
+    return backend.get_password(DOMAIN, USERNAME)
+
+def get_d(key):
+    return key.private_numbers().private_value.to_bytes(32, 'big')
+
+def set_secure_key(pk):
+    backend = get_backend(False)
+    try:
+        backend.delete_password(DOMAIN, USERNAME)
+    except:
+        pass
+    backend.set_password(DOMAIN, USERNAME, pk.private_bytes(Encoding.PEM, PrivateFormat.TraditionalOpenSSL, NoEncryption()))
+
+def get_secure_key():
+    key = None
+    try:
+        backend = get_backend(False)
+        key = backend.get_password(DOMAIN, USERNAME)[0]
+    except keyring.errors.KeyringError:
+        try:
+            key = generate_secure_key(False)[0] # It should be True, but secure enclave causes python segfault
+        except keyring.errors.PasswordSetError:
+            key = generate_secure_key(False)[0]
+    return get_d(key)

tools/secure_key/windows.py

@@ -0,0 +1,44 @@
+import sys
+import os
+import base64
+
+DOMAIN = "PicoKeys.com"
+USERNAME = "Pico-HSM"
+
+try:
+    import keyring
+except:
+    print('ERROR: keyring module not found! Install keyring package.\nTry with `pip install keyrings.osx-keychain-keys`')
+    sys.exit(-1)
+
+try:
+    from cryptography.hazmat.primitives.serialization import Encoding, PrivateFormat, NoEncryption, load_pem_private_key
+    from cryptography.hazmat.primitives.asymmetric import ec
+except:
+    print('ERROR: cryptography module not found! Install cryptography package.\nTry with `pip install cryptography`')
+    sys.exit(-1)
+
+
+
+def generate_secure_key():
+    pkey = ec.generate_private_key(ec.SECP256R1())
+    set_secure_key(pkey)
+    return keyring.get_password(DOMAIN, USERNAME)
+
+def get_d(key):
+    return load_pem_private_key(key, password=None).private_numbers().private_value.to_bytes(32, 'big')
+
+def set_secure_key(pk):
+    try:
+        keyring.delete_password(DOMAIN, USERNAME)
+    except:
+        pass
+    keyring.set_password(DOMAIN, USERNAME, pk.private_bytes(Encoding.PEM, PrivateFormat.PKCS8, NoEncryption()).decode())
+
+def get_secure_key():
+    key = None
+    try:
+        key = keyring.get_password(DOMAIN, USERNAME)
+    except keyring.errors.KeyringError:
+        key = generate_secure_key()
+    return get_d(key.encode())