Fix merge.

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

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: polhenarejos
+custom: ["https://www.paypal.me/polhenarejos"]

.github/workflows/codeql.yml

@@ -13,12 +13,13 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "development", "development-eddsa" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+    branches: [ "master", "development", "development-eddsa" ]
   schedule:
     - cron: '23 5 * * 4'
+  workflow_dispatch:
 
 jobs:
   analyze:
@@ -48,11 +49,11 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        
+
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-        
+
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     # - name: Autobuild
@@ -61,7 +62,7 @@ jobs:
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     - run: |

.github/workflows/test.yml

@@ -0,0 +1,66 @@
+# 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", "development-eddsa" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master", "development", "development-eddsa" ]
+  schedule:
+    - cron: '23 5 * * 4'
+  workflow_dispatch:
+
+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: Export image
+      run: |
+        mkdir -p artifacts
+        docker save pico-hsm-test:bullseye -o artifacts/docker-image.tar
+    - name: Temporarily save image
+      uses: actions/upload-artifact@v3
+      with:
+        name: docker-artifact
+        path: artifacts
+        retention-days: 1
+
+  test:
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      matrix:
+        suite: ["pkcs11", "pytest", "sc-hsm-pkcs11"]
+    steps:
+    - name: Checkout repository and submodules
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - name: Retrieve saved image
+      uses: actions/download-artifact@v3
+      with:
+        name: docker-artifact
+        path: artifacts
+    - name: Load image
+      run: |
+        cd artifacts
+        docker load -q -i docker-image.tar
+    - name: Test ${{ matrix.suite }}
+      run: ./tests/run-test-in-docker.sh ${{ matrix.suite }}

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "pico-hsm-sdk"]
-	path = pico-hsm-sdk
-	url = ../pico-hsm-sdk
+[submodule "pico-keys-sdk"]
+	path = pico-keys-sdk
+	url = https://github.com/polhenarejos/pico-keys-sdk

.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,31 @@
 
 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()
+
+if (NOT DEFINED __FOR_CI)
+    set(__FOR_CI 0)
+endif()
+if (__FOR_CI)
+    add_definitions(-D__FOR_CI)
+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
@@ -56,45 +69,45 @@ target_sources(pico_hsm PUBLIC
         ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_session_pin.c
         ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_puk_auth.c
         ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_pso.c
+        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_bip_slip.c
         ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cvc.c
         ${CMAKE_CURRENT_LIST_DIR}/src/hsm/files.c
         ${CMAKE_CURRENT_LIST_DIR}/src/hsm/kek.c
         ${CMAKE_CURRENT_LIST_DIR}/src/hsm/oid.c
 
         )
-set(HSM_DRIVER "ccid")
-include(pico-hsm-sdk/pico_hsm_sdk_import.cmake)
+set(USB_ITF_CCID 1)
+include(pico-keys-sdk/pico_keys_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)
-
-#
-#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)
+target_link_libraries(pico_hsm PRIVATE pico_keys_sdk pico_stdlib pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id hardware_rtc tinyusb_device tinyusb_board)
+endif()

README.md

@@ -3,7 +3,7 @@ This is a project to create a Hardware Security Module (HSM) with a Raspberry Pi
 
 ## Capabilities
 ### > Key generation and encrypted storage
-Private and secret keys are stored with a master AES 256 key (DKEK). The DKEK is, at the same time, encrypted with a hashed and salted version of the PIN.
+Private and secret keys are stored with a master AES 256 key (MKEK). The MKEK is, at the same time, encrypted with a hashed and salted version of the PIN.
 **No private/secret keys, DKEK or PIN are stored in plain text ever. Never.**
 
 ### > RSA key generation from 1024 to 4096 bits
@@ -37,7 +37,13 @@ It allows private decryption in place with RSA-OEP and RSA-X-509 algorithms.
 It supports AES key generation in place with keys of 128, 192 and 256 bits.
 
 ### > AES-CBC encryption/decryption
-AES encryption and decryption is performed in place.
+Legacy AES encryption and decryption is performed in place.
+
+### > AES ECB, CBC, CFB, OFB, XTS, CTR, GCM and CCM
+Advanced AES encryption and decryption with multiples modes and customized IV/nonce and additional authenticated data (AAD).[^4]
+
+### > AES key generation of 128, 192, 256 and 512 bits.
+Besides 128, 192 and 256 bits, Pico HSM also supports key generation of 512 bits (64 bytes). These keys are specially indicated for running AES XTS, where two keys of 256 bits are concatenated.
 
 ### > CMAC
 It supports AES-CMAC authentication.[^1]
@@ -109,13 +115,13 @@ Key usage can also be used to perform and auditory and track the usage of a part
 ### > Public Key Authentication
 Public Key Authentication (PKA) allows to authenticate by using a secondary device with a private key and a registered public key in the primary device. A challenge is generated by the primary Pico HSM and given to the secondary for signature. The secondary device signs the challenge and returns the signature. Then, the primary device verifies the signature with the registered public key and if it is valid, it grants full access, as normal PIN authentication.
 
-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.
+In PKA, the PIN is used for protecting the MKEK, 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.
+This is a novel fast and efficient symmetric encryption algorithm. Similarly to AES, it can be used to cipher your private data.[^4]
 
 ### > X25519 and X448
 Both cruves Curve25519 and Curve448 are supported for doing DH X25519 and X448. Remember that cannot be used for signing.
@@ -124,11 +130,24 @@ Both cruves Curve25519 and Curve448 are supported for doing DH X25519 and X448.
 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.
+It supports performing HMAC from a secret key on an arbitrary data with SHA digest algorithm.
+
+### > CMAC
+Similarly to HMAC, Pico HSM also supports CMAC with AES algorithm for keys of 128, 192 and 256 bits.
+
+### > XKEK
+Besides DKEK, it supports a more advanced scheme to share keys. Based on private key domains, it is possible to wrap and unwrap private and secret keys inside the domain to only authorized devices. If a device outside the domain tries to unwrap a key, it will fail.
+
+### > MKEK
+A Master Key Encryption Key is used to store safely all the keys. This key is also ciphered with an ephemereal key derived from the hashed PIN. Therefore, we can ensure all the keys are encrypted and stored.
+
+### > Hierarchical Deterministic key generation
+It supports **BIP32** for asymmetric deterministic key derivation and **SLIP10** for symmetric key derivation. With it, crypto wallets can be deployed with Pico HSM, as infinite keys can be derived for signature and symmetric encryption. Curves NIST 256 and Koblitz 256 are supported for master key generation.[^4]
 
 [^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.
+[^3]: Imports are available only if the Pico HSM is previously initialized with a DKEK and DKEK shares are available during the import process.
+[^4]: Available by using PicoHSM python tool.
 
 ## Security considerations
 All secret keys (asymmetric and symmetric) are stored encrypted in the flash memory of the Raspberry Pico. DKEK is used as a 256 bit AES key to protect private and secret keys. Keys are never stored in RAM except for signature and decryption operations and only during the process. All keys (including DKEK) are loaded and cleared every time to avoid potential security flaws.
@@ -140,16 +159,21 @@ If the Pico is stolen the contents of private and secret keys cannot be read wit
 ## Download
 Please, go to the Release page and download the UF2 file for your board.
 
-Note that UF2 files are shiped with a dummy VID/PID to avoid license issues (FEFF:FCFD). If you are planning to use it with OpenSC or similar, you should modify Info.plist of CCID driver to add these VID/PID or use the VID/PID patcher as follows:
+Note that UF2 files are shiped with a dummy VID/PID to avoid license issues (FEFF:FCFD). If you are planning to use it with OpenSC or similar, you should modify Info.plist of CCID driver to add these VID/PID or use the [Pico Patcher tool](https://www.picokeys.com/pico-patcher/).
+
+Alternatively you can use the legacy VID/PID patcher as follows:
 `./patch_vidpid.sh VID:PID input_hsm_file.uf2 output_hsm_file.uf2`
 
 You can use whatever VID/PID (i.e., 234b:0000 from FISJ), but remember that you are not authorized to distribute the binary with a VID/PID that you do not own.
 
+Note that the pure-browser option [Pico Patcher tool](https://www.picokeys.com/pico-patcher/) is the most recommended. 
+
 ## Build
 Before building, ensure you have installed the toolchain for the Pico and the Pico SDK is properly located in your drive.
 
 ```
 git clone https://github.com/polhenarejos/pico-hsm
+git submodule update --init --recursive
 cd pico-hsm
 mkdir build
 cd build
@@ -166,9 +190,9 @@ Independent from your Linux distribution or when using another OS that supports
 
 ```
 sudo docker build \
-    --build-arg VERSION_PICO_SDK=1.4.0 \
-    --build-arg VERSION_MAJOR=2 \
-    --build-arg VERSION_MINOR=6 \
+    --build-arg VERSION_PICO_SDK=1.5.0 \
+    --build-arg VERSION_MAJOR=3 \
+    --build-arg VERSION_MINOR=4 \
     --build-arg PICO_BOARD=waveshare_rp2040_zero \
     --build-arg USB_VID=0xfeff \
     --build-arg USB_PID=0xfcfd \

build_pico_hsm.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 VERSION_MAJOR="3"
-VERSION_MINOR="2"
+VERSION_MINOR="6"
 
 rm -rf release/*
 cd build_release
@@ -17,6 +17,7 @@ for board in adafruit_feather_rp2040 \
     eetree_gamekit_rp2040 \
     garatronic_pybstick26_rp2040 \
     melopero_shake_rp2040 \
+    nullbits_bit_c_pro \
     pico \
     pico_w \
     pimoroni_badger2040 \
@@ -31,6 +32,7 @@ for board in adafruit_feather_rp2040 \
     pimoroni_servo2040 \
     pimoroni_tiny2040 \
     pimoroni_tiny2040_2mb \
+    pololu_3pi_2040_robot \
     seeed_xiao_rp2040 \
     solderparty_rp2040_stamp \
     solderparty_rp2040_stamp_carrier \
@@ -40,6 +42,8 @@ for board in adafruit_feather_rp2040 \
     sparkfun_thingplus \
     vgaboard \
     waveshare_rp2040_lcd_0.96 \
+    waveshare_rp2040_lcd_1.28 \
+    waveshare_rp2040_one \
     waveshare_rp2040_plus_4mb \
     waveshare_rp2040_plus_16mb \
     waveshare_rp2040_zero \

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.py initialize --so-pin 3537363231383830 --pin 648219
+$ python3 tools/pico-hsm-tool.py --pin 648219 initialize --so-pin 57621880
 ```
 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.
@@ -51,7 +51,7 @@ $ pkcs11-tool --login --pin 648219 --change-pin --new-pin 123456
 
 To unblock the PIN:
 ```
-$ pkcs11-tool --login --login-type so --so-pin=3537363231383830 --init-pin --new-pin=648219
+$ pkcs11-tool --login --login-type so --so-pin 3537363231383830 --init-pin --new-pin 648219
 ```
 
 ## Keypair generation

src/hsm/cmd_bip_slip.c

@@ -0,0 +1,324 @@
+/*
+ * 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/>.
+ */
+
+#include "sc_hsm.h"
+#include "files.h"
+#include "random.h"
+#include "kek.h"
+#include "asn1.h"
+
+const uint8_t *k1_seed = (const uint8_t *) "Bitcoin seed";
+const uint8_t *p1_seed = (const uint8_t *) "Nist256p1 seed";
+const uint8_t *sym_seed = (const uint8_t *) "Symmetric key seed";
+mbedtls_ecp_keypair hd_context = { 0 };
+uint8_t hd_keytype = 0;
+
+int node_derive_bip_child(const mbedtls_ecp_keypair *parent,
+                          const uint8_t cpar[32],
+                          const uint8_t *i,
+                          mbedtls_ecp_keypair *child,
+                          uint8_t cchild[32]) {
+    uint8_t data[1 + 32 + 4], I[64], *iL = I, *iR = I + 32;
+    mbedtls_mpi il, kchild;
+    mbedtls_mpi_init(&il);
+    mbedtls_mpi_init(&kchild);
+    if (i[0] >= 0x80) {
+        if (mbedtls_mpi_cmp_int(&parent->d, 0) == 0) {
+            return CCID_ERR_NULL_PARAM;
+        }
+        data[0] = 0x00;
+        mbedtls_mpi_write_binary(&parent->d, data + 1, 32);
+    }
+    else {
+        size_t olen = 0;
+        mbedtls_ecp_point_write_binary(&parent->grp,
+                                       &parent->Q,
+                                       MBEDTLS_ECP_PF_COMPRESSED,
+                                       &olen,
+                                       data,
+                                       33);
+    }
+    do {
+        memcpy(data + 33, i, 4);
+        mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA512),
+                        cpar,
+                        32,
+                        data,
+                        sizeof(data),
+                        I);
+        mbedtls_mpi_read_binary(&il, iL, 32);
+        mbedtls_mpi_add_mpi(&kchild, &il, &parent->d);
+        mbedtls_mpi_mod_mpi(&kchild, &kchild, &parent->grp.N);
+        data[0] = 0x01;
+        memcpy(data + 1, iR, 32);
+    } while (mbedtls_mpi_cmp_mpi(&il,
+                                 &parent->grp.N) != -1 || mbedtls_mpi_cmp_int(&kchild, 0) == 0);
+    mbedtls_mpi_copy(&child->d, &kchild);
+    mbedtls_ecp_mul(&child->grp, &child->Q, &child->d, &child->grp.G, random_gen, NULL);
+    memcpy(cchild, iR, 32);
+    mbedtls_mpi_free(&il);
+    mbedtls_mpi_free(&kchild);
+    return CCID_OK;
+}
+
+int sha256_ripemd160(const uint8_t *buffer, size_t buffer_len, uint8_t *output) {
+    mbedtls_md(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), buffer, buffer_len, output);
+    mbedtls_md(mbedtls_md_info_from_type(MBEDTLS_MD_RIPEMD160), output, 32, output);
+    return CCID_OK;
+}
+
+int sha256_sha256(const uint8_t *buffer, size_t buffer_len, uint8_t *output) {
+    mbedtls_md(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), buffer, buffer_len, output);
+    mbedtls_md(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), output, 32, output);
+    return CCID_OK;
+}
+
+int node_fingerprint_bip(mbedtls_ecp_keypair *ctx, uint8_t fingerprint[4]) {
+    size_t olen = 0;
+    uint8_t buffer[33];
+    mbedtls_ecp_point_write_binary(&ctx->grp,
+                                   &ctx->Q,
+                                   MBEDTLS_ECP_PF_COMPRESSED,
+                                   &olen,
+                                   buffer,
+                                   sizeof(buffer));
+    sha256_ripemd160(buffer, sizeof(buffer), buffer);
+    memcpy(fingerprint, buffer, 4);
+    return CCID_OK;
+}
+
+int node_fingerprint_slip(mbedtls_ecp_keypair *ctx, uint8_t fingerprint[4]) {
+    uint8_t buffer[32];
+    mbedtls_mpi_write_binary(&ctx->d, buffer, sizeof(buffer));
+    sha256_ripemd160(buffer, sizeof(buffer), buffer);
+    memcpy(fingerprint, buffer, 4);
+    return CCID_OK;
+}
+
+int load_master_bip(uint32_t mid, mbedtls_ecp_keypair *ctx, uint8_t chain[32],
+                    uint8_t key_type[1]) {
+    uint8_t mkey[65];
+    mbedtls_ecp_keypair_init(ctx);
+    file_t *ef = search_dynamic_file(EF_MASTER_SEED | mid);
+    if (!file_has_data(ef)) {
+        return CCID_ERR_FILE_NOT_FOUND;
+    }
+    memcpy(mkey, file_get_data(ef), sizeof(mkey));
+    int r = mkek_decrypt(mkey + 1,
+                         sizeof(mkey) - 1);
+    if (r != CCID_OK) {
+        return CCID_EXEC_ERROR;
+    }
+    if (mkey[0] == 0x1 || mkey[0] == 0x2) {
+        if (mkey[0] == 0x1) {
+            mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256K1);
+        }
+        else if (mkey[0] == 0x2) {
+            mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1);
+        }
+        else {
+            return CCID_WRONG_DATA;
+        }
+
+        mbedtls_mpi_read_binary(&ctx->d, mkey + 1, 32);
+        memcpy(chain, mkey + 33, 32);
+        mbedtls_ecp_mul(&ctx->grp, &ctx->Q, &ctx->d, &ctx->grp.G, random_gen, NULL);
+    }
+    else if (mkey[0] == 0x3) {
+        mbedtls_mpi_read_binary(&ctx->d, mkey + 33, 32);
+        memcpy(chain, mkey + 1, 32);
+    }
+    key_type[0] = mkey[0];
+    return CCID_OK;
+}
+
+int node_derive_path(const uint8_t *path,
+                     size_t path_len,
+                     mbedtls_ecp_keypair *ctx,
+                     uint8_t chain[32],
+                     uint8_t fingerprint[4],
+                     uint8_t *nodes,
+                     uint8_t last_node[4],
+                     uint8_t key_type[1]) {
+    uint8_t *tag_data = NULL, *p = NULL;
+    size_t tag_len = 0;
+    uint16_t tag = 0x0;
+    uint8_t node = 0, N[64] = { 0 };
+    int r = 0;
+    memset(last_node, 0, 4);
+    memset(fingerprint, 0, 4);
+    for (; walk_tlv(path, path_len, &p, &tag, &tag_len, &tag_data); node++) {
+        if (tag == 0x02) {
+            if ((node == 0 && tag_len != 1) || (node != 0 && tag_len != 4)) {
+                return CCID_WRONG_DATA;
+            }
+            if (node == 0) {
+                if ((r = load_master_bip(tag_data[0], ctx, chain, key_type)) != CCID_OK) {
+                    return r;
+                }
+            }
+            else if (node > 0) {
+                node_fingerprint_bip(ctx, fingerprint);
+                if ((r = node_derive_bip_child(ctx, chain, tag_data, ctx, chain)) != CCID_OK) {
+                    return r;
+                }
+                memcpy(last_node, tag_data, 4);
+            }
+        }
+        else if (tag == 0x04) {
+            if (node == 0) {
+                return CCID_WRONG_DATA;
+            }
+            else if (node > 0) {
+                node_fingerprint_slip(ctx, fingerprint);
+                *(tag_data - 1) = 0;
+                mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA512),
+                                chain,
+                                32,
+                                tag_data - 1,
+                                tag_len + 1,
+                                N);
+                memcpy(chain, N, 32);
+                mbedtls_mpi_read_binary(&ctx->d, N + 32, 32);
+            }
+        }
+    }
+    if (nodes) {
+        *nodes = node;
+    }
+    return CCID_OK;
+}
+
+int cmd_bip_slip() {
+    uint8_t p1 = P1(apdu), p2 = P2(apdu);
+    if (p1 == 0x1 || p1 == 0x2 || p1 == 0x3) { // Master generation (K1 and P1)
+        if (p2 >= 10) {
+            return SW_INCORRECT_P1P2();
+        }
+        uint8_t mkey[65], *seed = mkey + 1, seed_len = 64;
+        const uint8_t *key_seed = NULL;
+        mbedtls_mpi il;
+        mbedtls_mpi_init(&il);
+        mbedtls_ecp_group grp;
+        mbedtls_ecp_group_init(&grp);
+        if (p1 == 0x1) {
+            mbedtls_ecp_group_load(&grp, MBEDTLS_ECP_DP_SECP256K1);
+            key_seed = k1_seed;
+        }
+        else if (p1 == 0x2) {
+            mbedtls_ecp_group_load(&grp, MBEDTLS_ECP_DP_SECP256R1);
+            key_seed = p1_seed;
+        }
+        else if (p1 == 0x3) {
+            key_seed = sym_seed;
+        }
+        if (apdu.nc == 0) {
+            seed_len = 64;
+            random_gen(NULL, seed, seed_len);
+        }
+        else {
+            seed_len = MIN(apdu.nc, 64);
+            memcpy(seed, apdu.data, seed_len);
+        }
+        if (p1 == 0x1 || p1 == 0x2) {
+            do {
+                mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA512), key_seed,
+                                strlen((char *) key_seed), seed, seed_len, seed);
+                mbedtls_mpi_read_binary(&il, seed, 32);
+                seed_len = 64;
+            } while (mbedtls_mpi_cmp_int(&il, 0) == 0 || mbedtls_mpi_cmp_mpi(&il, &grp.N) != -1);
+            mbedtls_ecp_group_free(&grp);
+            mbedtls_mpi_free(&il);
+        }
+        else if (p1 == 0x3) {
+            mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA512), key_seed,
+                            strlen((char *) key_seed), seed, seed_len, seed);
+        }
+        mkey[0] = p1;
+        file_t *ef = file_new(EF_MASTER_SEED | p2);
+        int r = mkek_encrypt(mkey + 1, sizeof(mkey) - 1);
+        if (r != CCID_OK) {
+            return SW_EXEC_ERROR();
+        }
+        r = flash_write_data_to_file(ef, mkey, sizeof(mkey));
+        if (r != CCID_OK) {
+            return SW_EXEC_ERROR();
+        }
+        low_flash_available();
+    }
+    else if (p1 == 0xA) {
+        if (apdu.nc == 0) {
+            return SW_WRONG_LENGTH();
+        }
+        mbedtls_ecp_keypair ctx;
+        uint8_t chain[32] = { 0 }, fgpt[4] = { 0 }, last_node[4] = { 0 }, key_type = 0, nodes = 0;
+        size_t olen = 0;
+        int r =
+            node_derive_path(apdu.data, apdu.nc, &ctx, chain, fgpt, &nodes, last_node, &key_type);
+        if (r != CCID_OK) {
+            mbedtls_ecp_keypair_free(&ctx);
+            return SW_EXEC_ERROR();
+        }
+        uint8_t pubkey[33];
+        res_APDU_size = 0;
+        memcpy(res_APDU, "\x04\x88\xB2\x1E", 4);
+        res_APDU_size += 4;
+        res_APDU[res_APDU_size++] = nodes - 1;
+        memcpy(res_APDU + res_APDU_size, fgpt, 4);
+        res_APDU_size += 4;
+        memcpy(res_APDU + res_APDU_size, last_node, 4);
+        res_APDU_size += 4;
+        if (key_type == 0x1 || key_type == 0x2) {
+            memcpy(res_APDU + res_APDU_size, chain, 32);
+            res_APDU_size += 32;
+            mbedtls_ecp_point_write_binary(&ctx.grp,
+                                           &ctx.Q,
+                                           MBEDTLS_ECP_PF_COMPRESSED,
+                                           &olen,
+                                           pubkey,
+                                           sizeof(pubkey));
+            memcpy(res_APDU + res_APDU_size, pubkey, olen);
+            res_APDU_size += olen;
+        }
+        else if (key_type == 0x3) {
+            sha256_sha256(chain, 32, chain);
+            memcpy(res_APDU + res_APDU_size, chain, 32);
+            res_APDU_size += 32;
+            mbedtls_mpi_write_binary(&ctx.d, pubkey, 32);
+            sha256_sha256(pubkey, 32, pubkey);
+            memcpy(res_APDU + res_APDU_size, pubkey, 32);
+            res_APDU_size += 32;
+        }
+        mbedtls_ecp_keypair_free(&ctx);
+    }
+    else if (p1 == 0x10) {
+        uint8_t chain[32] = { 0 }, fgpt[4] = { 0 }, last_node[4] = { 0 }, nodes = 0;
+        int r = node_derive_path(apdu.data,
+                                 apdu.nc,
+                                 &hd_context,
+                                 chain,
+                                 fgpt,
+                                 &nodes,
+                                 last_node,
+                                 &hd_keytype);
+        if (r != CCID_OK) {
+            mbedtls_ecp_keypair_free(&hd_context);
+            return SW_EXEC_ERROR();
+        }
+    }
+    return SW_OK();
+}

src/hsm/cmd_challenge.c

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

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,29 +37,32 @@ int cmd_change_pin() {
             }
             uint8_t pin_len = file_read_uint8(file_get_data(file_pin));
             int r = check_pin(file_pin, apdu.data, pin_len);
-            if (r != 0x9000)
+            if (r != 0x9000) {
                 return r;
+            }
             uint8_t mkek[MKEK_SIZE];
             r = load_mkek(mkek); //loads the MKEK with old pin
-            if (r != CCID_OK)
+            if (r != CCID_OK) {
                 return SW_EXEC_ERROR();
+            }
             //encrypt MKEK with new pin
 
             if (P2(apdu) == 0x81) {
-                hash_multi(apdu.data+pin_len, apdu.nc-pin_len, session_pin);
+                hash_multi(apdu.data + pin_len, apdu.nc - pin_len, session_pin);
                 has_session_pin = true;
             }
             else if (P2(apdu) == 0x88) {
-                hash_multi(apdu.data+pin_len, apdu.nc-pin_len, session_sopin);
+                hash_multi(apdu.data + pin_len, apdu.nc - pin_len, session_sopin);
                 has_session_sopin = true;
             }
             r = store_mkek(mkek);
             release_mkek(mkek);
-            if (r != CCID_OK)
+            if (r != CCID_OK) {
                 return SW_EXEC_ERROR();
+            }
             uint8_t dhash[33];
-            dhash[0] = apdu.nc-pin_len;
-            double_hash_pin(apdu.data+pin_len, apdu.nc-pin_len, dhash+1);
+            dhash[0] = apdu.nc - pin_len;
+            double_hash_pin(apdu.data + pin_len, apdu.nc - pin_len, dhash + 1);
             flash_write_data_to_file(file_pin, dhash, sizeof(dhash));
             low_flash_available();
             return SW_OK();

src/hsm/cmd_cipher_sym.c

@@ -20,6 +20,7 @@
 #include "mbedtls/cmac.h"
 #include "mbedtls/hkdf.h"
 #include "mbedtls/chachapoly.h"
+#include "mbedtls/gcm.h"
 #include "md_wrap.h"
 #include "mbedtls/md.h"
 #include "crypto_utils.h"
@@ -32,22 +33,26 @@
 #include "mbedtls/asn1.h"
 #include "mbedtls/cipher.h"
 #include "mbedtls/oid.h"
+#include "mbedtls/ccm.h"
+
+extern mbedtls_ecp_keypair hd_context;
+extern uint8_t hd_keytype;
 
 /* This is copied from pkcs5.c Mbedtls */
 /** Unfortunately it is declared as static, so I cannot call it. **/
 
-static int pkcs5_parse_pbkdf2_params( const mbedtls_asn1_buf *params,
-                                      mbedtls_asn1_buf *salt, int *iterations,
-                                      int *keylen, mbedtls_md_type_t *md_type )
-{
+static int pkcs5_parse_pbkdf2_params(const mbedtls_asn1_buf *params,
+                                     mbedtls_asn1_buf *salt, int *iterations,
+                                     int *keylen, mbedtls_md_type_t *md_type) {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     mbedtls_asn1_buf prf_alg_oid;
     unsigned char *p = params->p;
     const unsigned char *end = params->p + params->len;
 
-    if (params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE))
-        return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT,
-                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) );
+    if (params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) {
+        return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT,
+                                 MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
+    }
     /*
      *  PBKDF2-params ::= SEQUENCE {
      *    salt              OCTET STRING,
@@ -57,42 +62,56 @@ static int pkcs5_parse_pbkdf2_params( const mbedtls_asn1_buf *params,
      *  }
      *
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &salt->len,
-                                      MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
-        return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret ) );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &salt->len,
+                                    MBEDTLS_ASN1_OCTET_STRING)) != 0) {
+        return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret);
+    }
 
     salt->p = p;
     p += salt->len;
 
-    if( ( ret = mbedtls_asn1_get_int( &p, end, iterations ) ) != 0 )
-        return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret ) );
-
-    if( p == end )
-        return( 0 );
-
-    if( ( ret = mbedtls_asn1_get_int( &p, end, keylen ) ) != 0 ) {
-        if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-            return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret ) );
+    if ((ret = mbedtls_asn1_get_int(&p, end, iterations)) != 0) {
+        return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret);
     }
 
-    if( p == end )
-        return( 0 );
+    if (p == end) {
+        return 0;
+    }
 
-    if( ( ret = mbedtls_asn1_get_alg_null( &p, end, &prf_alg_oid ) ) != 0 )
-        return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret ) );
+    if ((ret = mbedtls_asn1_get_int(&p, end, keylen)) != 0) {
+        if (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) {
+            return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret);
+        }
+    }
 
-    if( mbedtls_oid_get_md_hmac( &prf_alg_oid, md_type ) != 0 )
-        return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+    if (p == end) {
+        return 0;
+    }
 
-    if( p != end )
-        return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PKCS5_INVALID_FORMAT,
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ) );
+    if ((ret = mbedtls_asn1_get_alg_null(&p, end, &prf_alg_oid)) != 0) {
+        return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret);
+    }
 
-    return( 0 );
+    if (mbedtls_oid_get_md_hmac(&prf_alg_oid, md_type) != 0) {
+        return MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE;
+    }
+
+    if (p != end) {
+        return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT,
+                                 MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
+    }
+
+    return 0;
 }
 
 /* Taken from https://github.com/Mbed-TLS/mbedtls/issues/2335 */
-int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, size_t input_len, uint8_t *input, size_t shared_info_len, uint8_t *shared_info, size_t output_len, uint8_t *output) {
+int mbedtls_ansi_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;
@@ -110,13 +129,13 @@ int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, size_t input_len, uint8_t *
         return exit_code;
     }
 
-    if (input_len + shared_info_len + 4 >= (1ULL<<61)-1) {
+    if (input_len + shared_info_len + 4 >= (1ULL << 61) - 1) {
         return exit_code;
     }
 
     // keydatalen equals output_len
     hashlen = md_info->size;
-    if (output_len >= hashlen * ((1ULL<<32)-1)) {
+    if (output_len >= hashlen * ((1ULL << 32) - 1)) {
         return exit_code;
     }
 
@@ -138,7 +157,6 @@ int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, size_t input_len, uint8_t *
         mbedtls_md_finish(&md_ctx, tmp_output);
         memcpy(&output[i], tmp_output, (output_len - i < hashlen) ? output_len - i : hashlen);
         i += hashlen;
-        counter++;
     }
     mbedtls_md_free(&md_ctx);
     return 0;
@@ -147,19 +165,25 @@ int mbedtls_ansi_x936_kdf(mbedtls_md_type_t md_type, size_t input_len, uint8_t *
 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 (wait_button_pressed() == true) // timeout
+    }
+    if (wait_button_pressed() == true) { // timeout
         return SW_SECURE_MESSAGE_EXEC_ERROR();
+    }
+    file_t *ef = search_dynamic_file((KEY_PREFIX << 8) | key_id);
+    if (hd_keytype == 0) {
+        if (!ef) {
+            return SW_FILE_NOT_FOUND();
+        }
+        if (key_has_purpose(ef, algo) == false) {
+            return SW_CONDITIONS_NOT_SATISFIED();
+        }
+    }
     int key_size = file_get_size(ef);
-    uint8_t kdata[32]; //maximum AES key size
+    uint8_t kdata[64]; //maximum AES key size
     memcpy(kdata, file_get_data(ef), key_size);
-    if (mkek_decrypt(kdata, key_size) != 0) {
+    if (hd_keytype == 0 && mkek_decrypt(kdata, key_size) != 0) {
         return SW_EXEC_ERROR();
     }
     if (algo == ALGO_AES_CBC_ENCRYPT || algo == ALGO_AES_CBC_DECRYPT) {
@@ -171,65 +195,85 @@ int cmd_cipher_sym() {
         uint8_t tmp_iv[IV_SIZE];
         memset(tmp_iv, 0, sizeof(tmp_iv));
         if (algo == ALGO_AES_CBC_ENCRYPT) {
-            int r = mbedtls_aes_setkey_enc(&aes, kdata, key_size*8);
-            if (r != 0) {
-                mbedtls_platform_zeroize(kdata, sizeof(kdata));
-                mbedtls_aes_free(&aes);
-                return SW_EXEC_ERROR();
-            }
-            r = mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_ENCRYPT, apdu.nc, tmp_iv, apdu.data, res_APDU);
+            int r = mbedtls_aes_setkey_enc(&aes, kdata, key_size * 8);
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
             if (r != 0) {
                 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);
+            mbedtls_aes_free(&aes);
+            if (r != 0) {
+                return SW_EXEC_ERROR();
+            }
         }
         else if (algo == ALGO_AES_CBC_DECRYPT) {
-            int r = mbedtls_aes_setkey_dec(&aes, kdata, key_size*8);
+            int r = mbedtls_aes_setkey_dec(&aes, kdata, key_size * 8);
             if (r != 0) {
-                mbedtls_platform_zeroize(kdata, sizeof(kdata));
                 mbedtls_aes_free(&aes);
                 return SW_EXEC_ERROR();
             }
-            r = mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_DECRYPT, apdu.nc, tmp_iv, apdu.data, res_APDU);
-            mbedtls_platform_zeroize(kdata, sizeof(kdata));
+            r = mbedtls_aes_crypt_cbc(&aes,
+                                      MBEDTLS_AES_DECRYPT,
+                                      apdu.nc,
+                                      tmp_iv,
+                                      apdu.data,
+                                      res_APDU);
+            mbedtls_aes_free(&aes);
             if (r != 0) {
-                mbedtls_aes_free(&aes);
                 return SW_EXEC_ERROR();
             }
         }
         res_APDU_size = apdu.nc;
-        mbedtls_aes_free(&aes);
     }
     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);
+        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,
+                             kdata,
+                             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) {
+        if (!asn1_find_tag(apdu.data, apdu.nc, 0x6, &oid_len,
+                           &oid) || oid_len == 0 || oid == NULL) {
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
             return SW_WRONG_DATA();
         }
@@ -246,60 +290,105 @@ int cmd_cipher_sym() {
             int r = 0;
             mbedtls_chachapoly_context ctx;
             mbedtls_chachapoly_init(&ctx);
+            mbedtls_chachapoly_setkey(&ctx, kdata);
             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);
+                r = mbedtls_chachapoly_encrypt_and_tag(&ctx,
+                                                       enc_len,
+                                                       iv ? iv : tmp_iv,
+                                                       aad,
+                                                       aad_len,
+                                                       enc,
+                                                       res_APDU,
+                                                       res_APDU + enc_len);
             }
             else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
-                r = mbedtls_chachapoly_auth_decrypt(&ctx, enc_len - 16, iv ? iv : tmp_iv, aad, aad_len, enc + enc_len - 16, enc, res_APDU);
+                r = mbedtls_chachapoly_auth_decrypt(&ctx,
+                                                    enc_len - 16,
+                                                    iv ? iv : tmp_iv,
+                                                    aad,
+                                                    aad_len,
+                                                    enc + enc_len - 16,
+                                                    enc,
+                                                    res_APDU);
             }
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
             mbedtls_chachapoly_free(&ctx);
-            if (r != 0)
+            if (r != 0) {
+                if (r == MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED) {
+                    return SW_WRONG_DATA();
+                }
                 return SW_EXEC_ERROR();
-            if (algo == ALGO_EXT_CIPHER_ENCRYPT)
+            }
+            if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
                 res_APDU_size = enc_len + 16;
-            else if (algo == ALGO_EXT_CIPHER_DECRYPT)
+            }
+            else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
                 res_APDU_size = enc_len - 16;
+            }
         }
         else if (memcmp(oid, OID_DIGEST, 7) == 0) {
             const mbedtls_md_info_t *md_info = NULL;
-            if (memcmp(oid, OID_HMAC_SHA1, oid_len) == 0)
+            if (memcmp(oid, OID_HMAC_SHA1, oid_len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
-            else if (memcmp(oid, OID_HMAC_SHA224, oid_len) == 0)
+            }
+            else if (memcmp(oid, OID_HMAC_SHA224, oid_len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA224);
-            else if (memcmp(oid, OID_HMAC_SHA256, oid_len) == 0)
+            }
+            else if (memcmp(oid, OID_HMAC_SHA256, oid_len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
-            else if (memcmp(oid, OID_HMAC_SHA384, oid_len) == 0)
+            }
+            else if (memcmp(oid, OID_HMAC_SHA384, oid_len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384);
-            else if (memcmp(oid, OID_HMAC_SHA512, oid_len) == 0)
+            }
+            else if (memcmp(oid, OID_HMAC_SHA512, oid_len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
-            if (md_info == NULL)
+            }
+            if (md_info == NULL) {
                 return SW_WRONG_DATA();
-            int r = mbedtls_md_hmac(md_info, kdata, key_size, apdu.data, apdu.nc, res_APDU);
+            }
+            int r = mbedtls_md_hmac(md_info, kdata, key_size, enc, enc_len, res_APDU);
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
-            if (r != 0)
+            if (r != 0) {
                 return SW_EXEC_ERROR();
+            }
             res_APDU_size = md_info->size;
         }
-        else if (memcmp(oid, OID_HKDF_SHA256, oid_len) == 0 || memcmp(oid, OID_HKDF_SHA384, oid_len) == 0 || memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) {
+        else if (memcmp(oid, OID_HKDF_SHA256,
+                        oid_len) == 0 ||
+                 memcmp(oid, OID_HKDF_SHA384,
+                        oid_len) == 0 || memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) {
             const mbedtls_md_info_t *md_info = NULL;
-            if (memcmp(oid, OID_HKDF_SHA256, oid_len) == 0)
+            if (memcmp(oid, OID_HKDF_SHA256, oid_len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
-            else if (memcmp(oid, OID_HKDF_SHA384, oid_len) == 0)
+            }
+            else if (memcmp(oid, OID_HKDF_SHA384, oid_len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384);
-            else if (memcmp(oid, OID_HKDF_SHA512, oid_len) == 0)
+            }
+            else if (memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
-            int r = mbedtls_hkdf(md_info, iv, iv_len, kdata, key_size, enc, enc_len, res_APDU, apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : mbedtls_md_get_size(md_info));
+            }
+            int r = mbedtls_hkdf(md_info,
+                                 iv,
+                                 iv_len,
+                                 kdata,
+                                 key_size,
+                                 enc,
+                                 enc_len,
+                                 res_APDU,
+                                 apdu.ne > 0 &&
+                                 apdu.ne < 65536 ? apdu.ne : mbedtls_md_get_size(md_info));
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
-            if (r != 0)
+            if (r != 0) {
                 return SW_EXEC_ERROR();
-            res_APDU_size = apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne :mbedtls_md_get_size(md_info);
+            }
+            res_APDU_size = apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : mbedtls_md_get_size(md_info);
         }
         else if (memcmp(oid, OID_PKCS5_PBKDF2, oid_len) == 0) {
             int iterations = 0, keylen = 0;
-            mbedtls_asn1_buf salt, params = { .p = enc, .len = enc_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) };
+            mbedtls_asn1_buf salt,
+                             params =
+            { .p = enc, .len = enc_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) };
             mbedtls_md_type_t md_type = MBEDTLS_MD_SHA1;
-            mbedtls_md_context_t md_ctx;
 
             int r = pkcs5_parse_pbkdf2_params(&params, &salt, &iterations, &keylen, &md_type);
             if (r != 0) {
@@ -307,47 +396,316 @@ int cmd_cipher_sym() {
                 return SW_WRONG_DATA();
             }
 
-            mbedtls_md_init(&md_ctx);
-            if (mbedtls_md_setup(&md_ctx, mbedtls_md_info_from_type(md_type), 1) != 0) {
-                mbedtls_md_free(&md_ctx);
-                mbedtls_platform_zeroize(kdata, sizeof(kdata));
-                return SW_WRONG_DATA();
-            }
-            r = mbedtls_pkcs5_pbkdf2_hmac(&md_ctx, kdata, key_size, salt.p, salt.len, iterations, keylen ? keylen : (apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32), res_APDU);
+            r = mbedtls_pkcs5_pbkdf2_hmac_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));
-            mbedtls_md_free(&md_ctx);
-            if (r != 0)
+            if (r != 0) {
                 return SW_EXEC_ERROR();
+            }
             res_APDU_size = keylen ? keylen : (apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32);
         }
         else if (memcmp(oid, OID_PKCS5_PBES2, oid_len) == 0) {
-            mbedtls_asn1_buf params = { .p = aad, .len = aad_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) };
-            int r = mbedtls_pkcs5_pbes2(&params, algo == ALGO_EXT_CIPHER_ENCRYPT ? MBEDTLS_PKCS5_ENCRYPT : MBEDTLS_PKCS5_DECRYPT, kdata, key_size, enc, enc_len, res_APDU);
+            size_t olen = 0;
+            mbedtls_asn1_buf params =
+                {.p = aad, .len = aad_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)};
+            int r = mbedtls_pkcs5_pbes2_ext(&params,
+                                        algo == ALGO_EXT_CIPHER_ENCRYPT ? MBEDTLS_PKCS5_ENCRYPT : MBEDTLS_PKCS5_DECRYPT,
+                                        kdata,
+                                        key_size,
+                                        enc,
+                                        enc_len,
+                                        res_APDU, 4096, &olen);
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
             if (r != 0) {
                 return SW_WRONG_DATA();
             }
-            res_APDU_size = enc_len;
+            res_APDU_size = olen;
         }
         else if (memcmp(oid, OID_KDF_X963, oid_len) == 0) {
             mbedtls_md_type_t md_type = MBEDTLS_MD_SHA1;
-            if (memcmp(enc, OID_HMAC_SHA1, enc_len) == 0)
+            if (memcmp(enc, OID_HMAC_SHA1, enc_len) == 0) {
                 md_type = MBEDTLS_MD_SHA1;
-            else if (memcmp(enc, OID_HMAC_SHA224, enc_len) == 0)
+            }
+            else if (memcmp(enc, OID_HMAC_SHA224, enc_len) == 0) {
                 md_type = MBEDTLS_MD_SHA224;
-            else if (memcmp(enc, OID_HMAC_SHA256, enc_len) == 0)
+            }
+            else if (memcmp(enc, OID_HMAC_SHA256, enc_len) == 0) {
                 md_type = MBEDTLS_MD_SHA256;
-            else if (memcmp(enc, OID_HMAC_SHA384, enc_len) == 0)
+            }
+            else if (memcmp(enc, OID_HMAC_SHA384, enc_len) == 0) {
                 md_type = MBEDTLS_MD_SHA384;
-            else if (memcmp(enc, OID_HMAC_SHA512, enc_len) == 0)
+            }
+            else if (memcmp(enc, OID_HMAC_SHA512, enc_len) == 0) {
                 md_type = MBEDTLS_MD_SHA512;
-            int r = mbedtls_ansi_x936_kdf(md_type, key_size, kdata, aad_len, aad, apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32, res_APDU);
+            }
+            int r = mbedtls_ansi_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 if (memcmp(oid, OID_NIST_AES, 8) == 0) {
+            if (oid_len != 9) {
+                return SW_WRONG_DATA();
+            }
+            uint8_t aes_algo = oid[8],
+                    mode =
+                (algo == ALGO_EXT_CIPHER_ENCRYPT ? MBEDTLS_AES_ENCRYPT : MBEDTLS_AES_DECRYPT);
+            if ((aes_algo >= 0x01 && aes_algo <= 0x09 && key_size != 16) ||
+                (aes_algo >= 0x15 && aes_algo <= 0x1D && key_size != 24) ||
+                (aes_algo >= 0x29 && aes_algo <= 0x31 && key_size != 32)) {
+                return SW_WRONG_DATA();
+            }
+            mbedtls_aes_context ctx;
+            int r = 0;
+            mbedtls_aes_init(&ctx);
+            if (iv == NULL || iv_len == 0) {
+                iv = tmp_iv;
+                iv_len = sizeof(tmp_iv);
+            }
+            if (aes_algo == 0x01 || aes_algo == 0x15 || aes_algo == 0x29) { /* ECB */
+                if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
+                    r = mbedtls_aes_setkey_enc(&ctx, kdata, key_size * 8);
+                }
+                else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
+                    r = mbedtls_aes_setkey_dec(&ctx, kdata, key_size * 8);
+                }
+                mbedtls_platform_zeroize(kdata, sizeof(kdata));
+                r = mbedtls_aes_crypt_ecb(&ctx, mode, enc, res_APDU);
+                mbedtls_aes_free(&ctx);
+                if (r != 0) {
+                    return SW_EXEC_ERROR();
+                }
+                res_APDU_size = MIN(enc_len, 16); // ECB operates with 16-byte blocks
+            }
+            else if (aes_algo == 0x02 || aes_algo == 0x16 || aes_algo == 0x2A) { /* CBC */
+                if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
+                    r = mbedtls_aes_setkey_enc(&ctx, kdata, key_size * 8);
+                }
+                else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
+                    r = mbedtls_aes_setkey_dec(&ctx, kdata, key_size * 8);
+                }
+                if (r != 0) {
+                    return SW_EXEC_ERROR();
+                }
+                mbedtls_platform_zeroize(kdata, sizeof(kdata));
+                r = mbedtls_aes_crypt_cbc(&ctx, mode, enc_len, iv, enc, res_APDU);
+                mbedtls_aes_free(&ctx);
+                if (r != 0) {
+                    return SW_EXEC_ERROR();
+                }
+                res_APDU_size = enc_len;
+            }
+            else if (aes_algo == 0x03 || aes_algo == 0x17 || aes_algo == 0x2B) { /* OFB */
+                size_t iv_off = 0;
+                r = mbedtls_aes_setkey_enc(&ctx, kdata, key_size * 8);
+                mbedtls_platform_zeroize(kdata, sizeof(kdata));
+                r = mbedtls_aes_crypt_ofb(&ctx, enc_len, &iv_off, iv, enc, res_APDU);
+                mbedtls_aes_free(&ctx);
+                if (r != 0) {
+                    return SW_EXEC_ERROR();
+                }
+                res_APDU_size = enc_len;
+            }
+            else if (aes_algo == 0x04 || aes_algo == 0x18 || aes_algo == 0x2C) { /* CFB */
+                size_t iv_off = 0;
+                r = mbedtls_aes_setkey_enc(&ctx, kdata, key_size * 8);
+                mbedtls_platform_zeroize(kdata, sizeof(kdata));
+                r = mbedtls_aes_crypt_cfb128(&ctx, mode, enc_len, &iv_off, iv, enc, res_APDU);
+                mbedtls_aes_free(&ctx);
+                if (r != 0) {
+                    return SW_EXEC_ERROR();
+                }
+                res_APDU_size = enc_len;
+            }
+            else if (aes_algo == 0x06 || aes_algo == 0x1A || aes_algo == 0x2E) { /* GCM */
+                mbedtls_aes_free(&ctx); // No AES ctx used
+                mbedtls_gcm_context gctx;
+                mbedtls_gcm_init(&gctx);
+                r = mbedtls_gcm_setkey(&gctx, MBEDTLS_CIPHER_ID_AES, kdata, key_size * 8);
+                mbedtls_platform_zeroize(kdata, sizeof(kdata));
+                if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
+                    r = mbedtls_gcm_crypt_and_tag(&gctx,
+                                                  MBEDTLS_GCM_ENCRYPT,
+                                                  enc_len,
+                                                  iv,
+                                                  iv_len,
+                                                  aad,
+                                                  aad_len,
+                                                  enc,
+                                                  res_APDU,
+                                                  16,
+                                                  res_APDU + enc_len);
+                    res_APDU_size = enc_len + 16;
+                }
+                else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
+                    r = mbedtls_gcm_auth_decrypt(&gctx,
+                                                 enc_len - 16,
+                                                 iv,
+                                                 iv_len,
+                                                 aad,
+                                                 aad_len,
+                                                 enc + enc_len - 16,
+                                                 16,
+                                                 enc,
+                                                 res_APDU);
+                    res_APDU_size = enc_len - 16;
+                }
+                mbedtls_gcm_free(&gctx);
+                if (r != 0) {
+                    return SW_EXEC_ERROR();
+                }
+            }
+            else if (aes_algo == 0x09 || aes_algo == 0x1D || aes_algo == 0x31) { /* CTR */
+                size_t iv_off = 0;
+                uint8_t stream_block[16];
+                r = mbedtls_aes_setkey_enc(&ctx, kdata, key_size * 8);
+                mbedtls_platform_zeroize(kdata, sizeof(kdata));
+                r = mbedtls_aes_crypt_ctr(&ctx, enc_len, &iv_off, iv, stream_block, enc, res_APDU);
+                mbedtls_aes_free(&ctx);
+                if (r != 0) {
+                    return SW_EXEC_ERROR();
+                }
+                res_APDU_size = enc_len;
+            }
+            else if (aes_algo == 0x07 || aes_algo == 0x1B || aes_algo == 0x2F) { /* CCM */
+                mbedtls_aes_free(&ctx); // No AES ctx used
+                mbedtls_ccm_context gctx;
+                mbedtls_ccm_init(&gctx);
+                r = mbedtls_ccm_setkey(&gctx, MBEDTLS_CIPHER_ID_AES, kdata, key_size * 8);
+                if (r != 0) {
+                    return SW_EXEC_ERROR();
+                }
+                if (iv_len == 16) {
+                    iv_len = 12;
+                }
+                mbedtls_platform_zeroize(kdata, sizeof(kdata));
+                if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
+                    r = mbedtls_ccm_encrypt_and_tag(&gctx,
+                                                    enc_len,
+                                                    iv,
+                                                    iv_len,
+                                                    aad,
+                                                    aad_len,
+                                                    enc,
+                                                    res_APDU,
+                                                    res_APDU + enc_len,
+                                                    16);
+                    res_APDU_size = enc_len + 16;
+                }
+                else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
+                    r = mbedtls_ccm_auth_decrypt(&gctx,
+                                                 enc_len - 16,
+                                                 iv,
+                                                 iv_len,
+                                                 aad,
+                                                 aad_len,
+                                                 enc,
+                                                 res_APDU,
+                                                 enc + enc_len - 16,
+                                                 16);
+                    res_APDU_size = enc_len - 16;
+                }
+                mbedtls_ccm_free(&gctx);
+                if (r != 0) {
+                    return SW_EXEC_ERROR();
+                }
+            }
+        }
+        else if (memcmp(oid, OID_IEEE_ALG, 8) == 0) {
+            if (oid_len != 9) {
+                return SW_WRONG_DATA();
+            }
+            uint8_t aes_algo = oid[8],
+                    mode =
+                (algo == ALGO_EXT_CIPHER_ENCRYPT ? MBEDTLS_AES_ENCRYPT : MBEDTLS_AES_DECRYPT);
+            int r = 0;
+            uint8_t tmp_iv[16];
+            memset(tmp_iv, 0, sizeof(tmp_iv));
+            if (iv == NULL || iv_len == 0) {
+                iv = tmp_iv;
+                iv_len = sizeof(tmp_iv);
+            }
+            if ((aes_algo == 0x01 && key_size != 32) || (aes_algo == 0x02 && key_size != 64)) {
+                return SW_WRONG_DATA();
+            }
+            mbedtls_aes_xts_context ctx;
+            mbedtls_aes_xts_init(&ctx);
+            if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
+                r = mbedtls_aes_xts_setkey_enc(&ctx, kdata, key_size * 8);
+            }
+            else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
+                r = mbedtls_aes_xts_setkey_dec(&ctx, kdata, key_size * 8);
+            }
+            mbedtls_platform_zeroize(kdata, sizeof(kdata));
+            r = mbedtls_aes_crypt_xts(&ctx, mode, enc_len, iv, enc, res_APDU);
+            mbedtls_aes_xts_free(&ctx);
+            if (r != 0) {
+                return SW_EXEC_ERROR();
+            }
+            res_APDU_size = enc_len;
+        }
+        else if (memcmp(oid, OID_HD, 11) == 0) {
+            mbedtls_aes_context ctx;
+            int r = 0;
+            uint8_t mode =
+                (algo == ALGO_EXT_CIPHER_ENCRYPT ? MBEDTLS_AES_ENCRYPT : MBEDTLS_AES_DECRYPT),
+                    secret[64] = { 0 };
+            mbedtls_aes_init(&ctx);
+            if (hd_keytype != 0x3) {
+                return SW_INCORRECT_PARAMS();
+            }
+            key_size = 32;
+            mbedtls_mpi_write_binary(&hd_context.d, kdata, key_size);
+            r = mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA512),
+                                kdata,
+                                key_size,
+                                aad,
+                                aad_len,
+                                secret);
+            mbedtls_platform_zeroize(kdata, sizeof(kdata));
+            if (r != 0) {
+                return SW_EXEC_ERROR();
+            }
+            if (iv == tmp_iv || iv_len == 0) {
+                iv = secret + 32;
+                iv_len = 16;
+            }
+            if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
+                r = mbedtls_aes_setkey_enc(&ctx, secret, key_size * 8);
+            }
+            else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
+                r = mbedtls_aes_setkey_dec(&ctx, secret, key_size * 8);
+            }
+            if (r != 0) {
+                return SW_EXEC_ERROR();
+            }
+            r = mbedtls_aes_crypt_cbc(&ctx, mode, enc_len, iv, enc, res_APDU);
+            mbedtls_aes_free(&ctx);
+            if (r != 0) {
+                return SW_EXEC_ERROR();
+            }
+            res_APDU_size = enc_len;
+            mbedtls_ecdsa_free(&hd_context);
+            hd_keytype = 0;
+        }
+        else {
+            return SW_WRONG_DATA();
+        }
     }
     else {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));

src/hsm/cmd_decrypt_asym.c

@@ -29,40 +29,49 @@
 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)
-            mbedtls_rsa_set_padding(&ctx, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_NONE);
+        if (p2 == ALGO_RSA_DECRYPT_OEP) {
+            mbedtls_rsa_set_padding(&ctx, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA256);
+        }
         int r = load_private_key_rsa(&ctx, ef);
         if (r != CCID_OK) {
             mbedtls_rsa_free(&ctx);
-            if (r == CCID_VERIFICATION_FAILED)
+            if (r == CCID_VERIFICATION_FAILED) {
                 return SW_SECURE_MESSAGE_EXEC_ERROR();
+            }
             return SW_EXEC_ERROR();
         }
         int key_size = file_get_size(ef);
-        if (apdu.nc < key_size) //needs padding
-            memset(apdu.data+apdu.nc, 0, key_size-apdu.nc);
+        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);
@@ -72,10 +81,11 @@ 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);
+        uint8_t *kdata = (uint8_t *) calloc(1, key_size);
         memcpy(kdata, file_get_data(ef), key_size);
         if (mkek_decrypt(kdata, key_size) != 0) {
             mbedtls_platform_zeroize(kdata, key_size);
@@ -92,7 +102,7 @@ int cmd_decrypt_asym() {
             free(kdata);
             return SW_DATA_INVALID();
         }
-        r = mbedtls_mpi_read_binary(&ctx.ctx.mbed_ecdh.d, kdata+1, key_size-1);
+        r = mbedtls_ecp_read_key(gid, (mbedtls_ecdsa_context *)&ctx.ctx.mbed_ecdh, kdata + 1, key_size - 1);
         mbedtls_platform_zeroize(kdata, key_size);
         free(kdata);
         if (r != 0) {
@@ -100,8 +110,9 @@ int cmd_decrypt_asym() {
             return SW_DATA_INVALID();
         }
         r = -1;
-        if (p2 == ALGO_EC_DH)
-            r = mbedtls_ecdh_read_public(&ctx, apdu.data-1, apdu.nc+1);
+        if (p2 == ALGO_EC_DH) {
+            r = mbedtls_ecdh_read_public(&ctx, apdu.data - 1, apdu.nc + 1);
+        }
         else if (p2 == ALGO_EC_DH_XKEK) {
             size_t pub_len = 0;
             const uint8_t *pub = cvc_get_pub(apdu.data, apdu.nc, &pub_len);
@@ -109,7 +120,7 @@ int cmd_decrypt_asym() {
                 size_t t86_len = 0;
                 const uint8_t *t86 = cvc_get_field(pub, pub_len, &t86_len, 0x86);
                 if (t86) {
-                    r = mbedtls_ecdh_read_public(&ctx, t86-1, t86_len+1);
+                    r = mbedtls_ecdh_read_public(&ctx, t86 - 1, t86_len + 1);
                 }
             }
         }
@@ -118,20 +129,26 @@ int cmd_decrypt_asym() {
             return SW_DATA_INVALID();
         }
         size_t olen = 0;
+        // The SmartCard-HSM returns the point result of the DH operation
+        // with a leading '04'
         res_APDU[0] = 0x04;
-        r = mbedtls_ecdh_calc_secret(&ctx, &olen, res_APDU+1, MBEDTLS_ECP_MAX_BYTES, random_gen, NULL);
+        r =
+            mbedtls_ecdh_calc_secret(&ctx, &olen, res_APDU + 1, MBEDTLS_ECP_MAX_BYTES, random_gen,
+                                     NULL);
         mbedtls_ecdh_free(&ctx);
         if (r != 0) {
             return SW_EXEC_ERROR();
         }
-        if (p2 == ALGO_EC_DH)
-            res_APDU_size = olen+1;
+        if (p2 == ALGO_EC_DH) {
+            res_APDU_size = olen + 1;
+        }
         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,22 +156,32 @@ int cmd_decrypt_asym() {
                 if (tag == 0x73) {
                     size_t oid_len = 0;
                     uint8_t *oid_data = NULL;
-                    if (asn1_find_tag(tag_data, tag_len, 0x6, &oid_len, &oid_data) == true && oid_len == strlen(OID_ID_KEY_DOMAIN_UID) && memcmp(oid_data, OID_ID_KEY_DOMAIN_UID, strlen(OID_ID_KEY_DOMAIN_UID)) == 0) {
-                        if (asn1_find_tag(tag_data, tag_len, 0x80, &kdom_uid_len, &kdom_uid) == false)
+                    if (asn1_find_tag(tag_data, tag_len, 0x6, &oid_len,
+                                      &oid_data) == true &&
+                        oid_len == strlen(OID_ID_KEY_DOMAIN_UID) &&
+                        memcmp(oid_data, OID_ID_KEY_DOMAIN_UID,
+                               strlen(OID_ID_KEY_DOMAIN_UID)) == 0) {
+                        if (asn1_find_tag(tag_data, tag_len, 0x80, &kdom_uid_len,
+                                          &kdom_uid) == false) {
                             return SW_WRONG_DATA();
+                        }
                         break;
                     }
                 }
             }
-            if (kdom_uid_len == 0 || kdom_uid == NULL)
+            if (kdom_uid_len == 0 || kdom_uid == NULL) {
                 return SW_WRONG_DATA();
+            }
             for (int n = 0; n < MAX_KEY_DOMAINS; n++) {
-                file_t *tf = search_dynamic_file(EF_XKEK+n);
+                file_t *tf = search_dynamic_file(EF_XKEK + n);
                 if (tf) {
-                    if (file_get_size(tf) == kdom_uid_len && memcmp(file_get_data(tf), kdom_uid, kdom_uid_len) == 0) {
-                        file_new(EF_DKEK+n);
-                        if (store_dkek_key(n, res_APDU+1) != CCID_OK)
+                    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) {
                             return SW_EXEC_ERROR();
+                        }
+                        mbedtls_platform_zeroize(res_APDU, 32);
                         return SW_OK();
                     }
                 }
@@ -162,8 +189,9 @@ int cmd_decrypt_asym() {
             return SW_REFERENCE_NOT_FOUND();
         }
     }
-    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

@@ -22,51 +22,55 @@
 #include "cvc.h"
 
 #define MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED -0x006E
-#define MOD_ADD( N )                                                    \
-    while( mbedtls_mpi_cmp_mpi( &(N), &grp->P ) >= 0 )                  \
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( &(N), &(N), &grp->P ) )
-static inline int mbedtls_mpi_add_mod( const mbedtls_ecp_group *grp,
-                                       mbedtls_mpi *X,
-                                       const mbedtls_mpi *A,
-                                       const mbedtls_mpi *B )
-{
+#define MOD_ADD(N)                                                    \
+    while (mbedtls_mpi_cmp_mpi(&(N), &grp->P) >= 0)                  \
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_abs(&(N), &(N), &grp->P))
+static inline int mbedtls_mpi_add_mod(const mbedtls_ecp_group *grp,
+                                      mbedtls_mpi *X,
+                                      const mbedtls_mpi *A,
+                                      const mbedtls_mpi *B) {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( X, A, B ) );
-    MOD_ADD( *X );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(X, A, B));
+    MOD_ADD(*X);
 cleanup:
-    return( ret );
+    return ret;
 }
 
 int cmd_derive_asym() {
     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);
+        mbedtls_ecp_keypair ctx;
+        mbedtls_ecp_keypair_init(&ctx);
 
         int r;
-        r = load_private_key_ecdsa(&ctx, fkey);
+        r = load_private_key_ec(&ctx, fkey);
         if (r != CCID_OK) {
-            mbedtls_ecdsa_free(&ctx);
-            if (r == CCID_VERIFICATION_FAILED)
+            mbedtls_ecp_keypair_free(&ctx);
+            if (r == CCID_VERIFICATION_FAILED) {
                 return SW_SECURE_MESSAGE_EXEC_ERROR();
+            }
             return SW_EXEC_ERROR();
         }
         mbedtls_mpi a, nd;
         mbedtls_mpi_init(&a);
         mbedtls_mpi_init(&nd);
-        r = mbedtls_mpi_read_binary(&a, apdu.data+1, apdu.nc-1);
+        r = mbedtls_mpi_read_binary(&a, apdu.data + 1, apdu.nc - 1);
         if (r != 0) {
-            mbedtls_ecdsa_free(&ctx);
+            mbedtls_ecp_keypair_free(&ctx);
             mbedtls_mpi_free(&a);
             mbedtls_mpi_free(&nd);
             return SW_DATA_INVALID();
@@ -74,24 +78,25 @@ int cmd_derive_asym() {
         r = mbedtls_mpi_add_mod(&ctx.grp, &nd, &ctx.d, &a);
         mbedtls_mpi_free(&a);
         if (r != 0) {
-            mbedtls_ecdsa_free(&ctx);
+            mbedtls_ecp_keypair_free(&ctx);
             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_ecp_keypair_free(&ctx);
             return SW_EXEC_ERROR();
         }
-        r = store_keys(&ctx, HSM_KEY_EC, dest_id);
+        r = store_keys(&ctx, PICO_KEYS_KEY_EC, dest_id);
         if (r != CCID_OK) {
-            mbedtls_ecdsa_free(&ctx);
+            mbedtls_ecp_keypair_free(&ctx);
             return SW_EXEC_ERROR();
         }
-        mbedtls_ecdsa_free(&ctx);
+        mbedtls_ecp_keypair_free(&ctx);
     }
-    else
+    else {
         return SW_WRONG_DATA();
+    }
     return SW_OK();
 }

src/hsm/cmd_external_authenticate.c

@@ -25,28 +25,41 @@ 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();
+    }
+    puk_status[ef_puk_aut->fid & (MAX_PUK - 1)] = 0;
     uint8_t *puk_data = file_get_data(ef_puk);
-    uint8_t *input = (uint8_t *)calloc(dev_name_len+challenge_len, sizeof(uint8_t)), hash[32];
+    uint8_t *input = (uint8_t *) calloc(dev_name_len + challenge_len, sizeof(uint8_t)), hash[32];
     memcpy(input, dev_name, dev_name_len);
-    memcpy(input+dev_name_len, challenge, challenge_len);
-    hash256(input, dev_name_len+challenge_len, hash);
-    int r = puk_verify(apdu.data, apdu.nc, hash, 32, file_get_data(ef_puk_aut), file_get_size(ef_puk_aut));
+    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));
     free(input);
-    if (r != 0)
+    if (r != 0) {
         return SW_CONDITIONS_NOT_SATISFIED();
-    puk_status[ef_puk_aut->fid & (MAX_PUK-1)] = 1;
+    }
+    puk_status[ef_puk_aut->fid & (MAX_PUK - 1)] = 1;
     uint8_t auts = 0;
-    for (int i = 0; i < puk_data[0]; i++)
+    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

@@ -18,7 +18,9 @@
 #include "common.h"
 #include "mbedtls/ecdh.h"
 #include "sc_hsm.h"
+#ifndef ENABLE_EMULATION
 #include "hardware/rtc.h"
+#endif
 #include "files.h"
 #include "random.h"
 #include "kek.h"
@@ -27,12 +29,15 @@
 
 int cmd_extras() {
     if (P1(apdu) == 0xA) { //datetime operations
-        if (P2(apdu) != 0x0)
+        if (P2(apdu) != 0x0) {
             return SW_INCORRECT_P1P2();
+        }
         if (apdu.nc == 0) {
+#ifndef ENABLE_EMULATION
             datetime_t dt;
-            if (!rtc_get_datetime(&dt))
+            if (!rtc_get_datetime(&dt)) {
                 return SW_EXEC_ERROR();
+            }
             res_APDU[res_APDU_size++] = dt.year >> 8;
             res_APDU[res_APDU_size++] = dt.year & 0xff;
             res_APDU[res_APDU_size++] = dt.month;
@@ -41,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];
@@ -53,15 +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 (P2(apdu) != 0x0)
+    else if (P1(apdu) == 0x6) {   //dynamic options
+        if (P2(apdu) != 0x0) {
             return SW_INCORRECT_P1P2();
-        if (apdu.nc > sizeof(uint8_t))
+        }
+        if (apdu.nc > sizeof(uint8_t)) {
             return SW_WRONG_LENGTH();
+        }
         uint16_t opts = get_device_options();
         if (apdu.nc == 0) {
             res_APDU[res_APDU_size++] = opts >> 8;
@@ -74,7 +86,7 @@ int cmd_extras() {
             low_flash_available();
         }
     }
-    else if (P1(apdu) == 0x3A) { // secure lock
+    else if (P1(apdu) == 0x3A) {   // secure lock
         if (apdu.nc == 0) {
             return SW_WRONG_LENGTH();
         }
@@ -82,9 +94,16 @@ int cmd_extras() {
             mbedtls_ecdh_context hkey;
             mbedtls_ecdh_init(&hkey);
             mbedtls_ecdh_setup(&hkey, MBEDTLS_ECP_DP_SECP256R1);
-            int ret = mbedtls_ecdh_gen_public(&hkey.ctx.mbed_ecdh.grp, &hkey.ctx.mbed_ecdh.d, &hkey.ctx.mbed_ecdh.Q, random_gen, NULL);
+            int ret = mbedtls_ecdh_gen_public(&hkey.ctx.mbed_ecdh.grp,
+                                              &hkey.ctx.mbed_ecdh.d,
+                                              &hkey.ctx.mbed_ecdh.Q,
+                                              random_gen,
+                                              NULL);
             mbedtls_mpi_lset(&hkey.ctx.mbed_ecdh.Qp.Z, 1);
-            ret = mbedtls_ecp_point_read_binary(&hkey.ctx.mbed_ecdh.grp, &hkey.ctx.mbed_ecdh.Qp, apdu.data, apdu.nc);
+            ret = mbedtls_ecp_point_read_binary(&hkey.ctx.mbed_ecdh.grp,
+                                                &hkey.ctx.mbed_ecdh.Qp,
+                                                apdu.data,
+                                                apdu.nc);
             if (ret != 0) {
                 mbedtls_ecdh_free(&hkey);
                 return SW_WRONG_DATA();
@@ -93,20 +112,38 @@ int cmd_extras() {
 
             uint8_t buf[MBEDTLS_ECP_MAX_BYTES];
             size_t olen = 0;
-            ret = mbedtls_ecdh_calc_secret(&hkey, &olen, buf, MBEDTLS_ECP_MAX_BYTES, random_gen, NULL);
+            ret = mbedtls_ecdh_calc_secret(&hkey,
+                                           &olen,
+                                           buf,
+                                           MBEDTLS_ECP_MAX_BYTES,
+                                           random_gen,
+                                           NULL);
             if (ret != 0) {
                 mbedtls_ecdh_free(&hkey);
                 mbedtls_platform_zeroize(buf, sizeof(buf));
                 return SW_WRONG_DATA();
             }
-            ret = mbedtls_hkdf(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), NULL, 0, buf, olen, mse.Qpt, sizeof(mse.Qpt), mse.key_enc, sizeof(mse.key_enc));
+            ret = mbedtls_hkdf(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256),
+                               NULL,
+                               0,
+                               buf,
+                               olen,
+                               mse.Qpt,
+                               sizeof(mse.Qpt),
+                               mse.key_enc,
+                               sizeof(mse.key_enc));
             mbedtls_platform_zeroize(buf, sizeof(buf));
             if (ret != 0) {
                 mbedtls_ecdh_free(&hkey);
                 return SW_EXEC_ERROR();
             }
 
-            ret = mbedtls_ecp_point_write_binary(&hkey.ctx.mbed_ecdh.grp, &hkey.ctx.mbed_ecdh.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &olen, res_APDU, 4096);
+            ret = mbedtls_ecp_point_write_binary(&hkey.ctx.mbed_ecdh.grp,
+                                                 &hkey.ctx.mbed_ecdh.Q,
+                                                 MBEDTLS_ECP_PF_UNCOMPRESSED,
+                                                 &olen,
+                                                 res_APDU,
+                                                 4096);
             mbedtls_ecdh_free(&hkey);
             if (ret != 0) {
                 return SW_EXEC_ERROR();
@@ -115,8 +152,9 @@ int cmd_extras() {
             res_APDU_size = olen;
         }
         else if (P2(apdu) == 0x02 || P2(apdu) == 0x03 || P2(apdu) == 0x04) {
-            if (mse.init == false)
+            if (mse.init == false) {
                 return SW_COMMAND_NOT_ALLOWED();
+            }
 
             int ret = mse_decrypt_ct(apdu.data, apdu.nc);
             if (ret != 0) {
@@ -125,12 +163,13 @@ int cmd_extras() {
             if (P2(apdu) == 0x02 || P2(apdu) == 0x04) { // Enable
                 uint16_t opts = get_device_options();
                 uint8_t newopts[] = { opts >> 8, (opts & 0xff) };
-                if ((P2(apdu) == 0x02 && !(opts & HSM_OPT_SECURE_LOCK)) || (P2(apdu) == 0x04 && (opts & HSM_OPT_SECURE_LOCK))) {
+                if ((P2(apdu) == 0x02 && !(opts & HSM_OPT_SECURE_LOCK)) ||
+                    (P2(apdu) == 0x04 && (opts & HSM_OPT_SECURE_LOCK))) {
                     uint16_t tfids[] = { EF_MKEK, EF_MKEK_SO };
-                    for (int t = 0; t < sizeof(tfids)/sizeof(uint16_t); t++) {
+                    for (int t = 0; t < sizeof(tfids) / sizeof(uint16_t); t++) {
                         file_t *tf = search_by_fid(tfids[t], NULL, SPECIFY_EF);
                         if (tf) {
-                            uint8_t *tmp = (uint8_t *)calloc(1, file_get_size(tf));
+                            uint8_t *tmp = (uint8_t *) calloc(1, file_get_size(tf));
                             memcpy(tmp, file_get_data(tf), file_get_size(tf));
                             for (int i = 0; i < MKEK_KEY_SIZE; i++) {
                                 MKEK_KEY(tmp)[i] ^= apdu.data[i];
@@ -140,10 +179,12 @@ int cmd_extras() {
                         }
                     }
                 }
-                if (P2(apdu) == 0x02)
+                if (P2(apdu) == 0x02) {
                     newopts[0] |= HSM_OPT_SECURE_LOCK >> 8;
-                else if (P2(apdu) == 0x04)
+                }
+                else if (P2(apdu) == 0x04) {
                     newopts[0] &= ~HSM_OPT_SECURE_LOCK >> 8;
+                }
                 file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF);
                 flash_write_data_to_file(tf, newopts, sizeof(newopts));
                 low_flash_available();
@@ -154,7 +195,8 @@ int cmd_extras() {
             }
         }
     }
-    else
+    else {
         return SW_INCORRECT_P1P2();
+    }
     return SW_OK();
 }

src/hsm/cmd_general_authenticate.c

@@ -33,20 +33,21 @@ int cmd_general_authenticate() {
             uint16_t tag = 0x0;
             uint8_t *tag_data = NULL, *p = NULL;
             size_t tag_len = 0;
-            while (walk_tlv(apdu.data+2, apdu.nc-2, &p, &tag, &tag_len, &tag_data)) {
+            while (walk_tlv(apdu.data + 2, apdu.nc - 2, &p, &tag, &tag_len, &tag_data)) {
                 if (tag == 0x80) {
-                    pubkey = tag_data-1; //mbedtls ecdh starts reading one pos before
-                    pubkey_len = tag_len+1;
+                    pubkey = tag_data - 1; //mbedtls ecdh starts reading one pos before
+                    pubkey_len = tag_len + 1;
                 }
             }
             file_t *fkey = search_by_fid(EF_KEY_DEV, NULL, SPECIFY_EF);
-            if (!fkey)
+            if (!fkey) {
                 return SW_EXEC_ERROR();
-            mbedtls_ecdsa_context ectx;
-            mbedtls_ecdsa_init(&ectx);
-            r = load_private_key_ecdsa(&ectx, fkey);
+            }
+            mbedtls_ecp_keypair ectx;
+            mbedtls_ecp_keypair_init(&ectx);
+            r = load_private_key_ecdh(&ectx, fkey);
             if (r != CCID_OK) {
-                mbedtls_ecdsa_free(&ectx);
+                mbedtls_ecp_keypair_free(&ectx);
                 return SW_EXEC_ERROR();
             }
             mbedtls_ecdh_context ctx;
@@ -54,12 +55,12 @@ int cmd_general_authenticate() {
             mbedtls_ecp_group_id gid = MBEDTLS_ECP_DP_SECP256R1;
             r = mbedtls_ecdh_setup(&ctx, gid);
             if (r != 0) {
-                mbedtls_ecdsa_free(&ectx);
+                mbedtls_ecp_keypair_free(&ectx);
                 mbedtls_ecdh_free(&ctx);
                 return SW_DATA_INVALID();
             }
             r = mbedtls_mpi_copy(&ctx.ctx.mbed_ecdh.d, &ectx.d);
-            mbedtls_ecdsa_free(&ectx);
+            mbedtls_ecp_keypair_free(&ectx);
             if (r != 0) {
                 mbedtls_ecdh_free(&ctx);
                 return SW_DATA_INVALID();
@@ -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();
@@ -79,27 +85,29 @@ int cmd_general_authenticate() {
 
             sm_derive_all_keys(derived, olen);
 
-            uint8_t *t = (uint8_t *)calloc(1, pubkey_len+16);
+            uint8_t *t = (uint8_t *) calloc(1, pubkey_len + 16);
             memcpy(t, "\x7F\x49\x4F\x06\x0A", 5);
-            if (sm_get_protocol() == MSE_AES)
-                memcpy(t+5, OID_ID_CA_ECDH_AES_CBC_CMAC_128, 10);
+            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);
+            memcpy(t + 16, pubkey, pubkey_len);
 
             res_APDU[res_APDU_size++] = 0x7C;
             res_APDU[res_APDU_size++] = 20;
             res_APDU[res_APDU_size++] = 0x81;
             res_APDU[res_APDU_size++] = 8;
-            memcpy(res_APDU+res_APDU_size, sm_get_nonce(), 8);
+            memcpy(res_APDU + res_APDU_size, sm_get_nonce(), 8);
             res_APDU_size += 8;
             res_APDU[res_APDU_size++] = 0x82;
             res_APDU[res_APDU_size++] = 8;
 
-            r = sm_sign(t, pubkey_len+16, res_APDU+res_APDU_size);
+            r = sm_sign(t, pubkey_len + 16, res_APDU + res_APDU_size);
 
             free(t);
-            if (r != CCID_OK)
+            if (r != CCID_OK) {
                 return SW_EXEC_ERROR();
+            }
             res_APDU_size += 8;
         }
     }

src/hsm/cmd_initialize.c

@@ -28,12 +28,17 @@ 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;
 }
 
+extern void reset_puk_store();
 int cmd_initialize() {
     if (apdu.nc > 0) {
         uint8_t mkek[MKEK_SIZE];
@@ -49,27 +54,27 @@ int cmd_initialize() {
                 file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF);
                 flash_write_data_to_file(tf, tag_data, tag_len);
             }
-            else if (tag == 0x81) { //user pin
+            else if (tag == 0x81) {   //user pin
                 if (file_pin1 && file_pin1->data) {
                     uint8_t dhash[33];
                     dhash[0] = tag_len;
-                    double_hash_pin(tag_data, tag_len, dhash+1);
+                    double_hash_pin(tag_data, tag_len, dhash + 1);
                     flash_write_data_to_file(file_pin1, dhash, sizeof(dhash));
                     hash_multi(tag_data, tag_len, session_pin);
                     has_session_pin = true;
                 }
             }
-            else if (tag == 0x82) { //sopin pin
+            else if (tag == 0x82) {   //sopin pin
                 if (file_sopin && file_sopin->data) {
                     uint8_t dhash[33];
                     dhash[0] = tag_len;
-                    double_hash_pin(tag_data, tag_len, dhash+1);
+                    double_hash_pin(tag_data, tag_len, dhash + 1);
                     flash_write_data_to_file(file_sopin, dhash, sizeof(dhash));
                     hash_multi(tag_data, tag_len, session_sopin);
                     has_session_sopin = true;
                 }
             }
-            else if (tag == 0x91) { //retries user pin
+            else if (tag == 0x91) {   //retries user pin
                 file_t *tf = search_by_fid(0x1082, NULL, SPECIFY_EF);
                 if (tf && tf->data) {
                     flash_write_data_to_file(tf, tag_data, tag_len);
@@ -93,14 +98,14 @@ int cmd_initialize() {
                     release_mkek(mkek);
                     return SW_MEMORY_FAILURE();
                 }
-                uint8_t pk_status[4], puks = MIN(tag_data[0],MAX_PUK);
+                uint8_t pk_status[4], puks = MIN(tag_data[0], MAX_PUK);
                 memset(pk_status, 0, sizeof(pk_status));
                 pk_status[0] = puks;
                 pk_status[1] = puks;
                 pk_status[2] = tag_data[1];
                 flash_write_data_to_file(ef_puk, pk_status, sizeof(pk_status));
                 for (int i = 0; i < puks; i++) {
-                    file_t *tf = file_new(EF_PUK+i);
+                    file_t *tf = file_new(EF_PUK + i);
                     if (!tf) {
                         release_mkek(mkek);
                         return SW_MEMORY_FAILURE();
@@ -111,13 +116,13 @@ int cmd_initialize() {
             else if (tag == 0x97) {
                 kds = tag_data;
                 /*
-                for (int i = 0; i < MIN(*kds,MAX_KEY_DOMAINS); i++) {
+                   for (int i = 0; i < MIN(*kds,MAX_KEY_DOMAINS); i++) {
                     file_t *tf = file_new(EF_DKEK+i);
                     if (!tf)
                         return SW_MEMORY_FAILURE();
                     flash_write_data_to_file(tf, NULL, 0);
-                }
-                */
+                   }
+                 */
             }
         }
         file_t *tf_kd = search_by_fid(EF_KEY_DOMAIN, NULL, SPECIFY_EF);
@@ -125,8 +130,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 +141,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)
+            uint8_t t[MAX_KEY_DOMAINS * 2], k = MIN(*kds, MAX_KEY_DOMAINS);
+            memset(t, 0xff, 2 * k);
+            if (flash_write_data_to_file(tf_kd, t, 2 * k) != CCID_OK) {
                 return SW_EXEC_ERROR();
+            }
         }
         /* 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;
@@ -175,33 +187,57 @@ int cmd_initialize() {
                 mbedtls_ecdsa_free(&ecdsa);
                 return SW_EXEC_ERROR();
             }
-            ret = store_keys(&ecdsa, HSM_KEY_EC, key_id);
+            ret = store_keys(&ecdsa, PICO_KEYS_KEY_EC, key_id);
             if (ret != CCID_OK) {
                 mbedtls_ecdsa_free(&ecdsa);
                 return SW_EXEC_ERROR();
             }
             size_t cvc_len = 0;
-            if ((cvc_len = asn1_cvc_aut(&ecdsa, HSM_KEY_EC, res_APDU, 4096, NULL, 0)) == 0) {
+            if ((cvc_len = asn1_cvc_aut(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, 4096, NULL, 0)) == 0) {
                 mbedtls_ecdsa_free(&ecdsa);
                 return SW_EXEC_ERROR();
             }
-            mbedtls_ecdsa_free(&ecdsa);
 
             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) {
+                mbedtls_ecdsa_free(&ecdsa);
                 return SW_EXEC_ERROR();
+            }
 
-            const uint8_t *keyid = (const uint8_t *)"\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0", *label = (const uint8_t *)"ESTERMHSM";
-            size_t prkd_len = asn1_build_prkd_ecc(label, strlen((const char *)label), keyid, 20, 192, res_APDU, 4096);
+            if ((cvc_len = asn1_cvc_cert(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, 4096, NULL, 0, true)) == 0) {
+                mbedtls_ecdsa_free(&ecdsa);
+                return SW_EXEC_ERROR();
+            }
+            memcpy(res_APDU + cvc_len, res_APDU, cvc_len);
+            mbedtls_ecdsa_free(&ecdsa);
+            fpk = search_by_fid(EF_TERMCA, NULL, SPECIFY_EF);
+            ret = flash_write_data_to_file(fpk, res_APDU, 2 * cvc_len);
+            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 *) "ESPICOHSMTR";
+            size_t prkd_len = asn1_build_prkd_ecc(label,
+                                                  strlen((const char *) label),
+                                                  keyid,
+                                                  20,
+                                                  256,
+                                                  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();
+        reset_puk_store();
     }
-    else { //free memory bytes request
+    else {   //free memory bytes request
         int heap_left = heapLeft();
         res_APDU[0] = ((heap_left >> 24) & 0xff);
         res_APDU[1] = ((heap_left >> 16) & 0xff);

src/hsm/cmd_key_domain.c

@@ -23,117 +23,165 @@
 
 uint8_t get_key_domain(file_t *fkey) {
     size_t tag_len = 0;
+    if (!file_has_data(fkey)) {
+        return 0xff;
+    }
     const uint8_t *meta_tag = get_meta_tag(fkey, 0x92, &tag_len);
-    if (meta_tag)
+    if (meta_tag) {
         return *meta_tag;
-    return 0xff;
+    }
+    return 0x0;
 }
 
 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)
+            file_t *tf = file_new(EF_DKEK + p2);
+            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)
-                    return SW_FILE_NOT_FOUND();
+                int r = save_dkek_key(p2, NULL);
+                if (r != CCID_OK) {
+                    if (r == CCID_NO_LOGIN) {
+                        pending_save_dkek = p2;
+                    }
+                    else {
+                        /* 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];
+            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)
+            t[2 * p2 + 1] = current_dkeks;
+            if (flash_write_data_to_file(tf_kd, t, tf_kd_size) != CCID_OK) {
                 return SW_EXEC_ERROR();
+            }
             low_flash_available();
         }
         else {
-            file_t *tf = search_dynamic_file(EF_XKEK+p2);
-            if (2*p2 >= tf_kd_size || current_dkeks == 0)
+            file_t *tf = search_dynamic_file(EF_XKEK + p2);
+            if (2 * p2 >= tf_kd_size) {
                 return SW_INCORRECT_P1P2();
-            if (current_dkeks == 0xff && !tf) //XKEK have always 0xff
+            }
+            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)
-            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)
-                    return SW_FILE_EXISTS();
             }
         }
-        uint8_t t[MAX_KEY_DOMAINS*2];
+    }
+    else if (p1 == 0x1 || p1 == 0x3 || p1 == 0x4) {   //key domain setup
+        if (p1 == 0x1 && apdu.nc != 1) {
+            return SW_WRONG_LENGTH();
+        }
+        if (p1 == 0x3) { //if key domain is not empty, command is denied
+            for (int i = 1; i < 256; i++) {
+                file_t *fkey = search_dynamic_file(KEY_PREFIX << 8 | i);
+                if (get_key_domain(fkey) == p2) {
+                    return SW_FILE_EXISTS();
+                }
+            }
+        }
+        uint8_t t[MAX_KEY_DOMAINS * 2];
         memcpy(t, kdata, tf_kd_size);
         if (p1 == 0x1) {
-            t[2*p2] = dkeks = apdu.data[0];
-            t[2*p2+1] = current_dkeks = 0;
+            if (t[2 * p2] != 0xff || t[2 * p2 + 1] != 0xff) {
+                return SW_INCORRECT_P1P2();
+            }
+            t[2 * p2] = dkeks = apdu.data[0];
+            t[2 * p2 + 1] = current_dkeks = 0;
         }
         else if (p1 == 0x3) {
-            t[2*p2] = dkeks = 0xff;
-            t[2*p2+1] = 0xff;
+            if (t[2 * p2] == 0xff && t[2 * p2 + 1] == 0xff) {
+                return SW_INCORRECT_P1P2();
+            }
+            t[2 * p2] = dkeks = 0xff;
+            t[2 * p2 + 1] = 0xff;
         }
         else if (p1 == 0x4) {
-            t[2*p2+1] = current_dkeks = 0;
+            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)
-                return SW_EXEC_ERROR();
         }
-        if (p1 == 0x3 && (tf = search_dynamic_file(EF_XKEK+p2))) {
-            if (delete_file(tf) != CCID_OK)
+        file_t *tf = NULL;
+        if ((tf = search_dynamic_file(EF_DKEK + p2))) {
+            if (delete_file(tf) != CCID_OK) {
                 return SW_EXEC_ERROR();
+            }
+        }
+        if (p1 == 0x3 && (tf = search_dynamic_file(EF_XKEK + p2))) {
+            if (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
+    else if (p1 == 0x2) {   //XKEK Key Domain creation
         if (apdu.nc > 0) {
             size_t pub_len = 0;
             file_t *fterm = search_by_fid(EF_TERMCA, NULL, SPECIFY_EF);
-            if (!fterm)
+            if (!fterm) {
                 return SW_EXEC_ERROR();
+            }
             const uint8_t *pub = cvc_get_pub(file_get_data(fterm), file_get_size(fterm), &pub_len);
-            if (!pub)
+            if (!pub) {
                 return SW_EXEC_ERROR();
+            }
             size_t t86_len = 0;
             const uint8_t *t86 = cvc_get_field(pub, pub_len, &t86_len, 0x86);
-            if (!t86 || t86[0] != 0x4)
+            if (!t86 || t86[0] != 0x4) {
                 return SW_EXEC_ERROR();
+            }
             size_t t54_len = 0;
             const uint8_t *t54 = cvc_get_field(apdu.data, apdu.nc, &t54_len, 0x54);
-            if (!t54)
+            if (!t54) {
                 return SW_WRONG_DATA();
-            uint8_t hash[32], *input = (uint8_t *)calloc(1, (t86_len-1)/2+1);
+            }
+            uint8_t hash[32], *input = (uint8_t *) calloc(1, (t86_len - 1) / 2 + 1);
             input[0] = 0x54;
-            memcpy(input+1, t86+1, (t86_len-1)/2);
-            hash256(input, (t86_len-1)/2+1, hash);
+            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)
+            }
+            file_t *tf = file_new(EF_XKEK + p2);
+            if (!tf) {
                 return SW_MEMORY_FAILURE();
+            }
 
             //All checks done. Get Key Domain UID
             pub = cvc_get_pub(apdu.data, apdu.nc, &pub_len);
@@ -141,22 +189,23 @@ int cmd_key_domain() {
                 size_t t86_len = 0;
                 const uint8_t *t86 = cvc_get_field(pub, pub_len, &t86_len, 0x86);
                 if (t86) {
-                    flash_write_data_to_file(tf, t86+1, t86_len-1);
+                    flash_write_data_to_file(tf, t86 + 1, t86_len - 1);
                     low_flash_available();
                 }
             }
         }
     }
-    else
+    else {
         return SW_INCORRECT_P1P2();
-    memset(res_APDU,0,10);
+    }
+    memset(res_APDU, 0, 10);
     res_APDU[0] = dkeks;
-    res_APDU[1] = dkeks > current_dkeks ? dkeks-current_dkeks : 0;
-    dkek_kcv(p2, res_APDU+2);
-    res_APDU_size = 2+8;
-    file_t *tf = search_dynamic_file(EF_XKEK+p2);
+    res_APDU[1] = dkeks > current_dkeks ? dkeks - current_dkeks : 0;
+    dkek_kcv(p2, res_APDU + 2);
+    res_APDU_size = 2 + 8;
+    file_t *tf = search_dynamic_file(EF_XKEK + p2);
     if (tf) {
-        memcpy(res_APDU+10, file_get_data(tf), file_get_size(tf));
+        memcpy(res_APDU + 10, file_get_data(tf), file_get_size(tf));
         res_APDU_size += file_get_size(tf);
     }
     return SW_OK();

src/hsm/cmd_key_gen.c

@@ -24,29 +24,44 @@ 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 == 0xB3) {
+        key_size = 64;
+    }
+    else 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
+    uint8_t aes_key[64]; //maximum AES key size
     memcpy(aes_key, random_bytes_get(key_size), key_size);
     int aes_type = 0x0;
-    if (key_size == 16)
-        aes_type = HSM_KEY_AES_128;
-    else if (key_size == 24)
-        aes_type = HSM_KEY_AES_192;
-    else if (key_size == 32)
-        aes_type = HSM_KEY_AES_256;
+    if (key_size == 16) {
+        aes_type = PICO_KEYS_KEY_AES_128;
+    }
+    else if (key_size == 24) {
+        aes_type = PICO_KEYS_KEY_AES_192;
+    }
+    else if (key_size == 32) {
+        aes_type = PICO_KEYS_KEY_AES_256;
+    }
+    else if (key_size == 64) {
+        aes_type = PICO_KEYS_KEY_AES_512;
+    }
     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

@@ -15,78 +15,109 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "common.h"
 #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)
+    uint8_t kdom = -1, *allowed = NULL, prkd_buf[128];
+    size_t allowed_len = 0, prkd_len = 0;
+    if (key_type == 0x0) {
         return SW_DATA_INVALID();
-    if (key_type == HSM_KEY_RSA) {
+    }
+    if (key_type & PICO_KEYS_KEY_RSA) {
         mbedtls_rsa_context ctx;
         mbedtls_rsa_init(&ctx);
         do {
             r = dkek_decode_key(++kdom, &ctx, apdu.data, apdu.nc, NULL, &allowed, &allowed_len);
-        } while((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
+        } while ((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
         if (r != CCID_OK) {
             mbedtls_rsa_free(&ctx);
             return SW_EXEC_ERROR();
         }
-        r = store_keys(&ctx, HSM_KEY_RSA, key_id);
+        r = store_keys(&ctx, PICO_KEYS_KEY_RSA, key_id);
+        if ((res_APDU_size = asn1_cvc_aut(&ctx, PICO_KEYS_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) {
+            mbedtls_rsa_free(&ctx);
+            return SW_EXEC_ERROR();
+        }
+        int key_size = ctx.len;
         mbedtls_rsa_free(&ctx);
         if (r != CCID_OK) {
             return SW_EXEC_ERROR();
         }
+        prkd_len = asn1_build_prkd_ecc(NULL, 0, NULL, 0, key_size * 8, prkd_buf, sizeof(prkd_buf));
     }
-    else if (key_type == HSM_KEY_EC) {
-        mbedtls_ecdsa_context ctx;
-        mbedtls_ecdsa_init(&ctx);
+    else if (key_type & PICO_KEYS_KEY_EC) {
+        mbedtls_ecp_keypair ctx;
+        mbedtls_ecp_keypair_init(&ctx);
         do {
             r = dkek_decode_key(++kdom, &ctx, apdu.data, apdu.nc, NULL, &allowed, &allowed_len);
-        } while((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
+        } while ((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
         if (r != CCID_OK) {
-            mbedtls_ecdsa_free(&ctx);
+            mbedtls_ecp_keypair_free(&ctx);
             return SW_EXEC_ERROR();
         }
-        r = store_keys(&ctx, HSM_KEY_EC, key_id);
-        mbedtls_ecdsa_free(&ctx);
+        r = store_keys(&ctx, PICO_KEYS_KEY_EC, key_id);
+        if ((res_APDU_size = asn1_cvc_aut(&ctx, PICO_KEYS_KEY_EC, res_APDU, 4096, NULL, 0)) == 0) {
+            mbedtls_ecp_keypair_free(&ctx);
+            return SW_EXEC_ERROR();
+        }
+        int key_size = ctx.grp.nbits;
+        mbedtls_ecp_keypair_free(&ctx);
         if (r != CCID_OK) {
             return SW_EXEC_ERROR();
         }
+        prkd_len = asn1_build_prkd_ecc(NULL, 0, NULL, 0, key_size, prkd_buf, sizeof(prkd_buf));
     }
-    else if (key_type == HSM_KEY_AES) {
-        uint8_t aes_key[32];
+    else if (key_type & PICO_KEYS_KEY_AES) {
+        uint8_t aes_key[64];
         int key_size = 0, aes_type = 0;
         do {
-            r = dkek_decode_key(++kdom, aes_key, apdu.data, apdu.nc, &key_size, &allowed, &allowed_len);
-        } while((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
+            r = dkek_decode_key(++kdom,
+                                aes_key,
+                                apdu.data,
+                                apdu.nc,
+                                &key_size,
+                                &allowed,
+                                &allowed_len);
+        } while ((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
         if (r != CCID_OK) {
             return SW_EXEC_ERROR();
         }
-        if (key_size == 32)
-            aes_type = HSM_KEY_AES_256;
-        else if (key_size == 24)
-            aes_type = HSM_KEY_AES_192;
-        else if (key_size == 16)
-            aes_type = HSM_KEY_AES_128;
-        else
+        if (key_size == 64) {
+            aes_type = PICO_KEYS_KEY_AES_512;
+        }
+        else if (key_size == 32) {
+            aes_type = PICO_KEYS_KEY_AES_256;
+        }
+        else if (key_size == 24) {
+            aes_type = PICO_KEYS_KEY_AES_192;
+        }
+        else if (key_size == 16) {
+            aes_type = PICO_KEYS_KEY_AES_128;
+        }
+        else {
             return SW_EXEC_ERROR();
+        }
         r = store_keys(aes_key, aes_type, key_id);
         if (r != CCID_OK) {
             return SW_EXEC_ERROR();
         }
+        prkd_len = asn1_build_prkd_aes(NULL, 0, NULL, 0, key_size * 8, prkd_buf, sizeof(prkd_buf));
     }
     if ((allowed != NULL && allowed_len > 0) || kdom >= 0) {
-        size_t meta_len = (allowed_len > 0 ? 2+allowed_len : 0) + (kdom >= 0 ? 3 : 0);
-        uint8_t *meta = (uint8_t *)calloc(1,meta_len), *m = meta;
+        size_t meta_len = (allowed_len > 0 ? 2 + allowed_len : 0) + (kdom >= 0 ? 3 : 0);
+        uint8_t *meta = (uint8_t *) calloc(1, meta_len), *m = meta;
         if (allowed_len > 0) {
             *m++ = 0x91;
             *m++ = allowed_len;
@@ -99,8 +130,25 @@ 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 (prkd_len > 0) {
+        file_t *fpk = file_new((PRKD_PREFIX << 8) | key_id);
+        r = flash_write_data_to_file(fpk, prkd_buf, prkd_len);
+        if (r != 0) {
+            return SW_EXEC_ERROR();
+        }
+    }
+    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();
+        }
+        res_APDU_size = 0;
+    }
+    low_flash_available();
     return SW_OK();
 }

src/hsm/cmd_key_wrap.c

@@ -19,24 +19,39 @@
 #include "sc_hsm.h"
 #include "asn1.h"
 #include "kek.h"
+#include "files.h"
 
 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);
+    if (!ef) {
+        return SW_FILE_NOT_FOUND();
+    }
     uint8_t kdom = get_key_domain(ef);
-    if (!ef)
-        return SW_FILE_NOT_FOUND();
-    if (key_has_purpose(ef, ALGO_WRAP) == false)
+    if (kdom == 0xff) {
+        return SW_REFERENCE_NOT_FOUND();
+    }
+    file_t *tf_kd = search_by_fid(EF_KEY_DOMAIN, NULL, SPECIFY_EF);
+    uint8_t *kdata = file_get_data(tf_kd), dkeks = kdata ? kdata[2 * kdom] : 0,
+            current_dkeks = kdata ? kdata[2 * kdom + 1] : 0;
+    if (dkeks != current_dkeks || dkeks == 0 || dkeks == 0xff) {
+        return SW_REFERENCE_NOT_FOUND();
+    }
+    if (key_has_purpose(ef, ALGO_WRAP) == false) {
         return SW_CONDITIONS_NOT_SATISFIED();
+    }
     file_t *prkd = search_dynamic_file((PRKD_PREFIX << 8) | key_id);
-    if (!prkd)
+    if (!prkd) {
         return SW_FILE_NOT_FOUND();
+    }
     const uint8_t *dprkd = file_get_data(prkd);
     size_t wrap_len = MAX_DKEK_ENCODE_KEY_BUFFER;
     size_t tag_len = 0;
@@ -47,47 +62,57 @@ 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);
+        r = dkek_encode_key(kdom, &ctx, PICO_KEYS_KEY_RSA, res_APDU, &wrap_len, meta_tag, tag_len);
         mbedtls_rsa_free(&ctx);
     }
     else if (*dprkd == P15_KEYTYPE_ECC) {
-        mbedtls_ecdsa_context ctx;
-        mbedtls_ecdsa_init(&ctx);
-        r = load_private_key_ecdsa(&ctx, ef);
+        mbedtls_ecp_keypair ctx;
+        mbedtls_ecp_keypair_init(&ctx);
+        r = load_private_key_ec(&ctx, ef);
         if (r != CCID_OK) {
-            mbedtls_ecdsa_free(&ctx);
-            if (r == CCID_VERIFICATION_FAILED)
+            mbedtls_ecp_keypair_free(&ctx);
+            if (r == CCID_VERIFICATION_FAILED) {
                 return SW_SECURE_MESSAGE_EXEC_ERROR();
+            }
             return SW_EXEC_ERROR();
         }
-        r = dkek_encode_key(kdom, &ctx, HSM_KEY_EC, res_APDU, &wrap_len, meta_tag, tag_len);
-        mbedtls_ecdsa_free(&ctx);
+        r = dkek_encode_key(kdom, &ctx, PICO_KEYS_KEY_EC, res_APDU, &wrap_len, meta_tag, tag_len);
+        mbedtls_ecp_keypair_free(&ctx);
     }
     else if (*dprkd == P15_KEYTYPE_AES) {
-        uint8_t kdata[32]; //maximum AES key size
-        if (wait_button_pressed() == true) //timeout
+        uint8_t kdata[64]; //maximum AES key size
+        if (wait_button_pressed() == true) { //timeout
             return SW_SECURE_MESSAGE_EXEC_ERROR();
+        }
 
-        int key_size = file_get_size(ef), aes_type = HSM_KEY_AES;
+        int key_size = file_get_size(ef), aes_type = PICO_KEYS_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)
-            aes_type = HSM_KEY_AES_256;
-        else if (key_size == 24)
-            aes_type = HSM_KEY_AES_192;
-        else if (key_size == 16)
-            aes_type = HSM_KEY_AES_128;
+        if (key_size == 64) {
+            aes_type = PICO_KEYS_KEY_AES_512;
+        }
+        else if (key_size == 32) {
+            aes_type = PICO_KEYS_KEY_AES_256;
+        }
+        else if (key_size == 24) {
+            aes_type = PICO_KEYS_KEY_AES_192;
+        }
+        else if (key_size == 16) {
+            aes_type = PICO_KEYS_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,35 +57,52 @@ 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;
                 ret = mbedtls_rsa_gen_key(&rsa, random_gen, &index, key_size, exponent);
                 if (ret != 0) {
-                        mbedtls_rsa_free(&rsa);
+                    mbedtls_rsa_free(&rsa);
                     return SW_EXEC_ERROR();
                 }
-                if ((res_APDU_size = asn1_cvc_aut(&rsa, HSM_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) {
+                if ((res_APDU_size =
+                         asn1_cvc_aut(&rsa, PICO_KEYS_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) {
                     return SW_EXEC_ERROR();
                 }
-	            ret = store_keys(&rsa, HSM_KEY_RSA, key_id);
-	            if (ret != CCID_OK) {
+                ret = store_keys(&rsa, PICO_KEYS_KEY_RSA, key_id);
+                if (ret != CCID_OK) {
                     mbedtls_rsa_free(&rsa);
                     return SW_EXEC_ERROR();
                 }
                 mbedtls_rsa_free(&rsa);
             }
-            else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256,MIN(oid_len,10)) == 0) { //ECC
+            else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, MIN(oid_len, 10)) == 0) {   //ECC
                 size_t prime_len;
                 uint8_t *prime = NULL;
-                if (asn1_find_tag(p, tout, 0x81, &prime_len, &prime) != true)
+                if (asn1_find_tag(p, tout, 0x81, &prime_len, &prime) != true) {
                     return SW_WRONG_DATA();
+                }
                 mbedtls_ecp_group_id ec_id = ec_get_curve_from_prime(prime, prime_len);
-                printf("KEYPAIR ECC %d\r\n",ec_id);
                 if (ec_id == MBEDTLS_ECP_DP_NONE) {
                     return SW_FUNC_NOT_SUPPORTED();
                 }
+                if (ec_id == MBEDTLS_ECP_DP_CURVE25519 || ec_id == MBEDTLS_ECP_DP_CURVE448) {
+                    size_t g_len = 0;
+                    uint8_t *g = NULL;
+                    if (asn1_find_tag(p, tout, 0x83, &g_len, &g) != true) {
+                        return SW_WRONG_DATA();
+                    }
+                    if (ec_id == MBEDTLS_ECP_DP_CURVE25519 && (g[0] != 9)) {
+                        ec_id = MBEDTLS_ECP_DP_ED25519;
+                    }
+                    else if (ec_id == MBEDTLS_ECP_DP_CURVE448 && (g_len != 56 || g[0] != 5)) {
+                        ec_id = MBEDTLS_ECP_DP_ED448;
+                    }
+                }
+                printf("KEYPAIR ECC %d\r\n", ec_id);
                 mbedtls_ecdsa_context ecdsa;
                 mbedtls_ecdsa_init(&ecdsa);
                 uint8_t index = 0;
@@ -99,18 +118,23 @@ 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)
+                            }
+                            file_t *tf_xkek = search_dynamic_file(EF_XKEK + p92[0]);
+                            if (!tf_xkek) {
                                 return SW_WRONG_DATA();
-                            ext_len = 2+2+strlen(OID_ID_KEY_DOMAIN_UID)+2+file_get_size(tf_xkek);
-                            ext = (uint8_t *)calloc(1, ext_len);
+                            }
+                            ext_len = 2 + 2 + strlen(OID_ID_KEY_DOMAIN_UID) + 2 + file_get_size(
+                                tf_xkek);
+                            ext = (uint8_t *) calloc(1, ext_len);
                             uint8_t *pe = ext;
                             *pe++ = 0x73;
-                            *pe++ = ext_len-2;
+                            *pe++ = ext_len - 2;
                             *pe++ = 0x6;
                             *pe++ = strlen(OID_ID_KEY_DOMAIN_UID);
                             memcpy(pe, OID_ID_KEY_DOMAIN_UID, strlen(OID_ID_KEY_DOMAIN_UID));
@@ -121,33 +145,40 @@ int cmd_keypair_gen() {
                         }
                     }
                 }
-                if ((res_APDU_size = asn1_cvc_aut(&ecdsa, HSM_KEY_EC, res_APDU, 4096, ext, ext_len)) == 0) {
-                    if (ext)
+                if ((res_APDU_size =
+                         asn1_cvc_aut(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, 4096, ext, ext_len)) == 0) {
+                    if (ext) {
                         free(ext);
+                    }
                     mbedtls_ecdsa_free(&ecdsa);
                     return SW_EXEC_ERROR();
                 }
-                if (ext)
+                if (ext) {
                     free(ext);
-                ret = store_keys(&ecdsa, HSM_KEY_EC, key_id);
+                }
+                ret = store_keys(&ecdsa, PICO_KEYS_KEY_EC, key_id);
                 mbedtls_ecdsa_free(&ecdsa);
-	            if (ret != CCID_OK) {
+                if (ret != CCID_OK) {
                     return SW_EXEC_ERROR();
                 }
             }
 
         }
     }
-    else
+    else {
         return SW_WRONG_DATA();
-    if (find_and_store_meta_key(key_id) != CCID_OK)
+    }
+    if (find_and_store_meta_key(key_id) != CCID_OK) {
         return SW_EXEC_ERROR();
+    }
     file_t *fpk = file_new((EE_CERTIFICATE_PREFIX << 8) | key_id);
     ret = flash_write_data_to_file(fpk, res_APDU, res_APDU_size);
-    if (ret != 0)
+    if (ret != 0) {
         return SW_EXEC_ERROR();
-    //if (apdu.ne == 0)
-    //    apdu.ne = res_APDU_size;
+    }
+    if (apdu.ne == 0) {
+        apdu.ne = res_APDU_size;
+    }
     low_flash_available();
     return SW_OK();
 }

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,8 +37,10 @@ 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) {
@@ -46,20 +49,28 @@ int cmd_mse() {
                 }
                 else {
                     if (p2 == 0xB6) {
-                        if (puk_store_select_chr(tag_data) == CCID_OK)
+                        if (puk_store_select_chr(tag_data) == CCID_OK) {
                             return SW_OK();
+                        }
                     }
-                    else if (p2 == 0xA4) { /* Aut */
+                    else if (p2 == 0xA4) {   /* Aut */
                         for (int i = 0; i < MAX_PUK; i++) {
-                            file_t *ef = search_dynamic_file(EF_PUK+i);
-                            if (!ef)
+                            file_t *ef = search_dynamic_file(EF_PUK + i);
+                            if (!ef) {
                                 break;
-                            if (ef->data == NULL || file_get_size(ef) == 0)
+                            }
+                            if (!file_has_data(ef)) {
                                 break;
+                            }
                             size_t chr_len = 0;
-                            const uint8_t *chr = cvc_get_chr(file_get_data(ef), file_get_size(ef), &chr_len);
+                            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;
+                                if (puk_status[i] == 1) {
+                                    return SW_CONDITIONS_NOT_SATISFIED(); // It is correct
+                                }
                                 return SW_OK();
                             }
                         }
@@ -69,7 +80,8 @@ int cmd_mse() {
             }
         }
     }
-    else
+    else {
         return SW_INCORRECT_P1P2();
+    }
     return SW_OK();
 }

src/hsm/cmd_pso.c

@@ -26,23 +26,27 @@ 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);
+            uint8_t tlv_len = 2 + format_tlv_len(apdu.nc, NULL);
+            memmove(apdu.data + tlv_len, apdu.data, apdu.nc);
             memcpy(apdu.data, "\x7F\x21", 2);
-            format_tlv_len(apdu.nc, apdu.data+2);
+            format_tlv_len(apdu.nc, apdu.data + 2);
             apdu.nc += tlv_len;
         }
         int r = cvc_verify(apdu.data, apdu.nc, current_puk->cvcert, current_puk->cvcert_len);
         if (r != CCID_OK) {
-            if (r == CCID_WRONG_DATA)
+            if (r == CCID_WRONG_DATA) {
                 return SW_DATA_INVALID();
-            else if (r == CCID_WRONG_SIGNATURE)
+            }
+            else if (r == CCID_WRONG_SIGNATURE) {
                 return SW_CONDITIONS_NOT_SATISFIED();
+            }
             return SW_EXEC_ERROR();
         }
         for (int i = 0; i < 0xfe; i++) {
@@ -51,27 +55,33 @@ int cmd_pso() {
             if (!ca_ef) {
                 ca_ef = file_new(fid);
                 flash_write_data_to_file(ca_ef, apdu.data, apdu.nc);
-                if (add_cert_puk_store(file_get_data(ca_ef), file_get_size(ca_ef), false) != CCID_OK)
+                if (add_cert_puk_store(file_get_data(ca_ef), file_get_size(ca_ef),
+                                       false) != CCID_OK) {
                     return SW_FILE_FULL();
+                }
 
                 size_t chr_len = 0;
                 const uint8_t *chr = cvc_get_chr(apdu.data, apdu.nc, &chr_len);
-                if (chr == NULL)
+                if (chr == NULL) {
                     return SW_WRONG_DATA();
+                }
                 size_t puk_len = 0, puk_bin_len = 0;
                 const uint8_t *puk = cvc_get_pub(apdu.data, apdu.nc, &puk_len), *puk_bin = NULL;
-                if (puk == NULL)
+                if (puk == NULL) {
                     return SW_WRONG_DATA();
+                }
                 size_t oid_len = 0;
                 const uint8_t *oid = cvc_get_field(puk, puk_len, &oid_len, 0x6);
-                if (oid == NULL)
+                if (oid == NULL) {
                     return SW_WRONG_DATA();
+                }
                 if (memcmp(oid, OID_ID_TA_RSA, 9) == 0) { //RSA
                     puk_bin = cvc_get_field(puk, puk_len, &puk_bin_len, 0x81);
-                    if (!puk_bin)
+                    if (!puk_bin) {
                         return SW_WRONG_DATA();
+                    }
                 }
-                else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC
+                else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) {   //ECC
                     mbedtls_ecp_group_id ec_id = cvc_inherite_ec_group(apdu.data, apdu.nc);
                     mbedtls_ecp_group grp;
                     mbedtls_ecp_group_init(&grp);
@@ -92,13 +102,13 @@ int cmd_pso() {
                     }
                     else if (mbedtls_ecp_get_type(&grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) {
                         if (t86[0] == 0x2 || t86[0] == 0x3) {
-                            if (t86_len != plen+1) {
+                            if (t86_len != plen + 1) {
                                 mbedtls_ecp_group_free(&grp);
                                 return SW_WRONG_DATA();
                             }
                         }
                         else if (t86[0] == 0x4) {
-                            if (t86_len != 2*plen+1) {
+                            if (t86_len != 2 * plen + 1) {
                                 mbedtls_ecp_group_free(&grp);
                                 return SW_WRONG_DATA();
                             }
@@ -107,30 +117,46 @@ int cmd_pso() {
                             mbedtls_ecp_group_free(&grp);
                             return SW_WRONG_DATA();
                         }
-                        puk_bin = t86+1;
+                        puk_bin = t86 + 1;
                         puk_bin_len = plen;
                     }
                     mbedtls_ecp_group_free(&grp);
-                    if (!puk_bin)
+                    if (!puk_bin) {
                         return SW_WRONG_DATA();
+                    }
                 }
                 file_t *cd_ef = file_new((CD_PREFIX << 8) | i);
-                size_t cd_len = asn1_build_cert_description(chr, chr_len, puk_bin, puk_bin_len, fid, NULL, 0);
-                if (cd_len == 0)
+                size_t cd_len = asn1_build_cert_description(chr,
+                                                            chr_len,
+                                                            puk_bin,
+                                                            puk_bin_len,
+                                                            fid,
+                                                            NULL,
+                                                            0);
+                if (cd_len == 0) {
                     return SW_EXEC_ERROR();
-                uint8_t *buf = (uint8_t *)calloc(cd_len, sizeof(uint8_t));
-                int r = asn1_build_cert_description(chr, chr_len, puk_bin, puk_bin_len, fid, buf, cd_len);
+                }
+                uint8_t *buf = (uint8_t *) calloc(cd_len, sizeof(uint8_t));
+                int r = asn1_build_cert_description(chr,
+                                                    chr_len,
+                                                    puk_bin,
+                                                    puk_bin_len,
+                                                    fid,
+                                                    buf,
+                                                    cd_len);
                 flash_write_data_to_file(cd_ef, buf, cd_len);
                 free(buf);
-                if (r == 0)
+                if (r == 0) {
                     return SW_EXEC_ERROR();
+                }
                 low_flash_available();
                 break;
             }
         }
         return SW_OK();
     }
-    else
+    else {
         return SW_INCORRECT_P1P2();
+    }
     return SW_OK();
 }

src/hsm/cmd_puk_auth.c

@@ -22,50 +22,63 @@
 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)
-        return SW_FILE_NOT_FOUND();
+    if (!file_has_data(ef_puk)) {
+        if (apdu.nc > 0) {
+            return SW_FILE_NOT_FOUND();
+        }
+        return SW_INCORRECT_P1P2();
+    }
     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 */
-                        return SW_MEMORY_FAILURE();
-                    if (ef->data == NULL || file_get_size(ef) == 0) /* found first empty slot */
-                        break;
                 }
-                uint8_t *tmp = (uint8_t *)calloc(file_get_size(ef_puk), sizeof(uint8_t));
+                for (int i = 0; i < puk_data[0]; i++) {
+                    ef = search_dynamic_file(EF_PUK + i);
+                    if (!ef) { /* Never should not happen */
+                        return SW_MEMORY_FAILURE();
+                    }
+                    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;
+                tmp[1] = puk_data[1] - 1;
                 flash_write_data_to_file(ef_puk, tmp, file_get_size(ef_puk));
                 puk_data = file_get_data(ef_puk);
                 free(tmp);
             }
-            else if (p1 == 0x1) { /* Replace */
-                if (p2 >= puk_data[0])
+            else if (p1 == 0x1) {   /* Replace */
+                if (p2 >= puk_data[0]) {
                     return SW_INCORRECT_P1P2();
-                ef = search_dynamic_file(EF_PUK+p2);
-                if (!ef) /* Never should not happen */
+                }
+                ef = search_dynamic_file(EF_PUK + p2);
+                if (!ef) { /* Never should not happen */
                     return SW_MEMORY_FAILURE();
+                }
             }
             flash_write_data_to_file(ef, apdu.data, apdu.nc);
             low_flash_available();
         }
-        else
+        else {
             return SW_INCORRECT_P1P2();
+        }
     }
     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)
+        }
+        file_t *ef = search_dynamic_file(EF_PUK + p2);
+        if (!ef) {
             return SW_INCORRECT_P1P2();
-        if (ef->data == NULL || file_get_size(ef) == 0)
+        }
+        if (!file_has_data(ef)) {
             return SW_REFERENCE_NOT_FOUND();
+        }
         size_t chr_len = 0;
         const uint8_t *chr = cvc_get_chr(file_get_data(ef), file_get_size(ef), &chr_len);
         if (chr) {
@@ -77,8 +90,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)))
-                return SW_FILE_NOT_FOUND ();
+            if (!(ef = search_by_fid(p1 & 0x1f, NULL, SPECIFY_EF))) {
+                return SW_FILE_NOT_FOUND();
+            }
             offset = p2;
         }
         else {
@@ -37,22 +37,29 @@ 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)))
-                return SW_FILE_NOT_FOUND ();
+            if (!(ef = search_by_fid(p2 & 0x1f, NULL, SPECIFY_EF))) {
+                return SW_FILE_NOT_FOUND();
+            }
         }
         else {
             uint16_t file_id = make_uint16_t(p1, p2); // & 0x7fff;
-            if (file_id == 0x0)
+            if (file_id == 0x0) {
                 ef = currentEF;
-            else if (!(ef = search_by_fid(file_id, NULL, SPECIFY_EF)) && !(ef = search_dynamic_file(file_id)))
-                return SW_FILE_NOT_FOUND ();
+            }
+            else if (!(ef =
+                           search_by_fid(file_id, NULL,
+                                         SPECIFY_EF)) && !(ef = search_dynamic_file(file_id))) {
+                return SW_FILE_NOT_FOUND();
+            }
 
-            if (apdu.data[0] != 0x54)
+            if (apdu.data[0] != 0x54) {
                 return SW_WRONG_DATA();
+            }
 
             offset = 0;
-            for (int d = 0; d < apdu.data[1]; d++)
-                offset |= apdu.data[2+d]<<(apdu.data[1]-1-d)*8;
+            for (int d = 0; d < apdu.data[1]; d++) {
+                offset |= apdu.data[2 + d] << (apdu.data[1] - 1 - d) * 8;
+            }
         }
     }
 
@@ -61,28 +68,32 @@ int cmd_read_binary() {
     }
     if (ef->data) {
         if ((ef->type & FILE_DATA_FUNC) == FILE_DATA_FUNC) {
-            uint16_t data_len = ((int (*)(const file_t *, int))(ef->data))((const file_t *)ef, 1); //already copies content to res_APDU
-            if (offset > data_len)
+            uint16_t data_len = ((int (*)(const file_t *, int))(ef->data))((const file_t *) ef, 1); //already copies content to res_APDU
+            if (offset > data_len) {
                 return SW_WRONG_P1P2();
-            uint16_t maxle = data_len-offset;
-            if (apdu.ne > maxle)
+            }
+            uint16_t maxle = data_len - offset;
+            if (apdu.ne > maxle) {
                 apdu.ne = maxle;
+            }
             if (offset) {
-                memmove(res_APDU, res_APDU+offset, res_APDU_size-offset);
+                memmove(res_APDU, res_APDU + offset, res_APDU_size - offset);
                 //res_APDU += offset;
                 res_APDU_size -= offset;
             }
         }
         else {
             uint16_t data_len = file_get_size(ef);
-            if (offset > data_len)
-                return SW_WRONG_P1P2();
+            if (offset > data_len) {
+                return SW_WARNING_EOF();
+            }
 
-            uint16_t maxle = data_len-offset;
-            if (apdu.ne > maxle)
-                apdu.ne = maxle;
-            memcpy(res_APDU, file_get_data(ef)+offset, data_len-offset);
-            res_APDU_size = data_len-offset;
+            //uint16_t maxle = data_len - offset;
+            //if (apdu.ne > maxle) {
+            //    apdu.ne = maxle;
+            //}
+            memcpy(res_APDU, file_get_data(ef) + offset, data_len - offset);
+            res_APDU_size = data_len - offset;
         }
     }
 

src/hsm/cmd_reset_retry.c

@@ -20,75 +20,88 @@
 #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)
+            uint8_t so_pin_len = file_read_uint8(file_get_data(file_sopin));
+            if (apdu.nc <= so_pin_len + 1) {
                 return SW_WRONG_LENGTH();
-            uint16_t r = check_pin(file_sopin, apdu.data, 8);
-            if (r != 0x9000)
+            }
+            uint16_t r = check_pin(file_sopin, apdu.data, so_pin_len);
+            if (r != 0x9000) {
                 return r;
-            newpin_len = apdu.nc-8;
-            has_session_sopin = true;
-            hash_multi(apdu.data, 8, session_sopin);
+            }
+            newpin_len = apdu.nc - so_pin_len;
         }
         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);
+        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);
+        }
+        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)
+            uint8_t so_pin_len = file_read_uint8(file_get_data(file_sopin));
+            if (apdu.nc != so_pin_len) {
                 return SW_WRONG_LENGTH();
-            uint16_t r = check_pin(file_sopin, apdu.data, 8);
-            if (r != 0x9000)
+            }
+            uint16_t r = check_pin(file_sopin, apdu.data, so_pin_len);
+            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,9 +19,8 @@
 #include "version.h"
 
 void select_file(file_t *pe) {
-    if (!pe)
-    {
-        currentDF = (file_t *)MF;
+    if (!pe) {
+        currentDF = (file_t *) MF;
         currentEF = NULL;
     }
     else if (pe->type & FILE_TYPE_INTERNAL_EF) {
@@ -48,29 +47,32 @@ 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);
 
-    uint8_t pfx = fid >> 8;
-    if (pfx == PRKD_PREFIX ||
+    /*uint8_t pfx = fid >> 8;*/
+    /*if (pfx == PRKD_PREFIX ||
         pfx == CD_PREFIX ||
         pfx == CA_CERTIFICATE_PREFIX ||
         pfx == KEY_PREFIX ||
         pfx == EE_CERTIFICATE_PREFIX ||
         pfx == DCOD_PREFIX ||
         pfx == DATA_PREFIX ||
-        pfx == PROT_DATA_PREFIX) {
-        if (!(pe = search_dynamic_file(fid)) && !(pe = search_by_fid(fid, NULL, SPECIFY_EF)))
-            return SW_FILE_NOT_FOUND();
+        pfx == PROT_DATA_PREFIX) {*/
+    if (fid != 0x0 && !(pe = search_dynamic_file(fid)) &&
+        !(pe = search_by_fid(fid, NULL, SPECIFY_EF))) {
+        return SW_FILE_NOT_FOUND();
     }
+    /*}*/
     if (!pe) {
         if (p1 == 0x0) { //Select MF, DF or EF - File identifier or absent
             if (apdu.nc == 0) {
-            	pe = (file_t *)MF;
-            	//ac_fini();
+                pe = (file_t *) MF;
+                //ac_fini();
             }
             else if (apdu.nc == 2) {
                 if (!(pe = search_by_fid(fid, NULL, SPECIFY_ANY))) {
@@ -78,21 +80,22 @@ int cmd_select() {
                 }
             }
         }
-        else if (p1 == 0x01) { //Select child DF - DF identifier
+        else if (p1 == 0x01) {   //Select child DF - DF identifier
             if (!(pe = search_by_fid(fid, currentDF, SPECIFY_DF))) {
                 return SW_FILE_NOT_FOUND();
             }
         }
-        else if (p1 == 0x02) { //Select EF under the current DF - EF identifier
+        else if (p1 == 0x02) {   //Select EF under the current DF - EF identifier
             if (!(pe = search_by_fid(fid, currentDF, SPECIFY_EF))) {
                 return SW_FILE_NOT_FOUND();
             }
         }
-        else if (p1 == 0x03) { //Select parent DF of the current DF - Absent
-            if (apdu.nc != 0)
+        else if (p1 == 0x03) {   //Select parent DF of the current DF - Absent
+            if (apdu.nc != 0) {
                 return SW_FILE_NOT_FOUND();
+            }
         }
-        else if (p1 == 0x04) { //Select by DF name - e.g., [truncated] application identifier
+        else if (p1 == 0x04) {   //Select by DF name - e.g., [truncated] application identifier
             if (!(pe = search_by_name(apdu.data, apdu.nc))) {
                 return SW_FILE_NOT_FOUND();
             }
@@ -100,19 +103,19 @@ int cmd_select() {
                 return set_res_sw(0x62, 0x85);
             }
         }
-        else if (p1 == 0x08) { //Select from the MF - Path without the MF identifier
+        else if (p1 == 0x08) {   //Select from the MF - Path without the MF identifier
             if (!(pe = search_by_path(apdu.data, apdu.nc, MF))) {
                 return SW_FILE_NOT_FOUND();
             }
         }
-        else if (p1 == 0x09) { //Select from the current DF - Path without the current DF identifier
+        else if (p1 == 0x09) {   //Select from the current DF - Path without the current DF identifier
             if (!(pe = search_by_path(apdu.data, apdu.nc, currentDF))) {
                 return SW_FILE_NOT_FOUND();
             }
         }
     }
     if ((p2 & 0xfc) == 0x00 || (p2 & 0xfc) == 0x04) {
-        process_fci(pe,0);
+        process_fci(pe, 0);
         if (pe == file_sc_hsm) {
             res_APDU[res_APDU_size++] = 0x85;
             res_APDU[res_APDU_size++] = 5;
@@ -122,11 +125,12 @@ int cmd_select() {
             res_APDU[res_APDU_size++] = 0xFF;
             res_APDU[res_APDU_size++] = HSM_VERSION_MAJOR;
             res_APDU[res_APDU_size++] = HSM_VERSION_MINOR;
-            res_APDU[1] = res_APDU_size-2;
+            res_APDU[1] = res_APDU_size - 2;
         }
     }
-    else
+    else {
         return SW_INCORRECT_P1P2();
+    }
     select_file(pe);
-    return SW_OK ();
+    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

@@ -14,76 +14,86 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
+#include "sc_hsm.h"
 #include "crypto_utils.h"
 #include "sc_hsm.h"
 #include "asn1.h"
 #include "mbedtls/oid.h"
 #include "random.h"
+#include "mbedtls/eddsa.h"
+
+extern mbedtls_ecp_keypair hd_context;
+extern uint8_t hd_keytype;
 
 //-----
 /* From OpenSC */
 static const uint8_t hdr_md5[] = {
-	0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7,
-	0x0d, 0x02, 0x05, 0x05, 0x00, 0x04, 0x10
+    0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7,
+    0x0d, 0x02, 0x05, 0x05, 0x00, 0x04, 0x10
 };
 static const uint8_t hdr_sha1[] = {
-	0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a,
-	0x05, 0x00, 0x04, 0x14
+    0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a,
+    0x05, 0x00, 0x04, 0x14
 };
 static const uint8_t hdr_sha256[] = {
-	0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
-	0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20
+    0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
+    0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20
 };
 static const uint8_t hdr_sha384[] = {
-	0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
-	0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30
+    0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
+    0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30
 };
 static const uint8_t hdr_sha512[] = {
-	0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
-	0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40
+    0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
+    0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40
 };
 static const uint8_t hdr_sha224[] = {
-	0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
-	0x03, 0x04, 0x02, 0x04, 0x05, 0x00, 0x04, 0x1c
+    0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
+    0x03, 0x04, 0x02, 0x04, 0x05, 0x00, 0x04, 0x1c
 };
 static const uint8_t hdr_ripemd160[] = {
-	0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x24, 0x03, 0x02, 0x01,
-	0x05, 0x00, 0x04, 0x14
+    0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x24, 0x03, 0x02, 0x01,
+    0x05, 0x00, 0x04, 0x14
 };
 static const struct digest_info_prefix {
-	mbedtls_md_type_t algorithm;
-	const uint8_t *	hdr;
-	size_t hdr_len;
-	size_t hash_len;
+    mbedtls_md_type_t algorithm;
+    const uint8_t *hdr;
+    size_t hdr_len;
+    size_t hash_len;
 } digest_info_prefix[] = {
-      {	MBEDTLS_MD_MD5,	hdr_md5, sizeof(hdr_md5), 16 },
-      { MBEDTLS_MD_SHA1, hdr_sha1, sizeof(hdr_sha1), 20	},
-      { MBEDTLS_MD_SHA256, hdr_sha256, sizeof(hdr_sha256), 32 },
-      { MBEDTLS_MD_SHA384, hdr_sha384, sizeof(hdr_sha384), 48 },
-      { MBEDTLS_MD_SHA512, hdr_sha512, sizeof(hdr_sha512), 64 },
-      { MBEDTLS_MD_SHA224, hdr_sha224, sizeof(hdr_sha224), 28 },
-      { MBEDTLS_MD_RIPEMD160,hdr_ripemd160,	sizeof(hdr_ripemd160), 20 },
-      {	0, NULL, 0,	0 }
+    { MBEDTLS_MD_MD5, hdr_md5, sizeof(hdr_md5), 16 },
+    { MBEDTLS_MD_SHA1, hdr_sha1, sizeof(hdr_sha1), 20 },
+    { MBEDTLS_MD_SHA256, hdr_sha256, sizeof(hdr_sha256), 32 },
+    { MBEDTLS_MD_SHA384, hdr_sha384, sizeof(hdr_sha384), 48 },
+    { MBEDTLS_MD_SHA512, hdr_sha512, sizeof(hdr_sha512), 64 },
+    { MBEDTLS_MD_SHA224, hdr_sha224, sizeof(hdr_sha224), 28 },
+    { MBEDTLS_MD_RIPEMD160, hdr_ripemd160, sizeof(hdr_ripemd160), 20 },
+    { 0, NULL, 0, 0 }
 };
-int pkcs1_strip_digest_info_prefix(mbedtls_md_type_t *algorithm, const uint8_t *in_dat, size_t in_len, uint8_t *out_dat, size_t *out_len)
-{
-	for (int i = 0; digest_info_prefix[i].algorithm != 0; i++) {
-		size_t hdr_len = digest_info_prefix[i].hdr_len, hash_len = digest_info_prefix[i].hash_len;
-		const uint8_t *hdr = digest_info_prefix[i].hdr;
-		if (in_len == (hdr_len + hash_len) && !memcmp(in_dat, hdr, hdr_len)) {
-			if (algorithm)
-				*algorithm = digest_info_prefix[i].algorithm;
-			if (out_dat == NULL)
-				return CCID_OK;
-			if (*out_len < hash_len)
-				return CCID_WRONG_DATA;
-			memmove(out_dat, in_dat + hdr_len, hash_len);
-			*out_len = hash_len;
-			return CCID_OK;
-		}
-	}
-	return CCID_EXEC_ERROR;
+int pkcs1_strip_digest_info_prefix(mbedtls_md_type_t *algorithm,
+                                   const uint8_t *in_dat,
+                                   size_t in_len,
+                                   uint8_t *out_dat,
+                                   size_t *out_len) {
+    for (int i = 0; digest_info_prefix[i].algorithm != 0; i++) {
+        size_t hdr_len = digest_info_prefix[i].hdr_len, hash_len = digest_info_prefix[i].hash_len;
+        const uint8_t *hdr = digest_info_prefix[i].hdr;
+        if (in_len == (hdr_len + hash_len) && !memcmp(in_dat, hdr, hdr_len)) {
+            if (algorithm) {
+                *algorithm = digest_info_prefix[i].algorithm;
+            }
+            if (out_dat == NULL) {
+                return CCID_OK;
+            }
+            if (*out_len < hash_len) {
+                return CCID_WRONG_DATA;
+            }
+            memmove(out_dat, in_dat + hdr_len, hash_len);
+            *out_len = hash_len;
+            return CCID_OK;
+        }
+    }
+    return CCID_EXEC_ERROR;
 }
 //-----
 
@@ -92,22 +102,42 @@ 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)) &&
+         !(fkey =
+               search_by_fid((KEY_PREFIX << 8) | key_id, NULL,
+                             SPECIFY_EF))) || !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 +145,22 @@ int cmd_signature() {
         mbedtls_rsa_context ctx;
         mbedtls_rsa_init(&ctx);
 
-        int r;
-        r = load_private_key_rsa(&ctx, fkey);
+        int r = load_private_key_rsa(&ctx, fkey);
         if (r != CCID_OK) {
             mbedtls_rsa_free(&ctx);
-            if (r == CCID_VERIFICATION_FAILED)
+            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,40 +176,51 @@ 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
-                memset(apdu.data+apdu.nc, 0, key_size-apdu.nc);
+            if (apdu.nc < key_size) { //needs padding
+                memset(apdu.data + apdu.nc, 0, key_size - apdu.nc);
+            }
             r = mbedtls_rsa_private(&ctx, random_gen, NULL, apdu.data, res_APDU);
         }
         else {
-            uint8_t *signature = (uint8_t *)calloc(key_size, sizeof(uint8_t));
+            uint8_t *signature = (uint8_t *) calloc(key_size, sizeof(uint8_t));
             r = mbedtls_rsa_pkcs1_sign(&ctx, random_gen, NULL, md, hash_len, hash, signature);
             memcpy(res_APDU, signature, key_size);
             free(signature);
@@ -191,51 +234,90 @@ int cmd_signature() {
         mbedtls_rsa_free(&ctx);
     }
     else if (p2 >= ALGO_EC_RAW && p2 <= ALGO_EC_SHA512) {
-        mbedtls_ecdsa_context ctx;
-        mbedtls_ecdsa_init(&ctx);
+        mbedtls_ecp_keypair ctx;
+        mbedtls_ecp_keypair_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_ec(&ctx, fkey);
         if (r != CCID_OK) {
-            mbedtls_ecdsa_free(&ctx);
-            if (r == CCID_VERIFICATION_FAILED)
+            mbedtls_ecp_keypair_free(&ctx);
+            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) {
-            mbedtls_ecdsa_free(&ctx);
+        if (ctx.grp.id == MBEDTLS_ECP_DP_ED25519 || ctx.grp.id == MBEDTLS_ECP_DP_ED448) {
+            r = mbedtls_eddsa_write_signature(&ctx, apdu.data, apdu.nc, buf, sizeof(buf), &olen, MBEDTLS_EDDSA_PURE, NULL, 0, random_gen, NULL);
+        }
+        else {
+            r = mbedtls_ecdsa_write_signature(&ctx, md, apdu.data, apdu.nc, buf, MBEDTLS_ECDSA_MAX_LEN,
+                                              &olen, random_gen, NULL);
+        }
+        if (r != 0) {
+            mbedtls_ecp_keypair_free(&ctx);
             return SW_EXEC_ERROR();
         }
         memcpy(res_APDU, buf, olen);
         res_APDU_size = olen;
-        mbedtls_ecdsa_free(&ctx);
+        mbedtls_ecp_keypair_free(&ctx);
     }
-    else
+    else if (p2 == ALGO_HD) {
+        size_t olen = 0;
+        uint8_t buf[MBEDTLS_ECDSA_MAX_LEN];
+        if (hd_context.grp.id == MBEDTLS_ECP_DP_NONE) {
+            return SW_CONDITIONS_NOT_SATISFIED();
+        }
+        if (hd_keytype != 0x1 && hd_keytype != 0x2) {
+            return SW_INCORRECT_PARAMS();
+        }
+        md = MBEDTLS_MD_SHA256;
+        if (mbedtls_ecdsa_write_signature(&hd_context, md, apdu.data, apdu.nc, buf,
+                                          MBEDTLS_ECDSA_MAX_LEN,
+                                          &olen, random_gen, NULL) != 0) {
+            mbedtls_ecdsa_free(&hd_context);
+            return SW_EXEC_ERROR();
+        }
+        memcpy(res_APDU, buf, olen);
+        res_APDU_size = olen;
+        mbedtls_ecdsa_free(&hd_context);
+        hd_keytype = 0;
+    }
+    else {
         return SW_INCORRECT_P1P2();
+    }
     decrement_key_counter(fkey);
     return SW_OK();
 }

src/hsm/cmd_update_ef.c

@@ -27,25 +27,35 @@ 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)
+    }
+    /*
+       // This should not happen
+       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++)
-                offset |= (*tag_data++ << (8*(tag_len-i)));
+            for (int i = 1; i <= tag_len; i++) {
+                offset |= (*tag_data++ << (8 * (tag_len - i)));
+            }
         }
-        else if (tag == 0x53) { //data
+        else if (tag == 0x53) {   //data
             data_len = tag_len;
             data = tag_data;
         }
@@ -57,28 +67,35 @@ 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);
+            uint8_t *data_merge = (uint8_t *) calloc(1, offset + data_len);
             memcpy(data_merge, file_get_data(ef), offset);
-            memcpy(data_merge+offset, data, data_len);
-            int r = flash_write_data_to_file(ef, data_merge, offset+data_len);
+            memcpy(data_merge + offset, data, data_len);
+            int r = flash_write_data_to_file(ef, data_merge, offset + data_len);
             free(data_merge);
-            if (r != CCID_OK)
+            if (r != CCID_OK) {
                 return SW_MEMORY_FAILURE();
+            }
         }
         low_flash_available();
     }

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
+    else if (p2 == 0x88) {   //SOPin
+        if (file_read_uint8(file_get_data(file_sopin)) == 0) { //not initialized
             return SW_REFERENCE_NOT_FOUND();
+        }
         if (apdu.nc > 0) {
             return check_pin(file_sopin, apdu.data, apdu.nc);
         }
-        if (file_read_uint8(file_get_data(file_retries_sopin)) == 0)
+        if (file_read_uint8(file_get_data(file_retries_sopin)) == 0) {
             return SW_PIN_BLOCKED();
-        if (has_session_sopin)
+        }
+        if (has_session_sopin) {
             return SW_OK();
+        }
         return set_res_sw(0x63, 0xc0 | file_read_uint8(file_get_data(file_retries_sopin)));
     }
     else if (p2 == 0x85) {

src/hsm/cvc.c

@@ -27,6 +27,7 @@
 #include "oid.h"
 #include "mbedtls/md.h"
 #include "files.h"
+#include "mbedtls/eddsa.h"
 
 extern const uint8_t *dev_name;
 extern size_t dev_name_len;
@@ -36,133 +37,218 @@ size_t asn1_cvc_public_key_rsa(mbedtls_rsa_context *rsa, uint8_t *buf, size_t bu
     size_t n_size = mbedtls_mpi_size(&rsa->N), e_size = mbedtls_mpi_size(&rsa->E);
     size_t ntot_size = asn1_len_tag(0x81, n_size), etot_size = asn1_len_tag(0x82, e_size);
     size_t oid_len = asn1_len_tag(0x6, sizeof(oid_rsa));
-    size_t tot_len = asn1_len_tag(0x7f49, oid_len+ntot_size+etot_size);
-    if (buf == NULL || buf_len == 0)
+    size_t tot_len = asn1_len_tag(0x7f49, oid_len + ntot_size + etot_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+ntot_size+etot_size, p);
+    p += format_tlv_len(oid_len + ntot_size + etot_size, p);
     //oid
-    *p++ = 0x6; p += format_tlv_len(sizeof(oid_rsa), p); memcpy(p, oid_rsa, sizeof(oid_rsa)); p += sizeof(oid_rsa);
+    *p++ = 0x6; p += format_tlv_len(sizeof(oid_rsa), p); memcpy(p, oid_rsa, sizeof(oid_rsa));
+    p += sizeof(oid_rsa);
     //n
-    *p++ = 0x81; p += format_tlv_len(n_size, p); mbedtls_mpi_write_binary(&rsa->N, p, n_size); p += n_size;
+    *p++ = 0x81; p += format_tlv_len(n_size, p); mbedtls_mpi_write_binary(&rsa->N, p, n_size);
+    p += n_size;
     //n
-    *p++ = 0x82; p += format_tlv_len(e_size, p); mbedtls_mpi_write_binary(&rsa->E, p, e_size); p += e_size;
+    *p++ = 0x82; p += format_tlv_len(e_size, p); mbedtls_mpi_write_binary(&rsa->E, p, e_size);
+    p += e_size;
     return tot_len;
 }
 
 const uint8_t *pointA[] = {
     NULL,
-    (uint8_t *)"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC",
-    (uint8_t *)"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE",
-    (uint8_t *)"\xFF\xFF\xFF\xFF\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC",
-    (uint8_t *)"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFC",
-    (uint8_t *)"\x01\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC",
+    (uint8_t *)
+    "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC",
+    (uint8_t *)
+    "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE",
+    (uint8_t *)
+    "\xFF\xFF\xFF\xFF\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC",
+    (uint8_t *)
+    "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFC",
+    (uint8_t *)
+    "\x01\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC",
 };
 
-size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, size_t buf_len) {
+size_t asn1_cvc_public_key_ecdsa(mbedtls_ecp_keypair *ecdsa, uint8_t *buf, size_t buf_len) {
+    uint8_t Y_buf[MBEDTLS_ECP_MAX_PT_LEN], G_buf[MBEDTLS_ECP_MAX_PT_LEN];
     const uint8_t oid_ecdsa[] = { 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x02, 0x02, 0x03 };
+    const uint8_t oid_ri[]    = { 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x05, 0x02, 0x03 };
+    const uint8_t *oid = oid_ecdsa;
     size_t p_size = mbedtls_mpi_size(&ecdsa->grp.P), a_size = mbedtls_mpi_size(&ecdsa->grp.A);
-    size_t b_size = mbedtls_mpi_size(&ecdsa->grp.B), g_size = 1+mbedtls_mpi_size(&ecdsa->grp.G.X)+mbedtls_mpi_size(&ecdsa->grp.G.X);
-    size_t o_size = mbedtls_mpi_size(&ecdsa->grp.N), y_size = 1+mbedtls_mpi_size(&ecdsa->Q.X)+mbedtls_mpi_size(&ecdsa->Q.X);
+    size_t b_size = mbedtls_mpi_size(&ecdsa->grp.B), g_size = 0;
+    size_t o_size = mbedtls_mpi_size(&ecdsa->grp.N), y_size = 0;
+    mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->grp.G, MBEDTLS_ECP_PF_UNCOMPRESSED, &g_size, G_buf, sizeof(G_buf));
+    mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &y_size, Y_buf, sizeof(Y_buf));
     size_t c_size = 1;
     size_t ptot_size = asn1_len_tag(0x81, p_size), atot_size = asn1_len_tag(0x82, a_size ? a_size : (pointA[ecdsa->grp.id] && ecdsa->grp.id < 6 ? p_size : 1));
     size_t btot_size = asn1_len_tag(0x83, b_size), gtot_size = asn1_len_tag(0x84, g_size);
     size_t otot_size = asn1_len_tag(0x85, o_size), ytot_size = asn1_len_tag(0x86, y_size);
     size_t ctot_size = asn1_len_tag(0x87, c_size);
     size_t oid_len = asn1_len_tag(0x6, sizeof(oid_ecdsa));
-    size_t tot_len = asn1_len_tag(0x7f49, oid_len+ptot_size+atot_size+btot_size+gtot_size+otot_size+ytot_size+ctot_size);
-    if (buf == NULL || buf_len == 0)
+    size_t tot_len = 0, tot_data_len = 0;
+    if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_MONTGOMERY || mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_EDWARDS) {
+        tot_data_len = oid_len + ptot_size + otot_size + gtot_size + ytot_size;
+        oid = oid_ri;
+    }
+    else {
+        tot_data_len = oid_len + ptot_size + atot_size + btot_size + gtot_size + otot_size + ytot_size +
+                                  ctot_size;
+    }
+    tot_len = asn1_len_tag(0x7f49, tot_data_len);
+    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(tot_data_len, p);
     //oid
-    *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;
-    //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++ = 0x6; p += format_tlv_len(sizeof(oid_ecdsa), p); memcpy(p, oid, sizeof(oid_ecdsa));
+    p += sizeof(oid_ecdsa);
+    if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_MONTGOMERY || mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_EDWARDS) {
+        //p
+        *p++ = 0x81; p += format_tlv_len(p_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.P, p, p_size);
+        p += p_size;
+        //order
+        *p++ = 0x82; p += format_tlv_len(o_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.N, p, o_size);
+        p += o_size;
+        //G
+        *p++ = 0x83; p += format_tlv_len(g_size, p); memcpy(p, G_buf, g_size); p += g_size;
+        //Y
+        *p++ = 0x84; p += format_tlv_len(y_size, p); memcpy(p, Y_buf, y_size); p += y_size;
     }
-    else { //mbedtls does not set point A for some curves
-        if (pointA[ecdsa->grp.id] && ecdsa->grp.id < 6) {
-            *p++ = 0x82; p += format_tlv_len(p_size, p); memcpy(p, pointA[ecdsa->grp.id], p_size); p += p_size;
+    else {
+        //p
+        *p++ = 0x81; p += format_tlv_len(p_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.P, p, p_size);
+        p += p_size;
+        //A
+        if (a_size) {
+            *p++ = 0x82; p += format_tlv_len(a_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.A, p, a_size); p += a_size;
         }
-        else {
-            *p++ = 0x82; p += format_tlv_len(1, p);
-            *p++ = 0x0;
+        else {   //mbedtls does not set point A for some curves
+            if (pointA[ecdsa->grp.id] && ecdsa->grp.id < 6) {
+                *p++ = 0x82; p += format_tlv_len(p_size, p); memcpy(p, pointA[ecdsa->grp.id], p_size);
+                p += p_size;
+            }
+            else {
+                *p++ = 0x82; p += format_tlv_len(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;
-    //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;
-    //order
-    *p++ = 0x85; p += format_tlv_len(o_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.N, p, o_size); p += o_size;
-    //Y
-    size_t y_new_size = 0;
-    *p++ = 0x86; p += format_tlv_len(y_size, p); mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &y_new_size, p, y_size); p += y_size;
-    //cofactor
-    *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
+        //B
+        *p++ = 0x83; p += format_tlv_len(b_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.B, p, b_size);
+        p += b_size;
+        //G
+        *p++ = 0x84; p += format_tlv_len(g_size, p); memcpy(p, G_buf, 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;
+        //Y
+        *p++ = 0x86; p += format_tlv_len(y_size, p); memcpy(p, Y_buf, y_size); p += y_size;
+        //cofactor
+        *p++ = 0x87; p += format_tlv_len(c_size, p);
         *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,
+                          bool full) {
     size_t pubkey_size = 0;
-    if (key_type == HSM_KEY_RSA)
+    if (key_type & PICO_KEYS_KEY_RSA) {
         pubkey_size = asn1_cvc_public_key_rsa(rsa_ecdsa, NULL, 0);
-    else if (key_type == HSM_KEY_EC)
+    }
+    else if (key_type & PICO_KEYS_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)
+    }
+    size_t cpi_size = 4, ext_size = 0, role_size = 0, valid_size = 0;
+    if (ext && ext_len > 0) {
         ext_size = asn1_len_tag(0x65, ext_len);
+    }
+    const uint8_t *role = (const uint8_t *)"\x06\x09\x04\x00\x7F\x00\x07\x03\x01\x02\x02\x53\x01\x00";
+    size_t rolelen = 14;
+    if (full) {
+        role_size = asn1_len_tag(0x7f4c, rolelen);
+        valid_size = asn1_len_tag(0x5f24, 6) + asn1_len_tag(0x5f25, 6);
+    }
 
     uint8_t *car = NULL, *chr = NULL;
     size_t lencar = 0, lenchr = 0;
 
-    if (asn1_find_tag(apdu.data, apdu.nc, 0x42, &lencar, &car) == false || lencar == 0 || car == NULL) {
-        car = (uint8_t *)dev_name;
+    if (asn1_find_tag(apdu.data, apdu.nc, 0x42, &lencar,
+                      &car) == false || lencar == 0 || car == NULL) {
+        car = (uint8_t *) dev_name;
         lencar = dev_name_len;
+        if (dev_name == NULL) {
+            car = (uint8_t *)"ESPICOHSMTR00001";
+            lencar = strlen((const char *)car);
+        }
     }
-    if (asn1_find_tag(apdu.data, apdu.nc, 0x5f20, &lenchr, &chr) == false || lenchr == 0 || chr == NULL) {
-        chr = (uint8_t *)dev_name;
+    if (asn1_find_tag(apdu.data, apdu.nc, 0x5f20, &lenchr,
+                      &chr) == false || lenchr == 0 || chr == NULL) {
+        chr = (uint8_t *) dev_name;
         lenchr = dev_name_len;
+        if (chr == NULL) {
+            chr = car;
+            lenchr = lencar;
+        }
     }
     size_t car_size = asn1_len_tag(0x42, lencar), chr_size = asn1_len_tag(0x5f20, lenchr);
 
-    size_t tot_len = asn1_len_tag(0x7f4e, cpi_size+car_size+pubkey_size+chr_size+ext_size);
+    size_t tot_len = asn1_len_tag(0x7f4e, cpi_size + car_size + pubkey_size + chr_size + ext_size + role_size + valid_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);
+    p += format_tlv_len(cpi_size + car_size + pubkey_size + chr_size + role_size + valid_size + ext_size, p);
     //cpi
     *p++ = 0x5f; *p++ = 0x29; *p++ = 1; *p++ = 0;
     //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 & PICO_KEYS_KEY_RSA) {
         p += asn1_cvc_public_key_rsa(rsa_ecdsa, p, pubkey_size);
-    else if (key_type == HSM_KEY_EC)
+    }
+    else if (key_type & PICO_KEYS_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 (full) {
+        *p++ = 0x7f;
+        *p++ = 0x4c;
+        p += format_tlv_len(rolelen, p);
+        memcpy(p, role, rolelen);
+        p += rolelen;
+
+        *p++ = 0x5f;
+        *p++ = 0x25;
+        p += format_tlv_len(6, p);
+        memcpy(p, "\x02\x03\x00\x03\x02\x01", 6);
+        p += 6;
+
+        *p++ = 0x5f;
+        *p++ = 0x24;
+        p += format_tlv_len(6, p);
+        memcpy(p, "\x07\x00\x01\x02\x03\x01", 6);
+        p += 6;
+    }
     if (ext && ext_len > 0) {
         *p++ = 0x65;
         p += format_tlv_len(ext_len, p);
@@ -172,42 +258,58 @@ 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,
+                     bool full) {
     size_t key_size = 0;
-    if (key_type == HSM_KEY_RSA)
-        key_size = mbedtls_mpi_size(&((mbedtls_rsa_context *)rsa_ecdsa)->N);
-    else if (key_type == HSM_KEY_EC)
-        key_size = 2*mbedtls_mpi_size(&((mbedtls_ecdsa_context *)rsa_ecdsa)->d);
-    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 (key_type & PICO_KEYS_KEY_RSA) {
+        key_size = mbedtls_mpi_size(&((mbedtls_rsa_context *) rsa_ecdsa)->N);
+    }
+    else if (key_type & PICO_KEYS_KEY_EC) {
+        key_size = 2 * (int)((mbedtls_ecp_curve_info_from_grp_id(((mbedtls_ecdsa_context *) rsa_ecdsa)->grp.id)->bit_size + 7) / 8);
+    }
+    size_t body_size = asn1_cvc_cert_body(rsa_ecdsa, key_type, NULL, 0, ext, ext_len, full), 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) {
         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);
+    p += format_tlv_len(body_size + sig_size, p);
     body = p;
-    p += asn1_cvc_cert_body(rsa_ecdsa, key_type, p, body_size, ext, ext_len);
+    p += asn1_cvc_cert_body(rsa_ecdsa, key_type, p, body_size, ext, ext_len, full);
     uint8_t hsh[32];
     hash256(body, body_size, hsh);
     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 (key_type & PICO_KEYS_KEY_RSA) {
+        if (mbedtls_rsa_rsassa_pkcs1_v15_sign(rsa_ecdsa, random_gen, NULL, MBEDTLS_MD_SHA256, 32, hsh, p) != 0) {
             memset(p, 0, key_size);
+        }
         p += key_size;
     }
-    else if (key_type == HSM_KEY_EC) {
+    else if (key_type & PICO_KEYS_KEY_EC) {
         mbedtls_mpi r, s;
         int ret = 0;
-        mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *)rsa_ecdsa;
+        mbedtls_ecp_keypair *ecdsa = (mbedtls_ecp_keypair *) 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);
+        if (ecdsa->grp.id == MBEDTLS_ECP_DP_ED25519 || ecdsa->grp.id == MBEDTLS_ECP_DP_ED448) {
+            ret = mbedtls_eddsa_sign(&ecdsa->grp, &r, &s, &ecdsa->d, body, body_size, MBEDTLS_EDDSA_PURE, NULL, 0, random_gen, NULL);
+        }
+        else {
+            ret = mbedtls_ecdsa_sign(&ecdsa->grp, &r, &s, &ecdsa->d, hsh, sizeof(hsh), random_gen, NULL);
+        }
         if (ret == 0) {
-            mbedtls_mpi_write_binary(&r, p, mbedtls_mpi_size(&r)); p += mbedtls_mpi_size(&r);
-            mbedtls_mpi_write_binary(&s, p, mbedtls_mpi_size(&s)); p += mbedtls_mpi_size(&s);
+            mbedtls_mpi_write_binary(&r, p, key_size / 2); p += key_size / 2;
+            mbedtls_mpi_write_binary(&s, p, key_size / 2); p += key_size / 2;
         }
         else {
             memset(p, 0, key_size);
@@ -216,46 +318,59 @@ size_t asn1_cvc_cert(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf
         mbedtls_mpi_free(&r);
         mbedtls_mpi_free(&s);
     }
-    return p-buf;
+    return p - buf;
 }
 
-size_t asn1_cvc_aut(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf_len, const uint8_t *ext, size_t ext_len) {
-    size_t cvcert_size = asn1_cvc_cert(rsa_ecdsa, key_type, NULL, 0, ext, 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, false);
     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)
-        return 0;
-    mbedtls_ecdsa_context ectx;
-    mbedtls_ecdsa_init(&ectx);
-    if (load_private_key_ecdsa(&ectx, fkey) != CCID_OK) {
-        mbedtls_ecdsa_free(&ectx);
+    if (!fkey) {
         return 0;
     }
-    int ret = 0, key_size = 2*mbedtls_mpi_size(&ectx.d);
-    size_t outsig_size = asn1_len_tag(0x5f37, key_size), tot_len = asn1_len_tag(0x67, cvcert_size+outcar_size+outsig_size);
-    if (buf_len == 0 || buf == NULL)
-        return tot_len;
-    if (buf_len < tot_len)
+    mbedtls_ecp_keypair ectx;
+    mbedtls_ecp_keypair_init(&ectx);
+    if (load_private_key_ec(&ectx, fkey) != CCID_OK) {
+        mbedtls_ecp_keypair_free(&ectx);
         return 0;
+    }
+    int ret = 0, key_size = 2 * mbedtls_mpi_size(&ectx.d);
+    size_t outsig_size = asn1_len_tag(0x5f37, key_size), tot_len = asn1_len_tag(0x67, cvcert_size + outcar_size + outsig_size);
+    if (buf_len == 0 || buf == NULL) {
+        return 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);
+    p += format_tlv_len(cvcert_size + outcar_size + outsig_size, p);
     uint8_t *body = p;
     //cvcert
-    p += asn1_cvc_cert(rsa_ecdsa, key_type, p, cvcert_size, ext, ext_len);
+    p += asn1_cvc_cert(rsa_ecdsa, key_type, p, cvcert_size, ext, ext_len, false);
     //outcar
     *p++ = 0x42; p += format_tlv_len(outcar_len, p); memcpy(p, outcar, outcar_len); p += outcar_len;
-    uint8_t hsh[32];
     memcpy(p, "\x5f\x37", 2); p += 2;
     p += format_tlv_len(key_size, p);
-    hash256(body, cvcert_size+outcar_size, hsh);
     mbedtls_mpi r, s;
     mbedtls_mpi_init(&r);
     mbedtls_mpi_init(&s);
-    ret = mbedtls_ecdsa_sign(&ectx.grp, &r, &s, &ectx.d, hsh, sizeof(hsh), random_gen, NULL);
-    mbedtls_ecdsa_free(&ectx);
+    if (ectx.grp.id == MBEDTLS_ECP_DP_ED25519 || ectx.grp.id == MBEDTLS_ECP_DP_ED448) {
+        ret = mbedtls_eddsa_sign(&ectx.grp, &r, &s, &ectx.d, body, cvcert_size + outcar_size, MBEDTLS_EDDSA_PURE, NULL, 0, random_gen, NULL);
+    }
+    else {
+        uint8_t hsh[32];
+        hash256(body, cvcert_size + outcar_size, hsh);
+        ret = mbedtls_ecdsa_sign(&ectx.grp, &r, &s, &ectx.d, hsh, sizeof(hsh), random_gen, NULL);
+    }
+    mbedtls_ecp_keypair_free(&ectx);
     if (ret != 0) {
         mbedtls_mpi_free(&r);
         mbedtls_mpi_free(&s);
@@ -265,25 +380,36 @@ size_t asn1_cvc_aut(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf_
     mbedtls_mpi_write_binary(&s, p, mbedtls_mpi_size(&s)); p += mbedtls_mpi_size(&s);
     mbedtls_mpi_free(&r);
     mbedtls_mpi_free(&s);
-    return p-buf;
+    return p - buf;
 }
 
-size_t asn1_build_cert_description(const uint8_t *label, 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 tot_len = asn1_len_tag(0x30, seq1_size+seq2_size+seq3_size);
-    if (buf_len == 0 || buf == NULL)
+    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) {
         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);
+    p += format_tlv_len(seq1_size + seq2_size + seq3_size, p);
     //Seq 1
     *p++ = 0x30;
-    p += format_tlv_len(asn1_len_tag(0xC, label_len)+asn1_len_tag(0x3, opt_len), p);
+    p += format_tlv_len(asn1_len_tag(0xC, label_len) + asn1_len_tag(0x3, opt_len), p);
     *p++ = 0xC;
     p += format_tlv_len(label_len, p);
     memcpy(p, label, label_len); p += label_len;
@@ -300,7 +426,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;
@@ -309,21 +436,56 @@ size_t asn1_build_cert_description(const uint8_t *label, size_t label_len, const
     p += format_tlv_len(sizeof(uint16_t), p);
     *p++ = fid >> 8;
     *p++ = fid & 0xff;
-    return p-buf;
+    return p - buf;
 }
 
-size_t asn1_build_prkd_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,
+                               int key_type,
+                               uint8_t *buf,
+                               size_t buf_len) {
+    size_t seq_len = 0;
+    const uint8_t *seq = NULL;
+    uint8_t first_tag = 0x0;
+    if (key_type & PICO_KEYS_KEY_EC) {
+        seq = (const uint8_t *)"\x07\x20\x80";
+        seq_len = 3;
+        first_tag = 0xA0;
+    }
+    else if (key_type & PICO_KEYS_KEY_RSA) {
+        seq = (const uint8_t *)"\x02\x74";
+        seq_len = 2;
+        first_tag = 0x30;
+    }
+    else if (key_type & PICO_KEYS_KEY_AES) {
+        seq = (const uint8_t *)"\x07\xC0\x10";
+        seq_len = 3;
+        first_tag = 0xA8;
+    }
     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 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)
+    size_t seq2_size =
+        asn1_len_tag(0x30, asn1_len_tag(0x4, keyid_len) + asn1_len_tag(0x3, seq_len));
+    size_t seq3_size = 0, seq4_size = 0;
+    if (key_type & PICO_KEYS_KEY_EC || key_type & PICO_KEYS_KEY_RSA) {
+        seq4_size = asn1_len_tag(0xA1, asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, 0)) + asn1_len_tag(0x2, 2)));
+    }
+    else if (key_type & PICO_KEYS_KEY_AES) {
+        seq3_size = asn1_len_tag(0xA0, asn1_len_tag(0x30, asn1_len_tag(0x2, 2)));
+        seq4_size = asn1_len_tag(0xA1, asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, 0))));
+    }
+    size_t tot_len = asn1_len_tag(first_tag, seq1_size + seq2_size + seq4_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++ = 0xA0;
-    p += format_tlv_len(seq1_size+seq2_size+seq3_size, p);
+    *p++ = first_tag;
+    p += format_tlv_len(seq1_size + seq2_size + seq3_size + seq4_size, p);
     //Seq 1
     *p++ = 0x30;
     p += format_tlv_len(asn1_len_tag(0xC, label_len), p);
@@ -333,43 +495,115 @@ size_t asn1_build_prkd_ecc(const uint8_t *label, size_t label_len, const uint8_t
 
     //Seq 2
     *p++ = 0x30;
-    p += format_tlv_len(asn1_len_tag(0x4, keyid_len)+asn1_len_tag(0x3, 3), p);
+    p += format_tlv_len(asn1_len_tag(0x4, keyid_len) + asn1_len_tag(0x3, seq_len), p);
     *p++ = 0x4;
     p += format_tlv_len(keyid_len, p);
     memcpy(p, keyid, keyid_len); p += keyid_len;
     *p++ = 0x3;
-    p += format_tlv_len(3, p);
-    memcpy(p, "\x07\x20\x80", 3); p += 3;
+    p += format_tlv_len(seq_len, p);
+    memcpy(p, seq, seq_len); p += seq_len;
 
     //Seq 3
+    if (key_type & PICO_KEYS_KEY_AES) {
+        *p++ = 0xA0;
+        p += format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x2, 2)), p);
+        *p++ = 0x30;
+        p += format_tlv_len(asn1_len_tag(0x2, 2), p);
+        *p++ = 0x2;
+        p += format_tlv_len(2, p);
+        *p++ = (keysize >> 8) & 0xff;
+        *p++ = keysize & 0xff;
+    }
+
+    //Seq 4
     *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);
+    size_t inseq4_len = asn1_len_tag(0x30, asn1_len_tag(0x4, 0));
+    if (key_type & PICO_KEYS_KEY_EC || key_type & PICO_KEYS_KEY_RSA) {
+        inseq4_len += asn1_len_tag(0x2, 2);
+    }
+    p += format_tlv_len(asn1_len_tag(0x30, inseq4_len), p);
     *p++ = 0x30;
-    p += format_tlv_len(asn1_len_tag(0x30, asn1_len_tag(0x4, 0))+asn1_len_tag(0x2,2), p);
+    p += format_tlv_len(inseq4_len, p);
     *p++ = 0x30;
     p += format_tlv_len(asn1_len_tag(0x4, 0), p);
     *p++ = 0x4;
     p += format_tlv_len(0, p);
-    *p++ = 0x2;
-    p += format_tlv_len(2, p);
-    *p++ = (keysize >> 8) & 0xff;
-    *p++ = keysize & 0xff;
-    return p-buf;
+    if (key_type & PICO_KEYS_KEY_EC || key_type & PICO_KEYS_KEY_RSA) {
+        *p++ = 0x2;
+        p += format_tlv_len(2, p);
+        *p++ = (keysize >> 8) & 0xff;
+        *p++ = keysize & 0xff;
+    }
+    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,
+                                   PICO_KEYS_KEY_EC,
+                                   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,
+                                   PICO_KEYS_KEY_RSA,
+                                   buf,
+                                   buf_len);
+}
+
+size_t asn1_build_prkd_aes(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,
+                                   PICO_KEYS_KEY_AES,
+                                   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);
     }
@@ -378,8 +612,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);
     }
@@ -419,8 +654,9 @@ 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;
 }
@@ -439,45 +675,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);
-        if (!t81 || !t82)
+        const uint8_t *t81 = cvc_get_field(puk, puk_len, &t81_len, 0x81), *t82 = cvc_get_field(puk,
+                                                                                               puk_len,
+                                                                                               &t81_len,
+                                                                                               0x82);
+        if (!t81 || !t82) {
             return CCID_WRONG_DATA;
+        }
         mbedtls_rsa_context rsa;
         mbedtls_rsa_init(&rsa);
         mbedtls_md_type_t md = MBEDTLS_MD_NONE;
-        if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_1, oid_len) == 0)
+        if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_1, oid_len) == 0) {
             md = MBEDTLS_MD_SHA1;
-        else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0)
+        }
+        else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) {
             md = MBEDTLS_MD_SHA256;
-        else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0)
+        }
+        else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0) {
             md = MBEDTLS_MD_SHA512;
+        }
         else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_1, oid_len) == 0) {
             md = MBEDTLS_MD_SHA1;
             mbedtls_rsa_set_padding(&rsa, MBEDTLS_RSA_PKCS_V21, md);
@@ -516,31 +769,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
+    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);
@@ -561,14 +823,14 @@ int puk_verify(const uint8_t *sig, size_t sig_len, const uint8_t *hash, size_t h
         mbedtls_mpi r, s;
         mbedtls_mpi_init(&r);
         mbedtls_mpi_init(&s);
-        ret = mbedtls_mpi_read_binary(&r, sig, sig_len/2);
+        ret = mbedtls_mpi_read_binary(&r, sig, sig_len / 2);
         if (ret != 0) {
             mbedtls_mpi_free(&r);
             mbedtls_mpi_free(&s);
             mbedtls_ecdsa_free(&ecdsa);
             return CCID_EXEC_ERROR;
         }
-        ret = mbedtls_mpi_read_binary(&s, sig+sig_len/2, sig_len/2);
+        ret = mbedtls_mpi_read_binary(&s, sig + sig_len / 2, sig_len / 2);
         if (ret != 0) {
             mbedtls_mpi_free(&r);
             mbedtls_mpi_free(&s);
@@ -579,8 +841,9 @@ 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;
 }
@@ -588,55 +851,73 @@ int puk_verify(const uint8_t *sig, size_t sig_len, const uint8_t *hash, size_t h
 int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t ca_len) {
     size_t puk_len = 0;
     const uint8_t *puk = cvc_get_pub(ca, ca_len, &puk_len);
-    if (!puk)
+    if (!puk) {
         return CCID_WRONG_DATA;
+    }
     size_t oid_len = 0, cv_body_len = 0, sig_len = 0;
     const uint8_t *oid = cvc_get_field(puk, puk_len, &oid_len, 0x6);
     const uint8_t *cv_body = cvc_get_body(cert, cert_len, &cv_body_len);
     const uint8_t *sig = cvc_get_sig(cert, cert_len, &sig_len);
-    if (!sig)
+    if (!sig) {
         return CCID_WRONG_DATA;
-    if (!cv_body)
+    }
+    if (!cv_body) {
         return CCID_WRONG_DATA;
-    if (!oid)
+    }
+    if (!oid) {
         return CCID_WRONG_DATA;
+    }
     mbedtls_md_type_t md = MBEDTLS_MD_NONE;
     if (memcmp(oid, OID_ID_TA_RSA, 9) == 0) { //RSA
-        if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_1, oid_len) == 0)
+        if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_1, oid_len) == 0) {
             md = MBEDTLS_MD_SHA1;
-        else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0)
+        }
+        else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) {
             md = MBEDTLS_MD_SHA256;
-        else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0)
+        }
+        else if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_512, oid_len) == 0) {
             md = MBEDTLS_MD_SHA512;
-        else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_1, oid_len) == 0)
+        }
+        else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_1, oid_len) == 0) {
             md = MBEDTLS_MD_SHA1;
-        else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_256, oid_len) == 0)
+        }
+        else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_256, oid_len) == 0) {
             md = MBEDTLS_MD_SHA256;
-        else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_512, oid_len) == 0)
+        }
+        else if (memcmp(oid, OID_ID_TA_RSA_PSS_SHA_512, oid_len) == 0) {
             md = MBEDTLS_MD_SHA512;
+        }
     }
-    else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC
-        if (memcmp(oid, OID_ID_TA_ECDSA_SHA_1, oid_len) == 0)
+    else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) {   //ECC
+        if (memcmp(oid, OID_ID_TA_ECDSA_SHA_1, oid_len) == 0) {
             md = MBEDTLS_MD_SHA1;
-        else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0)
+        }
+        else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0) {
             md = MBEDTLS_MD_SHA224;
-        else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0)
+        }
+        else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0) {
             md = MBEDTLS_MD_SHA256;
-        else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0)
+        }
+        else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0) {
             md = MBEDTLS_MD_SHA384;
-        else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0)
+        }
+        else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0) {
             md = MBEDTLS_MD_SHA512;
+        }
     }
-    if (md == MBEDTLS_MD_NONE)
+    if (md == MBEDTLS_MD_NONE) {
         return CCID_WRONG_DATA;
+    }
     const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md);
     uint8_t hash[64], hash_len = mbedtls_md_get_size(md_info);
-    uint8_t tlv_body = 2+format_tlv_len(cv_body_len, NULL);
-    int r = mbedtls_md(md_info, cv_body-tlv_body, cv_body_len+tlv_body, hash);
-    if (r != 0)
+    uint8_t tlv_body = 2 + format_tlv_len(cv_body_len, NULL);
+    int r = mbedtls_md(md_info, cv_body - tlv_body, cv_body_len + tlv_body, hash);
+    if (r != 0) {
         return CCID_EXEC_ERROR;
+    }
     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,26 @@ typedef struct PUK {
 
 #define MAX_PUK_STORE_ENTRIES 4
 
-extern size_t asn1_cvc_cert(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf_len, const uint8_t *ext, size_t ext_len);
-extern size_t asn1_cvc_aut(void *rsa_ecdsa, uint8_t key_type, uint8_t *buf, size_t buf_len, const uint8_t *ext, size_t ext_len);
-extern size_t asn1_build_cert_description(const uint8_t *label, size_t label_len, const uint8_t *puk, size_t puk_len, uint16_t fid, uint8_t *buf, size_t buf_len);
+extern size_t asn1_cvc_cert(void *rsa_ecdsa,
+                            uint8_t key_type,
+                            uint8_t *buf,
+                            size_t buf_len,
+                            const uint8_t *ext,
+                            size_t ext_len,
+                            bool full);
+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 +67,31 @@ extern const uint8_t *cvc_get_pub(const uint8_t *data, size_t len, size_t *olen)
 extern const uint8_t *cvc_get_ext(const uint8_t *data, size_t len, size_t *olen);
 extern int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t ca_len);
 extern mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len);
-extern int puk_verify(const uint8_t *sig, size_t sig_len, const uint8_t *hash, size_t hash_len, const uint8_t *ca, size_t ca_len);
-extern size_t asn1_build_prkd_ecc(const uint8_t *label, size_t label_len, const uint8_t *keyid, size_t keyid_len, size_t keysize, uint8_t *buf, size_t buf_len);
-
+extern int puk_verify(const uint8_t *sig,
+                      size_t sig_len,
+                      const uint8_t *hash,
+                      size_t hash_len,
+                      const uint8_t *ca,
+                      size_t ca_len);
+extern size_t asn1_build_prkd_ecc(const uint8_t *label,
+                                  size_t label_len,
+                                  const uint8_t *keyid,
+                                  size_t keyid_len,
+                                  size_t keysize,
+                                  uint8_t *buf,
+                                  size_t buf_len);
+extern size_t asn1_build_prkd_rsa(const uint8_t *label,
+                                  size_t label_len,
+                                  const uint8_t *keyid,
+                                  size_t keyid_len,
+                                  size_t keysize,
+                                  uint8_t *buf,
+                                  size_t buf_len);
+extern size_t asn1_build_prkd_aes(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,46 +21,95 @@ extern const uint8_t sc_hsm_aid[];
 extern int parse_token_info(const file_t *f, int mode);
 
 file_t file_entries[] = {
-    /*  0 */ { .fid = 0x3f00    , .parent = 0xff, .name = NULL, .type = FILE_TYPE_DF, .data = NULL, .ef_structure = 0, .acl = {0} }, // MF
-    /*  1 */ { .fid = 0x2f00    , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.DIR
-    /*  2 */ { .fid = 0x2f01    , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.ATR
-    /*  3 */ { .fid = EF_TERMCA , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.GDO
-    /*  4 */ { .fid = 0x2f03    , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF | FILE_DATA_FUNC,.data = (uint8_t *)parse_token_info, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.TokenInfo
-    /*  5 */ { .fid = 0x5015    , .parent = 0, .name = NULL, .type = FILE_TYPE_DF, .data = NULL, .ef_structure = 0, .acl = {0} }, //DF.PKCS15
-    /*  6 */ { .fid = 0x5031    , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.ODF
-    /*  7 */ { .fid = 0x5032    , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.TokenInfo
-    /*  8 */ { .fid = 0x5033    , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.UnusedSpace
-    /*  9 */ { .fid = 0x1081    , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //PIN (PIN1)
-    /* 10 */ { .fid = 0x1082    , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //max retries PIN (PIN1)
-    /* 11 */ { .fid = 0x1083    , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //retries PIN (PIN1)
-    /* 12 */ { .fid = 0x1088    , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //PIN (SOPIN)
-    /* 13 */ { .fid = 0x1089    , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //max retries PIN (SOPIN)
-    /* 14 */ { .fid = 0x108A    , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //retries PIN (SOPIN)
-    /* 15 */ { .fid = EF_DEVOPS , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //Device options
-    /* 16 */ { .fid = EF_PRKDFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.PrKDFs
-    /* 17 */ { .fid = EF_PUKDFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.PuKDFs
-    /* 18 */ { .fid = EF_CDFS   , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.CDFs
-    /* 19 */ { .fid = EF_AODFS  , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.AODFs
-    /* 20 */ { .fid = EF_DODFS  , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.DODFs
-    /* 21 */ { .fid = EF_SKDFS  , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.SKDFs
-    /* 22 */ { .fid = EF_KEY_DOMAIN, .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //Key domain options
-    /* 23 */ { .fid = EF_META   , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //EF.CDFs
-    /* 24 */ { .fid = EF_PUKAUT, .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //Public Key Authentication
-    /* 25 */ { .fid = EF_KEY_DEV, .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //Device Key
-    /* 26 */ { .fid = EF_PRKD_DEV, .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //PrKD Device
-    /* 27 */ { .fid = EF_EE_DEV, .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //End Entity Certificate Device
-    /* 28 */ { .fid = EF_MKEK , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //MKEK
-    /* 29 */ { .fid = EF_MKEK_SO , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //MKEK with SO-PIN
+    /*  0 */ { .fid = 0x3f00, .parent = 0xff, .name = NULL, .type = FILE_TYPE_DF, .data = NULL,
+               .ef_structure = 0, .acl = { 0 } },                                                                                    // MF
+    /*  1 */ { .fid = 0x2f00, .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                         //EF.DIR
+    /*  2 */ { .fid = 0x2f01, .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                         //EF.ATR
+    /*  3 */ { .fid = EF_TERMCA, .parent = 0, .name = NULL,
+               .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                                                             //EF.GDO
+    /*  4 */ { .fid = 0x2f03, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_WORKING_EF | FILE_DATA_FUNC, .data = (uint8_t *) parse_token_info,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                                                                //EF.TokenInfo
+    /*  5 */ { .fid = 0x5015, .parent = 0, .name = NULL, .type = FILE_TYPE_DF, .data = NULL,
+               .ef_structure = 0, .acl = { 0 } },                                                                                 //DF.PKCS15
+    /*  6 */ { .fid = 0x5031, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                         //EF.ODF
+    /*  7 */ { .fid = 0x5032, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                         //EF.TokenInfo
+    /*  8 */ { .fid = 0x5033, .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                         //EF.UnusedSpace
+    /*  9 */ { .fid = 0x1081, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //PIN (PIN1)
+    /* 10 */ { .fid = 0x1082, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //max retries PIN (PIN1)
+    /* 11 */ { .fid = 0x1083, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //retries PIN (PIN1)
+    /* 12 */ { .fid = 0x1088, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //PIN (SOPIN)
+    /* 13 */ { .fid = 0x1089, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //max retries PIN (SOPIN)
+    /* 14 */ { .fid = 0x108A, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //retries PIN (SOPIN)
+    /* 15 */ { .fid = EF_DEVOPS, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //Device options
+    /* 16 */ { .fid = EF_PRKDFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF,
+               .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                           //EF.PrKDFs
+    /* 17 */ { .fid = EF_PUKDFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF,
+               .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                           //EF.PuKDFs
+    /* 18 */ { .fid = EF_CDFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF,
+               .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                           //EF.CDFs
+    /* 19 */ { .fid = EF_AODFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF,
+               .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                           //EF.AODFs
+    /* 20 */ { .fid = EF_DODFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF,
+               .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                           //EF.DODFs
+    /* 21 */ { .fid = EF_SKDFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF,
+               .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                           //EF.SKDFs
+    /* 22 */ { .fid = EF_KEY_DOMAIN, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                               //Key domain options
+    /* 23 */ { .fid = EF_META, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //EF.CDFs
+    /* 24 */ { .fid = EF_PUKAUT, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                           //Public Key Authentication
+    /* 25 */ { .fid = EF_KEY_DEV, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                                              //Device Key
+    /* 26 */ { .fid = EF_PRKD_DEV, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                                               //PrKD Device
+    /* 27 */ { .fid = EF_EE_DEV, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                                             //End Entity Certificate Device
+    /* 28 */ { .fid = EF_MKEK, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                                            //MKEK
+    /* 29 */ { .fid = EF_MKEK_SO, .parent = 5, .name = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL,
+               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                                               //MKEK with SO-PIN
     ///* 30 */ { .fid = 0x0000, .parent = 0, .name = openpgpcard_aid, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} },
-    /* 31 */ { .fid = 0x0000, .parent = 5, .name = sc_hsm_aid, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} },
-    /* 32 */ { .fid = 0x0000, .parent = 0xff, .name = NULL, .type = FILE_TYPE_UNKNOWN, .data = NULL, .ef_structure = 0, .acl = {0} } //end
+    /* 31 */ { .fid = 0x0000, .parent = 5, .name = sc_hsm_aid, .type = FILE_TYPE_WORKING_EF,
+               .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },
+    /* 32 */ { .fid = 0x0000, .parent = 0xff, .name = NULL, .type = FILE_TYPE_UNKNOWN, .data = NULL,
+               .ef_structure = 0, .acl = { 0 } }                                                                                     //end
 };
 
 const file_t *MF = &file_entries[0];
-const file_t *file_last = &file_entries[sizeof(file_entries)/sizeof(file_t)-1];
-const file_t *file_openpgp = &file_entries[sizeof(file_entries)/sizeof(file_t)-3];
-const file_t *file_sc_hsm = &file_entries[sizeof(file_entries)/sizeof(file_t)-2];
+const file_t *file_last = &file_entries[sizeof(file_entries) / sizeof(file_t) - 1];
+const file_t *file_openpgp = &file_entries[sizeof(file_entries) / sizeof(file_t) - 3];
+const file_t *file_sc_hsm = &file_entries[sizeof(file_entries) / sizeof(file_t) - 2];
 file_t *file_pin1 = NULL;
 file_t *file_retries_pin1 = NULL;
 file_t *file_sopin = NULL;
-file_t *file_retries_sopin = NULL;
+file_t *file_retries_sopin = NULL;

src/hsm/files.h

@@ -28,7 +28,8 @@
 #define EF_DKEK         0x1090
 #define EF_KEY_DOMAIN   0x10A0
 #define EF_PUKAUT       0x10C0
-#define EF_PUK          0X10D0
+#define EF_PUK          0x10D0
+#define EF_MASTER_SEED  0x1110
 #define EF_PRKDFS       0x6040
 #define EF_PUKDFS       0x6041
 #define EF_CDFS         0x6042
@@ -40,11 +41,13 @@
 #define EF_PRKD_DEV     0xC400
 #define EF_EE_DEV       0xCE00
 
-#define EF_TERMCA       0x2f02
+#define EF_TERMCA       0x2F02
+#define EF_TOKENINFO    0x2F03
+#define EF_STATICTOKEN  0xCB00
 
 extern file_t *file_pin1;
 extern file_t *file_retries_pin1;
 extern file_t *file_sopin;
 extern file_t *file_retries_sopin;
 
-#endif
+#endif

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"
@@ -34,69 +36,83 @@ 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;
+uint8_t pending_save_dkek = 0xff;
 
 #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;
+    }
 
     if (has_mkek_mask) {
         for (int i = 0; i < MKEK_KEY_SIZE; i++) {
             MKEK_KEY(mkek)[i] ^= mkek_mask[i];
         }
     }
-    int ret = aes_decrypt_cfb_256(pin, MKEK_IV(mkek), MKEK_KEY(mkek), MKEK_KEY_SIZE+MKEK_KEY_CS_SIZE);
-    if (ret != 0)
+    int ret =
+        aes_decrypt_cfb_256(pin, MKEK_IV(mkek), MKEK_KEY(mkek), MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE);
+    if (ret != 0) {
         return CCID_EXEC_ERROR;
-    if (crc32c(MKEK_KEY(mkek), MKEK_KEY_SIZE) != *(uint32_t *)MKEK_CHECKSUM(mkek))
+    }
+    if (crc32c(MKEK_KEY(mkek), MKEK_KEY_SIZE) != *(uint32_t *) MKEK_CHECKSUM(mkek)) {
         return CCID_WRONG_DKEK;
+    }
     return CCID_OK;
 }
 
-mse_t mse = {.init = false};
+mse_t mse = { .init = false };
 
 int mse_decrypt_ct(uint8_t *data, size_t len) {
     mbedtls_chachapoly_context chatx;
     mbedtls_chachapoly_init(&chatx);
     mbedtls_chachapoly_setkey(&chatx, mse.key_enc + 12);
-    int ret = mbedtls_chachapoly_auth_decrypt(&chatx, len - 16, mse.key_enc, mse.Qpt, 65, data + len - 16, data, data);
+    int ret = mbedtls_chachapoly_auth_decrypt(&chatx,
+                                              len - 16,
+                                              mse.key_enc,
+                                              mse.Qpt,
+                                              65,
+                                              data + len - 16,
+                                              data,
+                                              data);
     mbedtls_chachapoly_free(&chatx);
     return ret;
 }
 
 int load_dkek(uint8_t id, uint8_t *dkek) {
-    file_t *tf = search_dynamic_file(EF_DKEK+id);
-    if (!tf)
+    file_t *tf = search_dynamic_file(EF_DKEK + id);
+    if (!tf) {
         return CCID_ERR_FILE_NOT_FOUND;
+    }
     memcpy(dkek, file_get_data(tf), DKEK_KEY_SIZE);
     return mkek_decrypt(dkek, DKEK_KEY_SIZE);
 }
@@ -106,16 +122,18 @@ 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);
+        const uint8_t *rd = random_bytes_get(MKEK_IV_SIZE + MKEK_KEY_SIZE);
+        memcpy(tmp_mkek, rd, MKEK_IV_SIZE + MKEK_KEY_SIZE);
     }
-    else
+    else {
         memcpy(tmp_mkek, mkek, MKEK_SIZE);
-    *(uint32_t*)MKEK_CHECKSUM(tmp_mkek) = crc32c(MKEK_KEY(tmp_mkek), MKEK_KEY_SIZE);
+    }
+    *(uint32_t *) MKEK_CHECKSUM(tmp_mkek) = crc32c(MKEK_KEY(tmp_mkek), MKEK_KEY_SIZE);
     if (has_session_pin) {
         uint8_t tmp_mkek_pin[MKEK_SIZE];
         memcpy(tmp_mkek_pin, tmp_mkek, MKEK_SIZE);
@@ -125,7 +143,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);
     }
@@ -138,7 +159,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);
     }
@@ -148,12 +172,14 @@ 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)
+    file_t *tf = search_dynamic_file(EF_DKEK + id);
+    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;
@@ -162,26 +188,31 @@ int store_dkek_key(uint8_t id, uint8_t *dkek) {
 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)
+        file_t *tf = search_dynamic_file(EF_DKEK + id);
+        if (!tf) {
             return CCID_ERR_FILE_NOT_FOUND;
+        }
         memcpy(dkek, file_get_data(tf), DKEK_KEY_SIZE);
     }
-    else
+    else {
         memcpy(dkek, key, DKEK_KEY_SIZE);
+    }
     return store_dkek_key(id, dkek);
 }
 
 int import_dkek_share(uint8_t id, const uint8_t *share) {
     uint8_t tmp_dkek[DKEK_KEY_SIZE];
-    file_t *tf = search_dynamic_file(EF_DKEK+id);
-    if (!tf)
+    file_t *tf = search_dynamic_file(EF_DKEK + id);
+    if (!tf) {
         return CCID_ERR_FILE_NOT_FOUND;
+    }
     memset(tmp_dkek, 0, sizeof(tmp_dkek));
-    if (file_get_size(tf) == DKEK_KEY_SIZE)
-        memcpy(tmp_dkek, file_get_data(tf),DKEK_KEY_SIZE);
-    for (int i = 0; i < DKEK_KEY_SIZE; i++)
+    if (file_get_size(tf) == DKEK_KEY_SIZE) {
+        memcpy(tmp_dkek, file_get_data(tf), DKEK_KEY_SIZE);
+    }
+    for (int i = 0; i < DKEK_KEY_SIZE; i++) {
         tmp_dkek[i] ^= share[i];
+    }
     flash_write_data_to_file(tf, tmp_dkek, DKEK_KEY_SIZE);
     low_flash_available();
     return CCID_OK;
@@ -192,8 +223,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);
@@ -201,34 +233,37 @@ int dkek_kcv(uint8_t id, uint8_t *kcv) { //kcv 8 bytes
 }
 
 int dkek_kenc(uint8_t id, uint8_t *kenc) { //kenc 32 bytes
-    uint8_t dkek[DKEK_KEY_SIZE+4];
+    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);
+    }
+    memcpy(dkek + DKEK_KEY_SIZE, "\x0\x0\x0\x1", 4);
     hash256(dkek, sizeof(dkek), kenc);
     mbedtls_platform_zeroize(dkek, sizeof(dkek));
     return CCID_OK;
 }
 
 int dkek_kmac(uint8_t id, uint8_t *kmac) { //kmac 32 bytes
-    uint8_t dkek[DKEK_KEY_SIZE+4];
+    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);
+    }
+    memcpy(dkek + DKEK_KEY_SIZE, "\x0\x0\x0\x2", 4);
+    hash256(dkek, DKEK_KEY_SIZE + 4, kmac);
     mbedtls_platform_zeroize(dkek, sizeof(dkek));
     return CCID_OK;
 }
 
 int mkek_encrypt(uint8_t *data, size_t len) {
     int r;
-    uint8_t mkek[MKEK_SIZE+4];
-    if ((r = load_mkek(mkek)) != CCID_OK)
+    uint8_t mkek[MKEK_SIZE + 4];
+    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;
@@ -236,19 +271,27 @@ 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)
+    uint8_t mkek[MKEK_SIZE + 4];
+    if ((r = load_mkek(mkek)) != CCID_OK) {
         return r;
+    }
     r = aes_decrypt_cfb_256(MKEK_KEY(mkek), MKEK_IV(mkek), data, len);
     release_mkek(mkek);
     return r;
 }
 
-int dkek_encode_key(uint8_t id, void *key_ctx, int key_type, uint8_t *out, size_t *out_len, const uint8_t *allowed, size_t allowed_len) {
-    if (!(key_type & HSM_KEY_RSA) && !(key_type & HSM_KEY_EC) && !(key_type & HSM_KEY_AES))
+int dkek_encode_key(uint8_t id,
+                    void *key_ctx,
+                    int key_type,
+                    uint8_t *out,
+                    size_t *out_len,
+                    const uint8_t *allowed,
+                    size_t allowed_len) {
+    if (!(key_type & PICO_KEYS_KEY_RSA) && !(key_type & PICO_KEYS_KEY_EC) && !(key_type & PICO_KEYS_KEY_AES)) {
         return CCID_WRONG_DATA;
+    }
 
-    uint8_t kb[8+2*4+2*4096/8+3+13]; //worst case: RSA-4096  (plus, 13 bytes padding)
+    uint8_t kb[8 + 2 * 4 + 2 * 4096 / 8 + 3 + 13]; //worst case: RSA-4096  (plus, 13 bytes padding)
     memset(kb, 0, sizeof(kb));
     int kb_len = 0, r = 0;
     uint8_t *algo = NULL;
@@ -256,240 +299,315 @@ 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 & PICO_KEYS_KEY_AES) {
+        if (key_type & PICO_KEYS_KEY_AES_128) {
             kb_len = 16;
-        else if (key_type & HSM_KEY_AES_192)
+        }
+        else if (key_type & PICO_KEYS_KEY_AES_192) {
             kb_len = 24;
-        else if (key_type & HSM_KEY_AES_256)
+        }
+        else if (key_type & PICO_KEYS_KEY_AES_256) {
             kb_len = 32;
+        }
+        else if (key_type & PICO_KEYS_KEY_AES_512) {
+            kb_len = 64;
+        }
 
-        if (kb_len != 16 && kb_len != 24 && kb_len != 32)
+        if (kb_len != 16 && kb_len != 24 && kb_len != 32 && kb_len != 64) {
             return CCID_WRONG_DATA;
-        if (*out_len < 8+1+10+6+4+(2+32+14)+16)
+        }
+        if (*out_len < 8 + 1 + 10 + 6 + (2 + 64 + 14) + 16) { // 14 bytes padding
             return CCID_WRONG_LENGTH;
+        }
 
-        put_uint16_t(kb_len, kb+8);
-        memcpy(kb+10, key_ctx, kb_len);
+        put_uint16_t(kb_len, kb + 8);
+        memcpy(kb + 10, key_ctx, kb_len);
         kb_len += 2;
 
-        algo = (uint8_t *)"\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01"; //2.16.840.1.101.3.4.1 (2+8)
+        algo = (uint8_t *) "\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01"; //2.16.840.1.101.3.4.1 (2+8)
         algo_len = 10;
     }
-    else if (key_type & HSM_KEY_RSA) {
-        if (*out_len < 8+1+12+6+(8+2*4+2*4096/8+3+13)+16) //13 bytes pading
+    else if (key_type & PICO_KEYS_KEY_RSA) {
+        if (*out_len < 8 + 1 + 12 + 6 + (8 + 2 * 4 + 2 * 4096 / 8 + 3 + 13) + 16) { //13 bytes pading
             return CCID_WRONG_LENGTH;
-        mbedtls_rsa_context *rsa = (mbedtls_rsa_context *)key_ctx;
+        }
+        mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) key_ctx;
         kb_len = 0;
-        put_uint16_t(mbedtls_rsa_get_len(rsa)*8, kb+8+kb_len); kb_len += 2;
+        put_uint16_t(mbedtls_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);
-        put_uint16_t(mbedtls_mpi_size(&rsa->N), kb+8+kb_len); kb_len += 2;
-        mbedtls_mpi_write_binary(&rsa->N, kb+8+kb_len, mbedtls_mpi_size(&rsa->N)); kb_len += mbedtls_mpi_size(&rsa->N);
-        put_uint16_t(mbedtls_mpi_size(&rsa->E), kb+8+kb_len); kb_len += 2;
-        mbedtls_mpi_write_binary(&rsa->E, kb+8+kb_len, mbedtls_mpi_size(&rsa->E)); kb_len += mbedtls_mpi_size(&rsa->E);
+        put_uint16_t(mbedtls_mpi_size(&rsa->D), kb + 8 + kb_len); kb_len += 2;
+        mbedtls_mpi_write_binary(&rsa->D, kb + 8 + kb_len, mbedtls_mpi_size(&rsa->D));
+        kb_len += mbedtls_mpi_size(&rsa->D);
+        put_uint16_t(mbedtls_mpi_size(&rsa->N), kb + 8 + kb_len); kb_len += 2;
+        mbedtls_mpi_write_binary(&rsa->N, kb + 8 + kb_len, mbedtls_mpi_size(&rsa->N));
+        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);
 
-        algo = (uint8_t *)"\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02";
+        algo = (uint8_t *) "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02";
         algo_len = 12;
     }
-    else if (key_type & HSM_KEY_EC) {
-        if (*out_len < 8+1+12+6+(8+2*8+9*66+2+4)+16) //4 bytes pading
+    else if (key_type & PICO_KEYS_KEY_EC) {
+        if (*out_len < 8 + 1 + 12 + 6 + (8 + 2 * 8 + 9 * 66 + 2 + 4) + 16) { //4 bytes pading
             return CCID_WRONG_LENGTH;
-        mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *)key_ctx;
+        }
+        mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx;
         kb_len = 0;
-        put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.P)*8, kb+8+kb_len); kb_len += 2;
-        put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.A), kb+8+kb_len); kb_len += 2;
-        mbedtls_mpi_write_binary(&ecdsa->grp.A, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.A)); kb_len += mbedtls_mpi_size(&ecdsa->grp.A);
-        put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.B), kb+8+kb_len); kb_len += 2;
-        mbedtls_mpi_write_binary(&ecdsa->grp.B, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.B)); kb_len += mbedtls_mpi_size(&ecdsa->grp.B);
-        put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.P), kb+8+kb_len); kb_len += 2;
-        mbedtls_mpi_write_binary(&ecdsa->grp.P, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.P)); kb_len += mbedtls_mpi_size(&ecdsa->grp.P);
-        put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.N), kb+8+kb_len); kb_len += 2;
-        mbedtls_mpi_write_binary(&ecdsa->grp.N, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.N)); kb_len += mbedtls_mpi_size(&ecdsa->grp.N);
-        put_uint16_t(1+mbedtls_mpi_size(&ecdsa->grp.G.X)+mbedtls_mpi_size(&ecdsa->grp.G.Y), kb+8+kb_len); kb_len += 2;
-        kb[8+kb_len++] = 0x4;
-        mbedtls_mpi_write_binary(&ecdsa->grp.G.X, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.G.X)); kb_len += mbedtls_mpi_size(&ecdsa->grp.G.X);
-        mbedtls_mpi_write_binary(&ecdsa->grp.G.Y, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.G.Y)); kb_len += mbedtls_mpi_size(&ecdsa->grp.G.Y);
-        put_uint16_t(mbedtls_mpi_size(&ecdsa->d), kb+8+kb_len); kb_len += 2;
-        mbedtls_mpi_write_binary(&ecdsa->d, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->d)); kb_len += mbedtls_mpi_size(&ecdsa->d);
-        put_uint16_t(1+mbedtls_mpi_size(&ecdsa->Q.X)+mbedtls_mpi_size(&ecdsa->Q.Y), kb+8+kb_len); kb_len += 2;
-        kb[8+kb_len++] = 0x4;
-        mbedtls_mpi_write_binary(&ecdsa->Q.X, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->Q.X)); kb_len += mbedtls_mpi_size(&ecdsa->Q.X);
-        mbedtls_mpi_write_binary(&ecdsa->Q.Y, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->Q.Y)); kb_len += mbedtls_mpi_size(&ecdsa->Q.Y);
+        put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.P) * 8, kb + 8 + kb_len); kb_len += 2;
+        put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.A), kb + 8 + kb_len); kb_len += 2;
+        mbedtls_mpi_write_binary(&ecdsa->grp.A, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->grp.A));
+        kb_len += mbedtls_mpi_size(&ecdsa->grp.A);
+        put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.B), kb + 8 + kb_len); kb_len += 2;
+        mbedtls_mpi_write_binary(&ecdsa->grp.B, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->grp.B));
+        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);
+        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);
 
-        algo = (uint8_t *)"\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03";
+        size_t olen = 0;
+        mbedtls_ecp_point_write_binary(&ecdsa->grp,
+                                       &ecdsa->grp.G,
+                                       MBEDTLS_ECP_PF_UNCOMPRESSED,
+                                       &olen,
+                                       kb + 8 + kb_len + 2,
+                                       sizeof(kb) - 8 - kb_len - 2);
+        put_uint16_t(olen, kb + 8 + kb_len);
+        kb_len += 2 + olen;
+
+        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_ecp_point_write_binary(&ecdsa->grp,
+                                       &ecdsa->Q,
+                                       MBEDTLS_ECP_PF_UNCOMPRESSED,
+                                       &olen,
+                                       kb + 8 + kb_len + 2,
+                                       sizeof(kb) - 8 - kb_len - 2);
+        put_uint16_t(olen, kb + 8 + kb_len);
+        kb_len += 2 + olen;
+
+        algo = (uint8_t *) "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03";
         algo_len = 12;
     }
     memset(out, 0, *out_len);
     *out_len = 0;
 
-    memcpy(out+*out_len, kcv, 8);
+    memcpy(out + *out_len, kcv, 8);
     *out_len += 8;
 
-    if (key_type & HSM_KEY_AES)
+    if (key_type & PICO_KEYS_KEY_AES) {
         out[*out_len] = 15;
-    else if (key_type & HSM_KEY_RSA)
+    }
+    else if (key_type & PICO_KEYS_KEY_RSA) {
         out[*out_len] = 5;
-    else if (key_type & HSM_KEY_EC)
+    }
+    else if (key_type & PICO_KEYS_KEY_EC) {
         out[*out_len] = 12;
+    }
     *out_len += 1;
 
     if (algo) {
-        memcpy(out+*out_len, algo, algo_len);
+        memcpy(out + *out_len, algo, algo_len);
         *out_len += algo_len;
     }
-    else
+    else {
         *out_len += 2;
+    }
 
     if (allowed && allowed_len > 0) {
-        put_uint16_t(allowed_len, out+*out_len); *out_len += 2;
-        memcpy(out+*out_len, allowed, allowed_len);
+        put_uint16_t(allowed_len, out + *out_len); *out_len += 2;
+        memcpy(out + *out_len, allowed, allowed_len);
         *out_len += allowed_len;
     }
-    else
+    else {
         *out_len += 2;
+    }
     //add 4 zeros
     *out_len += 4;
 
     memcpy(kb, random_bytes_get(8), 8);
     kb_len += 8; //8 random bytes
-    int kb_len_pad = ((int)(kb_len/16))*16;
-    if (kb_len % 16 > 0)
-        kb_len_pad = ((int)(kb_len/16)+1)*16;
+    int kb_len_pad = ((int) (kb_len / 16)) * 16;
+    if (kb_len % 16 > 0) {
+        kb_len_pad = ((int) (kb_len / 16) + 1) * 16;
+    }
     //key already copied at kb+10
     if (kb_len < kb_len_pad) {
         kb[kb_len] = 0x80;
     }
-    r = aes_encrypt(kenc, NULL, 256, HSM_AES_MODE_CBC, kb, kb_len_pad);
-    if (r != CCID_OK)
+    r = aes_encrypt(kenc, NULL, 256, PICO_KEYS_AES_MODE_CBC, kb, kb_len_pad);
+    if (r != CCID_OK) {
         return r;
+    }
 
-    memcpy(out+*out_len, kb, kb_len_pad);
+    memcpy(out + *out_len, kb, kb_len_pad);
     *out_len += kb_len_pad;
 
-    r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB), 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)
-        return HSM_KEY_RSA;
-    else if (in[8] == 12)
-        return HSM_KEY_EC;
-    else if (in[8] == 15)
-        return HSM_KEY_AES;
+    if (in[8] == 5 || in[8] == 6) {
+        return PICO_KEYS_KEY_RSA;
+    }
+    else if (in[8] == 12) {
+        return PICO_KEYS_KEY_EC;
+    }
+    else if (in[8] == 15) {
+        return PICO_KEYS_KEY_AES;
+    }
     return 0x0;
 }
 
-int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len, int *key_size_out, uint8_t **allowed, size_t *allowed_len) {
+int dkek_decode_key(uint8_t id,
+                    void *key_ctx,
+                    const uint8_t *in,
+                    size_t in_len,
+                    int *key_size_out,
+                    uint8_t **allowed,
+                    size_t *allowed_len) {
     uint8_t kcv[8];
     int r = 0;
     memset(kcv, 0, sizeof(kcv));
     r = dkek_kcv(id, kcv);
-    if (r != CCID_OK)
+    if (r != CCID_OK) {
         return r;
+    }
 
     uint8_t kmac[32];
     memset(kmac, 0, sizeof(kmac));
     r = dkek_kmac(id, kmac);
-    if (r != CCID_OK)
+    if (r != CCID_OK) {
         return r;
+    }
 
     uint8_t kenc[32];
     memset(kenc, 0, sizeof(kenc));
     r = dkek_kenc(id, kenc);
-    if (r != CCID_OK)
+    if (r != CCID_OK) {
         return r;
+    }
 
-    if (memcmp(kcv, in, 8) != 0)
+    if (memcmp(kcv, in, 8) != 0) {
         return CCID_WRONG_DKEK;
+    }
 
     uint8_t signature[16];
-    r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB), kmac, 256, in, in_len-16, signature);
-    if (r != 0)
+    r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB),
+                            kmac,
+                            256,
+                            in,
+                            in_len - 16,
+                            signature);
+    if (r != 0) {
         return CCID_WRONG_SIGNATURE;
-    if (memcmp(signature, in+in_len-16, 16) != 0)
+    }
+    if (memcmp(signature, in + in_len - 16, 16) != 0) {
         return CCID_WRONG_SIGNATURE;
+    }
 
     int key_type = in[8];
-    if (key_type != 5 && key_type != 6 && key_type != 12 && key_type != 15)
+    if (key_type != 5 && key_type != 6 && key_type != 12 && key_type != 15) {
         return CCID_WRONG_DATA;
+    }
 
-    if ((key_type == 5 || key_type == 6) && memcmp(in+9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02", 12) != 0)
+    if ((key_type == 5 || key_type == 6) &&
+        memcmp(in + 9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02", 12) != 0) {
         return CCID_WRONG_DATA;
+    }
 
-    if (key_type == 12 && memcmp(in+9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03", 12) != 0)
+    if (key_type == 12 &&
+        memcmp(in + 9, "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03", 12) != 0) {
         return CCID_WRONG_DATA;
+    }
 
-    if (key_type == 15 && memcmp(in+9, "\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01", 10) != 0)
+    if (key_type == 15 && memcmp(in + 9, "\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01", 10) != 0) {
         return CCID_WRONG_DATA;
+    }
 
     size_t ofs = 9;
 
     //OID
     size_t len = get_uint16_t(in, ofs);
-    ofs += len+2;
+    ofs += len + 2;
 
     //Allowed algorithms
     len = get_uint16_t(in, ofs);
-    *allowed = (uint8_t *)(in+ofs+2);
+    *allowed = (uint8_t *) (in + ofs + 2);
     *allowed_len = len;
-    ofs += len+2;
+    ofs += len + 2;
 
     //Access conditions
     len = get_uint16_t(in, ofs);
-    ofs += len+2;
+    ofs += len + 2;
 
     //Key OID
     len = get_uint16_t(in, ofs);
-    ofs += len+2;
+    ofs += len + 2;
 
-    if ((in_len-16-ofs) % 16 != 0)
+    if ((in_len - 16 - ofs) % 16 != 0) {
         return CCID_WRONG_PADDING;
-    uint8_t kb[8+2*4+2*4096/8+3+13]; //worst case: RSA-4096  (plus, 13 bytes padding)
+    }
+    uint8_t kb[8 + 2 * 4 + 2 * 4096 / 8 + 3 + 13]; //worst case: RSA-4096  (plus, 13 bytes padding)
     memset(kb, 0, sizeof(kb));
-    memcpy(kb, in+ofs, in_len-16-ofs);
-    r = aes_decrypt(kenc, NULL, 256, HSM_AES_MODE_CBC, kb, in_len-16-ofs);
-    if (r != CCID_OK)
+    memcpy(kb, in + ofs, in_len - 16 - ofs);
+    r = aes_decrypt(kenc, NULL, 256, PICO_KEYS_AES_MODE_CBC, kb, in_len - 16 - ofs);
+    if (r != CCID_OK) {
         return r;
+    }
 
     int key_size = get_uint16_t(kb, 8);
-    if (key_size_out)
+    if (key_size_out) {
         *key_size_out = key_size;
+    }
     ofs = 10;
     if (key_type == 5 || key_type == 6) {
-        mbedtls_rsa_context *rsa = (mbedtls_rsa_context *)key_ctx;
+        mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) key_ctx;
         mbedtls_rsa_init(rsa);
         if (key_type == 5) {
             len = get_uint16_t(kb, ofs); ofs += 2;
-            r = mbedtls_mpi_read_binary(&rsa->D, kb+ofs, len); ofs += len;
+            r = mbedtls_mpi_read_binary(&rsa->D, kb + ofs, len); ofs += len;
             if (r != 0) {
                 mbedtls_rsa_free(rsa);
                 return CCID_WRONG_DATA;
             }
 
             len = get_uint16_t(kb, ofs); ofs += 2;
-            r = mbedtls_mpi_read_binary(&rsa->N, kb+ofs, len); ofs += len;
+            r = mbedtls_mpi_read_binary(&rsa->N, kb + ofs, len); ofs += len;
             if (r != 0) {
                 mbedtls_rsa_free(rsa);
                 return CCID_WRONG_DATA;
@@ -497,33 +615,33 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len,
         }
         else if (key_type == 6) {
             //DP-1
-            len = get_uint16_t(kb, ofs); ofs += len+2;
+            len = get_uint16_t(kb, ofs); ofs += len + 2;
 
             //DQ-1
-            len = get_uint16_t(kb, ofs); ofs += len+2;
+            len = get_uint16_t(kb, ofs); ofs += len + 2;
 
             len = get_uint16_t(kb, ofs); ofs += 2;
-            r = mbedtls_mpi_read_binary(&rsa->P, kb+ofs, len); ofs += len;
+            r = mbedtls_mpi_read_binary(&rsa->P, kb + ofs, len); ofs += len;
             if (r != 0) {
                 mbedtls_rsa_free(rsa);
                 return CCID_WRONG_DATA;
             }
 
             //PQ
-            len = get_uint16_t(kb, ofs); ofs += len+2;
+            len = get_uint16_t(kb, ofs); ofs += len + 2;
 
             len = get_uint16_t(kb, ofs); ofs += 2;
-            r = mbedtls_mpi_read_binary(&rsa->Q, kb+ofs, len); ofs += len;
+            r = mbedtls_mpi_read_binary(&rsa->Q, kb + ofs, len); ofs += len;
             if (r != 0) {
                 mbedtls_rsa_free(rsa);
                 return CCID_WRONG_DATA;
             }
             //N
-            len = get_uint16_t(kb, ofs); ofs += len+2;
+            len = get_uint16_t(kb, ofs); ofs += len + 2;
         }
 
         len = get_uint16_t(kb, ofs); ofs += 2;
-        r = mbedtls_mpi_read_binary(&rsa->E, kb+ofs, len); ofs += len;
+        r = mbedtls_mpi_read_binary(&rsa->E, kb + ofs, len); ofs += len;
         if (r != 0) {
             mbedtls_rsa_free(rsa);
             return CCID_WRONG_DATA;
@@ -556,18 +674,18 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len,
         }
     }
     else if (key_type == 12) {
-        mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *)key_ctx;
+        mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx;
         mbedtls_ecdsa_init(ecdsa);
 
         //A
-        len = get_uint16_t(kb, ofs); ofs += len+2;
+        len = get_uint16_t(kb, ofs); ofs += len + 2;
 
         //B
-        len = get_uint16_t(kb, ofs); ofs += len+2;
+        len = get_uint16_t(kb, ofs); ofs += len + 2;
 
         //P
         len = get_uint16_t(kb, ofs); ofs += 2;
-        mbedtls_ecp_group_id ec_id = ec_get_curve_from_prime(kb+ofs, len);
+        mbedtls_ecp_group_id ec_id = ec_get_curve_from_prime(kb + ofs, len);
         if (ec_id == MBEDTLS_ECP_DP_NONE) {
             mbedtls_ecdsa_free(ecdsa);
             return CCID_WRONG_DATA;
@@ -575,21 +693,50 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, size_t in_len,
         ofs += len;
 
         //N
-        len = get_uint16_t(kb, ofs); ofs += len+2;
+        len = get_uint16_t(kb, ofs); ofs += len + 2;
 
         //G
-        len = get_uint16_t(kb, ofs); ofs += len+2;
+        len = get_uint16_t(kb, ofs);
+        if (ec_id == MBEDTLS_ECP_DP_CURVE25519 && kb[ofs + 2] != 0x09) {
+            ec_id = MBEDTLS_ECP_DP_ED25519;
+        }
+        else if (ec_id == MBEDTLS_ECP_DP_CURVE448 && (len != 56 || kb[ofs + 2] != 0x05)) {
+            ec_id = MBEDTLS_ECP_DP_ED448;
+        }
+        ofs += len + 2;
 
         //d
         len = get_uint16_t(kb, ofs); ofs += 2;
-        r = mbedtls_ecp_read_key(ec_id, ecdsa, kb+ofs, len);
+        r = mbedtls_ecp_read_key(ec_id, ecdsa, kb + ofs, len);
+        if (r != 0) {
+            mbedtls_ecdsa_free(ecdsa);
+            return CCID_EXEC_ERROR;
+        }
+        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) {
+            if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_EDWARDS) {
+                r = mbedtls_ecp_point_edwards(&ecdsa->grp, &ecdsa->Q, &ecdsa->d, random_gen, NULL);
+            }
+            else {
+                r = mbedtls_ecp_mul(&ecdsa->grp, &ecdsa->Q, &ecdsa->d, &ecdsa->grp.G, random_gen, NULL);
+            }
+            if (r != 0) {
+                mbedtls_ecdsa_free(ecdsa);
+                return CCID_EXEC_ERROR;
+            }
+        }
+        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);
+        memcpy(key_ctx, kb + ofs, key_size);
     }
     return CCID_OK;
 }

src/hsm/kek.h

@@ -19,6 +19,9 @@
 #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 *);
@@ -30,21 +33,33 @@ 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)
+#define MAX_DKEK_ENCODE_KEY_BUFFER (8 + 1 + 12 + 6 + (8 + 2 * 4 + 2 * 4096 / 8 + 3 + 13) + 16)
 
 #define MAX_KEY_DOMAINS 16
 
 #define MKEK_IV_SIZE     (IV_SIZE)
 #define MKEK_KEY_SIZE    (32)
 #define MKEK_KEY_CS_SIZE (4)
-#define MKEK_SIZE        (MKEK_IV_SIZE+MKEK_KEY_SIZE+MKEK_KEY_CS_SIZE)
+#define MKEK_SIZE        (MKEK_IV_SIZE + MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE)
 #define MKEK_IV(p)       (p)
-#define MKEK_KEY(p)      (MKEK_IV(p)+MKEK_IV_SIZE)
-#define MKEK_CHECKSUM(p) (MKEK_KEY(p)+MKEK_KEY_SIZE)
+#define MKEK_KEY(p)      (MKEK_IV(p) + MKEK_IV_SIZE)
+#define MKEK_CHECKSUM(p) (MKEK_KEY(p) + MKEK_KEY_SIZE)
 #define DKEK_KEY_SIZE    (32)
 
 extern uint8_t mkek_mask[MKEK_KEY_SIZE];
@@ -59,4 +74,6 @@ extern mse_t mse;
 
 extern int mse_decrypt_ct(uint8_t *, size_t);
 
+extern uint8_t pending_save_dkek;
+
 #endif

src/hsm/oid.h

@@ -18,9 +18,6 @@
 #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"
@@ -147,4 +144,34 @@
 
 #define OID_KDF_X963                    "\x2B\x81\x05\x10\x86\x48\x3F"
 
+#define OID_NIST_ALG                    "\x60\x86\x48\x01\x65\x03\x04"
+#define OID_NIST_AES                    OID_NIST_ALG "\x01"
+#define OID_AES128_ECB                  OID_NIST_AES "\x01"
+#define OID_AES128_CBC                  OID_NIST_AES "\x02"
+#define OID_AES128_OFB                  OID_NIST_AES "\x03"
+#define OID_AES128_CFB                  OID_NIST_AES "\x04"
+#define OID_AES128_GCM                  OID_NIST_AES "\x06"
+#define OID_AES128_CCM                  OID_NIST_AES "\x07"
+#define OID_AES128_CTR                  OID_NIST_AES "\x09" // Not existing
+#define OID_AES192_ECB                  OID_NIST_AES "\x15"
+#define OID_AES192_CBC                  OID_NIST_AES "\x16"
+#define OID_AES192_OFB                  OID_NIST_AES "\x17"
+#define OID_AES192_CFB                  OID_NIST_AES "\x18"
+#define OID_AES192_GCM                  OID_NIST_AES "\x1A"
+#define OID_AES192_CCM                  OID_NIST_AES "\x1B"
+#define OID_AES192_CTR                  OID_NIST_AES "\x1D" // Not existing
+#define OID_AES256_ECB                  OID_NIST_AES "\x29"
+#define OID_AES256_CBC                  OID_NIST_AES "\x2A"
+#define OID_AES256_OFB                  OID_NIST_AES "\x2B"
+#define OID_AES256_CFB                  OID_NIST_AES "\x2C"
+#define OID_AES256_GCM                  OID_NIST_AES "\x2E"
+#define OID_AES256_CCM                  OID_NIST_AES "\x2F"
+#define OID_AES256_CTR                  OID_NIST_AES "\x31" // Not existing
+
+#define OID_IEEE_ALG                    "\x2B\x6F\x02\x8C\x53\x00\x00\x01"
+#define OID_AES128_XTS                  OID_IEEE_ALG "\x01"
+#define OID_AES256_XTS                  OID_IEEE_ALG "\x02"
+
+#define OID_HD                          "\x2B\x06\x01\x04\x01\x83\xA8\x78\x05\x8D\x6B"
+
 #endif

src/hsm/sc_hsm.c

@@ -24,17 +24,19 @@
 #include "eac.h"
 #include "cvc.h"
 #include "asn1.h"
-#include "ccid.h"
+#include "pico_keys.h"
 #include "usb.h"
+#include "random.h"
 
 const uint8_t sc_hsm_aid[] = {
     11,
-    0xE8,0x2B,0x06,0x01,0x04,0x01,0x81,0xC3,0x1F,0x02,0x01
+    0xE8, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x81, 0xC3, 0x1F, 0x02, 0x01
 };
 
 const uint8_t atr_sc_hsm[] = {
     24,
-    0x3B,0xFE,0x18,0x00,0x00,0x81,0x31,0xFE,0x45,0x80,0x31,0x81,0x54,0x48,0x53,0x4D,0x31,0x73,0x80,0x21,0x40,0x81,0x07,0xFA
+    0x3B, 0xFE, 0x18, 0x00, 0x00, 0x81, 0x31, 0xFE, 0x45, 0x80, 0x31, 0x81, 0x54, 0x48, 0x53, 0x4D,
+    0x31, 0x73, 0x80, 0x21, 0x40, 0x81, 0x07, 0xFA
 };
 
 uint8_t session_pin[32], session_sopin[32];
@@ -74,21 +76,20 @@ extern int cmd_general_authenticate();
 extern int cmd_session_pin();
 extern int cmd_puk_auth();
 extern int cmd_pso();
+extern int cmd_bip_slip();
 
-app_t *sc_hsm_select_aid(app_t *a) {
-    if (!memcmp(apdu.data, sc_hsm_aid+1, MIN(apdu.nc,sc_hsm_aid[0]))) {
-        a->aid = sc_hsm_aid;
-        a->process_apdu = sc_hsm_process_apdu;
-        a->unload = sc_hsm_unload;
-        init_sc_hsm();
-        return a;
-    }
-    return NULL;
+extern const uint8_t *ccid_atr;
+
+int sc_hsm_select_aid(app_t *a) {
+    a->process_apdu = sc_hsm_process_apdu;
+    a->unload = sc_hsm_unload;
+    init_sc_hsm();
+    return CCID_OK;
 }
 
-void __attribute__ ((constructor)) sc_hsm_ctor() {
+void __attribute__((constructor)) sc_hsm_ctor() {
     ccid_atr = atr_sc_hsm;
-    register_app(sc_hsm_select_aid);
+    register_app(sc_hsm_select_aid, sc_hsm_aid);
 }
 
 void scan_files() {
@@ -174,23 +175,32 @@ 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) {
-        uint8_t *tmp = (uint8_t *)calloc(data_len, sizeof(uint8_t));
+        uint8_t *tmp = (uint8_t *) calloc(data_len, sizeof(uint8_t));
         memcpy(tmp, data, data_len);
         puk_store[puk_store_entries].cvcert = tmp;
     }
-    else
+    else {
         puk_store[puk_store_entries].cvcert = data;
+    }
     puk_store[puk_store_entries].cvcert_len = data_len;
-    puk_store[puk_store_entries].chr = cvc_get_chr(puk_store[puk_store_entries].cvcert, data_len, &puk_store[puk_store_entries].chr_len);
-    puk_store[puk_store_entries].car = cvc_get_car(puk_store[puk_store_entries].cvcert, data_len, &puk_store[puk_store_entries].car_len);
-    puk_store[puk_store_entries].puk = cvc_get_pub(puk_store[puk_store_entries].cvcert, data_len, &puk_store[puk_store_entries].puk_len);
+    puk_store[puk_store_entries].chr = cvc_get_chr(puk_store[puk_store_entries].cvcert,
+                                                   data_len,
+                                                   &puk_store[puk_store_entries].chr_len);
+    puk_store[puk_store_entries].car = cvc_get_car(puk_store[puk_store_entries].cvcert,
+                                                   data_len,
+                                                   &puk_store[puk_store_entries].car_len);
+    puk_store[puk_store_entries].puk = cvc_get_pub(puk_store[puk_store_entries].cvcert,
+                                                   data_len,
+                                                   &puk_store[puk_store_entries].puk_len);
 
     puk_store_entries++;
     return CCID_OK;
@@ -206,31 +216,43 @@ int puk_store_select_chr(const uint8_t *chr) {
     return CCID_ERR_FILE_NOT_FOUND;
 }
 
-void init_sc_hsm() {
-    scan_all();
-    has_session_pin = has_session_sopin = false;
-    isUserAuthenticated = false;
-    cmd_select();
+void reset_puk_store() {
     if (puk_store_entries > 0) { /* From previous session */
         for (int i = 0; i < puk_store_entries; i++) {
-            if (puk_store[i].copied == true)
-                free((uint8_t *)puk_store[i].cvcert);
+            if (puk_store[i].copied == true) {
+                free((uint8_t *) puk_store[i].cvcert);
+            }
         }
     }
     memset(puk_store, 0, sizeof(puk_store));
     puk_store_entries = 0;
     file_t *fterm = search_by_fid(EF_TERMCA, NULL, SPECIFY_EF);
-    if (fterm)
-        add_cert_puk_store(file_get_data(fterm), file_get_size(fterm), false);
+    if (fterm) {
+        uint8_t *p = NULL, *fterm_data = file_get_data(fterm), *pq = fterm_data;
+        size_t fterm_data_len = file_get_size(fterm);
+        while (walk_tlv(fterm_data, fterm_data_len, &p, NULL, NULL, NULL)) {
+            add_cert_puk_store(pq, p - pq, false);
+            pq = p;
+        }
+    }
     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));
 }
 
+void init_sc_hsm() {
+    scan_all();
+    has_session_pin = has_session_sopin = false;
+    isUserAuthenticated = false;
+    cmd_select();
+    reset_puk_store();
+}
+
 int sc_hsm_unload() {
     has_session_pin = has_session_sopin = false;
     isUserAuthenticated = false;
@@ -240,75 +262,92 @@ 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))
-        return (file_read_uint8(file_get_data(ef)) << 8) | file_read_uint8(file_get_data(ef)+1);
+    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 {
+        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) {
+#ifdef __FOR_CI
     char *label = "SmartCard-HSM";
+#else
+    char *label = "Pico-HSM";
+#endif
     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;
-        *p++ = 0x4; *p++ = 8; pico_get_unique_board_id((pico_unique_board_id_t *)p); p += 8;
-        *p++ = 0xC; *p++ = strlen(manu); strcpy((char *)p, manu); p += strlen(manu);
-        *p++ = 0x80; *p++ = strlen(label); strcpy((char *)p, label); p += strlen(label);
+#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;
-        res_APDU_size = p-res_APDU;
-        res_APDU[1] = res_APDU_size-2;
+        res_APDU_size = p - res_APDU;
+        res_APDU[1] = res_APDU_size - 2;
     }
-    return 2+(2+1)+(2+8)+(2+strlen(manu))+(2+strlen(label))+(2+2);
+    return 2 + (2 + 1) + (2 + 8) + (2 + strlen(manu)) + (2 + strlen(label)) + (2 + 2);
 }
 
 int pin_reset_retries(const file_t *pin, bool force) {
-    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)
+    }
+    const file_t *max = search_by_fid(pin->fid + 1, NULL, SPECIFY_EF);
+    const file_t *act = search_by_fid(pin->fid + 2, NULL, SPECIFY_EF);
+    if (!max || !act) {
         return CCID_ERR_FILE_NOT_FOUND;
+    }
     uint8_t retries = file_read_uint8(file_get_data(act));
-    if (retries == 0 && force == false) //blocked
+    if (retries == 0 && force == false) { // blocked
         return CCID_ERR_BLOCKED;
+    }
     retries = file_read_uint8(file_get_data(max));
-    int r = flash_write_data_to_file((file_t *)act, &retries, sizeof(retries));
+    int r = flash_write_data_to_file((file_t *) act, &retries, sizeof(retries));
     low_flash_available();
     return r;
 }
 
 int pin_wrong_retry(const file_t *pin) {
-    if (!pin)
+    if (!pin) {
         return CCID_ERR_NULL_PARAM;
-    const file_t *act = search_by_fid(pin->fid+2, NULL, SPECIFY_EF);
-    if (!act)
+    }
+    const file_t *act = search_by_fid(pin->fid + 2, NULL, SPECIFY_EF);
+    if (!act) {
         return CCID_ERR_FILE_NOT_FOUND;
+    }
     uint8_t retries = file_read_uint8(file_get_data(act));
     if (retries > 0) {
         retries -= 1;
-        int r = flash_write_data_to_file((file_t *)act, &retries, sizeof(retries));
-        if (r != CCID_OK)
+        int r = flash_write_data_to_file((file_t *) act, &retries, sizeof(retries));
+        if (r != CCID_OK) {
             return r;
+        }
         low_flash_available();
-        if (retries == 0)
+        if (retries == 0) {
             return CCID_ERR_BLOCKED;
+        }
         return retries;
     }
     return CCID_ERR_BLOCKED;
@@ -316,43 +355,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) {
+        }
+        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;
@@ -361,12 +407,17 @@ int check_pin(const file_t *pin, const uint8_t *data, size_t len) {
         hash_multi(data, len, session_sopin);
         has_session_sopin = true;
     }
+    if (pending_save_dkek != 0xff) {
+        save_dkek_key(pending_save_dkek, NULL);
+        pending_save_dkek = 0xff;
+    }
     return SW_OK();
 }
 
 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 +435,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,8 +446,9 @@ 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;
     }
@@ -403,20 +456,22 @@ bool key_has_purpose(file_t *ef, uint8_t purpose) {
 }
 
 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) {
         uint16_t tag = 0x0;
         uint8_t *tag_data = NULL, *p = NULL;
         size_t tag_len = 0;
-        uint8_t *cmeta = (uint8_t *)calloc(1, meta_size);
+        uint8_t *cmeta = (uint8_t *) calloc(1, meta_size);
         /* We cannot modify meta_data, as it comes from flash memory. It must be cpied to an aux buffer */
         memcpy(cmeta, meta_data, meta_size);
         while (walk_tlv(cmeta, meta_size, &p, &tag, &tag_len, &tag_data)) {
-            if (tag == 0x90) { //ofset tag
-                uint32_t val = (tag_data[0] << 24) | (tag_data[1] << 16) | (tag_data[2] << 8) | tag_data[3];
+            if (tag == 0x90) { // ofset tag
+                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 +480,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;
             }
@@ -436,59 +492,68 @@ uint32_t decrement_key_counter(file_t *fkey) {
     return 0xffffffff;
 }
 
-//Stores the private and public keys in flash
+// Stores the private and public keys in flash
 int store_keys(void *key_ctx, int type, uint8_t key_id) {
     int r, key_size = 0;
-    uint8_t kdata[4096/8]; //worst case
-    if (type == HSM_KEY_RSA) {
-        mbedtls_rsa_context *rsa = (mbedtls_rsa_context *)key_ctx;
-        key_size = mbedtls_mpi_size(&rsa->P)+mbedtls_mpi_size(&rsa->Q);
-        mbedtls_mpi_write_binary(&rsa->P, kdata, key_size/2);
-        mbedtls_mpi_write_binary(&rsa->Q, kdata+key_size/2, key_size/2);
+    uint8_t kdata[4096 / 8]; // worst case
+    if (type & PICO_KEYS_KEY_RSA) {
+        mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) key_ctx;
+        key_size = mbedtls_mpi_size(&rsa->P) + mbedtls_mpi_size(&rsa->Q);
+        mbedtls_mpi_write_binary(&rsa->P, kdata, key_size / 2);
+        mbedtls_mpi_write_binary(&rsa->Q, kdata + key_size / 2, key_size / 2);
     }
-    else if (type == HSM_KEY_EC) {
-        mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *)key_ctx;
+    else if (type & PICO_KEYS_KEY_EC) {
+        mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx;
         key_size = mbedtls_mpi_size(&ecdsa->d);
         kdata[0] = ecdsa->grp.id & 0xff;
-        mbedtls_mpi_write_binary(&ecdsa->d, kdata+1, key_size);
+        mbedtls_ecp_write_key(ecdsa, kdata + 1, key_size);
         key_size++;
     }
-    else if (type & HSM_KEY_AES) {
-        if (type == HSM_KEY_AES_128)
+    else if (type & PICO_KEYS_KEY_AES) {
+        if (type == PICO_KEYS_KEY_AES_128) {
             key_size = 16;
-        else if (type == HSM_KEY_AES_192)
+        }
+        else if (type == PICO_KEYS_KEY_AES_192) {
             key_size = 24;
-        else if (type == HSM_KEY_AES_256)
+        }
+        else if (type == PICO_KEYS_KEY_AES_256) {
             key_size = 32;
+        }
+        else if (type == PICO_KEYS_KEY_AES_512) {
+            key_size = 64;
+        }
         memcpy(kdata, key_ctx, key_size);
     }
-    else
+    else {
         return CCID_WRONG_DATA;
+    }
     file_t *fpk = file_new((KEY_PREFIX << 8) | key_id);
-    if (!fpk)
+    if (!fpk) {
         return CCID_ERR_MEMORY_FATAL;
+    }
     r = mkek_encrypt(kdata, key_size);
     if (r != CCID_OK) {
         return r;
     }
     r = flash_write_data_to_file(fpk, kdata, key_size);
-    if (r != CCID_OK)
+    if (r != CCID_OK) {
         return r;
+    }
     low_flash_available();
     return CCID_OK;
 }
 
 int find_and_store_meta_key(uint8_t key_id) {
-    size_t lt[4] = { 0,0,0,0 }, meta_size = 0;
-    uint8_t *pt[4] = { NULL,NULL,NULL,NULL };
+    size_t lt[4] = { 0, 0, 0, 0 }, meta_size = 0;
+    uint8_t *pt[4] = { NULL, NULL, NULL, NULL };
     uint8_t t90[4] = { 0xFF, 0xFF, 0xFF, 0xFE };
     for (int t = 0; t < 4; t++) {
         uint8_t *ptt = NULL;
         size_t ltt = 0;
-        if (asn1_find_tag(apdu.data, apdu.nc, 0x90+t, &ltt, &ptt) && ptt != NULL && ltt > 0) {
+        if (asn1_find_tag(apdu.data, apdu.nc, 0x90 + t, &ltt, &ptt) && ptt != NULL && ltt > 0) {
             lt[t] = ltt;
             pt[t] = ptt;
-            meta_size += asn1_len_tag(0x90+t, lt[t]);
+            meta_size += asn1_len_tag(0x90 + t, lt[t]);
         }
     }
     if (lt[0] == 0 && pt[0] == NULL) {
@@ -500,10 +565,10 @@ int find_and_store_meta_key(uint8_t key_id) {
         }
     }
     if (meta_size) {
-        uint8_t *meta = (uint8_t *)calloc(1, meta_size), *m = meta;
+        uint8_t *meta = (uint8_t *) calloc(1, meta_size), *m = meta;
         for (int t = 0; t < 4; t++) {
             if (lt[t] > 0 && pt[t] != NULL) {
-                *m++ = 0x90+t;
+                *m++ = 0x90 + t;
                 m += format_tlv_len(lt[t], m);
                 memcpy(m, pt[t], lt[t]);
                 m += lt[t];
@@ -511,28 +576,30 @@ 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];
+    uint8_t kdata[4096 / 8];
     memcpy(kdata, file_get_data(fkey), key_size);
     if (mkek_decrypt(kdata, key_size) != 0) {
         return CCID_EXEC_ERROR;
     }
-    if (mbedtls_mpi_read_binary(&ctx->P, kdata, key_size/2) != 0) {
+    if (mbedtls_mpi_read_binary(&ctx->P, kdata, key_size / 2) != 0) {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));
         mbedtls_rsa_free(ctx);
         return CCID_WRONG_DATA;
     }
-    if (mbedtls_mpi_read_binary(&ctx->Q, kdata+key_size/2, key_size/2) != 0) {
+    if (mbedtls_mpi_read_binary(&ctx->Q, kdata + key_size / 2, key_size / 2) != 0) {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));
         mbedtls_rsa_free(ctx);
         return CCID_WRONG_DATA;
@@ -560,32 +627,40 @@ int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey) {
     return CCID_OK;
 }
 
-int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey) {
-    if (wait_button_pressed() == true) //timeout
+int load_private_key_ec(mbedtls_ecp_keypair *ctx, file_t *fkey) {
+    if (wait_button_pressed() == true) { // timeout
         return CCID_VERIFICATION_FAILED;
+    }
 
     int key_size = file_get_size(fkey);
-    uint8_t kdata[67]; //Worst case, 521 bit + 1byte
+    uint8_t kdata[67]; // Worst case, 521 bit + 1byte
     memcpy(kdata, file_get_data(fkey), key_size);
     if (mkek_decrypt(kdata, key_size) != 0) {
         return CCID_EXEC_ERROR;
     }
     mbedtls_ecp_group_id gid = kdata[0];
-    int r = mbedtls_ecp_read_key(gid, ctx, kdata+1, key_size-1);
+    int r = mbedtls_ecp_read_key(gid, ctx, kdata + 1, key_size - 1);
     if (r != 0) {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));
-        mbedtls_ecdsa_free(ctx);
+        mbedtls_ecp_keypair_free(ctx);
         return CCID_EXEC_ERROR;
     }
     mbedtls_platform_zeroize(kdata, sizeof(kdata));
+    if (gid == MBEDTLS_ECP_DP_ED25519 || gid == MBEDTLS_ECP_DP_ED448) {
+        r = mbedtls_ecp_point_edwards(&ctx->grp, &ctx->Q, &ctx->d, random_gen, NULL);
+    }
+    else {
+        r = mbedtls_ecp_mul(&ctx->grp, &ctx->Q, &ctx->d, &ctx->grp.G, random_gen, NULL);
+    }
+    if (r != 0) {
+        mbedtls_ecp_keypair_free(ctx);
+        return CCID_EXEC_ERROR;
+    }
     return CCID_OK;
 }
-
-typedef struct cmd
-{
-  uint8_t ins;
-  int (*cmd_handler)();
-} cmd_t;
+int load_private_key_ecdh(mbedtls_ecp_keypair *ctx, file_t *fkey) {
+    return load_private_key_ec(ctx, fkey);
+}
 
 #define INS_VERIFY                  0x20
 #define INS_MSE                     0x22
@@ -594,6 +669,7 @@ typedef struct cmd
 #define INS_RESET_RETRY             0x2C
 #define INS_KEYPAIR_GEN             0x46
 #define INS_KEY_GEN                 0x48
+#define INS_BIP_SLIP                0x4A
 #define INS_INITIALIZE              0x50
 #define INS_KEY_DOMAIN              0x52
 #define INS_PUK_AUTH                0x54
@@ -609,8 +685,8 @@ typedef struct cmd
 #define INS_EXTERNAL_AUTHENTICATE   0x82
 #define INS_CHALLENGE               0x84
 #define INS_GENERAL_AUTHENTICATE    0x86
-#define INS_SELECT_FILE				0xA4
-#define INS_READ_BINARY				0xB0
+#define INS_SELECT_FILE             0xA4
+#define INS_READ_BINARY             0xB0
 #define INS_READ_BINARY_ODD         0xB1
 #define INS_UPDATE_EF               0xD7
 #define INS_DELETE_FILE             0xE4
@@ -643,13 +719,15 @@ static const cmd_t cmds[] = {
     { INS_PUK_AUTH, cmd_puk_auth },
     { INS_PSO, cmd_pso },
     { INS_EXTERNAL_AUTHENTICATE, cmd_external_authenticate },
-    { 0x00, 0x0}
+    { INS_BIP_SLIP, cmd_bip_slip },
+    { 0x00, 0x0 }
 };
 
 int sc_hsm_process_apdu() {
     int r = sm_unwrap();
-    if (r != CCID_OK)
+    if (r != CCID_OK) {
         return SW_DATA_INVALID();
+    }
     for (const cmd_t *cmd = cmds; cmd->ins != 0x00; cmd++) {
         if (cmd->ins == INS(apdu)) {
             int r = cmd->cmd_handler();

src/hsm/sc_hsm.h

@@ -22,53 +22,56 @@
 #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"
+#include "pico_keys.h"
 
 extern const uint8_t sc_hsm_aid[];
 
-#define ALGO_RSA_RAW			0x20		/* RSA signature with external padding */
-#define ALGO_RSA_DECRYPT		0x21		/* RSA raw decrypt */
+#define ALGO_RSA_RAW            0x20        /* RSA signature with external padding */
+#define ALGO_RSA_DECRYPT        0x21        /* RSA raw decrypt */
 #define ALGO_RSA_DECRYPT_PKCS1  0x22
 #define ALGO_RSA_DECRYPT_OEP    0x23
-#define ALGO_RSA_PKCS1			0x30		/* RSA signature with DigestInfo input and PKCS#1 V1.5 padding */
-#define ALGO_RSA_PKCS1_SHA1		0x31		/* RSA signature with SHA-1 hash and PKCS#1 V1.5 padding */
+#define ALGO_RSA_PKCS1          0x30        /* RSA signature with DigestInfo input and PKCS#1 V1.5 padding */
+#define ALGO_RSA_PKCS1_SHA1     0x31        /* RSA signature with SHA-1 hash and PKCS#1 V1.5 padding */
 #define ALGO_RSA_PKCS1_SHA224   0x32
-#define ALGO_RSA_PKCS1_SHA256	0x33		/* RSA signature with SHA-256 hash and PKCS#1 V1.5 padding */
+#define ALGO_RSA_PKCS1_SHA256   0x33        /* RSA signature with SHA-256 hash and PKCS#1 V1.5 padding */
 #define ALGO_RSA_PKCS1_SHA384   0x34
 #define ALGO_RSA_PKCS1_SHA512   0x35
 
-#define ALGO_RSA_PSS			0x40		/* RSA signature with external hash and PKCS#1 PSS padding*/
-#define ALGO_RSA_PSS_SHA1		0x41		/* RSA signature with SHA-1 hash and PKCS#1 PSS padding */
+#define ALGO_RSA_PSS            0x40        /* RSA signature with external hash and PKCS#1 PSS padding*/
+#define ALGO_RSA_PSS_SHA1       0x41        /* RSA signature with SHA-1 hash and PKCS#1 PSS padding */
 #define ALGO_RSA_PSS_SHA224     0x42
-#define ALGO_RSA_PSS_SHA256		0x43		/* RSA signature with SHA-256 hash and PKCS#1 PSS padding */
+#define ALGO_RSA_PSS_SHA256     0x43        /* RSA signature with SHA-256 hash and PKCS#1 PSS padding */
 #define ALGO_RSA_PSS_SHA384     0x44
 #define ALGO_RSA_PSS_SHA512     0x45
 
-#define ALGO_EC_RAW				0x70		/* ECDSA signature with hash input */
-#define ALGO_EC_SHA1			0x71		/* ECDSA signature with SHA-1 hash */
-#define ALGO_EC_SHA224			0x72		/* ECDSA signature with SHA-224 hash */
-#define ALGO_EC_SHA256			0x73		/* ECDSA signature with SHA-256 hash */
+#define ALGO_EC_RAW             0x70        /* ECDSA signature with hash input */
+#define ALGO_EC_SHA1            0x71        /* ECDSA signature with SHA-1 hash */
+#define ALGO_EC_SHA224          0x72        /* ECDSA signature with SHA-224 hash */
+#define ALGO_EC_SHA256          0x73        /* ECDSA signature with SHA-256 hash */
 #define ALGO_EC_SHA384          0x74
 #define ALGO_EC_SHA512          0x75
-#define ALGO_EC_DH				0x80        /* ECDH key derivation */
+#define ALGO_EC_DH              0x80        /* ECDH key derivation */
 #define ALGO_EC_DH_AUTPUK       0x83
 #define ALGO_EC_DH_XKEK         0x84
+#define ALGO_HD                 0xA0
 
 #define ALGO_WRAP               0x92
 #define ALGO_UNWRAP             0x93
 #define ALGO_REPLACE            0x94
 
-#define ALGO_EC_DERIVE		    0x98		/* Derive EC key from EC key */
+#define ALGO_EC_DERIVE          0x98        /* Derive EC key from EC key */
 
-#define ALGO_AES_CBC_ENCRYPT	0x10
-#define ALGO_AES_CBC_DECRYPT	0x11
-#define ALGO_AES_CMAC		    0x18
+#define ALGO_AES_CBC_ENCRYPT    0x10
+#define ALGO_AES_CBC_DECRYPT    0x11
+#define ALGO_AES_CMAC           0x18
 #define ALGO_EXT_CIPHER_ENCRYPT 0x51        /* Extended ciphering Encrypt */
 #define ALGO_EXT_CIPHER_DECRYPT 0x52        /* Extended ciphering Decrypt */
-#define ALGO_AES_DERIVE		    0x99
+#define ALGO_AES_DERIVE         0x99
 
 #define HSM_OPT_RRC                 0x0001
 #define HSM_OPT_TRANSPORT_PIN       0x0002
@@ -81,14 +84,14 @@ extern const uint8_t sc_hsm_aid[];
 #define HSM_OPT_KEY_COUNTER_ALL     0x0200
 #define HSM_OPT_SECURE_LOCK         0x0400
 
-#define PRKD_PREFIX				0xC4		/* Hi byte in file identifier for PKCS#15 PRKD objects */
-#define CD_PREFIX				0xC8		/* Hi byte in file identifier for PKCS#15 CD objects */
-#define DCOD_PREFIX				0xC9		/* Hi byte in file identifier for PKCS#15 DCOD objects */
-#define CA_CERTIFICATE_PREFIX	0xCA		/* Hi byte in file identifier for CA certificates */
-#define KEY_PREFIX				0xCC		/* Hi byte in file identifier for key objects */
-#define PROT_DATA_PREFIX		0xCD		/* Hi byte in file identifier for PIN protected data objects */
-#define EE_CERTIFICATE_PREFIX	0xCE		/* Hi byte in file identifier for EE certificates */
-#define DATA_PREFIX				0xCF		/* Hi byte in file identifier for readable data objects */
+#define PRKD_PREFIX             0xC4        /* Hi byte in file identifier for PKCS#15 PRKD objects */
+#define CD_PREFIX               0xC8        /* Hi byte in file identifier for PKCS#15 CD objects */
+#define DCOD_PREFIX             0xC9        /* Hi byte in file identifier for PKCS#15 DCOD objects */
+#define CA_CERTIFICATE_PREFIX   0xCA        /* Hi byte in file identifier for CA certificates */
+#define KEY_PREFIX              0xCC        /* Hi byte in file identifier for key objects */
+#define PROT_DATA_PREFIX        0xCD        /* Hi byte in file identifier for PIN protected data objects */
+#define EE_CERTIFICATE_PREFIX   0xCE        /* Hi byte in file identifier for EE certificates */
+#define DATA_PREFIX             0xCF        /* Hi byte in file identifier for readable data objects */
 
 #define P15_KEYTYPE_RSA     0x30
 #define P15_KEYTYPE_ECC     0xA0
@@ -115,11 +118,12 @@ extern int delete_file(file_t *ef);
 extern const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len);
 extern bool key_has_purpose(file_t *ef, uint8_t purpose);
 extern int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey);
-extern int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey);
+extern int load_private_key_ec(mbedtls_ecp_keypair *ctx, file_t *fkey);
+extern int load_private_key_ecdh(mbedtls_ecp_keypair *ctx, file_t *fkey);
 extern bool wait_button_pressed();
 extern int store_keys(void *key_ctx, int type, uint8_t key_id);
 extern int find_and_store_meta_key(uint8_t key_id);
 extern uint32_t get_key_counter(file_t *fkey);
 extern uint32_t decrement_key_counter(file_t *fkey);
 
-#endif
+#endif

src/hsm/version.h

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

tests/build-in-docker.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -eu
+
+source tests/docker_env.sh
+build_image
+#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 -D__FOR_CI=1 ..
+run_in_docker -w "$PWD/build_in_docker" make -j ${NUM_PROC}
+docker create --name temp_container pico-hsm-test:bullseye
+docker cp $PWD/build_in_docker/pico_hsm temp_container:/pico_hsm
+docker commit temp_container pico-hsm-test:bullseye
+docker stop temp_container
+docker rm temp_container
+docker image prune -f

tests/conftest.py

@@ -0,0 +1,33 @@
+"""
+/*
+ * 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
+
+try:
+    from picohsm import PicoHSM
+except ModuleNotFoundError:
+    print('ERROR: picohsm module not found! Install picohsm package.\nTry with `pip install pypicohsm`')
+    sys.exit(-1)
+
+
+@pytest.fixture(scope="session")
+def device():
+    dev = PicoHSM()
+    return dev

tests/const.py

@@ -0,0 +1,25 @@
+"""
+/*
+ * 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 binascii import unhexlify
+
+DEFAULT_DKEK = [0x1] * 32
+
+TERM_CERT = unhexlify('7F2181E57F4E819E5F290100421045535049434F48534D445630303030317F494F060A04007F00070202020203864104F571E53AA8E75C929D925081CF0F893CB5991D48BD546C1A3F22199F037E4B12D601ACD91C67C88D3C5B3D04C08EC0A372485F7A248E080EE0C6237C1B075E1C5F201045535049434F48534D54525A474E50327F4C0E060904007F0007030102025301005F25060203000300055F24060204000300045F374041BF5E970739135770DBCC5DDA81FFD8B13419A9257D44CAF8404267C644E8F435B43F5E57EB2A8CF4B198045ACD094E0CB34E6217D9C8922CFB9BBEFD4088AD')
+DICA_CERT = unhexlify('7F2181E97F4E81A25F290100421045535049434F48534D434130303030317F494F060A04007F0007020202020386410421EE4A21C16A10F737F12E78E5091B266612038CDABEBB722B15BF6D41B877FBF64D9AB69C39B9831B1AE00BEF2A4E81976F7688D45189BB232A24703D8A96A55F201045535049434F48534D445630303030317F4C12060904007F000703010202530580000000005F25060202000801085F24060203000601045F37403F75C08FFFC9186B56E6147199E82BFC327CEEF72495BC567961CD54D702F13E3C2766FCD1D11BD6A9D1F4A229B76B248CEB9AF88D59A74D0AB149448705159B')

tests/docker/bullseye/Dockerfile

@@ -0,0 +1,49 @@
+FROM debian:bullseye
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && apt upgrade -y
+RUN apt install -y apt-utils
+RUN apt autoremove -y
+RUN rm -rf /var/cache/apt/archives/*
+RUN apt install -y libccid \
+    libpcsclite-dev \
+    git \
+    autoconf \
+    pkg-config \
+    libtool \
+    help2man \
+    automake \
+    gcc \
+    make \
+    build-essential \
+    python3 \
+    python3-pip \
+    swig \
+    libssl-dev \
+    cmake \
+    vsmartcard-vpcd \
+    && rm -rf /var/lib/apt/lists/*
+RUN pip3 install pytest pycvc cryptography pyscard base58
+WORKDIR /
+RUN git clone https://github.com/OpenSC/OpenSC
+WORKDIR /OpenSC
+RUN git checkout tags/0.23.0
+RUN ./bootstrap
+RUN ./configure --enable-openssl
+RUN make -j `nproc`
+RUN make install
+RUN make clean
+RUN ldconfig
+WORKDIR /
+RUN git clone https://github.com/polhenarejos/pypicohsm.git
+RUN pip3 install -e pypicohsm
+RUN git clone https://github.com/CardContact/sc-hsm-embedded
+WORKDIR /sc-hsm-embedded
+RUN autoreconf -fi
+RUN ./configure
+RUN make -j `nproc`
+RUN make install
+RUN cp ./src/tests/sc-hsm-pkcs11-test /usr/local/bin/sc-hsm-pkcs11-test
+RUN make clean
+WORKDIR /

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/polhenarejos/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,108 @@
+#!/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:=bullseye}
+
+
+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_image() {
+    # 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,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
+
+def test_select(device):
+    device.select_applet()
+
+def test_initialization(device):
+    device.initialize()
+
+def test_termca(device):
+    data = device.get_termca()
+    assert(b'ESPICOHSMTR' == data['cv']['chr'][:11])
+    assert(b'ESPICOHSMDV' == data['cv']['car'][:11] or b'ESPICOHSMTR' == data['cv']['car'][:11])
+    assert(b'ESPICOHSMDV' == data['dv']['chr'][:11] or b'ESPICOHSMTR' == data['dv']['chr'][:11])
+    assert(b'ESPICOHSMCA' == data['dv']['car'][:11] or b'ESPICOHSMTR' == 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,110 @@
+"""
+/*
+ * 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 const import DEFAULT_DKEK
+from picohsm import APDUResponse, SWCodes
+from picohsm.const import DEFAULT_DKEK_SHARES
+
+KEY_DOMAINS = 3
+TEST_KEY_DOMAIN = 1
+
+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_import_dkek_wrong_key_domain(device):
+    with pytest.raises(APDUResponse) as e:
+        device.import_dkek(DEFAULT_DKEK, key_domain=0)
+    assert(e.value.sw == SWCodes.SW_COMMAND_NOT_ALLOWED)
+
+def test_import_dkek_fail(device):
+    with pytest.raises(APDUResponse) as e:
+        device.import_dkek(DEFAULT_DKEK, key_domain=TEST_KEY_DOMAIN)
+    assert(e.value.sw == SWCodes.SW_COMMAND_NOT_ALLOWED)
+
+def test_set_key_domain_fail(device):
+    with pytest.raises(APDUResponse) as e:
+        device.set_key_domain(key_domain=10)
+    assert(e.value.sw == SWCodes.SW_INCORRECT_P1P2)
+
+def test_set_key_domain_ok(device):
+    kd = device.get_key_domain(key_domain=TEST_KEY_DOMAIN)
+    assert('error' in kd)
+    assert(kd['error'] == 0x6A88)
+
+    device.set_key_domain(key_domain=TEST_KEY_DOMAIN)
+    kd = device.get_key_domain(key_domain=TEST_KEY_DOMAIN)
+    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_import_dkek_ok(device):
+    resp = device.import_dkek(DEFAULT_DKEK, key_domain=TEST_KEY_DOMAIN)
+    assert(resp[0] == DEFAULT_DKEK_SHARES)
+    assert(resp[1] == DEFAULT_DKEK_SHARES-1)
+
+    resp = device.import_dkek(DEFAULT_DKEK, key_domain=TEST_KEY_DOMAIN)
+    assert(resp[1] == DEFAULT_DKEK_SHARES-2)
+
+    kcv = hashlib.sha256(b'\x00'*32).digest()[:8]
+    assert(resp[2:] == kcv)
+
+def test_clear_key_domain(device):
+    kd = device.get_key_domain(key_domain=0)
+    assert('error' in kd)
+    assert(kd['error'] == SWCodes.SW_REFERENCE_NOT_FOUND)
+
+    kd = device.get_key_domain(key_domain=TEST_KEY_DOMAIN)
+    assert(kd['dkek']['total'] == DEFAULT_DKEK_SHARES)
+
+    device.clear_key_domain(key_domain=TEST_KEY_DOMAIN)
+    kd = device.get_key_domain(key_domain=TEST_KEY_DOMAIN)
+    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=TEST_KEY_DOMAIN)
+    assert(kd['dkek']['total'] == DEFAULT_DKEK_SHARES)
+    with pytest.raises(APDUResponse) as e:
+        device.delete_key_domain(key_domain=0)
+    assert(e.value.sw == SWCodes.SW_INCORRECT_P1P2)
+
+def test_delete_key_domain(device):
+    assert(device.get_key_domains() == KEY_DOMAINS)
+    kd = device.get_key_domain(key_domain=TEST_KEY_DOMAIN)
+    assert(kd['dkek']['total'] == DEFAULT_DKEK_SHARES)
+
+    device.delete_key_domain(key_domain=TEST_KEY_DOMAIN)
+    assert(device.get_key_domains() == KEY_DOMAINS)
+    kd = device.get_key_domain(key_domain=TEST_KEY_DOMAIN)
+    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 picohsm.const import DEFAULT_DKEK_SHARES, DEFAULT_PIN, DEFAULT_RETRIES
+from const import  DEFAULT_DKEK
+
+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(resp[2:] == kcv)
+

tests/pico-hsm/test_010_pin.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
+from picohsm import APDUResponse, SWCodes
+from picohsm.const import DEFAULT_PIN, DEFAULT_RETRIES
+
+WRONG_PIN = '112233'
+
+def test_pin_init_retries(device):
+    device.initialize(retries=DEFAULT_RETRIES)
+    retries = device.get_login_retries()
+    assert(retries == DEFAULT_RETRIES)
+
+def test_pin_login(device):
+    device.initialize(retries=DEFAULT_RETRIES)
+    device.login(DEFAULT_PIN)
+
+def test_pin_retries(device):
+    device.initialize(retries=DEFAULT_RETRIES)
+    device.login(DEFAULT_PIN)
+
+    for ret in range(DEFAULT_RETRIES-1):
+        with pytest.raises(APDUResponse) as e:
+            device.login(WRONG_PIN)
+        assert(e.value.sw1 == 0x63 and e.value.sw2 == (0xC0 | (DEFAULT_RETRIES-1-ret)))
+
+    with pytest.raises(APDUResponse) as e:
+        device.login(WRONG_PIN)
+    assert(e.value.sw == SWCodes.SW_PIN_BLOCKED)
+
+    device.initialize(retries=DEFAULT_RETRIES)
+    retries = device.get_login_retries()
+    assert(retries == DEFAULT_RETRIES)
+
+

tests/pico-hsm/test_020_keypair_gen.py

@@ -0,0 +1,47 @@
+"""
+/*
+ * 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 picohsm import KeyType, DOPrefixes
+
+def test_gen_initialize(device):
+    device.initialize()
+
+@pytest.mark.parametrize(
+    "curve", ['secp192r1', 'secp256r1', 'secp384r1', 'secp521r1', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1', 'secp192k1', 'secp256k1', 'curve25519', 'curve448', 'ed25519', 'ed448']
+)
+def test_gen_ecc(device, curve):
+    keyid = device.key_generation(KeyType.ECC, curve)
+    resp = device.list_keys()
+    assert((DOPrefixes.KEY_PREFIX, keyid) in resp)
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, keyid)
+    resp = device.list_keys()
+    assert((DOPrefixes.KEY_PREFIX, keyid) not in resp)
+
+@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, keyid) in resp)
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, keyid)
+

tests/pico-hsm/test_021_key_import.py

@@ -0,0 +1,89 @@
+"""
+/*
+ * 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 picohsm import DOPrefixes
+from cryptography.hazmat.primitives.asymmetric import rsa, ec, x25519, x448, ed25519, ed448
+from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
+from picohsm.const import DEFAULT_RETRIES, DEFAULT_DKEK_SHARES
+from const import 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(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, keyid)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, 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, keyid)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, keyid)
+
+@pytest.mark.parametrize(
+    "curve", [x25519.X25519PrivateKey, x448.X448PrivateKey]
+)
+def test_import_montgomery(device, curve):
+    pkey = curve.generate()
+    keyid = device.import_key(pkey)
+    pubkey = device.public_key(keyid, param=curve)
+    assert(pubkey.public_bytes(Encoding.Raw, PublicFormat.Raw) == pkey.public_key().public_bytes(Encoding.Raw, PublicFormat.Raw))
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, keyid)
+
+@pytest.mark.parametrize(
+    "curve", [ed25519.Ed25519PrivateKey, ed448.Ed448PrivateKey]
+)
+def test_import_edwards(device, curve):
+    pkey = curve.generate()
+    keyid = device.import_key(pkey)
+    pubkey = device.public_key(keyid, param=curve)
+    assert(pubkey.public_bytes(Encoding.Raw, PublicFormat.Raw) == pkey.public_key().public_bytes(Encoding.Raw, PublicFormat.Raw))
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, 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,74 @@
+"""
+/*
+ * 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 picohsm import DOPrefixes
+from cryptography.hazmat.primitives.asymmetric import ec, x25519, x448
+from picohsm.const import DEFAULT_RETRIES, DEFAULT_DKEK_SHARES
+from const import 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(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(sharedA == sharedB)
+
+    sharedAA = pkeyA.exchange(ec.ECDH(), pbkeyB)
+    assert(sharedA == sharedAA)
+
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, keyid)
+
+@pytest.mark.parametrize(
+    "curve", [x25519.X25519PrivateKey, x448.X448PrivateKey]
+)
+def test_exchange_montgomery(device, curve):
+    pkeyA = curve.generate()
+    pbkeyA = pkeyA.public_key()
+    keyid = device.import_key(pkeyA)
+    pkeyB = curve.generate()
+    pbkeyB = pkeyB.public_key()
+
+    sharedB = pkeyB.exchange(pbkeyA)
+    sharedA = device.exchange(keyid, pbkeyB)
+
+    assert(sharedA == sharedB)
+
+    sharedAA = pkeyA.exchange(pbkeyB)
+    assert(sharedA == sharedAA)
+
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, 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 picohsm 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, keyid) in resp)
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)

tests/pico-hsm/test_025_key_export.py

@@ -0,0 +1,137 @@
+"""
+/*
+ * This file is part of the Pico HSM distribution (https://github.com/polhenarejos/pico-hsm).
+ * Copyright (c) 2023 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 picohsm import KeyType, DOPrefixes, APDUResponse, SWCodes
+from binascii import hexlify
+import hashlib
+from const import DEFAULT_DKEK
+from cryptography.hazmat.primitives import cmac
+from cryptography.hazmat.primitives.ciphers import algorithms, Cipher, modes
+from cryptography.hazmat.primitives.asymmetric import ec
+from cryptography.hazmat.primitives import serialization
+
+def test_initialize(device):
+    device.initialize(key_domains=1)
+    assert(device.get_key_domains() == 1)
+
+    device.set_key_domain(key_domain=0, total=2)
+
+keyid_in = -1
+keyid_out = -1
+def test_key_generation_no_key_domain(device):
+    global keyid_out
+    keyid_out = device.key_generation(KeyType.ECC, 'brainpoolP256r1')
+    device.put_contents(p1=DOPrefixes.PRKD_PREFIX, p2=keyid_out, data=[0xA0])
+    resp = device.list_keys()
+    assert((DOPrefixes.KEY_PREFIX, keyid_out) in resp)
+    assert((DOPrefixes.PRKD_PREFIX, keyid_out) in resp)
+
+def test_key_generation_with_key_domain(device):
+    global keyid_in
+    keyid_in = device.key_generation(KeyType.ECC, 'brainpoolP256r1', key_domain=0)
+    device.put_contents(p1=DOPrefixes.PRKD_PREFIX, p2=keyid_in, data=[0xA0])
+    resp = device.list_keys()
+    assert((DOPrefixes.KEY_PREFIX, keyid_in) in resp)
+    assert((DOPrefixes.PRKD_PREFIX, keyid_in) in resp)
+
+def test_export_key_out(device):
+    with pytest.raises(APDUResponse) as e:
+        device.export_key(keyid_out)
+    assert(e.value.sw == SWCodes.SW_REFERENCE_NOT_FOUND)
+
+def test_export_key_in_fail(device):
+    with pytest.raises(APDUResponse) as e:
+        device.export_key(keyid_in)
+    assert(e.value.sw == SWCodes.SW_REFERENCE_NOT_FOUND)
+
+def test_export_import_dkek(device):
+    resp = device.import_dkek(DEFAULT_DKEK, key_domain=0)
+    resp = device.import_dkek(DEFAULT_DKEK, key_domain=0)
+
+def test_export_key_in_ok(device):
+    resp = device.export_key(keyid_in)
+    kcv = hashlib.sha256(b'\x00'*32).digest()[:8]
+    assert(kcv == resp[:8])
+    assert(resp[8] == 12)
+    assert(resp[9:21] == b"\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03")
+
+    pkey = hashlib.sha256(b'\x00'*32+b'\x00\x00\x00\x02').digest()
+    c = cmac.CMAC(algorithms.AES(pkey))
+    c.update(resp[:-16])
+    resCMAC = c.finalize()
+    assert(resCMAC == resp[-16:])
+
+def test_delete_keys_in_out(device):
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid_in)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, keyid_in)
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid_out)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, keyid_out)
+
+def test_export_import(device):
+    pkey_gen = ec.generate_private_key(ec.BrainpoolP256R1())
+    keyid = device.import_key(pkey_gen)
+
+    resp = device.export_key(keyid)
+    kcv = hashlib.sha256(b'\x00'*32).digest()[:8]
+    assert(kcv == resp[:8])
+    assert(resp[8] == 12)
+    assert(resp[9:21] == b"\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03")
+
+    pkey = hashlib.sha256(b'\x00'*32+b'\x00\x00\x00\x02').digest()
+    c = cmac.CMAC(algorithms.AES(pkey))
+    c.update(resp[:-16])
+    resCMAC = c.finalize()
+    assert(resCMAC == resp[-16:])
+
+    iv = b'\x00'*16
+    pkey = hashlib.sha256(b'\x00'*32+b'\x00\x00\x00\x01').digest()
+    cipher = Cipher(algorithms.AES(pkey), modes.CBC(iv))
+    decryptor = cipher.decryptor()
+    payload = decryptor.update(resp[27:-16]) + decryptor.finalize()
+
+    rnd = payload[:8]
+    ofs = 8
+    key_size = int.from_bytes(payload[ofs:ofs+2], 'big')
+    ofs += 2
+    A_len = int.from_bytes(payload[ofs:ofs+2], 'big')
+    ofs += 2+A_len
+    B_len = int.from_bytes(payload[ofs:ofs+2], 'big')
+    ofs += 2+B_len
+    P_len = int.from_bytes(payload[ofs:ofs+2], 'big')
+    ofs += 2+P_len
+    N_len = int.from_bytes(payload[ofs:ofs+2], 'big')
+    ofs += 2+N_len
+    G_len = int.from_bytes(payload[ofs:ofs+2], 'big')
+    ofs += 2+G_len
+    d_len = int.from_bytes(payload[ofs:ofs+2], 'big')
+    ofs += 2
+    d = payload[ofs:ofs+d_len]
+    ofs += d_len
+    Q_len = int.from_bytes(payload[ofs:ofs+2], 'big')
+    ofs += 2
+    Q = payload[ofs:ofs+Q_len]
+    ofs += Q_len
+
+    pkey_ex = ec.EllipticCurvePrivateNumbers(int.from_bytes(d, 'big'), ec.EllipticCurvePublicKey.from_encoded_point(ec.BrainpoolP256R1(), Q).public_numbers()).private_key()
+    assert(pkey_gen.private_bytes(serialization.Encoding.DER, serialization.PrivateFormat.PKCS8, serialization.NoEncryption()) == pkey_ex.private_bytes(serialization.Encoding.DER, serialization.PrivateFormat.PKCS8, serialization.NoEncryption()))
+    assert(pkey_gen.public_key().public_bytes(serialization.Encoding.X962, serialization.PublicFormat.UncompressedPoint) == pkey_ex.public_key().public_bytes(serialization.Encoding.X962, serialization.PublicFormat.UncompressedPoint))
+
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, keyid)

tests/pico-hsm/test_030_signature.py

@@ -0,0 +1,66 @@
+"""
+/*
+ * 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 picohsm 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, 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, keyid)
+    device.verify(pubkey, data, signature, scheme)
+
+@pytest.mark.parametrize(
+    "curve", ['ed25519', 'ed448']
+)
+def test_signature_edwards(device, curve):
+    keyid = device.key_generation(KeyType.ECC, curve)
+    pubkey = device.public_key(keyid=keyid)
+    signature = device.sign(keyid=keyid, scheme=Algorithm.ALGO_EC_RAW, data=data)
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    device.verify(pubkey, data, signature)

tests/pico-hsm/test_040_decrypt.py

@@ -0,0 +1,47 @@
+"""
+/*
+ * 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 picohsm import KeyType, DOPrefixes
+from binascii import hexlify
+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, keyid)
+    assert(datab == message)
+

tests/pico-hsm/test_050_cipher.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
+import os
+from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+from picohsm import Algorithm, DOPrefixes
+from picohsm.const import DEFAULT_DKEK_SHARES
+from const import 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(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, keyid)
+    assert(plB == plA)
+    assert(plB == MESSAGE)

tests/pico-hsm/test_051_chachapoly.py

@@ -0,0 +1,126 @@
+"""
+/*
+ * 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 aead
+import cryptography.exceptions
+from picohsm import APDUResponse, DOPrefixes, EncryptionMode, SWCodes
+from picohsm.const import DEFAULT_DKEK_SHARES
+from const import DEFAULT_DKEK
+from binascii import hexlify
+
+MESSAGE = b'a secret message'
+AAD = b'this is a tag for AAD'
+
+def test_prepare_chachapoly(device):
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
+    resp = device.import_dkek(DEFAULT_DKEK)
+    resp = device.import_dkek(DEFAULT_DKEK)
+
+def generate_key(device):
+     # ChaCha uses 32 bytes key
+    pkey = os.urandom(256 // 8)
+    keyid = device.import_key(pkey)
+    return pkey, keyid
+
+
+def test_cipher_chachapoly_cipher(device):
+    iv = b'\x00'*12
+    pkey, keyid = generate_key(device)
+
+    ctd = device.chachapoly(keyid, EncryptionMode.ENCRYPT, data=MESSAGE, aad=AAD)
+
+    chacha = aead.ChaCha20Poly1305(pkey)
+    ctg = chacha.encrypt(iv, MESSAGE, AAD)
+    assert(ctd == ctg)
+
+    pld = device.chachapoly(keyid, EncryptionMode.DECRYPT, data=ctd, aad=AAD)
+
+    plg = chacha.decrypt(iv, ctg, AAD)
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    assert(pld == plg)
+    assert(pld == MESSAGE)
+
+def test_cipher_chachapoly_random_iv(device):
+    pkey, keyid = generate_key(device)
+    iv = os.urandom(12)
+    ctd = device.chachapoly(keyid, EncryptionMode.ENCRYPT, data=MESSAGE, iv=iv, aad=AAD)
+
+    chacha = aead.ChaCha20Poly1305(pkey)
+    ctg = chacha.encrypt(iv, MESSAGE, AAD)
+    assert(ctd == ctg)
+
+    pld = device.chachapoly(keyid, EncryptionMode.DECRYPT, data=ctd, iv=iv, aad=AAD)
+
+    plg = chacha.decrypt(iv, ctg, AAD)
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    assert(pld == plg)
+    assert(pld == MESSAGE)
+
+def test_cipher_chachapoly_no_aad(device):
+    pkey, keyid = generate_key(device)
+    iv = os.urandom(12)
+    ctd = device.chachapoly(keyid, EncryptionMode.ENCRYPT, data=MESSAGE, iv=iv)
+
+    chacha = aead.ChaCha20Poly1305(pkey)
+    ctg = chacha.encrypt(iv, MESSAGE, b'')
+    assert(ctd == ctg)
+
+    pld = device.chachapoly(keyid, EncryptionMode.DECRYPT, data=ctd, iv=iv)
+
+    plg = chacha.decrypt(iv, ctg, b'')
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    assert(pld == plg)
+    assert(pld == MESSAGE)
+
+def test_cipher_chachapoly_bad_random_iv(device):
+    pkey, keyid = generate_key(device)
+    iv = os.urandom(12)
+    ctd = device.chachapoly(keyid, EncryptionMode.ENCRYPT, data=MESSAGE, iv=iv, aad=AAD)
+
+    chacha = aead.ChaCha20Poly1305(pkey)
+    ctg = chacha.encrypt(iv, MESSAGE, AAD)
+    assert(ctd == ctg)
+
+    iv = os.urandom(12)
+    with pytest.raises(APDUResponse) as e:
+        pld = device.chachapoly(keyid, EncryptionMode.DECRYPT, data=ctd, iv=iv, aad=AAD)
+    assert (e.value.sw == SWCodes.SW_WRONG_DATA)
+
+    with pytest.raises(cryptography.exceptions.InvalidTag):
+        plg = chacha.decrypt(iv, ctg, AAD)
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+
+def test_cipher_chachapoly_bad_aad(device):
+    pkey, keyid = generate_key(device)
+    iv = os.urandom(12)
+    ctd = device.chachapoly(keyid, EncryptionMode.ENCRYPT, data=MESSAGE, iv=iv, aad=AAD)
+
+    chacha = aead.ChaCha20Poly1305(pkey)
+    ctg = chacha.encrypt(iv, MESSAGE, AAD)
+    assert(ctd == ctg)
+
+    with pytest.raises(APDUResponse) as e:
+        pld = device.chachapoly(keyid, EncryptionMode.DECRYPT, data=ctd, iv=iv, aad=AAD + b'bad')
+    assert (e.value.sw == SWCodes.SW_WRONG_DATA)
+
+    with pytest.raises(cryptography.exceptions.InvalidTag):
+        plg = chacha.decrypt(iv, ctg, AAD + b'bad')
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)

tests/pico-hsm/test_052_aes_ext.py

@@ -0,0 +1,342 @@
+"""
+/*
+ * 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, aead
+import cryptography.exceptions
+from picohsm import APDUResponse, DOPrefixes, EncryptionMode, SWCodes, AES
+from picohsm.const import DEFAULT_DKEK_SHARES
+from const import DEFAULT_DKEK
+from binascii import hexlify
+
+MESSAGE = b'a secret message'
+AAD = b'this is a tag for AAD'
+
+def test_prepare_aes(device):
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
+    resp = device.import_dkek(DEFAULT_DKEK)
+    resp = device.import_dkek(DEFAULT_DKEK)
+
+def generate_key(device, size):
+    pkey = os.urandom(size // 8)
+    keyid = device.import_key(pkey)
+    return pkey, keyid
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_ecb(device, size):
+    pkey, keyid = generate_key(device, size)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.ECB, MESSAGE)
+
+    cipher = Cipher(algorithms.AES(pkey), modes.ECB())
+    encryptor = cipher.encryptor()
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.ECB, ctA)
+    decryptor = cipher.decryptor()
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_cbc_no_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.CBC, MESSAGE)
+
+    iv = b'\x00' * 16
+    cipher = Cipher(algorithms.AES(pkey), modes.CBC(iv))
+    encryptor = cipher.encryptor()
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.CBC, ctA)
+    decryptor = cipher.decryptor()
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_cbc_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    iv = os.urandom(16)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.CBC, MESSAGE, iv=iv)
+
+    cipher = Cipher(algorithms.AES(pkey), modes.CBC(iv))
+    encryptor = cipher.encryptor()
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.CBC, ctA, iv=iv)
+    decryptor = cipher.decryptor()
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_ofb_no_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.OFB, MESSAGE)
+
+    iv = b'\x00' * 16
+    cipher = Cipher(algorithms.AES(pkey), modes.OFB(iv))
+    encryptor = cipher.encryptor()
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.OFB, ctA)
+    decryptor = cipher.decryptor()
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_ofb_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    iv = os.urandom(16)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.OFB, MESSAGE, iv=iv)
+
+    cipher = Cipher(algorithms.AES(pkey), modes.OFB(iv))
+    encryptor = cipher.encryptor()
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.OFB, ctA, iv=iv)
+    decryptor = cipher.decryptor()
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_cfb_no_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.CFB, MESSAGE)
+
+    iv = b'\x00' * 16
+    cipher = Cipher(algorithms.AES(pkey), modes.CFB(iv))
+    encryptor = cipher.encryptor()
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.CFB, ctA)
+    decryptor = cipher.decryptor()
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_cfb_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    iv = os.urandom(16)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.CFB, MESSAGE, iv=iv)
+
+    cipher = Cipher(algorithms.AES(pkey), modes.CFB(iv))
+    encryptor = cipher.encryptor()
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.CFB, ctA, iv=iv)
+    decryptor = cipher.decryptor()
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_gcm_no_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.GCM, MESSAGE, aad=AAD)
+
+    iv = b'\x00' * 16
+    encryptor = Cipher(algorithms.AES(pkey), modes.GCM(iv)).encryptor()
+    encryptor.authenticate_additional_data(AAD)
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB + encryptor.tag)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.GCM, ctA, aad=AAD)
+    decryptor = Cipher(algorithms.AES(pkey), modes.GCM(iv, encryptor.tag)).decryptor()
+    decryptor.authenticate_additional_data(AAD)
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_gcm_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    iv = os.urandom(16)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.GCM, MESSAGE, iv=iv, aad=AAD)
+
+    encryptor = Cipher(algorithms.AES(pkey), modes.GCM(iv)).encryptor()
+    encryptor.authenticate_additional_data(AAD)
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB + encryptor.tag)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.GCM, ctA, iv=iv, aad=AAD)
+    decryptor = Cipher(algorithms.AES(pkey), modes.GCM(iv, encryptor.tag)).decryptor()
+    decryptor.authenticate_additional_data(AAD)
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [256, 512]
+)
+def test_aes_xts_no_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.XTS, MESSAGE)
+
+    iv = b'\x00' * 16
+    cipher = Cipher(algorithms.AES(pkey), modes.XTS(iv))
+    encryptor = cipher.encryptor()
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.XTS, ctA)
+    decryptor = cipher.decryptor()
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [256, 512]
+)
+def test_aes_xts_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    iv = os.urandom(16)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.XTS, MESSAGE, iv=iv)
+
+    cipher = Cipher(algorithms.AES(pkey), modes.XTS(iv))
+    encryptor = cipher.encryptor()
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.XTS, ctA, iv=iv)
+    decryptor = cipher.decryptor()
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_ctr_no_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.CTR, MESSAGE)
+
+    iv = b'\x00' * 16
+    cipher = Cipher(algorithms.AES(pkey), modes.CTR(iv))
+    encryptor = cipher.encryptor()
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.CTR, ctA)
+    decryptor = cipher.decryptor()
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_ctr_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    iv = os.urandom(16)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.CTR, MESSAGE, iv=iv)
+
+    cipher = Cipher(algorithms.AES(pkey), modes.CTR(iv))
+    encryptor = cipher.encryptor()
+    ctB = encryptor.update(MESSAGE) + encryptor.finalize()
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.CTR, ctA, iv=iv)
+    decryptor = cipher.decryptor()
+    dtB = decryptor.update(ctB) + decryptor.finalize()
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+def test_aes_ccm_no_iv(device, size):
+    pkey, keyid = generate_key(device, size)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.CCM, MESSAGE, aad=AAD)
+
+    iv = b'\x00' * 12
+    encryptor = aead.AESCCM(pkey)
+    ctB = encryptor.encrypt(iv, MESSAGE, AAD)
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.CCM, ctA, aad=AAD)
+    decryptor = encryptor
+    dtB = decryptor.decrypt(iv, ctB, AAD)
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)
+
+@pytest.mark.parametrize(
+    "size", [128, 192, 256]
+)
+@pytest.mark.parametrize(
+    "iv_len", [7, 8, 9, 10, 11, 12, 13]
+)
+def test_aes_ccm_iv(device, size, iv_len):
+    pkey, keyid = generate_key(device, size)
+    iv = os.urandom(iv_len)
+    ctA = device.aes(keyid, EncryptionMode.ENCRYPT, AES.CCM, MESSAGE, iv=iv, aad=AAD)
+
+    encryptor = aead.AESCCM(pkey)
+    ctB = encryptor.encrypt(iv, MESSAGE, AAD)
+    assert(ctA == ctB)
+
+    dtA = device.aes(keyid, EncryptionMode.DECRYPT, AES.CCM, ctA, iv=iv, aad=AAD)
+    decryptor = encryptor
+    dtB = decryptor.decrypt(iv, ctB, AAD)
+    assert(dtA == dtB)
+    assert(dtA == MESSAGE)
+    device.delete_key(keyid)

tests/pico-hsm/test_060_mac.py

@@ -0,0 +1,63 @@
+"""
+/*
+ * 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 picohsm import DOPrefixes
+from picohsm.const import DEFAULT_DKEK_SHARES
+from const import 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, keyid)
+    assert(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, keyid)
+    assert(resA == resB)
+

tests/pico-hsm/test_070_hkdf.py

@@ -0,0 +1,82 @@
+"""
+/*
+ * 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 picohsm.const import DEFAULT_DKEK_SHARES
+from const import DEFAULT_DKEK
+from picohsm 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, keyid)
+        hkdf = HKDF(
+            algorithm=algo(),
+            length=out_len,
+            salt=salt,
+            info=INFO,
+        )
+        resB = hkdf.derive(pkey)
+        assert(resA == resB)
+        hkdf = HKDF(
+            algorithm=algo(),
+            length=out_len,
+            salt=salt,
+            info=INFO,
+        )
+        hkdf.verify(pkey, 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, 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, resA)

tests/pico-hsm/test_071_pbkdf2.py

@@ -0,0 +1,86 @@
+"""
+/*
+ * 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 picohsm.const import DEFAULT_DKEK_SHARES
+from const import DEFAULT_DKEK
+from picohsm 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, keyid)
+        kdf = PBKDF2HMAC(
+            algorithm=algo(),
+            length=out_len,
+            salt=salt,
+            iterations=iterations,
+        )
+        resB = kdf.derive(pkey)
+        assert(resA == resB)
+        kdf = PBKDF2HMAC(
+            algorithm=algo(),
+            length=out_len,
+            salt=salt,
+            iterations=iterations,
+        )
+        kdf.verify(pkey, 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, 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, resA)

tests/pico-hsm/test_072_x963.py

@@ -0,0 +1,77 @@
+"""
+/*
+ * 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 picohsm.const import DEFAULT_DKEK_SHARES
+from const import DEFAULT_DKEK
+from picohsm 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, keyid)
+        xkdf = X963KDF(
+            algorithm=algo(),
+            length=out_len,
+            sharedinfo=INFO,
+        )
+        resB = xkdf.derive(pkey)
+        assert(resA == resB)
+        xkdf = X963KDF(
+            algorithm=algo(),
+            length=out_len,
+            sharedinfo=INFO,
+        )
+        xkdf.verify(pkey, 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, keyid)
+        xkdf = X963KDF(
+            algorithm=algo(),
+            length=out_len,
+            sharedinfo=INFO,
+        )
+        pkey = os.urandom(size // 8)
+        with pytest.raises(exceptions.InvalidKey):
+            xkdf.verify(pkey, resA)

tests/pico-hsm/test_080_pka.py

@@ -0,0 +1,146 @@
+"""
+/*
+ * This file is part of the Pico HSM distribution (https://github.com/polhenarejos/pico-hsm).
+ * Copyright (c) 2023 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 binascii import unhexlify, hexlify
+from cvc.certificates import CVC
+from picohsm.utils import int_to_bytes
+from picohsm import APDUResponse, SWCodes
+from const import TERM_CERT, DICA_CERT
+from cryptography.hazmat.primitives.asymmetric import ec, utils
+from cryptography.hazmat.primitives import hashes
+
+AUT_KEY = unhexlify('0A40E11E672C28C558B72C25D93BCF28C08D39AFDD5A1A2FD3BAF7A6B27F0C2E')
+aut_pk = ec.derive_private_key(int.from_bytes(AUT_KEY, 'big'), ec.BrainpoolP256R1())
+AUT_PUK = unhexlify('678201ed7f218201937f4e82014b5f290100421045535049434f48534d54525a474e50327f4982011d060a04007f000702020202038120a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e537782207d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9832026dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b68441048bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f0469978520a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a78641040cc18ce246da678239af0913a1579dda58c07be404da4a65327794fac93f57a333267979905b5d046da7020226cc4e5fc477e8fc651a0cf87095259aafa88e648701015f201045535049434f48534d54525a474e50325f37401fc90bdab2a58c3cd25f18a90baa2c21d3d087002ba240fb274ff066759297f79e130053d902d637a448c8cdcd0670fe8ebcc06d8a3ee82079f08d1ff8660393421045535049434f48534d54525a474e50325f3740e24e7e23eae3c78f9fa88391004369a293c43ef99e2279170983e1dbe707fbf0382d09de3e60ef1addd2f055947c3efcef17926065ddb7a031f4905da474ed1d')
+
+
+term_chr = CVC().decode(TERM_CERT).chr()
+
+def test_initialize(device):
+    device.initialize(puk_auts=1, puk_min_auts=1)
+    device.logout()
+
+def test_register_puk(device):
+    status = device.get_puk_status()
+    assert(status == bytes([1,1,1,0]))
+
+    status = device.register_puk(AUT_PUK, TERM_CERT, DICA_CERT)
+    assert(status == bytes([1,0,1,0]))
+    assert(device.check_puk_key(term_chr) == 0)
+
+def test_enumerate_puk_reg(device):
+    puks = device.enumerate_puk()
+    assert(len(puks) == 1)
+    assert(puks[0]['status'] == 0)
+
+def test_authentication(device):
+    input = device.puk_prepare_signature()
+    signature = aut_pk.sign(input, ec.ECDSA(hashes.SHA256()))
+    r,s = utils.decode_dss_signature(signature)
+    signature = list(int_to_bytes(r) + int_to_bytes(s))
+    device.authenticate_puk(term_chr, signature)
+    status = device.get_puk_status()
+    assert(status == bytes([1,0,1,1]))
+
+def test_enumerate_puk_ok(device):
+    puks = device.enumerate_puk()
+    assert(len(puks) == 1)
+    assert(puks[0]['status'] == 1)
+
+def test_check_key(device):
+    assert(device.check_puk_key(term_chr) == 1)
+    bad_chr = b'XXXXX'
+    assert(device.check_puk_key(bad_chr) == -1)
+    assert(device.check_puk_key(bad_chr) != 0)
+    assert(device.check_puk_key(bad_chr) != 1)
+
+def test_puk_reset(device):
+    device.logout()
+    status = device.get_puk_status()
+    assert(status == bytes([1,0,1,0]))
+    assert(device.check_puk_key(term_chr) == 0)
+
+def test_authentication_fail(device):
+    input = b'this is a fake input'
+    signature = aut_pk.sign(input, ec.ECDSA(hashes.SHA256()))
+    r,s = utils.decode_dss_signature(signature)
+    signature = list(int_to_bytes(r) + int_to_bytes(s))
+    with pytest.raises(APDUResponse) as e:
+        device.authenticate_puk(term_chr, signature)
+    assert(e.value.sw == SWCodes.SW_CONDITIONS_NOT_SATISFIED)
+
+    status = device.get_puk_status()
+    assert(status == bytes([1,0,1,0]))
+    assert(device.check_puk_key(term_chr) == 0)
+
+def test_enumerate_puk_1(device):
+    device.initialize(puk_auts=1, puk_min_auts=1)
+    puks = device.enumerate_puk()
+    assert(len(puks) == 1)
+    assert(puks[0]['status'] == -1)
+
+    device.register_puk(AUT_PUK, TERM_CERT, DICA_CERT)
+    puks = device.enumerate_puk()
+    assert(len(puks) == 1)
+    assert(puks[0]['status'] == 0)
+
+def test_enumerate_puk_2(device):
+    device.initialize(puk_auts=2, puk_min_auts=1)
+    puks = device.enumerate_puk()
+    assert(len(puks) == 2)
+    assert(puks[0]['status'] == -1)
+    assert(puks[1]['status'] == -1)
+
+    device.register_puk(AUT_PUK, TERM_CERT, DICA_CERT)
+    puks = device.enumerate_puk()
+    assert(len(puks) == 2)
+    assert(puks[0]['status'] == 0)
+    assert(puks[1]['status'] == -1)
+
+def test_register_more_puks(device):
+    device.initialize(puk_auts=2, puk_min_auts=1)
+    status = device.get_puk_status()
+    assert(status == bytes([2,2,1,0]))
+
+    status = device.register_puk(AUT_PUK, TERM_CERT, DICA_CERT)
+    assert(status == bytes([2,1,1,0]))
+
+def test_is_pku(device):
+    device.initialize(puk_auts=1, puk_min_auts=1)
+    assert(device.is_puk() == True)
+
+    device.initialize()
+    assert(device.is_puk() == False)
+
+def test_check_puk_key(device):
+    device.initialize(puk_auts=1, puk_min_auts=1)
+    status = device.check_puk_key(term_chr)
+    assert(status == -1)
+
+    status = device.register_puk(AUT_PUK, TERM_CERT, DICA_CERT)
+    status = device.check_puk_key(term_chr)
+    assert(status == 0)
+
+
+def test_register_puk_with_no_puk(device):
+    device.initialize()
+    with pytest.raises(APDUResponse) as e:
+        device.register_puk(AUT_PUK, TERM_CERT, DICA_CERT)
+    assert(e.value.sw == SWCodes.SW_FILE_NOT_FOUND)

tests/pico-hsm/test_090_xkek.py

@@ -0,0 +1,98 @@
+"""
+/*
+ * This file is part of the Pico HSM distribution (https://github.com/polhenarejos/pico-hsm).
+ * Copyright (c) 2023 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 binascii import unhexlify, hexlify
+from picohsm.utils import int_to_bytes
+from const import TERM_CERT, DICA_CERT
+from cvc.asn1 import ASN1
+from cvc.certificates import CVC
+from cvc import oid
+from cryptography.hazmat.primitives.asymmetric import ec
+from picohsm import DOPrefixes, APDUResponse, SWCodes
+
+KDM = unhexlify(b'30820420060b2b0601040181c31f0402016181ed7f2181e97f4e81a25f290100421045535049434f48534d434130303030317f494f060a04007f0007020202020386410421ee4a21c16a10f737f12e78e5091b266612038cdabebb722b15bf6d41b877fbf64d9ab69c39b9831b1ae00bef2a4e81976f7688d45189bb232a24703d8a96a55f201045535049434f48534d445630303030317f4c12060904007f000703010202530580000000005f25060202000801085f24060203000601045f37403f75c08fffc9186b56e6147199e82bfc327ceef72495bc567961cd54d702f13e3c2766fcd1d11bd6a9d1f4a229b76b248ceb9af88d59a74d0ab149448705159b6281e97f2181e57f4e819e5f290100421045535049434f48534d445630303030317f494f060a04007f00070202020203864104c8561b41e54fea81bb80dd4a6d537e7c3904344e8ca90bc5f668111811e02c8d5d51ca93ca89558f2a8a9cbb147434e3441ec174505ff980fd7a7106286196915f201045535049434f48534d54524a444736387f4c0e060904007f0007030102025301005f25060203000300065f24060204000300055f3740983de63d0975b715ebd8a93cb38fa9638882c8b7064d51a6facabed693b92edc098e458b713203413ef6de0958c44772cbdbc264205c7b1bdb8b4fcb2516437f638201f1678201ed7f218201937f4e82014b5f290100421045535049434f48534d54524a444736387f4982011d060a04007f000702020202038120a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e537782207d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9832026dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b68441048bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f0469978520a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a78641048b1f450912a2e4d428b7eefc5fa05618a9ef295e90009a61cbb0970181b333474ea94f94cde5a11aba0589e85d4225002789ff1cdcf25756f059647b49fc2a158701015f201045535049434f48534d54524a444736385f3740372407c20de7257c89dae1e6606c8a046ca65efaa010c0a22b75c402ee243de51f5f1507457193679ed9db4fbbfe8efb9d695b684492b665ad8ba98c1f84ea38421045535049434f48534d54524a444736385f374098718e2e14a44386b689b71a101530316b65ab49a91bab0dd56099c5161ecb8aadff6cf27449f94034e58b7306f01e6ffa2766a2f5bb1281e12e5f1f9174733454400cf8926ca5bec9a91bcd47bf391c15d94ef6e3243d5fd1fffeaafd586766bc3221eafd808f17f8450f238cc1fe7ab1854443db31d622f53a2b3fdb3ad750d5ce')
+
+def test_initialize(device):
+    device.initialize(key_domains=1)
+    device.logout()
+
+def test_create_xkek(device):
+    with pytest.raises(APDUResponse) as e:
+        device.create_xkek(KDM)
+    assert(e.value.sw == SWCodes.SW_CONDITIONS_NOT_SATISFIED)
+
+    device.login()
+    kcv, did = device.create_xkek(KDM)
+    assert(kcv == b'\x00'*8)
+
+    gskcert = ASN1().decode(KDM).find(0x30).find(0x63).data()
+    gskQ = CVC().decode(gskcert).pubkey().find(0x86).data()
+    pub = ec.EllipticCurvePublicKey.from_encoded_point(ec.BrainpoolP256R1(), bytes(gskQ))
+    assert(did == int_to_bytes(pub.public_numbers().x)+int_to_bytes(pub.public_numbers().y))
+
+keyid = -1
+def test_derive_xkek(device):
+    global keyid
+    keyid = device.generate_xkek_key()
+
+    resp = device.list_keys()
+    assert((DOPrefixes.KEY_PREFIX, keyid) in resp)
+
+    xkek_dom = device.get_key_domain()['xkek']
+    pkey = ec.generate_private_key(ec.BrainpoolP256R1())
+    pubkey = pkey.public_key()
+    cert = CVC().cert(pubkey=pubkey, scheme=oid.ID_TA_ECDSA_SHA_256, signkey=pkey, signscheme=oid.ID_TA_ECDSA_SHA_256, car=b"UTCA00001", chr=b"UTCDUMMY00001", extensions=[
+                {
+                    'tag': 0x73,
+                    'oid': b'\x2B\x06\x01\x04\x01\x81\xC3\x1F\x03\x02\x02',
+                    'contexts': {
+                        0: xkek_dom
+                    }
+                }
+            ]).encode()
+    device.derive_xkek(keyid, cert)
+
+    resp = device.get_key_domain()
+    assert(resp['kcv'] != b'\x00'*8)
+
+
+def test_delete_xkek(device):
+    device.delete_xkek()
+
+    resp = device.get_key_domain()
+    assert(resp['kcv'] == b'\x00'*8)
+
+def test_delete_domain_with_key(device):
+    with pytest.raises(APDUResponse) as e:
+        device.delete_key_domain()
+    assert(e.value.sw == SWCodes.SW_FILE_EXISTS)
+
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, keyid)
+
+def test_delete_domain(device):
+    device.delete_key_domain()
+
+    resp = device.get_key_domain()
+    assert('kcv' not in resp)
+    assert('xkek' not in resp)
+    assert('error' in resp)
+    assert(resp['error'] == SWCodes.SW_REFERENCE_NOT_FOUND)
+

tests/pico-hsm/test_095_bip_slip.py

@@ -0,0 +1,453 @@
+"""
+/*
+ * This file is part of the Pico HSM distribution (https://github.com/polhenarejos/pico-hsm).
+ * Copyright (c) 2023 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 binascii import unhexlify, hexlify
+from picohsm.utils import int_to_bytes
+from picohsm.const import DEFAULT_DKEK_SHARES
+from const import DEFAULT_DKEK
+from cvc.asn1 import ASN1
+from cvc.certificates import CVC
+from cvc import oid
+from cryptography.hazmat.primitives.asymmetric import ec
+from cryptography.hazmat.primitives import hashes
+from picohsm import EncryptionMode, APDUResponse, SWCodes, PicoHSM
+import hashlib
+
+TEST_STRING = b'Pico Keys are awesome!'
+
+def sha256_sha256(data):
+    return hashlib.sha256(hashlib.sha256(data).digest()).digest()
+
+def test_initialize(device):
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
+    resp = device.import_dkek(DEFAULT_DKEK)
+    resp = device.import_dkek(DEFAULT_DKEK)
+
+seeds = [
+        {
+            'name': 'secp256k1',
+            'id': 0,
+            'seed': unhexlify('000102030405060708090a0b0c0d0e0f'),
+        },
+        {
+            'name': 'secp256k1',
+            'id': 1,
+            'seed': unhexlify('fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542'),
+        },
+        {
+            'name': 'secp256k1',
+            'id': 2,
+            'seed': unhexlify('4b381541583be4423346c643850da4b320e46a87ae3d2a4e6da11eba819cd4acba45d239319ac14f863b8d5ab5a0d0c64d2e8a1e7d1457df2e5a3c51c73235be'),
+        },
+        {
+            'name': 'secp256k1',
+            'id': 3,
+            'seed': unhexlify('3ddd5602285899a946114506157c7997e5444528f3003f6134712147db19b678'),
+        },
+        {
+            'name': 'secp256r1',
+            'id': 4,
+            'seed': unhexlify('000102030405060708090a0b0c0d0e0f'),
+        },
+        {
+            'name': 'secp256r1',
+            'id': 5,
+            'seed': unhexlify('fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542'),
+        },
+        {
+            'name': 'secp256r1',
+            'id': 6,
+            'seed': unhexlify('a7305bc8df8d0951f0cb224c0e95d7707cbdf2c6ce7e8d481fec69c7ff5e9446'),
+        },
+        {
+            'name': 'symmetric',
+            'id': 7,
+            'seed': unhexlify('c76c4ac4f4e4a00d6b274d5c39c700bb4a7ddc04fbc6f78e85ca75007b5b495f74a9043eeb77bdd53aa6fc3a0e31462270316fa04b8c19114c8798706cd02ac8'),
+        },
+    ]
+@pytest.mark.parametrize(
+    "seed", seeds
+)
+def test_generate_master(device, seed):
+    resp = device.hd_generate_master_node(curve=seed['name'], id=seed['id'], seed=seed['seed'])
+
+def hardened(i):
+    return 0x80000000 + i
+
+@pytest.mark.parametrize(
+    "path", [
+        {
+            'path': [0],
+            'xpub': b'xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8',
+        },
+        {
+            'path': [0, hardened(0)],
+            'xpub': b'xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LHhwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw',
+        },
+        {
+            'path': [0, hardened(0), 1],
+            'xpub': b'xpub6ASuArnXKPbfEwhqN6e3mwBcDTgzisQN1wXN9BJcM47sSikHjJf3UFHKkNAWbWMiGj7Wf5uMash7SyYq527Hqck2AxYysAA7xmALppuCkwQ',
+        },
+        {
+            'path': [0, hardened(0), 1, hardened(2)],
+            'xpub': b'xpub6D4BDPcP2GT577Vvch3R8wDkScZWzQzMMUm3PWbmWvVJrZwQY4VUNgqFJPMM3No2dFDFGTsxxpG5uJh7n7epu4trkrX7x7DogT5Uv6fcLW5',
+        },
+        {
+            'path': [0, hardened(0), 1, hardened(2), 2],
+            'xpub': b'xpub6FHa3pjLCk84BayeJxFW2SP4XRrFd1JYnxeLeU8EqN3vDfZmbqBqaGJAyiLjTAwm6ZLRQUMv1ZACTj37sR62cfN7fe5JnJ7dh8zL4fiyLHV',
+        },
+        {
+            'path': [0, hardened(0), 1, hardened(2), 2, 1000000000],
+            'xpub': b'xpub6H1LXWLaKsWFhvm6RVpEL9P4KfRZSW7abD2ttkWP3SSQvnyA8FSVqNTEcYFgJS2UaFcxupHiYkro49S8yGasTvXEYBVPamhGW6cFJodrTHy',
+        },
+        {
+            'path': [1],
+            'xpub': b'xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB',
+        },
+        {
+            'path': [1, 0],
+            'xpub': b'xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH',
+        },
+        {
+            'path': [1, 0, hardened(2147483647)],
+            'xpub': b'xpub6ASAVgeehLbnwdqV6UKMHVzgqAG8Gr6riv3Fxxpj8ksbH9ebxaEyBLZ85ySDhKiLDBrQSARLq1uNRts8RuJiHjaDMBU4Zn9h8LZNnBC5y4a',
+        },
+        {
+            'path': [1, 0, hardened(2147483647), 1],
+            'xpub': b'xpub6DF8uhdarytz3FWdA8TvFSvvAh8dP3283MY7p2V4SeE2wyWmG5mg5EwVvmdMVCQcoNJxGoWaU9DCWh89LojfZ537wTfunKau47EL2dhHKon',
+        },
+        {
+            'path': [1, 0, hardened(2147483647), 1, hardened(2147483646)],
+            'xpub': b'xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL',
+        },
+        {
+            'path': [1, 0, hardened(2147483647), 1, hardened(2147483646), 2],
+            'xpub': b'xpub6FnCn6nSzZAw5Tw7cgR9bi15UV96gLZhjDstkXXxvCLsUXBGXPdSnLFbdpq8p9HmGsApME5hQTZ3emM2rnY5agb9rXpVGyy3bdW6EEgAtqt',
+        },
+        {
+            'path': [2],
+            'xpub': b'xpub661MyMwAqRbcEZVB4dScxMAdx6d4nFc9nvyvH3v4gJL378CSRZiYmhRoP7mBy6gSPSCYk6SzXPTf3ND1cZAceL7SfJ1Z3GC8vBgp2epUt13',
+        },
+        {
+            'path': [2, hardened(0)],
+            'xpub': b'xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y',
+        },
+        {
+            'path': [3],
+            'xpub': b'xpub661MyMwAqRbcGczjuMoRm6dXaLDEhW1u34gKenbeYqAix21mdUKJyuyu5F1rzYGVxyL6tmgBUAEPrEz92mBXjByMRiJdba9wpnN37RLLAXa',
+        },
+        {
+            'path': [3, hardened(0)],
+            'xpub': b'xpub69AUMk3qDBi3uW1sXgjCmVjJ2G6WQoYSnNHyzkmdCHEhSZ4tBok37xfFEqHd2AddP56Tqp4o56AePAgCjYdvpW2PU2jbUPFKsav5ut6Ch1m',
+        },
+        {
+            'path': [3, hardened(0), hardened(1)],
+            'xpub': b'xpub6BJA1jSqiukeaesWfxe6sNK9CCGaujFFSJLomWHprUL9DePQ4JDkM5d88n49sMGJxrhpjazuXYWdMf17C9T5XnxkopaeS7jGk1GyyVziaMt',
+        },
+    ]
+)
+def test_derive_node_bip(device, path):
+    resp = device.hd_derive_node(path['path'])
+    assert(resp == path['xpub'])
+
+@pytest.mark.parametrize(
+    "path", [
+        {
+            'path': [0],
+            'fingerprint': unhexlify('00000000'),
+            'chain': unhexlify('873dff81c02f525623fd1fe5167eac3a55a049de3d314bb42ee227ffed37d508'),
+            'public': unhexlify('0339a36013301597daef41fbe593a02cc513d0b55527ec2df1050e2e8ff49c85c2')
+        },
+        {
+            'path': [0, hardened(0)],
+            'fingerprint': unhexlify('3442193e'),
+            'chain': unhexlify('47fdacbd0f1097043b78c63c20c34ef4ed9a111d980047ad16282c7ae6236141'),
+            'public': unhexlify('035a784662a4a20a65bf6aab9ae98a6c068a81c52e4b032c0fb5400c706cfccc56')
+        },
+        {
+            'path': [0, hardened(0), 1],
+            'fingerprint': unhexlify('5c1bd648'),
+            'chain': unhexlify('2a7857631386ba23dacac34180dd1983734e444fdbf774041578e9b6adb37c19'),
+            'public': unhexlify('03501e454bf00751f24b1b489aa925215d66af2234e3891c3b21a52bedb3cd711c')
+        },
+        {
+            'path': [0, hardened(0), 1, hardened(2)],
+            'fingerprint': unhexlify('bef5a2f9'),
+            'chain': unhexlify('04466b9cc8e161e966409ca52986c584f07e9dc81f735db683c3ff6ec7b1503f'),
+            'public': unhexlify('0357bfe1e341d01c69fe5654309956cbea516822fba8a601743a012a7896ee8dc2')
+        },
+        {
+            'path': [0, hardened(0), 1, hardened(2), 2],
+            'fingerprint': unhexlify('ee7ab90c'),
+            'chain': unhexlify('cfb71883f01676f587d023cc53a35bc7f88f724b1f8c2892ac1275ac822a3edd'),
+            'public': unhexlify('02e8445082a72f29b75ca48748a914df60622a609cacfce8ed0e35804560741d29')
+        },
+        {
+            'path': [0, hardened(0), 1, hardened(2), 2, 1000000000],
+            'fingerprint': unhexlify('d880d7d8'),
+            'chain': unhexlify('c783e67b921d2beb8f6b389cc646d7263b4145701dadd2161548a8b078e65e9e'),
+            'public': unhexlify('022a471424da5e657499d1ff51cb43c47481a03b1e77f951fe64cec9f5a48f7011')
+        },
+        {
+            'path': [4],
+            'fingerprint': unhexlify('00000000'),
+            'chain': unhexlify('beeb672fe4621673f722f38529c07392fecaa61015c80c34f29ce8b41b3cb6ea'),
+            'public': unhexlify('0266874dc6ade47b3ecd096745ca09bcd29638dd52c2c12117b11ed3e458cfa9e8')
+        },
+        {
+            'path': [4, hardened(0)],
+            'fingerprint': unhexlify('be6105b5'),
+            'chain': unhexlify('3460cea53e6a6bb5fb391eeef3237ffd8724bf0a40e94943c98b83825342ee11'),
+            'public': unhexlify('0384610f5ecffe8fda089363a41f56a5c7ffc1d81b59a612d0d649b2d22355590c')
+        },
+        {
+            'path': [4, hardened(0), 1],
+            'fingerprint': unhexlify('9b02312f'),
+            'chain': unhexlify('4187afff1aafa8445010097fb99d23aee9f599450c7bd140b6826ac22ba21d0c'),
+            'public': unhexlify('03526c63f8d0b4bbbf9c80df553fe66742df4676b241dabefdef67733e070f6844')
+        },
+        {
+            'path': [4, hardened(0), 1, hardened(2)],
+            'fingerprint': unhexlify('b98005c1'),
+            'chain': unhexlify('98c7514f562e64e74170cc3cf304ee1ce54d6b6da4f880f313e8204c2a185318'),
+            'public': unhexlify('0359cf160040778a4b14c5f4d7b76e327ccc8c4a6086dd9451b7482b5a4972dda0')
+        },
+        {
+            'path': [4, hardened(0), 1, hardened(2), 2],
+            'fingerprint': unhexlify('0e9f3274'),
+            'chain': unhexlify('ba96f776a5c3907d7fd48bde5620ee374d4acfd540378476019eab70790c63a0'),
+            'public': unhexlify('029f871f4cb9e1c97f9f4de9ccd0d4a2f2a171110c61178f84430062230833ff20')
+        },
+        {
+            'path': [4, hardened(0), 1, hardened(2), 2, 1000000000],
+            'fingerprint': unhexlify('8b2b5c4b'),
+            'chain': unhexlify('b9b7b82d326bb9cb5b5b121066feea4eb93d5241103c9e7a18aad40f1dde8059'),
+            'public': unhexlify('02216cd26d31147f72427a453c443ed2cde8a1e53c9cc44e5ddf739725413fe3f4')
+        },
+        {
+            'path': [1],
+            'fingerprint': unhexlify('00000000'),
+            'chain': unhexlify('60499f801b896d83179a4374aeb7822aaeaceaa0db1f85ee3e904c4defbd9689'),
+            'public': unhexlify('03cbcaa9c98c877a26977d00825c956a238e8dddfbd322cce4f74b0b5bd6ace4a7')
+        },
+        {
+            'path': [1, 0],
+            'fingerprint': unhexlify('bd16bee5'),
+            'chain': unhexlify('f0909affaa7ee7abe5dd4e100598d4dc53cd709d5a5c2cac40e7412f232f7c9c'),
+            'public': unhexlify('02fc9e5af0ac8d9b3cecfe2a888e2117ba3d089d8585886c9c826b6b22a98d12ea')
+        },
+        {
+            'path': [1, 0, hardened(2147483647)],
+            'fingerprint': unhexlify('5a61ff8e'),
+            'chain': unhexlify('be17a268474a6bb9c61e1d720cf6215e2a88c5406c4aee7b38547f585c9a37d9'),
+            'public': unhexlify('03c01e7425647bdefa82b12d9bad5e3e6865bee0502694b94ca58b666abc0a5c3b')
+        },
+        {
+            'path': [1, 0, hardened(2147483647), 1],
+            'fingerprint': unhexlify('d8ab4937'),
+            'chain': unhexlify('f366f48f1ea9f2d1d3fe958c95ca84ea18e4c4ddb9366c336c927eb246fb38cb'),
+            'public': unhexlify('03a7d1d856deb74c508e05031f9895dab54626251b3806e16b4bd12e781a7df5b9')
+        },
+        {
+            'path': [1, 0, hardened(2147483647), 1, hardened(2147483646)],
+            'fingerprint': unhexlify('78412e3a'),
+            'chain': unhexlify('637807030d55d01f9a0cb3a7839515d796bd07706386a6eddf06cc29a65a0e29'),
+            'public': unhexlify('02d2b36900396c9282fa14628566582f206a5dd0bcc8d5e892611806cafb0301f0')
+        },
+        {
+            'path': [1, 0, hardened(2147483647), 1, hardened(2147483646), 2],
+            'fingerprint': unhexlify('31a507b8'),
+            'chain': unhexlify('9452b549be8cea3ecb7a84bec10dcfd94afe4d129ebfd3b3cb58eedf394ed271'),
+            'public': unhexlify('024d902e1a2fc7a8755ab5b694c575fce742c48d9ff192e63df5193e4c7afe1f9c')
+        },
+        {
+            'path': [5],
+            'fingerprint': unhexlify('00000000'),
+            'chain': unhexlify('96cd4465a9644e31528eda3592aa35eb39a9527769ce1855beafc1b81055e75d'),
+            'public': unhexlify('02c9e16154474b3ed5b38218bb0463e008f89ee03e62d22fdcc8014beab25b48fa')
+        },
+        {
+            'path': [5, 0],
+            'fingerprint': unhexlify('607f628f'),
+            'chain': unhexlify('84e9c258bb8557a40e0d041115b376dd55eda99c0042ce29e81ebe4efed9b86a'),
+            'public': unhexlify('039b6df4bece7b6c81e2adfeea4bcf5c8c8a6e40ea7ffa3cf6e8494c61a1fc82cc')
+        },
+        {
+            'path': [5, 0, hardened(2147483647)],
+            'fingerprint': unhexlify('946d2a54'),
+            'chain': unhexlify('f235b2bc5c04606ca9c30027a84f353acf4e4683edbd11f635d0dcc1cd106ea6'),
+            'public': unhexlify('02f89c5deb1cae4fedc9905f98ae6cbf6cbab120d8cb85d5bd9a91a72f4c068c76')
+        },
+        {
+            'path': [5, 0, hardened(2147483647), 1],
+            'fingerprint': unhexlify('218182d8'),
+            'chain': unhexlify('7c0b833106235e452eba79d2bdd58d4086e663bc8cc55e9773d2b5eeda313f3b'),
+            'public': unhexlify('03abe0ad54c97c1d654c1852dfdc32d6d3e487e75fa16f0fd6304b9ceae4220c64')
+        },
+        {
+            'path': [5, 0, hardened(2147483647), 1, hardened(2147483646)],
+            'fingerprint': unhexlify('931223e4'),
+            'chain': unhexlify('5794e616eadaf33413aa309318a26ee0fd5163b70466de7a4512fd4b1a5c9e6a'),
+            'public': unhexlify('03cb8cb067d248691808cd6b5a5a06b48e34ebac4d965cba33e6dc46fe13d9b933')
+        },
+        {
+            'path': [5, 0, hardened(2147483647), 1, hardened(2147483646), 2],
+            'fingerprint': unhexlify('956c4629'),
+            'chain': unhexlify('3bfb29ee8ac4484f09db09c2079b520ea5616df7820f071a20320366fbe226a7'),
+            'public': unhexlify('020ee02e18967237cf62672983b253ee62fa4dd431f8243bfeccdf39dbe181387f')
+        },
+        {
+            'path': [4],
+            'fingerprint': unhexlify('00000000'),
+            'chain': unhexlify('beeb672fe4621673f722f38529c07392fecaa61015c80c34f29ce8b41b3cb6ea'),
+            'public': unhexlify('0266874dc6ade47b3ecd096745ca09bcd29638dd52c2c12117b11ed3e458cfa9e8')
+        },
+        {
+            'path': [4, hardened(28578)],
+            'fingerprint': unhexlify('be6105b5'),
+            'chain': unhexlify('e94c8ebe30c2250a14713212f6449b20f3329105ea15b652ca5bdfc68f6c65c2'),
+            'public': unhexlify('02519b5554a4872e8c9c1c847115363051ec43e93400e030ba3c36b52a3e70a5b7')
+        },
+        {
+            'path': [4, hardened(28578), 33941],
+            'fingerprint': unhexlify('3e2b7bc6'),
+            'chain': unhexlify('9e87fe95031f14736774cd82f25fd885065cb7c358c1edf813c72af535e83071'),
+            'public': unhexlify('0235bfee614c0d5b2cae260000bb1d0d84b270099ad790022c1ae0b2e782efe120')
+        },
+        {
+            'path': [6],
+            'fingerprint': unhexlify('00000000'),
+            'chain': unhexlify('7762f9729fed06121fd13f326884c82f59aa95c57ac492ce8c9654e60efd130c'),
+            'public': unhexlify('0383619fadcde31063d8c5cb00dbfe1713f3e6fa169d8541a798752a1c1ca0cb20')
+        },
+    ]
+)
+def test_derive_node_xpub(device, path):
+    resp = device.hd_derive_node(path['path'])
+    xpub = PicoHSM.hd_decode_xpub(resp)
+    assert(xpub['fingerprint'] == path['fingerprint'])
+    assert(xpub['chain'] == path['chain'])
+    assert(xpub['public'] == path['public'])
+
+@pytest.mark.parametrize(
+    "path", [
+        {
+            'path': [7],
+            'fingerprint': unhexlify('00000000'),
+            'chain': unhexlify('8F8C33732530A0417DD446097EDB6F6617D52D627C6DB28581D74D11B385D25A'),
+            'public': unhexlify('dbf12b44133eaab506a740f6565cc117228cbf1dd70635cfa8ddfdc9af734756')
+        },
+        {
+            'path': [7, b"SLIP-0021"],
+            'fingerprint': unhexlify('0e521cdd'),
+            'chain': unhexlify('446ADED06078CF950DAB737F014C7BAE81EEB6E7BEECC260A38E2E0FA9973104'),
+            'public': unhexlify('1d065e3ac1bbe5c7fad32cf2305f7d709dc070d672044a19e610c77cdf33de0d')
+        },
+        {
+            'path': [7, b"SLIP-0021", b"Master encryption key"],
+            'fingerprint': unhexlify('4a6e721d'),
+            'chain': unhexlify('7072D5593032B84A90E2E2E42996D277026FF55C1082AC82A121D775FED0ACEB'),
+            'public': unhexlify('ea163130e35bbafdf5ddee97a17b39cef2be4b4f390180d65b54cf05c6a82fde')
+        },
+        {
+            'path': [7, b"SLIP-0021", b"Authentication key"],
+            'fingerprint': unhexlify('4a6e721d'),
+            'chain': unhexlify('3D5C87DC62CE006681B8C3DF723AE50FEEA40D6C26AEF8135BD321BA390A5B42'),
+            'public': unhexlify('47194e938ab24cc82bfa25f6486ed54bebe79c40ae2a5a32ea6db294d81861a6')
+        },
+    ]
+)
+def test_derive_node_slip(device, path):
+    resp = device.hd_derive_node(path['path'])
+    xpub = PicoHSM.hd_decode_xpub(resp)
+    assert(xpub['fingerprint'] == path['fingerprint'])
+    assert(xpub['chain'] == sha256_sha256(path['chain']))
+    assert(xpub['public'] == sha256_sha256(path['public']))
+
+def get_master_curve(mid):
+    for m in seeds:
+        if (m['id'] == mid):
+            if (m['name'] == 'secp256k1'):
+                return ec.SECP256K1()
+            elif (m['name'] == 'secp256r1'):
+                return ec.SECP256R1()
+    return None
+
+@pytest.mark.parametrize(
+    "path", [
+        [0],
+        [0, hardened(0)],
+        [0, hardened(0), 1],
+        [0, hardened(0), 1, hardened(2)],
+        [0, hardened(0), 1, hardened(2), 2],
+        [0, hardened(0), 1, hardened(2), 2, 1000000000],
+        [1],
+        [1, 0],
+        [1, 0, hardened(2147483647)],
+        [1, 0, hardened(2147483647), 1],
+        [1, 0, hardened(2147483647), 1, hardened(2147483646)],
+        [1, 0, hardened(2147483647), 1, hardened(2147483646), 2],
+        [4],
+        [4, hardened(0)],
+        [4, hardened(0), 1],
+        [4, hardened(0), 1, hardened(2)],
+        [4, hardened(0), 1, hardened(2), 2],
+        [4, hardened(0), 1, hardened(2), 2, 1000000000],
+        [5],
+        [5, 0],
+        [5, 0, hardened(2147483647)],
+        [5, 0, hardened(2147483647), 1],
+        [5, 0, hardened(2147483647), 1, hardened(2147483646)],
+        [5, 0, hardened(2147483647), 1, hardened(2147483646), 2],
+    ]
+)
+def test_signature(device, path):
+    pub = device.hd_derive_node(path)
+    xpub = PicoHSM.hd_decode_xpub(pub)
+    curve = get_master_curve(path[0])
+    pubkey = ec.EllipticCurvePublicKey.from_encoded_point(curve, xpub['public'])
+    resp = device.hd_signature(path, TEST_STRING)
+    pubkey.verify(resp, TEST_STRING, ec.ECDSA(hashes.SHA256()))
+
+@pytest.mark.parametrize(
+    "path", [
+        [7],
+        [7, b"SLIP-0021"],
+        [7, b"SLIP-0021", b"Master encryption key"],
+        [7, b"SLIP-0021", b"Authentication key"],
+    ]
+)
+def test_signature_slip(device, path):
+    pub = device.hd_derive_node(path)
+    with pytest.raises(APDUResponse) as e:
+        resp = device.hd_signature(path, TEST_STRING)
+    assert (e.value.sw == SWCodes.SW_CONDITIONS_NOT_SATISFIED)
+
+@pytest.mark.parametrize(
+    "ask_on_encrypt", [True, False]
+)
+@pytest.mark.parametrize(
+    "ask_on_decrypt", [True, False]
+)
+def test_cipher_slip(device, ask_on_encrypt, ask_on_decrypt):
+    MSG1 = b"testing message!"
+    enctext = device.hd_cipher([7, b"\x01", b"\x02"], b"test", MSG1, EncryptionMode.ENCRYPT, ask_on_encrypt, ask_on_decrypt)
+    resp = device.hd_cipher([7, b"\x01", b"\x02"], b"test", enctext, EncryptionMode.DECRYPT, ask_on_encrypt, ask_on_decrypt)
+    assert(resp == MSG1)

tests/run-test-in-docker.sh

@@ -0,0 +1,11 @@
+#!/bin/bash -eu
+
+source tests/docker_env.sh
+
+if [[ $1 == "pkcs11" ]]; then
+    run_in_docker ./tests/start-up-and-test-pkcs11.sh
+elif [[ $1 == "sc-hsm-pkcs11" ]]; then
+    run_in_docker ./tests/scripts/sc_hsm_test.sh
+else
+    run_in_docker ./tests/start-up-and-test.sh
+fi

tests/scripts/aes.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+source ./tests/scripts/func.sh
+reset
+test $? -eq 0 || exit $?
+
+TEST_DATA="This is a text."
+
+echo "${TEST_DATA}" > test
+
+sc_tool() {
+    pkcs11-tool --module /usr/local/lib/libsc-hsm-pkcs11.so -l --pin 648219 $@
+}
+
+aeses=("16" "24" "32")
+
+for aes in ${aeses[*]}; do
+    echo "  Test AES (AES:${aes})"
+    echo -n "    Keygen... "
+    sc_tool --keygen --key-type "AES:${aes}" --id 1 --label "AES:${aes}" > /dev/null 2>&1
+    test $? -eq 0 && echo -n "." || exit $?
+    e=$(sc_tool --list-object --type secrkey 2>&1)
+    test $? -eq 0 && echo -n "." || exit $?
+    grep -q "AES length ${aes}" <<< $e && echo -n "." || exit $?
+    grep -q "AES:${aes}" <<< $e && echo -e ".\t${OK}" || exit $?
+
+    echo -n "    Encryption..."
+    sc_tool --encrypt --id 1 --input-file test --mechanism aes-cbc > crypted.aes 2>/dev/null
+    test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+    echo -n "    Decryption..."
+    e=$(sc_tool --decrypt --id 1 --input-file crypted.aes --mechanism aes-cbc 2>/dev/null)
+    test $? -eq 0 && echo -n "." || exit $?
+    grep -q "${TEST_DATA}" <<< $e && echo -e ".\t${OK}" || exit $?
+
+    sc_tool --delete --type secrkey --id 1 > /dev/null 2>&1
+done
+rm -rf test crypted.aes

tests/scripts/asym_cipher.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+source ./tests/scripts/func.sh
+reset
+test $? -eq 0 || exit $?
+
+rsa_encrypt_decrypt() {
+    openssl pkeyutl -encrypt -pubin -inkey 1.pub $2 -in $1 -out data.crypt
+    test $? -eq 0 && echo -n "." || exit $?
+    TDATA=$(tr -d '\0' < <(pkcs11-tool --id 1 --pin 648219 --decrypt $3 -i data.crypt 2>/dev/null))
+    test $? -eq 0 && echo -n "." || exit $?
+    if [[ ${TEST_STRING} != "$TDATA" ]]; then
+        exit 1
+    fi
+    test $? -eq 0 && echo -n "." || exit $?
+}
+
+TEST_STRING="This is a test string. Be safe, be secure."
+
+echo ${TEST_STRING} > data
+
+echo -n "  Keygen RSA 2048..."
+keygen_and_export rsa:2048
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+echo -n "  Test RSA-PKCS ciphering..."
+rsa_encrypt_decrypt data "-pkeyopt rsa_padding_mode:pkcs1" "--mechanism RSA-PKCS"
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+echo -n "  Test RSA-X-509 ciphering..."
+cp data data_pad
+tlen=${#TEST_STRING}
+dd if=/dev/zero bs=1 count=$((256-$tlen-1)) >> data_pad 2> /dev/null
+test $? -eq 0 && echo -n "." || exit $?
+rsa_encrypt_decrypt data_pad "-pkeyopt rsa_padding_mode:none" "--mechanism RSA-X-509"
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+echo -n "  Test RSA-PKCS-OAEP ciphering..."
+rsa_encrypt_decrypt data "-pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 -pkeyopt rsa_mgf1_md:sha256" "--mechanism RSA-PKCS-OAEP"
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+rm -rf data* 1.*
+pkcs11-tool -l --pin 648219 --delete-object --type privkey --id 1 > /dev/null 2>&1
+
+algs=("secp192r1" "secp256r1" "secp384r1" "secp521r1" "brainpoolP256r1" "brainpoolP384r1" "brainpoolP512r1" "secp192k1" "secp256k1")
+for alg in ${algs[*]}; do
+    echo -n "  Test EC derive with ${alg}..."
+    keygen_and_export ec:${alg}
+    test $? -eq 0 && echo -n "." || exit $?
+    openssl ecparam -genkey -name ${alg} > bob.pem 2>/dev/null
+    test $? -eq 0 && echo -n "." || exit $?
+    openssl ec -in bob.pem -pubout -outform DER > bob.der 2>/dev/null
+    test $? -eq 0 && echo -n "." || exit $?
+    pkcs11-tool --pin 648219 --id 1 --derive -i bob.der -o mine-bob.der > /dev/null 2>&1
+    test $? -eq 0 && echo -n "." || exit $?
+    openssl pkeyutl -derive -out bob-mine.der -inkey bob.pem -peerkey 1.pub 2>/dev/null
+    test $? -eq 0 && echo -n "." || exit $?
+    cmp bob-mine.der mine-bob.der
+    test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+    rm -rf data* 1.*
+    pkcs11-tool -l --pin 648219 --delete-object --type privkey --id 1 > /dev/null 2>&1
+done

tests/scripts/backup.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+source ./tests/scripts/func.sh
+reset
+test $? -eq 0 || exit $?
+
+sc_backup() {
+    for i in $(seq 1 $1); do
+        sc-hsm-tool --create-dkek-share dkek.${i}.pbe --password testpw > /dev/null 2>&1
+        test $? -eq 0 && echo -n "." || exit $?
+    done
+    sc-hsm-tool --initialize --so-pin 3537363231383830 --pin 648219 --dkek-shares $1 > /dev/null 2>&1
+    test $? -eq 0 && echo -n "." || exit $?
+    pkcs11-tool -l --pin 648219 -I > /dev/null 2>&1
+    test $? -eq 0 && echo -n "." || exit $?
+    for i in $(seq 1 $1); do
+        e=$(sc-hsm-tool --import-dkek-share dkek.${i}.pbe --password testpw 2>&1)
+        test $? -eq 0 && echo -n "." || exit $?
+        grep -q "DKEK share imported" <<< $e && echo -n "." || exit $?
+        grep -q "DKEK shares[[:blank:]]*: $1" <<< $e && echo -n "." || exit $?
+        if [[ $i -lt $1 ]]; then
+            grep -q "DKEK import pending, $(( $1 - $i ))" <<< $e && echo -n "." || exit $?
+        fi
+    done
+    # Store DKEK, since it is not logged in
+    pkcs11-tool -l --pin 648219 -I > /dev/null 2>&1
+    test $? -eq 0 && echo -n "." || exit $?
+}
+echo -n "  Test single DKEK..."
+sc_backup 1
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+echo -n "  Test multiple DKEK..."
+sc_backup 3
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+rm -rf dkek.*.pbe
+
+echo "  Test backup and restore"
+algs=("rsa:1024" "rsa:2048" "ec:secp192r1" "ec:secp256r1" "ec:secp384r1" "ec:secp521r1" "ec:brainpoolP256r1" "ec:brainpoolP384r1" "ec:brainpoolP512r1" "ec:secp192k1" "ec:secp256k1")
+for alg in ${algs[*]}; do
+    echo -n "    Keygen ${alg}..."
+    gen_and_check ${alg}
+    test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+    echo -n "    Wrap key..."
+    sc-hsm-tool --wrap-key wrap-key.bin --key-reference 1 --pin 648219 > /dev/null 2>&1
+    test $? -eq 0 && echo -n "." || exit $?
+    e=$(pkcs15-tool -D 2>&1)
+    grep -q "Key ref[[:blank:]]*: 10" <<< $e && exit $? || echo -e ".\t${OK}"
+    echo -n "    Unwrap key..."
+    sc-hsm-tool --unwrap-key wrap-key.bin --key-reference 10 --pin 648219 --force > /dev/null 2>&1
+    test $? -eq 0 && echo -n "." || exit $?
+    e=$(pkcs15-tool -D 2>&1)
+    grep -q "Key ref[[:blank:]]*: 10" <<< $e && echo -e ".\t${OK}" || exit $?
+    echo -n "    Cleaning..."
+    pkcs11-tool -l --pin 648219 --delete-object --type privkey --id 1 > /dev/null 2>&1
+    test $? -eq 0 && echo -n "." || exit $?
+    pkcs11-tool -l --pin 648219 --delete-object --type privkey --id 1 > /dev/null 2>&1
+    test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+done

tests/scripts/func.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+OK="\033[32mok\033[0m"
+FAIL="\033[31mfail\033[0m"
+
+gen_and_check() {
+    e=$(pkcs11-tool -l --pin 648219 --keypairgen --key-type $1 --id 1 --label "TestLabel" 2>&1)
+    test $? -eq 0 && echo -n "." || exit $?
+    glabel=""
+    case $1 in
+    *"192"*)
+        glabel="EC_POINT 192 bits"
+        ;;
+    *"256"*)
+        glabel="EC_POINT 256 bits"
+        ;;
+    *"384"*)
+        glabel="EC_POINT 384 bits"
+        ;;
+    *"512"*)
+        glabel="EC_POINT 512 bits"
+        ;;
+    *"521"*)
+        glabel="EC_POINT 528 bits"
+        ;;
+    *"rsa"*)
+        IFS=: read -r v1 bits <<< "$1"
+        glabel="RSA ${bits} bits"
+        ;;
+    esac
+    grep -q "${glabel}" <<< $e && echo -n "." || exit $?
+}
+gen_and_delete() {
+    gen_and_check $1
+    test $? -eq 0 && echo -n "." || exit $?
+    pkcs11-tool -l --pin 648219 --delete-object --type privkey --id 1 > /dev/null 2>&1
+    test $? -eq 0 && echo -n "." || exit $?
+}
+reset() {
+    python3 tools/pico-hsm-tool.py --pin 648219 initialize --so-pin 57621880 --silent > /dev/null 2>&1
+    test $? -eq 0 || exit $?
+}
+
+keygen_and_export() {
+    gen_and_check $1
+    test $? -eq 0 && echo -n "." || exit $?
+    pkcs11-tool --read-object --pin 648219 --id 1 --type pubkey > 1.der 2>/dev/null
+    test $? -eq 0 && echo -n "." || exit $?
+    IFS=: read -r mk bts <<< "$1"
+    openssl ${mk} -inform DER -outform PEM -in 1.der -pubin > 1.pub 2>/dev/null
+    test $? -eq 0 && echo -n "." || exit $?
+}

tests/scripts/initialize.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+source ./tests/scripts/func.sh
+reset
+
+# Change SO-PIN
+echo -n "  Test SO-PIN change..."
+pkcs11-tool --login --login-type so --so-pin 3537363231383830 --change-pin --new-pin 0123456789012345 > /dev/null 2>&1
+test $? -eq 0 && echo -n "." || exit $?
+
+pkcs11-tool --login --login-type so --so-pin 0123456789012345 --change-pin --new-pin 3537363231383830 > /dev/null 2>&1
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+# Change PIN
+echo -n "  Test PIN change..."
+pkcs11-tool --login --pin 648219 --change-pin --new-pin 123456 > /dev/null 2>&1
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+# Reset PIN
+echo -n "  Test PIN reset..."
+pkcs11-tool --login --login-type so --so-pin 3537363231383830 --init-pin --new-pin 648219 > /dev/null 2>&1
+test $? -eq 0 && echo -n "." || exit $?
+
+# Change PIN
+pkcs11-tool --login --pin 648219 --change-pin --new-pin 123456 > /dev/null 2>&1
+test $? -eq 0 && echo -n "." || exit $?
+
+pkcs11-tool --login --pin 123456 --change-pin --new-pin 648219 > /dev/null 2>&1
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+# Wrong PIN (1st and 2nd PIN_INCORRECT, 3rd PIN_LOCKED)
+echo -n "  Test wrong PIN attempts..."
+e=$(pkcs11-tool --login --pin 123456 -I 2>&1)
+test $? -eq 1 && echo -n "." || exit $?
+grep -q CKR_PIN_INCORRECT <<< $e && echo -n "." || exit $?
+e=$(pkcs11-tool --login --pin 123456 -I 2>&1)
+test $? -eq 1 && echo -n "." || exit $?
+grep -q CKR_PIN_INCORRECT <<< $e && echo -n "." || exit $?
+e=$(pkcs11-tool --login --pin 123456 -I 2>&1)
+test $? -eq 1 && echo -n "." || exit $?
+grep -q CKR_PIN_LOCKED <<< $e && echo -e "\t${OK}" || exit $?
+
+# Reset PIN
+echo -n "  Test restore PIN..."
+pkcs11-tool --login --login-type so --so-pin 3537363231383830 --init-pin --new-pin 648219 > /dev/null 2>&1
+test $? -eq 0 && echo -n "." || exit $?
+
+pkcs11-tool --login --pin 648219 -I > /dev/null 2>&1
+test $? -eq 0 && echo -e "\t${OK}" || exit $?

tests/scripts/keygen.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+source ./tests/scripts/func.sh
+reset
+test $? -eq 0 || exit $?
+
+algs=("rsa:1024" "rsa:2048" "ec:secp192r1" "ec:secp256r1" "ec:secp384r1" "ec:secp521r1" "ec:brainpoolP256r1" "ec:brainpoolP384r1" "ec:brainpoolP512r1" "ec:secp192k1" "ec:secp256k1")
+for alg in ${algs[*]}; do
+    IFS=: read -r a s <<< "${alg}"
+    au=$(awk '{print toupper($0)}' <<<${a})
+    echo -n "  Test ${au} ${s}..."
+    gen_and_delete ${alg} && echo -e ".\t${OK}" || exit $?
+done

tests/scripts/pkcs11.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+source ./tests/scripts/func.sh
+echo "==== Test initialization ===="
+./tests/scripts/initialize.sh
+test $? -eq 0 || {
+    echo -e "\t${FAIL}"
+    exit 1
+}
+
+echo "==== Test keygen ===="
+./tests/scripts/keygen.sh
+test $? -eq 0 || {
+    echo -e "\t${FAIL}"
+    exit 1
+}
+
+echo "==== Test sign and verify ===="
+./tests/scripts/sign_and_verify.sh
+test $? -eq 0 || {
+    echo -e "\t${FAIL}"
+    exit 1
+}
+
+echo "==== Test asymmetric ciphering ===="
+./tests/scripts/asym_cipher.sh
+test $? -eq 0 || {
+    echo -e "\t${FAIL}"
+    exit 1
+}
+
+echo "==== Test binary storage ===="
+./tests/scripts/store_binary.sh
+test $? -eq 0 || {
+    echo -e "\t${FAIL}"
+    exit 1
+}
+
+echo "==== Test AES ===="
+./tests/scripts/aes.sh
+test $? -eq 0 || {
+    echo -e "\t${FAIL}"
+    exit 1
+}
+
+echo "==== Test PKCS11-tool ===="
+./tests/scripts/pkcs11_test.sh
+test $? -eq 0 || {
+    echo -e "\t${FAIL}"
+    exit 1
+}
+
+echo "==== Test backup and restore ===="
+./tests/scripts/backup.sh
+test $? -eq 0 || {
+    echo -e "\t${FAIL}"
+    exit 1
+}

tests/scripts/pkcs11_test.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+source ./tests/scripts/func.sh
+reset
+test $? -eq 0 || exit $?
+
+echo -n "  Test PKCS11 tool..."
+gen_and_check rsa:2048
+test $? -eq 0 && echo -n "." || exit $?
+e=$(pkcs11-tool --test -l --pin 648219 2>&1)
+test $? -eq 0 && echo -n "." || exit $?
+grep -q "No errors" <<< $e && echo -n "." || exit $?
+pkcs11-tool -l --pin 648219 --delete-object --type privkey --id 1 > /dev/null 2>&1
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+#e=$(pkcs11-tool --test-ec -l --pin 648219 --id 1 --key-type ec:secp256r1 2>&1)
+#test $? -eq 0 && echo -n "." || exit $?
+#grep -q "==> OK" <<< $e && echo -e ".\t${OK}" || exit $?

tests/scripts/sc_hsm_test.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+source ./tests/startup.sh
+
+echo "==== Test SC HSM ===="
+echo -n "  Running sc-hsm-pkcs11-test..."
+pkcs11-tool -l --pin 648219 --keypairgen --key-type ec:secp256r1 --id 1 --label "TestLabel" > /dev/null 2>&1
+test $? -eq 0 && echo -n "." ||  {
+    echo -e "\t${FAIL}"
+    exit 1
+}
+e=$(/usr/local/bin/sc-hsm-pkcs11-test --module /usr/local/lib/libsc-hsm-pkcs11.so --pin 648219 --invasive 2>&1)
+test $? -eq 0 && echo -n "." || {
+    echo -e "\t${FAIL}"
+    exit 1
+}
+grep -q "338 tests performed" <<< $e && echo -n "." || {
+    echo -e "\t${FAIL}"
+    exit 1
+}
+grep -q "0 tests failed" <<< $e && echo -e ".\t${OK}" || {
+    echo -e "\t${FAIL}"
+    exit 1
+}

tests/scripts/sign_and_verify.sh

@@ -0,0 +1,126 @@
+#!/bin/bash
+
+source ./tests/scripts/func.sh
+reset
+test $? -eq 0 || exit $?
+
+TEST_DATA="This is a test string. Be safe, be secure."
+echo ${TEST_DATA}  > data
+
+create_dgst() {
+    openssl dgst -$1 -binary -out data.$1 data > /dev/null 2>&1
+    test $? -eq 0 && echo -n "." || exit $?
+}
+
+dgsts=("sha1" "sha224" "sha256" "sha384" "sha512")
+for dgst in ${dgsts[*]}; do
+    echo -n "  Create digest ${dgst}..."
+    create_dgst ${dgst}
+    test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+done
+
+# $1 sign mechanism
+# $2 sign input file
+# $3 sign parameters
+# $4 vrfy input file
+# $5 vrfy parameters
+sign_and_verify() {
+    pkcs11-tool --id 1 --sign --pin 648219 --mechanism $1 -i $2 -o data.sig $3 > /dev/null 2>&1
+    test $? -eq 0 && echo -n "." || exit $?
+    e=$(openssl pkeyutl -verify -pubin -inkey 1.pub -in $4 -sigfile data.sig $5 2>&1)
+    test $? -eq 0 && echo -n "." || exit $?
+    grep -q "Signature Verified Successfully" <<< $e && echo -n "." || exit $?
+}
+
+sign_and_verify_rsa_pkcs() {
+    dgstl=$(awk '{print tolower($0)}' <<<$1)
+    dgstu=$(awk '{print toupper($0)}' <<<$1)
+    sign_and_verify "${dgstu}-RSA-PKCS" data "" data.${dgstl} "-pkeyopt digest:${dgstl}"
+    test $? -eq 0 && echo -n "." || exit $?
+}
+
+sign_and_verify_rsa_pss() {
+    dgstl=$(awk '{print tolower($0)}' <<<$1)
+    dgstu=$(awk '{print toupper($0)}' <<<$1)
+    sign_and_verify "RSA-PKCS-PSS" data.${dgstl} "--mgf MGF1-${dgstu} --hash-algorithm ${dgstu}" data.${dgstl} "-pkeyopt rsa_padding_mode:pss -pkeyopt rsa_pss_saltlen:-1 -pkeyopt digest:${dgstl}"
+    test $? -eq 0 && echo -n "." || exit $?
+}
+
+sign_and_verify_rsa_pss_dgst() {
+    dgstl=$(awk '{print tolower($0)}' <<<$1)
+    dgstu=$(awk '{print toupper($0)}' <<<$1)
+    sign_and_verify "${dgstu}-RSA-PKCS-PSS" data "" data.${dgstl} "-pkeyopt rsa_padding_mode:pss -pkeyopt rsa_pss_saltlen:-1 -pkeyopt digest:${dgstl}"
+    test $? -eq 0 && echo -n "." || exit $?
+}
+
+keygen_sign_and_verify_ec() {
+    echo "  Test ECDSA with $1"
+    echo -n "    Keygen $1..."
+    keygen_and_export $1
+    test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+    for dgst in ${dgsts[*]}; do
+        dgstu=$(awk '{print toupper($0)}' <<<${dgst})
+        echo -n "    Test ECDSA with ${dgst} and $1..."
+        sign_and_verify ECDSA "data.${dgst}" "--signature-format openssl" data.${dgst}
+        test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+        echo -n "    Test ECDSA-${dgstu} with $1..."
+        sign_and_verify "ECDSA-${dgstu}" data "--signature-format openssl" data.${dgst}
+        test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+    done
+    echo -n "    Delete $1..."
+    pkcs11-tool -l --pin 648219 --delete-object --type privkey --id 1 > /dev/null 2>&1
+    test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+}
+
+algs=("ec:secp192r1" "ec:secp256r1" "ec:secp384r1" "ec:secp521r1" "ec:brainpoolP256r1" "ec:brainpoolP384r1" "ec:brainpoolP512r1" "ec:secp192k1" "ec:secp256k1")
+for alg in ${algs[*]}; do
+    keygen_sign_and_verify_ec ${alg} || exit $?
+done
+
+echo "  Test RSA PKCS"
+echo -n "    Keygen rsa:2048..."
+keygen_and_export "rsa:2048"
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+echo -n "    Test RSA-PKCS..."
+pkcs11-tool --id 1 --sign --pin 648219 --mechanism RSA-PKCS -i data -o data.sig > /dev/null 2>&1
+test $? -eq 0 && echo -n "." || exit $?
+e=$(openssl pkeyutl -verify -pubin -inkey 1.pub -in data -sigfile data.sig 2>&1)
+test $? -eq 0 && echo -n "." || exit $?
+grep -q "Signature Verified Successfully" <<< $e && echo -e ".\t${OK}" || exit $?
+
+for dgst in ${dgsts[*]}; do
+    dgstu=$(awk '{print toupper($0)}' <<<${dgst})
+    echo -n "    Test RSA-PKCS-${dgstu}..."
+    sign_and_verify_rsa_pkcs ${dgst}
+    test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+done
+
+echo -n "    Test RSA-X-509..."
+cp data data_pad
+test $? -eq 0 && echo -n "." || exit $?
+tlen=${#TEST_DATA}
+dd if=/dev/zero bs=1 count=$((256-$tlen)) >> data_pad > /dev/null 2>&1
+test $? -eq 0 && echo -n "." || exit $?
+pkcs11-tool --id 1 --sign --pin 648219 --mechanism RSA-X-509 -i data_pad -o data.sig > /dev/null 2>&1
+test $? -eq 0 && echo -n "." || exit $?
+TDATA=$(tr -d '\0' < <(openssl rsautl -verify -inkey 1.pub -in data.sig -pubin -raw))
+if [[ ${TEST_DATA} != "$TDATA" ]]; then
+    exit 1
+fi
+test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+
+for dgst in ${dgsts[*]}; do
+    dgstu=$(awk '{print toupper($0)}' <<<${dgst})
+    if [[ "${dgst}" != "sha1" ]]; then
+        echo -n "    Test RSA-PKCS-PSS with ${dgst}..."
+        sign_and_verify_rsa_pss ${dgst}
+        test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+    fi
+    echo -n "    Test ${dgstu}-RSA-PKCS-PSS..."
+    sign_and_verify_rsa_pss_dgst ${dgst}
+    test $? -eq 0 && echo -e ".\t${OK}" || exit $?
+done
+
+rm -rf data* 1.*
+pkcs11-tool -l --pin 648219 --delete-object --type privkey --id 1 > /dev/null 2>&1

tests/scripts/store_binary.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+source ./tests/scripts/func.sh
+reset
+test $? -eq 0 || exit $?
+
+TEST_DATA="Pico HSM is awesome!"
+
+echo ${TEST_DATA} > test
+
+echo -n "  Test public binary storage..."
+pkcs11-tool --pin 648219 --write-object test --type data --id 1 --label 'test1' > /dev/null 2>&1
+test $? -eq 0 && echo -n "." || exit $?
+e=$(pkcs11-tool --read-object --type data --label 'test1' 2>&1)
+test $? -eq 0 && echo -n "." || exit $?
+grep -q "${TEST_DATA}" <<< $e && echo -e ".\t${OK}" || exit $?
+pkcs11-tool --pin 648219 --delete-object --type data --label 'test1' > /dev/null 2>&1
+
+echo -n "  Test private binary storage..."
+pkcs11-tool --pin 648219 --write-object test --type data --id 1 --label 'test1' --private > /dev/null 2>&1
+test $? -eq 0 && echo -n "." || exit $?
+e=$(pkcs11-tool --read-object --type data --label 'test1' --pin 648219 2>&1)
+test $? -eq 0 && echo -n "." || exit $?
+grep -q "${TEST_DATA}" <<< $e && echo -n "." || exit $?
+e=$(pkcs11-tool --read-object --type data --label 'test1' 2>&1)
+test $? -eq 1 && echo -n "." || exit $?
+grep -q "error: object not found" <<< $e && echo -e ".\t${OK}" || exit $?
+pkcs11-tool --pin 648219 --delete-object --type data --label 'test1' > /dev/null 2>&1

tests/start-up-and-test-pkcs11.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+source ./tests/startup.sh
+
+chmod a+x tests/scripts/*.sh
+
+echo "======== PKCS11 Test suite ========"
+./tests/scripts/pkcs11.sh

tests/start-up-and-test.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source ./tests/startup.sh
+
+pytest tests -W ignore::DeprecationWarning

tests/startup.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+OK="\t\033[32mok\033[0m"
+FAIL="\t\033[31mfail\033[0m"
+
+fail() {
+    echo -e "${FAIL}"
+    exit 1
+}
+
+echo -n "Start PCSC..."
+/usr/sbin/pcscd &
+test $? -eq 0 && echo -e "${OK}" || {
+    echo -e "${FAIL}"
+    exit 1
+}
+sleep 2
+rm -f memory.flash
+tar -xf tests/memory.tar.gz
+echo -n "Start Pico HSM..."
+/pico_hsm > /dev/null 2>&1 &
+test $? -eq 0 && echo -n "." || fail
+sleep 2
+ATR="3b:fe:18:00:00:81:31:fe:45:80:31:81:54:48:53:4d:31:73:80:21:40:81:07:fa"
+e=$(opensc-tool -an 2>&1)
+grep -q "${ATR}" <<< $e && echo -n "." || fail
+test $? -eq 0 && echo -e "${OK}" || fail

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_MINOR="4"
+VERSION_MAJOR="4" #Version of Pico CCID Core
+VERSION_MINOR="0"
 
 echo "----------------------------"
 echo "VID/PID patcher for Pico HSM"

tools/pico-hsm-tool.py

@@ -20,17 +20,8 @@
 """
 
 import sys
-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 cvc.certificates import CVC
-    from cvc.asn1 import ASN1
     from cvc.oid import oid2scheme
     from cvc.utils import scheme_rsa
 except ModuleNotFoundError:
@@ -47,6 +38,11 @@ except ModuleNotFoundError:
     print('ERROR: cryptography module not found! Install cryptography package.\nTry with `pip install cryptography`')
     sys.exit(-1)
 
+try:
+    from picohsm import PicoHSM, PinType, DOPrefixes, KeyType, EncryptionMode, utils, APDUResponse, SWCodes
+except ModuleNotFoundError:
+    print('ERROR: picohsm module not found! Install picohsm package.\nTry with `pip install pypicohsm`')
+    sys.exit(-1)
 
 import json
 import urllib.request
@@ -61,58 +57,16 @@ 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, 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
-
 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.add_argument('--pin', help='PIN number')
     parser_init.add_argument('--so-pin', help='SO-PIN number')
+    parser_init.add_argument('--silent', help='Confirms initialization silently.', action='store_true')
 
     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.')
     parser_attestate.add_argument('-k', '--key', help='The private key index', metavar='KEY_ID')
@@ -128,7 +82,7 @@ def parse_args():
     parser_rtc = subparser.add_parser('datetime', help='Datetime operations with the integrated Real Time Clock (RTC).')
     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_rtc_get = subparser_rtc.add_parser('get', help='Gets the current datetime.')
 
     parser_opts = subparser.add_parser('options', help='Manage extra options.', formatter_class=RawTextHelpFormatter)
     subparser_opts = parser_opts.add_subparsers(title='commands', dest='subcommand')
@@ -215,50 +169,44 @@ def get_pki_certs(certs_dir='certs', force=False):
             f.write(base64.urlsafe_b64decode(certs['dvca']['cert']))
     print(f'All PKI certificates are stored at {certs_dir} folder')
 
-def pki(card, args):
+def pki(_, args):
     if (args.subcommand == 'initialize'):
         if (args.default is True):
             get_pki_certs(certs_dir=args.certs_dir, force=args.force)
         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(picohsm, args):
+    if (not args.silent):
+        print('********************************')
+        print('*   PLEASE READ IT CAREFULLY   *')
+        print('********************************')
+        print('')
+        print('This tool will erase and reset your device. It will delete all '
+            'private and secret keys.')
+        print('Are you sure?')
+        _ = input('[Press enter to confirm]')
 
-def initialize(card, args):
-    print('********************************')
-    print('*   PLEASE READ IT CAREFULLY   *')
-    print('********************************')
-    print('')
-    print('This tool will erase and reset your device. It will delete all '
-        'private and secret keys.')
-    print('Are you sure?')
-    _ = input('[Press enter to confirm]')
-
-    send_apdu(card, 0xA4, 0x04, 0x00, [0xE8, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x81, 0xC3, 0x1F, 0x02, 0x01])
-    if (not args.pin):
-        pin = b'648219'
-
-    if (args.so_pin):
-        so_pin = args.so_pin.encode()
+    if (args.pin):
         try:
-            response = send_apdu(card, 0x20, 0x00, 0x82, list(so_pin))
+            picohsm.login(args.pin)
         except APDUResponse:
             pass
+        pin = args.pin
     else:
-        so_pin = b'57621880'
+        pin = '648219'
 
-    pin_data = [0x81, len(pin)] + list(pin)
-    so_pin_data = [0x82, len(so_pin)] + list(so_pin)
-    reset_data = [0x80, 0x02, 0x00, 0x01] + pin_data + so_pin_data + [0x91, 0x01, 0x03]
-    response = send_apdu(card, [0x80, 0x50], 0x00, 0x00, reset_data)
+    if (args.so_pin):
+        try:
+            picohsm.login(args.so_pin, who=PinType.SO_PIN)
+        except APDUResponse:
+            pass
+        so_pin = args.so_pin
+    else:
+        so_pin = '57621880'
 
-    response = send_apdu(card, 0xB1, 0xCE, 0x00, [0x54, 0x02, 0x00, 0x00])
+    picohsm.initialize(pin=pin, sopin=so_pin)
+    response = picohsm.get_contents(DOPrefixes.EE_CERTIFICATE_PREFIX, 0x00)
 
     cert = bytearray(response)
     Y = CVC().decode(cert).pubkey().find(0x86).data()
@@ -269,14 +217,10 @@ def initialize(card, args):
     j = get_pki_data('cvc', data=data)
     print('Device name: '+j['devname'])
     dataef = base64.urlsafe_b64decode(
-        j['cvcert']) + base64.urlsafe_b64decode(j['dvcert'])
+        j['cvcert']) + base64.urlsafe_b64decode(j['dvcert']) + base64.urlsafe_b64decode(j['cacert'])
 
-    response = send_apdu(card, 0xa4, 0x00, 0x00, [0x2f, 0x02])
-    response = send_apdu(card, 0x20, 0x00, 0x81, list(pin))
-
-    apdu_data = [0x54, 0x02, 0x00, 0x00] + \
-        list(ASN1.make_tag(0x53, dataef))
-    response = send_apdu(card, 0xd7, 0x00, 0x00, apdu_data)
+    picohsm.select_file(0x2f02)
+    response = picohsm.put_contents(0x0000, data=dataef)
 
     print('Certificate uploaded successfully!')
     print('')
@@ -285,22 +229,11 @@ def initialize(card, args):
     print('Now you can initialize the device as usual with your chosen PIN '
         'and configuration options.')
 
-def attestate(card, args):
+def attestate(picohsm, args):
     kid = int(args.key)
-    try:
-        response = send_apdu(card, 0xB1, 0x2F, 0x02, [0x54, 0x02, 0x00, 0x00])
-    except APDUResponse as a:
-        print('ERROR: There is an error with the device certificate.')
-        sys.exit(1)
-
-    devcert = ASN1().decode(response).find(0x7f21, pos=0).data(return_tag=True)
-
-    try:
-        cert = send_apdu(card, 0xB1, 0xCE, kid, [0x54, 0x02, 0x00, 0x00])
-    except APDUResponse as a:
-        if (a.sw1 == 0x6a and a.sw2 == 0x82):
-            print('ERROR: Key not found')
-            sys.exit(1)
+    termca = picohsm.get_termca()
+    devcert = termca['cv']['data']
+    cert = picohsm.get_contents(0xCE, kid)
 
     print(hexlify(bytearray(cert)))
     print(f'Details of key {kid}:\n')
@@ -339,42 +272,41 @@ def attestate(card, args):
     else:
         print(f'Key {kid} is NOT generated by device {chr.decode()}')
 
-def rtc(card, args):
+def rtc(picohsm, args):
     if (args.subcommand == 'set'):
         now = datetime.now()
-        _ = send_apdu(card, [0x80, 0x64], 0x0A, 0x00, list(now.year.to_bytes(2, 'big')) + [now.month, now.day, now.weekday(), now.hour, now.minute, now.second ])
+        _ = picohsm.send(cla=0x80, command=0x64, p1=0x0A, data=list(now.year.to_bytes(2, 'big')) + [now.month, now.day, now.weekday(), now.hour, now.minute, now.second ])
     elif (args.subcommand == 'get'):
-        response = send_apdu(card, [0x80, 0x64], 0x0A, 0x00)
+        response = picohsm.send(cla=0x80, command=0x64, p1=0x0A)
         dt = datetime(int.from_bytes(response[:2], 'big'), response[2], response[3], response[5], response[6], response[7])
         print(f'Current date and time is: {dt.ctime()}')
 
-def opts(card, args):
+def opts(picohsm, args):
     opt = 0x0
     if (args.opt == 'button'):
         opt = 0x1
     elif (args.opt == 'counter'):
         opt = 0x2
-    current = send_apdu(card, [0x80, 0x64], 0x6, 0x0)[0]
+    current = picohsm.send(cla=0x80, command=0x64, p1=0x6)[0]
     if (args.subcommand == 'set'):
         if (args.onoff == 'on'):
             newopt = current | opt
         else:
             newopt = current & ~opt
-        send_apdu(card, [0x80, 0x64], 0x6, 0x0, [newopt])
+        picohsm.send(cla=0x80, command=0x64, p1=0x6, data=[newopt])
     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 __init__(self, picohsm):
+        self.picohsm = picohsm
 
     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))
+        ret = self.picohsm.send(cla=0x80, command=0x64, p1=0x3A, p2=0x01, data=list(self.__pb))
 
         pk = ec.EllipticCurvePublicKey.from_encoded_point(ec.SECP256R1(), bytes(ret))
         shared_key = sk.exchange(ec.ECDH(), pk)
@@ -396,7 +328,7 @@ class SecureLock:
 
     def unlock_device(self):
         ct = self.get_skey()
-        send_apdu(self.card, [0x80, 0x64], 0x3A, 0x03, list(ct))
+        self.picohsm.send(cla=0x80, command=0x64, p1=0x3A, p2=0x03, data=list(ct))
 
     def _get_key_device(self):
         if (platform.system() == 'Windows' or platform.system() == 'Linux'):
@@ -415,15 +347,14 @@ class SecureLock:
 
     def enable_device_aut(self):
         ct = self.get_skey()
-        send_apdu(self.card, [0x80, 0x64], 0x3A, 0x02, list(ct))
+        self.picohsm.send(cla=0x80, command=0x64, p1=0x3A, p2=0x02, data=list(ct))
 
     def disable_device_aut(self):
         ct = self.get_skey()
-        send_apdu(self.card, [0x80, 0x64], 0x3A, 0x04, list(ct))
+        self.picohsm.send(cla=0x80, command=0x64, p1=0x3A, p2=0x04, p3=list(ct))
 
-
-def secure(card, args):
-    slck = SecureLock(card)
+def secure(picohsm, args):
+    slck = SecureLock(picohsm)
     if (args.subcommand == 'enable'):
         slck.enable_device_aut()
     elif (args.subcommand == 'unlock'):
@@ -431,120 +362,63 @@ def secure(card, args):
     elif (args.subcommand == 'disable'):
         slck.disable_device_aut()
 
-
-def cipher(card, args):
+def cipher(picohsm, 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)
-
+        ret = picohsm.key_generation(KeyType.AES, param=args.key_size * 8)
     else:
-        enc = None
-        aad = None
+        if (args.file_in):
+            fin = open(args.file_in, 'rb')
+        else:
+            fin = sys.stdin.buffer
+        enc = fin.read()
+        fin.close()
+        iv = args.iv
+        if (args.iv and args.hex):
+            iv = unhexlify(iv)
+        aad = args.aad
+        if (args.aad and args.hex):
+                aad = unhexlify(aad)
+
+        mode = EncryptionMode.ENCRYPT if args.subcommand[0] == 'e' else EncryptionMode.DECRYPT
         if (args.alg == 'CHACHAPOLY'):
-            oid = b'\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x03\x12'
+            ret = picohsm.chachapoly(args.key, mode, data=enc, iv=iv, aad=aad)
         elif (args.alg == 'HMAC-SHA1'):
-            oid = b'\x2A\x86\x48\x86\xF7\x0D\x02\x07'
+            ret = picohsm.hmac(hashes.SHA1, args.key, data=enc)
         elif (args.alg == 'HMAC-SHA224'):
-            oid = b'\x2A\x86\x48\x86\xF7\x0D\x02\x08'
+            ret = picohsm.hmac(hashes.SHA224, args.key, data=enc)
         elif (args.alg == 'HMAC-SHA256'):
-            oid = b'\x2A\x86\x48\x86\xF7\x0D\x02\x09'
+            ret = picohsm.hmac(hashes.SHA256, args.key, data=enc)
         elif (args.alg == 'HMAC-SHA384'):
-            oid = b'\x2A\x86\x48\x86\xF7\x0D\x02\x0A'
+            ret = picohsm.hmac(hashes.SHA384, args.key, data=enc)
         elif (args.alg == 'HMAC-SHA512'):
-            oid = b'\x2A\x86\x48\x86\xF7\x0D\x02\x0B'
+            ret = picohsm.hmac(hashes.SHA512, args.key, data=enc)
         elif (args.alg == 'HKDF-SHA256'):
-            oid = b'\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x03\x1D'
+            ret = picohsm.hkdf(hashes.SHA256, args.key, data=enc, salt=iv, out_len=args.output_len)
         elif (args.alg == 'HKDF-SHA384'):
-            oid = b'\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x03\x1E'
+            ret = picohsm.hkdf(hashes.SHA384, args.key, data=enc, salt=iv, out_len=args.output_len)
         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
-        '''
+            ret = picohsm.hkdf(hashes.SHA512, args.key, data=enc, salt=iv, out_len=args.output_len)
+        elif (args.alg == 'PBKDF2-SHA1'):
+            ret = picohsm.pbkdf2(hashes.SHA1, args.key, salt=iv, iterations=args.iteration, out_len=args.output_len)
+        elif (args.alg == 'PBKDF2-SHA224'):
+            ret = picohsm.pbkdf2(hashes.SHA224, args.key, salt=iv, iterations=args.iteration, out_len=args.output_len)
+        elif (args.alg == 'PBKDF2-SHA256'):
+            ret = picohsm.pbkdf2(hashes.SHA256, args.key, salt=iv, iterations=args.iteration, out_len=args.output_len)
+        elif (args.alg == 'PBKDF2-SHA384'):
+            ret = picohsm.pbkdf2(hashes.SHA384, args.key, salt=iv, iterations=args.iteration, out_len=args.output_len)
+        elif (args.alg == 'PBKDF2-SHA512'):
+            ret = picohsm.pbkdf2(hashes.SHA512, args.key, salt=iv, iterations=args.iteration, out_len=args.output_len)
+        elif (args.alg == 'X963-SHA1'):
+            ret = picohsm.x963(hashes.SHA1, args.key, data=enc, out_len=args.output_len)
+        elif (args.alg == 'X963-SHA224'):
+            ret = picohsm.x963(hashes.SHA224, args.key, data=enc, out_len=args.output_len)
+        elif (args.alg == 'X963-SHA256'):
+            ret = picohsm.x963(hashes.SHA256, args.key, data=enc, out_len=args.output_len)
+        elif (args.alg == 'X963-SHA384'):
+            ret = picohsm.x963(hashes.SHA384, args.key, data=enc, out_len=args.output_len)
+        elif (args.alg == 'X963-SHA512'):
+            ret = picohsm.x963(hashes.SHA512, args.key, data=enc, out_len=args.output_len)
 
-        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:
@@ -556,19 +430,16 @@ def cipher(card, args):
         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):
+def x25519(picohsm, 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)
+        A = utils.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)
+        A = utils.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'
@@ -583,45 +454,33 @@ def x25519(card, args):
     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))
+    ret = picohsm.send(command=0x46, p1=args.key, data=list(cdata))
 
 def main(args):
-    sys.stderr.buffer.write(b'Pico HSM Tool v1.8\n')
+    sys.stderr.buffer.write(b'Pico HSM Tool v1.10\n')
     sys.stderr.buffer.write(b'Author: Pol Henarejos\n')
     sys.stderr.buffer.write(b'Report bugs to https://github.com/polhenarejos/pico-hsm/issues\n')
     sys.stderr.buffer.write(b'\n\n')
-    cardtype = AnyCardType()
-    try:
-        # request card insertion
-        cardrequest = CardRequest(timeout=10, cardType=cardtype)
-        card = cardrequest.waitforcard()
 
-        # connect to the card and perform a few transmits
-        card.connection.connect()
-
-    except CardRequestTimeoutException:
-        print('time-out: no card inserted during last 10s')
-
-    if (args.pin):
-        login(card, args)
+    picohsm = PicoHSM(args.pin)
 
     # Following commands may raise APDU exception on error
     if (args.command == 'initialize'):
-        initialize(card, args)
+        initialize(picohsm, args)
     elif (args.command == 'attestate'):
-        attestate(card, args)
+        attestate(picohsm, args)
     elif (args.command == 'pki'):
-        pki(card, args)
+        pki(picohsm, args)
     elif (args.command == 'datetime'):
-        rtc(card, args)
+        rtc(picohsm, args)
     elif (args.command == 'options'):
-        opts(card, args)
+        opts(picohsm, args)
     elif (args.command == 'secure'):
-        secure(card, args)
+        secure(picohsm, args)
     elif (args.command == 'cipher'):
-        cipher(card, args)
+        cipher(picohsm, args)
     elif (args.command == 'x25519' or args.command == 'x448'):
-        x25519(card, args)
+        x25519(picohsm, args)
 
 
 def run():

tools/secure_key/macos.py

@@ -51,7 +51,9 @@ def get_secure_key():
     try:
         backend = get_backend(False)
         key = backend.get_password(DOMAIN, USERNAME)[0]
-    except keyring.errors.KeyringError:
+        if (key is None):
+            raise TypeError
+    except (keyring.errors.KeyringError, TypeError):
         try:
             key = generate_secure_key(False)[0] # It should be True, but secure enclave causes python segfault
         except keyring.errors.PasswordSetError:

tools/secure_key/windows.py

@@ -39,6 +39,8 @@ def get_secure_key():
     key = None
     try:
         key = keyring.get_password(DOMAIN, USERNAME)
-    except keyring.errors.KeyringError:
+        if (key is None):
+            raise TypeError
+    except (keyring.errors.KeyringError, TypeError):
         key = generate_secure_key()
     return get_d(key.encode())