Upgrading to version 2.0.

Using MBEDTLS from pico ccid.
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
2022-04-19 19:24:10 +02:00 · 2022-04-19 19:19:16 +02:00 · 2022-04-19 19:16:29 +02:00 · 2022-04-19 18:42:48 +02:00 · 2022-04-19 18:39:52 +02:00 · 2022-04-14 18:31:39 +02:00
30 changed files with 1842 additions and 4329 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "OpenSC"]
 	path = OpenSC
 	url = https://github.com/polhenarejos/OpenSC
-[submodule "mbedtls"]
-	path = mbedtls
-	url = https://github.com/ARMmbed/mbedtls
+[submodule "pico-ccid"]
+	path = pico-ccid
+	url = https://github.com/polhenarejos/pico-ccid
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,49 +41,61 @@ set_source_files_properties(
        ${CMAKE_CURRENT_LIST_DIR}/OpenSC/src/libopensc/ctx.c
        PROPERTIES COMPILE_DEFINITIONS "PACKAGE_VERSION=\"0.22.0\";OPENSC_CONF_PATH=\".\"" 
        )
+        
+
+find_package( PythonInterp 3.7 REQUIRED )
+        
+if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cvcerts.h)
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/burn-cvcerts.py ${CMAKE_CURRENT_LIST_DIR})
+    message("Burning CVCert")
+endif()

 target_sources(pico_hsm PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/hsm2040.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/ccid/ccid2040.c
        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/sc_hsm.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/usb/usb_descriptors.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/fs/file.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/fs/flash.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/fs/low_flash.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/rng/random.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/rng/neug.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/usb/usb_descriptors.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/fs/file.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/fs/flash.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/fs/low_flash.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/rng/random.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/rng/neug.c
+        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/files.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/ccid/crypto_utils.c
+        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/dkek.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/ccid/eac.c
        
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha256.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/aes.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha512.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/rsa.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/bignum.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/platform_util.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/md.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/oid.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/rsa_alt_helpers.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/constant_time.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/ecdsa.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/ecp.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/ecp_curves.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/asn1write.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/hmac_drbg.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/md5.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/ripemd160.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha1.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/ecdh.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/cmac.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/cipher.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/cipher_wrap.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/chachapoly.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/camellia.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/chacha20.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/aria.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/poly1305.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/gcm.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/ccm.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/des.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/nist_kw.c
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/hkdf.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/sha256.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/aes.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/sha512.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/rsa.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/bignum.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/platform_util.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/md.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/oid.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/rsa_alt_helpers.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/constant_time.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/ecdsa.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/ecp.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/ecp_curves.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/asn1write.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/hmac_drbg.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/md5.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/ripemd160.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/sha1.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/ecdh.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/cmac.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/cipher.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/cipher_wrap.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/chachapoly.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/camellia.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/chacha20.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/aria.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/poly1305.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/gcm.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/ccm.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/des.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/nist_kw.c
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library/hkdf.c
        
        ${CMAKE_CURRENT_LIST_DIR}/OpenSC/src/libopensc/pkcs15.c
        ${CMAKE_CURRENT_LIST_DIR}/OpenSC/src/libopensc/pkcs15-prkey.c
@@ -104,20 +116,21 @@ target_sources(pico_hsm PUBLIC
        )

 target_include_directories(pico_hsm PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/src/fs
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/fs
        ${CMAKE_CURRENT_LIST_DIR}/src/hsm
-        ${CMAKE_CURRENT_LIST_DIR}/src/rng
-        ${CMAKE_CURRENT_LIST_DIR}/src/usb
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/ccid
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/rng
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/src/usb
        ${CMAKE_CURRENT_LIST_DIR}/opensc/src
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/include
-        ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/include
+        ${CMAKE_CURRENT_LIST_DIR}/pico-ccid/mbedtls/library
        )
-
+        
 pico_add_extra_outputs(pico_hsm)

 #target_compile_definitions(pico_hsm PRIVATE MBEDTLS_ECDSA_DETERMINISTIC=1)

-target_link_libraries(pico_hsm PRIVATE pico_stdlib tinyusb_device tinyusb_board pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id)
+target_link_libraries(pico_hsm PRIVATE pico_stdlib tinyusb_device tinyusb_board pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id hardware_rtc)

 #
 #project(flash_nuke C CXX ASM)
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This is a project to create a Hardware Security Module (HSM) with a Raspberry Pi
 - RSA key generation from 1024 to 4096 bits.
 - ECDSA key generation from 192 to 521 bits.
 - ECC curves secp192r1, secp256r1, secp384r1, secp521r1, brainpoolP256r1, brainpoolP384r1, brainpoolP512r1, secp192k1 (insecure), secp256k1.
- SHA1, SHA224, SHA256, SHA384, SHA256 digests.
+- SHA1, SHA224, SHA256, SHA384, SHA512 digests.
 - RSA-PSS, RSA-PKCS and raw RSA signature.
 - ECDSA raw and hash signature.
 - ECDH key derivation.
@@ -23,11 +23,18 @@ This is a project to create a Hardware Security Module (HSM) with a Raspberry Pi
 - DKEK n-of-m threshold scheme.
 - USB/CCID support with OpenSC, openssl, etc.
 - Extended APDU support.
+- Private keys and certificates import from WKY or PKCS#12 files.[^2][^3]
+- Transport PIN for provisioning and forcing to set a new PIN.[^2]
+- Press-to-confirm button optional feature to authorize operations with private/secret keys.
+- Store and retrieve binary data.
+- Real time clock with external datetime setting and getting. 

 [^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/rsa_4096.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. 

 ## 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. All keys (including DKEK) are loaded and cleared every time to avoid potential flaws. 
+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. 

 At the same time, DKEK is encrypted with doubled salted and hashed PIN. Also, the PIN is hashed in memory during the session. Hence, PIN is never stored in plain text neither in flash nor in memory. Note that PIN is conveyed from the host to the HSM in plain text if no secure channel is provided.

@@ -80,6 +87,60 @@ For backup, restore and DKEK share management, check [doc/backup-and-restore.md]

 For AES key generation, encryption and decryption, check [doc/aes.md](/doc/aes.md).

+For 4096 bits RSA support, check [doc/rsa_4096_support.md](/doc/rsa_4096.md).
+
+For storing and retrieving arbitrary data, check [doc/store_data.md](/doc/store_data.md).
+
+For extra options, such as set/get real datetime or enable/disable press-to-confirm button, check [doc/extra_command.md](/doc/extra_command.md).
+
+## Operation time
+### Keypair generation
+Generating EC keys is almost instant. RSA keypair generation takes some time, specially for `3072` and `4096` bits. 
+
+| RSA key length (bits) | Average time (seconds) |
+| :---: | :---: |
+| 1024 | 16 |
+| 2048 | 124 |
+| 3072 | 600 |
+| 4096 | ~1000 |
+
+### Signature and decrypt
+| RSA key length (bits) | Average time (seconds) |
+| :---: | :---: |
+| 1024 | 1 |
+| 2048 | 3 |
+| 3072 | 7 |
+| 4096 | 15 |
+
+## Press-to-confirm button
+Raspberry Pico comes with the BOOTSEL button to load the firmware. When this firmware is running, the button can be used for other purposes. Pico HSM uses this button to confirm private/secret operations. This feature is optional and it shall be enabled. For more information, see [doc/extra_command.md](/doc/extra_command.md).
+
+With this feature enabled, everytime that a private/secret key is loaded, the Pico HSM awaits for the user confirmation by pressing the BOOTSEL button. The Led of the Pico HSM will remain almost illuminated, turning off quickly once a second, indicating that the user must press the button to confirm the operation. Otherwise, the Pico HSM waits indefinitely. See [Led blink](#press-to-confirm) for a picture of the blinking sequence. When in this mode, the Pico HSM sends periodic timeout commands to the host to do not trigger the timeout operation.
+
+This feature is an extra layer of security, as it requires the user intervention to sign or decrypt and it ensures that any application will use the Pico HSM without user awareness. However, it is not recommended for servers or other environments where operations are authomatized, since it requires a physical access to the Pico HSM to push the button.
+
+## Led blink
+Pico HSM uses the led to indicate the current status. Four states are available:
+### Press to confirm
+The Led is almost on all the time. It goes off for 100 miliseconds every second.
+
+![Press to confirm](https://user-images.githubusercontent.com/55573252/162008917-6a730eac-396c-44cc-890e-802294be30a3.gif)
+
+### Idle mode
+In idle mode, the Pico HSM goes to sleep. It waits for a command and it is awaken by the driver. The Led is almost off all the time. It goes on for 500 milliseconds every second.
+
+![Idle mode](https://user-images.githubusercontent.com/55573252/162008980-d5a5caad-072e-400c-98e3-2c606b4b2af9.gif)
+
+### Active mode
+In active mode, the Pico HSM is awaken and ready to receive a command. It blinks four times in a second.
+
+![Active](https://user-images.githubusercontent.com/55573252/162008997-1ea8cd7e-5384-4893-9dcb-b473153fc375.gif)
+
+### Processing
+While processing, the Pico HSM is busy and cannot receive additional commands until the current is processed. In this state, the Led blinks 20 times in a second.
+
+![Processing](https://user-images.githubusercontent.com/55573252/162009007-df45111e-2473-4a92-97c5-15c3cd19babd.gif)
+
 ## Driver

 Pico HSM uses the `sc-hsm` driver provided by [OpenSC](https://github.com/OpenSC/OpenSC/ "OpenSC") or the `sc-hsm-embedded` driver provided by [CardContact](https://github.com/CardContact/sc-hsm-embedded "CardContact"). This driver utilizes the standardized PKCS#11 interface to communicate with the user and it can be used with many engines that accept PKCS#11 interface, such as OpenSSL, P11 library or pkcs11-tool. 
@@ -90,6 +151,8 @@ The way to communicate is exactly the same as with other cards, such as OpenPGP

 For an advanced usage, see the docs and examples.

+Pico HSM also supports SCS3 tool. See [SCS3](/doc/rsa_4096.md "SCS3") for more information.
+
 ### Important
 OpenSC relies on PCSC driver, which reads a list (`Info.plist`) that contains a pair of VID/PID of supported readers. In order to be detectable, you must patch the UF2 binary (if you just downloaded from the [Release section](https://github.com/polhenarejos/pico-hsm/releases "Release section")) or configure the project with the proper VID/PID with `USB_VID` and `USB_PID` parameters in `CMake` (see [Build section](#build "Build section")). Note that you cannot distribute the patched/compiled binary if you do not own the VID/PID or have an explicit authorization.

--- a/build_pico_hsm.sh
+++ b/build_pico_hsm.sh
@@ -1,10 +1,10 @@
 #!/bin/bash

-VERSION_MAJOR="1"
-VERSION_MINOR="6"
+VERSION_MAJOR="2"
+VERSION_MINOR="0"

 rm -rf release/*
-cd build
+cd build_release

 for board in adafruit_feather_rp2040 adafruit_itsybitsy_rp2040 adafruit_qtpy_rp2040 adafruit_trinkey_qt2040 arduino_nano_rp2040_connect melopero_shake_rp2040 pimoroni_interstate75 pimoroni_keybow2040 pimoroni_pga2040 pimoroni_picolipo_4mb pimoroni_picolipo_16mb pimoroni_picosystem pimoroni_plasma2040 pimoroni_tiny2040 pybstick26_rp2040 sparkfun_micromod sparkfun_promicro sparkfun_thingplus vgaboard waveshare_rp2040_lcd_0.96 waveshare_rp2040_plus_4mb waveshare_rp2040_plus_16mb waveshare_rp2040_zero
 do
@@ -18,4 +18,4 @@ done
 rm -rf *
 PICO_SDK_PATH=~/Devel/pico/pico-sdk cmake ..
 make -kj20
-mv pico_hsm.uf2 ../release/pico_hsm-$VERSION_MAJOR.$VERSION_MINOR.uf2
+mv pico_hsm.uf2 ../release/pico_hsm_pico_generic-$VERSION_MAJOR.$VERSION_MINOR.uf2
--- a/burn-cvcerts.py
+++ b/burn-cvcerts.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Wed Apr 13 20:15:01 2022
+
+@author: Pol Henarejos
+"""
+
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import ec
+import base64
+import urllib.request
+import json
+import sys
+
+def print_var(v, name):
+    s = '\n'
+    s += "static const unsigned char "+name+"[] = {\n"
+    s += "\t0x{:02x},0x{:02x},\n".format((len(v) & 0xff),((len(v)>> 8) & 0xff))
+    for i in range(len(v)):
+        if (i%16 == 0):
+            s += '\t'
+        s += "0x{:02x}".format((v[i]))
+        if (i < len(v)-1):
+            s += ','
+        if (i%16 == 15):
+            s += '\n'
+    s += '\n'
+    s += '};\n'
+    return s
+
+def main():
+    args = sys.argv[1:]
+    
+    private_key = ec.generate_private_key(ec.SECP192R1(), default_backend())
+    public_key = private_key.public_key()
+    pub_num = public_key.public_numbers()
+    pbk = base64.urlsafe_b64encode(b'\x04'+pub_num.x.to_bytes(24,'big')+pub_num.y.to_bytes(24,'big'))
+    
+    user_agent = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.7) Gecko/2009021910 Firefox/3.0.7'
+    
+    data = urllib.parse.urlencode({'pubkey':pbk}).encode()
+    req = urllib.request.Request("https://www.henarejos.me/pico-hsm.php", method='POST', data=data, headers={'User-Agent':user_agent,} ) #The assembled request
+    response = urllib.request.urlopen(req)
+    resp = response.read().decode('utf-8')
+    j = json.loads(resp)
+    cvcert = base64.b64decode(j['cvcert'])
+    
+    dica = [
+        0x7f,0x21,0x81,0xc5,0x7f,0x4e,0x81,0x8e,0x5f,0x29,0x01,0x00,0x42,0x0e,0x45,0x53,
+        0x43,0x56,0x43,0x41,0x48,0x53,0x4d,0x30,0x30,0x30,0x30,0x31,0x7f,0x49,0x3f,0x06,
+        0x0a,0x04,0x00,0x7f,0x00,0x07,0x02,0x02,0x02,0x02,0x03,0x86,0x31,0x04,0x93,0x7e,
+        0xdf,0xf1,0xa6,0xd2,0x40,0x7e,0xb4,0x71,0xb2,0x97,0x50,0xdb,0x7e,0xe1,0x70,0xfb,
+        0x6c,0xcd,0x06,0x47,0x2a,0x3e,0x9c,0x8d,0x59,0x56,0x57,0xbe,0x11,0x11,0x0a,0x08,
+        0x81,0x54,0xed,0x22,0xc0,0x83,0xac,0xa1,0x2e,0x39,0x7b,0xd4,0x65,0x1f,0x5f,0x20,
+        0x0e,0x45,0x53,0x44,0x56,0x43,0x41,0x48,0x53,0x4d,0x30,0x30,0x30,0x30,0x31,0x7f,
+        0x4c,0x12,0x06,0x09,0x04,0x00,0x7f,0x00,0x07,0x03,0x01,0x02,0x02,0x53,0x05,0x80,
+        0x00,0x00,0x00,0x04,0x5f,0x25,0x06,0x02,0x02,0x00,0x03,0x02,0x07,0x5f,0x24,0x06,
+        0x02,0x05,0x01,0x02,0x03,0x01,0x5f,0x37,0x30,0x8b,0xb2,0x01,0xb6,0x24,0xfe,0xe5,
+        0x4e,0x65,0x3a,0x02,0xa2,0xb2,0x27,0x2d,0x3d,0xb4,0xb0,0xc9,0xdd,0xbf,0x10,0x6d,
+        0x99,0x49,0x46,0xd6,0xd0,0x72,0xc1,0xf3,0x4c,0xab,0x4f,0x32,0x14,0x7c,0xb0,0x99,
+        0xb7,0x33,0x70,0xd6,0x00,0xff,0x73,0x0c,0x5d
+    ]
+    
+    s = '#ifndef _CVCERTS_H_\n#define _CVCERTS_H_\n'
+    s += print_var(dica,'dica')
+    s += print_var(cvcert,'termca')
+    
+    pvk = private_key.private_numbers().private_value.to_bytes(24,'big')
+    s += print_var(pvk,'termca_pk')
+    s += '\n#endif\n'
+    f = open(args[0] + '/src/hsm/cvcerts.h','w')
+    f.write(s)
+    f.close()
+    
+if __name__ == '__main__':
+    main()
--- a/doc/extra_command.md
+++ b/doc/extra_command.md
@@ -0,0 +1,86 @@
+# Extra command
+
+Pico HSM supports a customized extra command to use with different options. Since the drivers in the market do not support the following features, a raw APDU command shall be sent. 
+
+To send a raw APDU command, `opensc-tool -s <APDU>` can be used. The `APDU` parameter is a string of hexadecimal numbers and it takes the following form:
+```
+8064XX00YYZZZZRR
+```
+
+It composed by the following fields:
+- `80` to indicate that it is a custom vendor type command.
+- `64` is the `INS` custom command.
+- `XX` is the command to execute. It varies depending on the targeted command.
+- `00` is the parameter of the command. At this moment, no commands support parameters.
+- `YY` is the length of the data. If no data is provided, this field is absent.
+- `ZZZZ` is the data to be sent. Optional. The length is variable.
+- `RR` is the length of the expected response. If no response is expected, this field is absent.
+
+## Real time clock and datetime
+Pico HSM has an internal real time clock (RTC) which can track precisely the date and the time. However, when it is reset or powered down, the Pico HSM is reset to the initial datetime: 2020 January 1, 00:00:00.
+
+### Getting the datetime
+To obtain the current datetime (referenced to 00:00:00 2020/01/01), the `XX` parameter must be set to `0A`. There is no data and, thus, `YY` and `ZZZZ` are absent. The expected response is 8 bytes length.
+
+For example, to obtain the current datetime:
+
+```
+$ opensc-tool -s 80640A0008
+Using reader with a card: Free Software Initiative of Japan Gnuk
+Sending: 80 64 0A 00 08 
+Received (SW1=0x90, SW2=0x00):
+07 E6 04 06 03 13 29 1E ......).
+```
+
+The response is composed by 8 bytes:
+- The first two bytes are the current year, MSB first. Hence, `07E6h` equals to `2022`.
+- 1 byte for the current month, `01h` is January and `0Ch` is December.
+- 1 byte for the current day, from `01h` (1) to `1Fh` (31).
+- 1 byte for the day of the week, `00h` is Sunday, `01h` is Monday, etc.
+- 1 byte for the hours, from `00h` (0) to `17h` (23).
+- 1 byte for the minutes, from `00h` (0) to `3Bh` (59).
+- 1 byte for the seconds, from `00h` (0) to `3Bh` (59).
+
+If the command is correctly received, `SW1=0x90` and `SW2=0x00`. Other values mean that an error has ocurred.
+
+### Setting the datetime
+To set the reference datetime, a datetime string must be provided. For example:
+
+```
+$ opensc-tool -s 80640A000807E6040603132917
+Using reader with a card: Free Software Initiative of Japan Gnuk
+Sending: 80 64 0A 00 08 07 E6 04 06 03 13 29 17 
+Received (SW1=0x90, SW2=0x00)
+```
+
+will set the reference datetime to `Wednesday, 2022 April 6th, 19:41:23`.
+
+## Dynamic options
+Pico HSM support initialize options, such as setting Transport PIN or reset retry counter options. However, once it is initialized, these options cannot be modified anymore, without a new initialization (loosing all stored keys). Pico HSM offers the chance to define a set of dynamic options that can be enabled/disabled dynamically without initializing the device at every moment.
+
+To specify a set of options, the `XX` parameter shall be set to `06`. The data parameter shall be 1 byte, where the options are combined with the or operand `|`. The length `YY` shall be set to `01`.
+
+### Press-to-confirm button
+Press-to-confirm button offers an extra security layer by requiring the user confirmation everytime that a private/secret key is loaded. This avoids ghost applications thay may perform hidden opperations without noticing the user, such as signing or decrypting. Pico HSM will inform the user that is awaiting for a confirmation by making almost a fixed Led blink.
+
+This feature is disabled by default but can be enabled rapidly by setting the LSB bit to 1:
+
+```
+$ opensc-tool -s 806406000101
+Using reader with a card: Free Software Initiative of Japan Gnuk
+Sending: 80 64 06 00 01 01 
+Received (SW1=0x90, SW2=0x00)
+```
+
+At this moment, when a private/secret key is loaded, the Pico HSM will wait for the pressed BOOTSEL button to confirm the operation.
+
+To disable, the LSB bit must be set to 0:
+
+```
+$ opensc-tool -s 806406000100
+Using reader with a card: Free Software Initiative of Japan Gnuk
+Sending: 80 64 06 00 01 00
+Received (SW1=0x90, SW2=0x00)
+```
+
+
--- a/doc/rsa_4096.md
+++ b/doc/rsa_4096.md
@@ -0,0 +1,49 @@
+# RSA 4096 support
+
+Generating 4096 bits key in the Pico HSM is highly expensive. It may take minutes or hours to finish the generation. Therefore, it is extremely recommendable to generate the key in the host and import it into the Pico HSM.
+
+## SCS3 tool
+
+Unfortunately, there is no pkcs11 tool or equivalent capable to perform the import. Since it uses the SC-HSM driver, it also supports the communication with the [SCS3 tool](https://www.openscdp.org/scsh3/ "SCS3 tool"). It can be downloaded from [here](https://www.openscdp.org/scsh3/download.html "here").
+
+However, SCS3 only works with those HSM manufactured by CardContact. The check is performed by means of trust store against the manufacturing certificates. For obvious reasons, these certificates can only be signed with the private keys of the Certificate Authorities listed in the trust store. 
+
+Pico HSM is shipped with its own CA certificates. To load this certificate onto the trust store of SCS3, the following line has to be appended to `SmartCardHSM.rootCerts` variable, near line `235` in the file `scs3/scsh/sc-hsm/SmartCardHSM.js`.
+
+```
+ESCVCAHSM00001: new CVC(new ByteString("7F218201657F4E82012D5F290100420E45534356434148534D30303030317F4981DD060A04007F000702020202038118FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF8218FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC831864210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1843104188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF101207192B95FFC8DA78631011ED6B24CDD573F977A11E7948118518FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831863104088FCDFCCE87EDD285920615E651D76452D857ECBB408C327ADB48A2A514C1C9BD77CC9783607A741493A742744AD1738701015F200E45534356434148534D30303030317F4C12060904007F0007030102025305C0000000045F25060202000302065F24060300010203015F37307297777664B60C57A2C45E7BFD12E520143EDE9038BFB302739106F2730D760665D74649910C519089848D4FB6E51340", HEX))
+```
+
+Therefore, the whole variable becomes:
+
+```
+SmartCardHSM.rootCerts = {
+	DESRCACC100001: new CVC(new ByteString("7F218201B47F4E82016C5F290100420E44455352434143433130303030317F4982011D060A04007F000702020202038120A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E537782207D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9832026DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B68441048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F0469978520A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A78641046D025A8026CDBA245F10DF1B72E9880FFF746DAB40A43A3D5C6BEBF27707C30F6DEA72430EE3287B0665C1EAA6EAA4FA26C46303001983F82BD1AA31E03DA0628701015F200E44455352434143433130303030317F4C10060B2B0601040181C31F0301015301C05F25060102010100095F24060302010100085F37409DBB382B1711D2BAACB0C623D40C6267D0B52BA455C01F56333DC9554810B9B2878DAF9EC3ADA19C7B065D780D6C9C3C2ECEDFD78DEB18AF40778ADF89E861CA", HEX)),
+	UTSRCACC100001: new CVC(new ByteString("7F218201B47F4E82016C5F290100420E55545352434143433130303030317F4982011D060A04007F000702020202038120A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E537782207D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9832026DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B68441048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F0469978520A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7864104A041FEB2FD116B2AD19CA6B7EACD71C9892F941BB88D67DCEEC92501F070011957E22122BA6C2CF5FF02936F482E35A6129CCBBA8E9383836D3106879C408EF08701015F200E55545352434143433130303030317F4C10060B2B0601040181C31F0301015301C05F25060102010100095F24060302010100085F3740914DD0FA00615C44048D1467435400423A4AD1BD37FD98D6DE84FD8037489582325C72956D4FDFABC6EDBA48184A754F37F1BE5142DD1C27D66569308CE19AAF", HEX)),
+	ESCVCAHSM00001: new CVC(new ByteString("7F218201657F4E82012D5F290100420E45534356434148534D30303030317F4981DD060A04007F000702020202038118FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF8218FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC831864210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1843104188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF101207192B95FFC8DA78631011ED6B24CDD573F977A11E7948118518FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831863104088FCDFCCE87EDD285920615E651D76452D857ECBB408C327ADB48A2A514C1C9BD77CC9783607A741493A742744AD1738701015F200E45534356434148534D30303030317F4C12060904007F0007030102025305C0000000045F25060202000302065F24060300010203015F37307297777664B60C57A2C45E7BFD12E520143EDE9038BFB302739106F2730D760665D74649910C519089848D4FB6E51340", HEX))
+}
+````
+
+After this ammendment, the KeyManager can be invoked (CTRL+M) and it will output something similar to:
+```
+>load("keymanager/keymanager.js");
+
+SmartCard-HSM Version 1.6 on JCOP          Free memory 217104 byte
+Issuer Certificate : CVC id-AT DV (official domestic) CAR=ESCVCAHSM00001 CHR=ESDVCAHSM00001 CED=27 / de març / 2022 CXD=31 / de desembre / 2025 
+Device Certificate : CVC id-AT Terminal CAR=ESDVCAHSM00001 CHR=ESTERMHSM00001 CED=27 / de març / 2022 CXD=31 / de desembre / 2023 
+Default Key Domain : 0F89B400975EDD2D425ABF85F2FBD318779B3D85475E65D4
+-------------------------------------------------------------------
+Please right-click on nodes in the outline to see possible actions.
+For most operations you will need to authenticate first using a
+mechanism from the User PIN context menu.
+>
+```
+
+The SCS3 tool is ready to import private keys and certificates, wraped in WKY files or in PKCS#12 format. Also, all stored keys can be exported, combined with their respective certificates. Note that the user has to be previously logged in.
+
+## DKEK requirement
+
+In order to perform the import, private keys must be wrapped with the same DKEK present in the Pico HSM. Thus, the Pico HSM must be previously initialized with at minimum of 1 DKEK share. This share will be used to wrap the private key before import. 
+
+Note that the DKEK share shall be available before the import. In this way, all custodians must be present during the import process, since they will have to introduce their respective DKEK.
+
--- a/doc/store_data.md
+++ b/doc/store_data.md
@@ -0,0 +1,117 @@
+# Store binary data
+Pico HSM has a internal flash which can store binary data. With this approach, you can save different files, encrypt into the Pico HSM and retrieve them after.
+
+## Maximum size
+Due to internal constraints with the flash components, the maximum file size is `4096` bytes. This mechanism is mainly used to store small files, such as keys in plain text, certificates, credentials, etc.
+
+## Store a file
+Before writting a file into the Pico HSM, we generate the data file with the following text:
+
+```
+$ echo 'Pico HSM is awesome!' > test
+``` 
+
+Then, we can store the data file with the following command:
+
+```
+$ pkcs11-tool --pin 648219 --write-object test --type data --id 1 --label 'test1'
+Using slot 0 with a present token (0x0)
+Created Data Object:
+Data object 1236368320
+  label:          'test1'
+  application:    'test1'
+  app_id:         <empty>
+  flags:           modifiable
+```
+
+This file can also be protected with the PIN. In this case, use the previous command with the `--private` flag:
+
+```
+$ pkcs11-tool --pin 648219 --write-object test --type data --id 2 --label 'test2' --private
+Using slot 0 with a present token (0x0)
+Created Data Object:
+Data object 1329612320
+  label:          'test2'
+  application:    'test2'
+  app_id:         <empty>
+  flags:           modifiable private
+```
+
+Always provide a unique `--label`, as it will be used to index and reference the file for retrieving.
+
+## Retrieve a file
+To view the stored file, we can use the following command with the same label we employed:
+
+```
+$ pkcs11-tool --read-object --type data --label 'test1' 
+Using slot 0 with a present token (0x0)
+Pico HSM is awesome!
+```
+
+Note that if the `--private` flag is not provided during the writting stage, the file can be accessed without the PIN.
+
+To retrieve a private file with the PIN:
+
+```
+$ pkcs11-tool --read-object --type data --label 'test2' --pin 648219
+Using slot 0 with a present token (0x0)
+Pico HSM is awesome!
+```
+
+## Using `pkcs15-tool`
+PKCS15 tool can be used to list the stored files. For instance:
+
+```
+$ pkcs15-tool -D
+Using reader with a card: Free Software Initiative of Japan Gnuk
+PKCS#15 Card [Pico-HSM]:
+	Version        : 1
+	Serial number  : ESTERMHSM
+	Manufacturer ID: Pol Henarejos
+	Flags          : PRN generation, EID compliant
+
+
+PIN [UserPIN]
+	Object Flags   : [0x03], private, modifiable
+	Auth ID        : 02
+	ID             : 01
+	Flags          : [0x812], local, initialized, exchangeRefData
+	Length         : min_len:6, max_len:15, stored_len:0
+	Pad char       : 0x00
+	Reference      : 129 (0x81)
+	Type           : ascii-numeric
+	Path           : e82b0601040181c31f0201::
+	Tries left     : 3
+
+PIN [SOPIN]
+	Object Flags   : [0x01], private
+	ID             : 02
+	Flags          : [0x9A], local, unblock-disabled, initialized, soPin
+	Length         : min_len:16, max_len:16, stored_len:0
+	Pad char       : 0x00
+	Reference      : 136 (0x88)
+	Type           : bcd
+	Path           : e82b0601040181c31f0201::
+	Tries left     : 15
+
+Data object 'test1'
+	applicationName: test1
+	Path:            e82b0601040181c31f0201::cf00
+	Data (21 bytes): 5069636F2048534D20697320617765736F6D65210A
+                  
+Data object 'test2'
+	applicationName: test2
+	Path:            e82b0601040181c31f0201::cd01
+	Auth ID:         01
+```
+
+As expected, the public file is displayed (in hexadecimal string). The private file contains the `Auth ID` flag and it is not displayed.
+
+## Delete a file
+A stored file can be deleted with the following command:
+
+```
+$ pkcs11-tool --login --pin 648219 --delete-object --type data --application-label test1
+```
+
+
--- a/patch_vidpid.sh
+++ b/patch_vidpid.sh
@@ -17,8 +17,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #

-VERSION_MAJOR="1"
-VERSION_MINOR="4"
+VERSION_MAJOR="2"
+VERSION_MINOR="0"

 echo "----------------------------"
 echo "VID/PID patcher for Pico HSM"
--- a/1
+++ b/1
--- a/src/fs/file.c
+++ b/src/fs/file.c
@@ -1,466 +0,0 @@
-/* 
- * 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 "file.h"
-#include "tusb.h"
-#include "hsm2040.h"
-#include "sc_hsm.h"
-#include "libopensc/card-sc-hsm.h"
-#include <string.h>
-
-extern const uintptr_t end_data_pool;
-extern const uintptr_t start_data_pool;
-extern int flash_write_data_to_file(file_t *file, const uint8_t *data, uint16_t len);
-extern int flash_program_halfword (uintptr_t addr, uint16_t data);
-extern int flash_program_word (uintptr_t addr, uint32_t data);
-extern int flash_program_uintptr (uintptr_t addr, uintptr_t data);
-extern int flash_program_block(uintptr_t addr, const uint8_t *data, size_t len);
-extern uintptr_t flash_read_uintptr(uintptr_t addr);
-extern uint16_t flash_read_uint16(uintptr_t addr);
-extern uint8_t flash_read_uint8(uintptr_t addr);
-extern uint8_t *flash_read(uintptr_t addr);
-extern void low_flash_available();
-
-//puts FCI in the RAPDU
-void process_fci(const file_t *pe) {
-    uint8_t *p = res_APDU;
-    uint8_t buf[64];
-    res_APDU_size = 0;
-    res_APDU[res_APDU_size++] = 0x6f;
-    res_APDU[res_APDU_size++] = 0x00; //computed later
-    
-    res_APDU[res_APDU_size++] = 0x81;
-    res_APDU[res_APDU_size++] = 2;
-    if (pe->data) {
-        if ((pe->type & FILE_DATA_FUNC) == FILE_DATA_FUNC) {
-            uint16_t len = ((int (*)(const file_t *, int))(pe->data))(pe, 0);
-            res_APDU[res_APDU_size++] = (len >> 8) & 0xff;
-            res_APDU[res_APDU_size++] = len & 0xff;
-        }
-        else {
-            res_APDU[res_APDU_size++] = pe->data[1];
-            res_APDU[res_APDU_size++] = pe->data[0];
-        }
-    }
-    else {
-        memset(res_APDU+res_APDU_size, 0, 2);
-        res_APDU_size += 2;
-    }
-    
-    res_APDU[res_APDU_size++] = 0x82;
-    res_APDU[res_APDU_size++] = 1;
-    res_APDU[res_APDU_size] = 0;
-    if (pe->type == FILE_TYPE_INTERNAL_EF)
-        res_APDU[res_APDU_size++] |= 0x08;
-    else if (pe->type == FILE_TYPE_WORKING_EF)
-        res_APDU[res_APDU_size++] |= pe->ef_structure & 0x7;
-    else if (pe->type == FILE_TYPE_DF)
-        res_APDU[res_APDU_size++] |= 0x38;
-    
-    res_APDU[res_APDU_size++] = 0x83;
-    res_APDU[res_APDU_size++] = 2;
-    put_uint16_t(pe->fid, res_APDU+res_APDU_size);
-    res_APDU_size += 2;
-    res_APDU[1] = res_APDU_size-2;
-}
-
-const uint8_t cvca[] = {
-    0x6A, 0x01,
-    0x7f, 0x21, 0x82, 0x01, 0x65, 0x7f, 0x4e, 0x82, 0x01, 0x2d, 0x5f, 
-	0x29, 0x01, 0x00, 0x42, 0x0e, 0x45, 0x53, 0x48, 0x53, 0x4d, 0x43, 
-	0x56, 0x43, 0x41, 0x32, 0x30, 0x34, 0x30, 0x31, 0x7f, 0x49, 0x81, 
-	0xdd, 0x06, 0x0a, 0x04, 0x00, 0x7f, 0x00, 0x07, 0x02, 0x02, 0x02, 
-	0x02, 0x03, 0x81, 0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x82, 0x18, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x83, 
-	0x18, 0x64, 0x21, 0x05, 0x19, 0xe5, 0x9c, 0x80, 0xe7, 0x0f, 0xa7, 
-	0xe9, 0xab, 0x72, 0x24, 0x30, 0x49, 0xfe, 0xb8, 0xde, 0xec, 0xc1, 
-	0x46, 0xb9, 0xb1, 0x84, 0x31, 0x04, 0x18, 0x8d, 0xa8, 0x0e, 0xb0, 
-	0x30, 0x90, 0xf6, 0x7c, 0xbf, 0x20, 0xeb, 0x43, 0xa1, 0x88, 0x00, 
-	0xf4, 0xff, 0x0a, 0xfd, 0x82, 0xff, 0x10, 0x12, 0x07, 0x19, 0x2b, 
-	0x95, 0xff, 0xc8, 0xda, 0x78, 0x63, 0x10, 0x11, 0xed, 0x6b, 0x24, 
-	0xcd, 0xd5, 0x73, 0xf9, 0x77, 0xa1, 0x1e, 0x79, 0x48, 0x11, 0x85, 
-	0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0x99, 0xde, 0xf8, 0x36, 0x14, 0x6b, 0xc9, 0xb1, 0xb4, 
-	0xd2, 0x28, 0x31, 0x86, 0x31, 0x04, 0x4d, 0x28, 0x34, 0x67, 0xb5, 
-	0x43, 0xfd, 0x84, 0x22, 0x09, 0xbd, 0xd2, 0xd6, 0x26, 0x27, 0x2d, 
-	0x53, 0xa7, 0xdf, 0x52, 0x8f, 0xc2, 0xde, 0x7c, 0x9a, 0xcd, 0x1f, 
-	0xf2, 0x10, 0x42, 0x7c, 0x13, 0x44, 0x03, 0xb0, 0xa5, 0xdf, 0x8a, 
-	0xd4, 0x59, 0xd1, 0x86, 0x4b, 0xde, 0x33, 0xb1, 0x60, 0x17, 0x87, 
-	0x01, 0x01, 0x5f, 0x20, 0x0e, 0x45, 0x53, 0x48, 0x53, 0x4d, 0x43, 
-	0x56, 0x43, 0x41, 0x32, 0x30, 0x34, 0x30, 0x31, 0x7f, 0x4c, 0x12, 
-	0x06, 0x09, 0x04, 0x00, 0x7f, 0x00, 0x07, 0x03, 0x01, 0x02, 0x02, 
-	0x53, 0x05, 0xc0, 0x00, 0x00, 0x00, 0x04, 0x5f, 0x25, 0x06, 0x02, 
-	0x02, 0x00, 0x02, 0x01, 0x09, 0x5f, 0x24, 0x06, 0x03, 0x00, 0x01, 
-	0x02, 0x03, 0x01, 0x5f, 0x37, 0x30, 0x26, 0x2d, 0x6f, 0xa6, 0xd0, 
-	0x52, 0x01, 0xf1, 0x41, 0x1e, 0xe9, 0x33, 0x29, 0x19, 0x42, 0x42, 
-	0x9b, 0xb0, 0xeb, 0xf7, 0x46, 0x20, 0xcb, 0x81, 0xfe, 0xda, 0xd7, 
-	0xab, 0x2b, 0xdc, 0xa7, 0x38, 0xf4, 0xc8, 0xec, 0x4c, 0x66, 0xb4, 
-	0x0a, 0x2d, 0x16, 0xfb, 0xf3, 0x79, 0xe9, 0x93, 0xc8, 0x25 
-};
-const uint8_t token_info[] = {
-    0x28, 0x00, //litle endian
-    0x30, 0x26, 0x2, 0x1, 0x1, 0x4, 0x4, 0xd, 0x0, 0x0, 0x0, 0xc, 0xd, 0x50, 0x6f, 0x6c, 0x20, 0x48, 0x65, 0x6e, 0x61, 0x72, 0x65, 0x6a, 0x6f, 0x73, 0x80, 0x8, 0x48, 0x53, 0x4d, 0x20, 0x32, 0x30, 0x34, 0x30, 0x3, 0x2, 0x4, 0xf0
-};
-
-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 = 0x2f02    , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF,.data = (uint8_t *)cvca, .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_DKEK   , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //DKEK
-    /* 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 = 0x0000, .parent = 0, .name = openpgpcard_aid, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} },
-    /* 23 */ { .fid = 0x0000, .parent = 5, .name = sc_hsm_aid, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} },
-    /* 24 */ { .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];
-file_t *file_pin1 = NULL;
-file_t *file_retries_pin1 = NULL;
-file_t *file_sopin = NULL;
-file_t *file_retries_sopin = NULL;
-
-#define MAX_DYNAMIC_FILES 64
-uint16_t dynamic_files = 0;
-file_t dynamic_file[MAX_DYNAMIC_FILES];
-
-bool card_terminated = false;
-
-bool is_parent(const file_t *child, const file_t *parent) {
-    if (child == parent)
-        return true;
-    if (child == MF)
-        return false;
-    return is_parent(&file_entries[child->parent], parent);
-}
-
-file_t *get_parent(file_t *f) {
-    return &file_entries[f->parent];
-}
-
-file_t *search_by_name(uint8_t *name, uint16_t namelen) {
-    for (file_t *p = file_entries; p != file_last; p++) {
-        if (p->name && *p->name == apdu.cmd_apdu_data_len && memcmp(p->name+1, name, namelen) == 0) {
-            return p;
-        }
-    }
-    return NULL;
-}
-
-file_t *search_by_fid(const uint16_t fid, const file_t *parent, const uint8_t sp) {
-    
-    for (file_t *p = file_entries; p != file_last; p++) {
-        if (p->fid != 0x0000 && p->fid == fid) {
-            if (!parent || (parent && is_parent(p, parent))) {
-                if (!sp || sp == SPECIFY_ANY || (((sp & SPECIFY_EF) && (p->type & FILE_TYPE_INTERNAL_EF)) || ((sp & SPECIFY_DF) && p->type == FILE_TYPE_DF)))
-                    return p;
-            }
-        }
-    }
-    return NULL;
-}
-
-uint8_t make_path_buf(const file_t *pe, uint8_t *buf, uint8_t buflen, const file_t *top) {
-    if (!buflen)
-        return 0;
-    if (pe == top) //MF or relative DF
-        return 0;
-    put_uint16_t(pe->fid, buf);
-    return make_path_buf(&file_entries[pe->parent], buf+2, buflen-2, top)+2;
-}
-
-uint8_t make_path(const file_t *pe, const file_t *top, uint8_t *path) {
-    uint8_t buf[MAX_DEPTH*2], *p = path;
-    put_uint16_t(pe->fid, buf);
-    uint8_t depth = make_path_buf(&file_entries[pe->parent], buf+2, sizeof(buf)-2, top)+2;
-    for (int d = depth-2; d >= 0; d -= 2) {
-        memcpy(p, buf+d, 2);
-        p += 2;
-    }
-    return depth;
-}
-
-file_t *search_by_path(const uint8_t *pe_path, uint8_t pathlen, const file_t *parent) {
-    uint8_t path[MAX_DEPTH*2];
-    if (pathlen > sizeof(path)) {
-        return NULL;
-    }
-    for (file_t *p = file_entries; p != file_last; p++) {
-        uint8_t depth = make_path(p, parent, path);
-        if (pathlen == depth && memcmp(path, pe_path, depth) == 0)
-            return p;
-    }
-    return NULL;
-}
-
-file_t *currentEF = NULL;
-file_t *currentDF = NULL;
-const file_t *selected_applet = NULL;
-bool isUserAuthenticated = false;
-
-bool authenticate_action(const file_t *ef, uint8_t op) {
-    uint8_t acl = ef->acl[op];
-    if (acl == 0x0)
-        return true;
-    else if (acl == 0xff)
-        return false;
-    else if (acl == 0x90 || acl & 0x9F == 0x10) {
-            // PIN required.
-        if(isUserAuthenticated) {
-            return true;
-        } 
-        else {
-            return false;
-        }
-    }
-    return false;
-}
-
-#include "libopensc/pkcs15.h"
-
-void initialize_chain(file_chain_t **chain) {
-    file_chain_t *next;
-    for (file_chain_t *f = *chain; f; f = next) {
-        next = f->next;
-        free(f);
-    }
-    *chain = NULL;
-}
-
-void initialize_flash(bool hard) {
-    if (hard) {
-        const uint8_t empty[8] = { 0 };
-        flash_program_block(end_data_pool, empty, sizeof(empty));
-        low_flash_available();
-    }
-    for (file_t *f = file_entries; f != file_last; f++) {
-        if ((f->type & FILE_DATA_FLASH) == FILE_DATA_FLASH)
-            f->data = NULL;
-    }
-    dynamic_files = 0;
-}
-
-void scan_flash() {
-    initialize_flash(false); //soft initialization
-    if (*(uintptr_t *)end_data_pool == 0xffffffff && *(uintptr_t *)(end_data_pool+sizeof(uintptr_t)) == 0xffffffff) 
-    {
-        printf("First initialization (or corrupted!)\r\n");
-        const uint8_t empty[8] = { 0 };
-        flash_program_block(end_data_pool, empty, sizeof(empty));
-        //low_flash_available();
-        //wait_flash_finish();
-    }
-    printf("SCAN\r\n");
-
-    uintptr_t base = flash_read_uintptr(end_data_pool);
-    for (uintptr_t base = flash_read_uintptr(end_data_pool); base >= start_data_pool; base = flash_read_uintptr(base)) {
-        if (base == 0x0) //all is empty
-            break;
-        
-        uint16_t fid = flash_read_uint16(base+sizeof(uintptr_t)+sizeof(uintptr_t));
-        printf("[%x] scan fid %x, len %d\r\n",base,fid,flash_read_uint16(base+sizeof(uintptr_t)+sizeof(uintptr_t)+sizeof(uint16_t)));
-        file_t *file = (file_t *)search_by_fid(fid, NULL, SPECIFY_EF);
-        if (!file) {
-            file = file_new(fid);
-            if ((fid & 0xff00) == (KEY_PREFIX << 8)) {
-                //add_file_to_chain(file, &ef_kf);
-            }
-            else if ((fid & 0xff00) == (PRKD_PREFIX << 8)) {
-                //add_file_to_chain(file, &ef_prkdf);
-            }
-            else if ((fid & 0xff00) == (CD_PREFIX << 8)) {
-                //add_file_to_chain(file, &ef_cdf);
-            }
-            else if ((fid & 0xff00) == (EE_CERTIFICATE_PREFIX << 8)) {
-                //add_file_to_chain(file, &ef_pukdf);
-            }
-            else {
-                TU_LOG1("SCAN FOUND ORPHAN FILE: %x\r\n",fid);
-                continue;
-            }
-        }
-        file->data = (uint8_t *)(base+sizeof(uintptr_t)+sizeof(uintptr_t)+sizeof(uint16_t));
-        if (flash_read_uintptr(base) == 0x0) {
-            break;
-        }
-    }
-    file_pin1 = search_by_fid(0x1081, NULL, SPECIFY_EF);
-    if (file_pin1) {
-        if (!file_pin1->data) {
-            TU_LOG1("PIN1 is empty. Initializing with default password\r\n");
-            const uint8_t empty[33] = { 0 };
-            flash_write_data_to_file(file_pin1, empty, sizeof(empty));
-        }
-    }
-    else {
-        TU_LOG1("FATAL ERROR: PIN1 not found in memory!\r\n");
-    }
-    file_sopin = search_by_fid(0x1088, NULL, SPECIFY_EF);
-    if (file_sopin) {
-        if (!file_sopin->data) {
-            TU_LOG1("SOPIN is empty. Initializing with default password\r\n");
-            const uint8_t empty[33] = { 0 };
-            flash_write_data_to_file(file_sopin, empty, sizeof(empty));
-        }
-    }
-    else {
-        TU_LOG1("FATAL ERROR: SOPIN not found in memory!\r\n");
-    }
-    file_retries_pin1 = search_by_fid(0x1083, NULL, SPECIFY_EF);
-    if (file_retries_pin1) {
-        if (!file_retries_pin1->data) {
-            TU_LOG1("Retries PIN1 is empty. Initializing with default retriesr\n");
-            const uint8_t retries = 3;
-            flash_write_data_to_file(file_retries_pin1, &retries, sizeof(uint8_t));
-        }
-    }
-    else {
-        TU_LOG1("FATAL ERROR: Retries PIN1 not found in memory!\r\n");
-    }
-    file_retries_sopin = search_by_fid(0x108A, NULL, SPECIFY_EF);
-    if (file_retries_sopin) {
-        if (!file_retries_sopin->data) {
-            TU_LOG1("Retries SOPIN is empty. Initializing with default retries\r\n");
-            const uint8_t retries = 15;
-            flash_write_data_to_file(file_retries_sopin, &retries, sizeof(uint8_t));
-        }
-    }
-    else {
-        TU_LOG1("FATAL ERROR: Retries SOPIN not found in memory!\r\n");
-    }
-    file_t *tf = NULL;
-    
-    tf = search_by_fid(0x1082, NULL, SPECIFY_EF);
-    if (tf) {
-        if (!tf->data) {
-            TU_LOG1("Max retries PIN1 is empty. Initializing with default max retriesr\n");
-            const uint8_t retries = 3;
-            flash_write_data_to_file(tf, &retries, sizeof(uint8_t));
-        }
-    }
-    else {
-        TU_LOG1("FATAL ERROR: Max Retries PIN1 not found in memory!\r\n");
-    }
-    tf = search_by_fid(0x1089, NULL, SPECIFY_EF);
-    if (tf) {
-        if (!tf->data) {
-            TU_LOG1("Max Retries SOPIN is empty. Initializing with default max retries\r\n");
-            const uint8_t retries = 15;
-            flash_write_data_to_file(tf, &retries, sizeof(uint8_t));
-        }
-    }
-    else {
-        TU_LOG1("FATAL ERROR: Retries SOPIN not found in memory!\r\n");
-    }
-    low_flash_available();
-}
-
-uint8_t *file_read(const uint8_t *addr) {
-    return flash_read((uintptr_t)addr);
-}
-uint16_t file_read_uint16(const uint8_t *addr) {
-    return flash_read_uint16((uintptr_t)addr);
-}
-uint8_t file_read_uint8(const uint8_t *addr) {
-    return flash_read_uint8((uintptr_t)addr);
-}
-
-file_t *search_dynamic_file(uint16_t fid) {
-    for (int i = 0; i < dynamic_files; i++) {
-        if (dynamic_file[i].fid == fid)
-            return &dynamic_file[i];
-    }
-    return NULL;
-}
-
-int delete_dynamic_file(file_t *f) {
-    for (int i = 0; i < dynamic_files; i++) {
-        if (dynamic_file[i].fid == f->fid) {
-            for (int j = i+1; j < dynamic_files; j++)
-                memcpy(&dynamic_file[j-1], &dynamic_file[j], sizeof(file_t));
-            dynamic_files--;
-            return HSM_OK;
-        }
-    }
-    return HSM_ERR_FILE_NOT_FOUND;
-}
-
-file_t *file_new(uint16_t fid) {
-    file_t *f;
-    if ((f = search_dynamic_file(fid)))
-        return f;
-    if (dynamic_files == MAX_DYNAMIC_FILES)
-        return NULL;
-    f = &dynamic_file[dynamic_files];
-    dynamic_files++;
-    file_t file = {
-        .fid = fid,
-        .parent = 5,
-        .name = NULL,
-        .type = FILE_TYPE_WORKING_EF,
-        .ef_structure = FILE_EF_TRANSPARENT,
-        .data = NULL,
-        .acl = {0}
-    };
-    memcpy(f, &file, sizeof(file_t));
-    //memset((uint8_t *)f->acl, 0x90, sizeof(f->acl));
-    return f;
-}
-
-file_chain_t *add_file_to_chain(file_t *file, file_chain_t **chain) {
-    if (search_file_chain(file->fid, *chain))
-        return NULL;
-    file_chain_t *fc = (file_chain_t *)malloc(sizeof(file_chain_t));
-    fc->file = file;
-    fc->next = *chain;
-    *chain = fc;
-    return fc;
-}
-
-file_t *search_file_chain(uint16_t fid, file_chain_t *chain) {
-    for (file_chain_t *fc = chain; fc; fc = fc->next) {
-        if (fid == fc->file->fid) {
-            return fc->file;
-        }
-    }
-    return NULL;
-}
--- a/src/fs/file.h
+++ b/src/fs/file.h
@@ -1,123 +0,0 @@
-/* 
- * 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/>.
- */
-
-
-#ifndef _FILE_H_
-#define _FILE_H_
-
-#include <stdlib.h>
-#include "pico/stdlib.h"
-
-#define FILE_TYPE_UNKNOWN       0x00
-#define FILE_TYPE_DF            0x04
-#define FILE_TYPE_INTERNAL_EF	0x03
-#define FILE_TYPE_WORKING_EF    0x01
-#define FILE_TYPE_BSO           0x10
-#define FILE_PERSISTENT         0x20
-#define FILE_DATA_FLASH         0x40
-#define FILE_DATA_FUNC          0x80
-
-/* EF structures */
-#define FILE_EF_UNKNOWN             0x00
-#define FILE_EF_TRANSPARENT         0x01
-#define FILE_EF_LINEAR_FIXED        0x02
-#define FILE_EF_LINEAR_FIXED_TLV    0x03
-#define FILE_EF_LINEAR_VARIABLE     0x04
-#define FILE_EF_LINEAR_VARIABLE_TLV 0x05
-#define FILE_EF_CYCLIC              0x06
-#define FILE_EF_CYCLIC_TLV          0x07
-
-#define ACL_OP_DELETE_SELF      0x00
-#define ACL_OP_CREATE_DF        0x01
-#define ACL_OP_CREATE_EF        0x02
-#define ACL_OP_DELETE_CHILD     0x03
-#define ACL_OP_WRITE            0x04
-#define ACL_OP_UPDATE_ERASE     0x05
-#define ACL_OP_READ_SEARCH      0x06
-
-#define SPECIFY_EF 0x1
-#define SPECIFY_DF 0x2
-#define SPECIFY_ANY 0x3
-
-#define EF_DKEK     0x108F
-#define EF_PRKDFS   0x6040
-#define EF_PUKDFS   0x6041
-#define EF_CDFS     0x6042
-#define EF_AODFS    0x6043
-#define EF_DODFS    0x6044
-#define EF_SKDFS    0x6045
-
-#define MAX_DEPTH 4
-
-typedef struct file
-{
-    const uint16_t fid;
-    const uint8_t parent; //entry number in the whole table!!
-    const uint8_t *name;
-    const uint8_t type;
-    const uint8_t ef_structure;
-    uint8_t *data; //should include 2 bytes len at begining
-    const uint8_t acl[7];
-} __attribute__((packed)) file_t;
-
-typedef struct file_chain
-{
-    file_t *file;
-    struct file_chain *next;
-} file_chain_t;
-
-extern file_t *currentEF;
-extern file_t *currentDF;
-extern const file_t *selected_applet;
-
-extern const file_t *MF;
-extern const file_t *file_last;
-extern const file_t *file_openpgp;
-extern const file_t *file_sc_hsm;
-extern bool card_terminated;
-extern file_t *file_pin1;
-extern file_t *file_retries_pin1;
-extern file_t *file_sopin;
-extern file_t *file_retries_sopin;
-
-extern file_t *search_by_fid(const uint16_t fid, const file_t *parent, const uint8_t sp);
-extern file_t *search_by_name(uint8_t *name, uint16_t namelen);
-extern file_t *search_by_path(const uint8_t *pe_path, uint8_t pathlen, const file_t *parent);
-extern bool authenticate_action(const file_t *ef, uint8_t op);
-extern void process_fci(const file_t *pe);
-extern void scan_flash();
-extern void initialize_flash(bool);
-
-extern file_t file_entries[];
-
-extern uint8_t *file_read(const uint8_t *addr);
-extern uint16_t file_read_uint16(const uint8_t *addr);
-extern uint8_t file_read_uint8(const uint8_t *addr);
-extern file_t *file_new(uint16_t);
-file_t *get_parent(file_t *f);
-
-extern uint16_t dynamic_files;
-extern file_t dynamic_file[];
-extern file_t *search_dynamic_file(uint16_t);
-extern int delete_dynamic_file(file_t *f);
-
-extern file_chain_t *add_file_to_chain(file_t *file, file_chain_t **chain);
-extern file_t *search_file_chain(uint16_t fid, file_chain_t *chain);
-extern bool isUserAuthenticated;
-
-#endif
-
--- a/src/fs/flash.c
+++ b/src/fs/flash.c
@@ -1,133 +0,0 @@
-/* 
- * 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 <stdint.h>
-#include <string.h>
-
-#include "pico/stdlib.h"
-#include "hardware/flash.h"
-#include "hsm2040.h"
-#include "tusb.h"
-#include "file.h"
-#include "sc_hsm.h"
-
-/*
- * ------------------------------------------------------
- * |                                                    |
- * | next_addr | prev_addr | fid | data (len + payload) |
- * |                                                    |
- * ------------------------------------------------------
- */
-#define FLASH_TARGET_OFFSET (PICO_FLASH_SIZE_BYTES >> 1) // DATA starts at the mid of flash
-#define FLASH_DATA_HEADER_SIZE (sizeof(uintptr_t)+sizeof(uint32_t))
-
-//To avoid possible future allocations, data region starts at the end of flash and goes upwards to the center region
-
-const uintptr_t start_data_pool = (XIP_BASE + FLASH_TARGET_OFFSET);
-const uintptr_t end_data_pool = (XIP_BASE + PICO_FLASH_SIZE_BYTES)-FLASH_DATA_HEADER_SIZE; //This is a fixed value. DO NOT CHANGE
-#define FLASH_ADDR_DATA_STORAGE_START start_data_pool
-
-extern int flash_program_block(uintptr_t addr, const uint8_t *data, size_t len);
-extern int flash_program_halfword (uintptr_t addr, uint16_t data);
-extern int flash_program_uintptr(uintptr_t, uintptr_t);
-extern uintptr_t flash_read_uintptr(uintptr_t addr);
-extern uint16_t flash_read_uint16(uintptr_t addr);
-
-extern void low_flash_available();
-
-uintptr_t allocate_free_addr(uint16_t size) {
-    if (size > FLASH_SECTOR_SIZE)
-        return 0x0; //ERROR
-    size_t real_size = size+sizeof(uint16_t)+sizeof(uintptr_t)+sizeof(uint16_t)+sizeof(uintptr_t); //len+len size+next address+fid+prev_addr size
-    uintptr_t next_base = 0x0;
-    for (uintptr_t base = end_data_pool; base >= start_data_pool; base = next_base) {
-        uintptr_t addr_alg = base & -FLASH_SECTOR_SIZE; //start address of sector
-        uintptr_t potential_addr = base-real_size;
-        next_base = flash_read_uintptr(base);
-        //printf("nb %x %x %x %x\r\n",base,next_base,addr_alg,potential_addr);
-        //printf("fid %x\r\n",flash_read_uint16(next_base+sizeof(uintptr_t)));
-        if (next_base == 0x0) { //we are at the end
-            //now we check if we fit in the current sector
-            if (addr_alg <= potential_addr) //it fits in the current sector
-            {
-                flash_program_uintptr(potential_addr, 0x0);
-                flash_program_uintptr(potential_addr+sizeof(uintptr_t), base);
-                flash_program_uintptr(base, potential_addr);
-                return potential_addr;
-            }
-            else if (addr_alg-FLASH_SECTOR_SIZE >= start_data_pool) { //check whether it fits in the next sector, so we take addr_aligned as the base
-                potential_addr = addr_alg-real_size;
-                flash_program_uintptr(potential_addr, 0x0);
-                flash_program_uintptr(potential_addr+sizeof(uintptr_t), base);
-                flash_program_uintptr(base, potential_addr);
-                return potential_addr;
-            }
-            return 0x0;
-        }
-        //we check if |base-(next_addr+size_next_addr)| > |base-potential_addr| only if fid != 1xxx (not size blocked)
-        else if (addr_alg <= potential_addr && base-(next_base+flash_read_uint16(next_base+sizeof(uintptr_t)+sizeof(uintptr_t)+sizeof(uint16_t))+2*sizeof(uint16_t)+2*sizeof(uintptr_t)) > base-potential_addr && flash_read_uint16(next_base+sizeof(uintptr_t)) & 0x1000 != 0x1000) {
-            flash_program_uintptr(potential_addr, next_base);
-            flash_program_uintptr(potential_addr+sizeof(uintptr_t), base);
-            flash_program_uintptr(base, potential_addr);
-            return potential_addr;
-        }
-    }
-    return 0x0; //probably never reached
-}
-
-int flash_clear_file(file_t *file) {
-    uintptr_t base_addr = (uintptr_t)(file->data-sizeof(uintptr_t)-sizeof(uint16_t)-sizeof(uintptr_t));
-    uintptr_t prev_addr = flash_read_uintptr(base_addr+sizeof(uintptr_t));
-    uintptr_t next_addr = flash_read_uintptr(base_addr);
-    //printf("nc %x->%x   %x->%x\r\n",prev_addr,flash_read_uintptr(prev_addr),base_addr,next_addr);
-    flash_program_uintptr(prev_addr, next_addr);
-    flash_program_halfword((uintptr_t)file->data, 0);
-    if (next_addr > 0)
-        flash_program_uintptr(next_addr+sizeof(uintptr_t), prev_addr);
-    //printf("na %x->%x\r\n",prev_addr,flash_read_uintptr(prev_addr));
-    return HSM_OK;
-}
-
-int flash_write_data_to_file(file_t *file, const uint8_t *data, uint16_t len) {
-    if (!file)
-        return HSM_ERR_NULL_PARAM;
-    if (len > FLASH_SECTOR_SIZE)
-        return HSM_ERR_NO_MEMORY;
-    if (file->data) { //already in flash
-        uint16_t size_file_flash = flash_read_uint16((uintptr_t)file->data);
-        if (len <= size_file_flash) { //it fits, no need to move it
-            flash_program_halfword((uintptr_t)file->data, len);
-            if (data)
-                flash_program_block((uintptr_t)file->data+sizeof(uint16_t), data, len);
-            return HSM_OK;
-        }
-        else { //we clear the old file
-            flash_clear_file(file);
-        }
-    }
-    uintptr_t new_addr = allocate_free_addr(len);
-    //printf("na %x\r\n",new_addr);
-    if (new_addr == 0x0) 
-        return HSM_ERR_NO_MEMORY;
-    file->data = (uint8_t *)new_addr+sizeof(uintptr_t)+sizeof(uint16_t)+sizeof(uintptr_t); //next addr+fid+prev addr
-    flash_program_halfword(new_addr+sizeof(uintptr_t)+sizeof(uintptr_t), file->fid);
-    flash_program_halfword((uintptr_t)file->data, len);
-    if (data)
-        flash_program_block((uintptr_t)file->data+sizeof(uint16_t), data, len);
-    return HSM_OK;
-}
--- a/src/fs/low_flash.c
+++ b/src/fs/low_flash.c
@@ -1,248 +0,0 @@
-/* 
- * 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 <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "pico/stdlib.h"
-#include "hardware/flash.h"
-#include "hardware/sync.h"
-#include "pico/mutex.h"
-#include "pico/sem.h"
-#include "pico/multicore.h"
-#include "hsm2040.h"
-#include "sc_hsm.h"
-#include <string.h>
-
-#define TOTAL_FLASH_PAGES 4
-
-typedef struct page_flash {
-    uint8_t page[FLASH_SECTOR_SIZE];
-    uintptr_t address;
-    bool ready;
-    bool erase;
-    size_t page_size; //this param is for easy erase. It allows to erase with a single call. IT DOES NOT APPLY TO WRITE
-} page_flash_t;
-
-static page_flash_t flash_pages[TOTAL_FLASH_PAGES];
-
-static mutex_t mtx_flash;
-static semaphore_t sem_wait;
-
-static uint8_t ready_pages = 0;
-
-bool flash_available = false;
-static bool locked_out = false;
-
-
-//this function has to be called from the core 0
-void do_flash()
-{
-    if (mutex_try_enter(&mtx_flash, NULL) == true) {
-        if (locked_out == true && flash_available == true && ready_pages > 0) {
-            //printf(" DO_FLASH AVAILABLE\r\n");
-            for (int r = 0; r < TOTAL_FLASH_PAGES; r++) {
-                if (flash_pages[r].ready == true) {
-                    //printf("WRITTING %X\r\n",flash_pages[r].address-XIP_BASE);
-                    while (multicore_lockout_start_timeout_us(1000) == false);
-                    //printf("WRITTING %X\r\n",flash_pages[r].address-XIP_BASE);
-                    uint32_t ints = save_and_disable_interrupts();
-                    flash_range_erase(flash_pages[r].address-XIP_BASE, FLASH_SECTOR_SIZE);
-                    flash_range_program(flash_pages[r].address-XIP_BASE, flash_pages[r].page, FLASH_SECTOR_SIZE);
-                    restore_interrupts (ints);
-                    while (multicore_lockout_end_timeout_us(1000) == false);
-                    //printf("WRITEN %X !\r\n",flash_pages[r].address);                    
-                    
-                    flash_pages[r].ready = false;
-                    ready_pages--;
-                }
-                else if (flash_pages[r].erase == true) {
-                    while (multicore_lockout_start_timeout_us(1000) == false);
-                    //printf("WRITTING\r\n");
-                    flash_range_erase(flash_pages[r].address-XIP_BASE, flash_pages[r].page_size ? ((int)(flash_pages[r].page_size/FLASH_SECTOR_SIZE))*FLASH_SECTOR_SIZE : FLASH_SECTOR_SIZE);
-                    while (multicore_lockout_end_timeout_us(1000) == false);
-                    flash_pages[r].erase = false;
-                    ready_pages--;
-                }
-            }
-            flash_available = false;
-            if (ready_pages != 0) {
-                DEBUG_INFO("ERROR: DO FLASH DOES NOT HAVE ZERO PAGES");
-            }
-        }
-        mutex_exit(&mtx_flash);
-    }
-    sem_release(&sem_wait);
-}
-
-//this function has to be called from the core 0
-void low_flash_init() {
-    mutex_init(&mtx_flash);
-    sem_init(&sem_wait, 0, 1);
-    memset(flash_pages, 0, sizeof(page_flash_t)*TOTAL_FLASH_PAGES);
-}
-
-void low_flash_init_core1() {
-    mutex_enter_blocking(&mtx_flash);
-    multicore_lockout_victim_init();
-    locked_out = true;
-    mutex_exit(&mtx_flash);
-}
-
-void wait_flash_finish() {
-    sem_acquire_blocking(&sem_wait); //blocks until released
-    //wake up
-    sem_acquire_blocking(&sem_wait); //decrease permits
-}
-
-void low_flash_available() {
-    mutex_enter_blocking(&mtx_flash);
-    flash_available = true;
-    mutex_exit(&mtx_flash);
-}
-
-page_flash_t *find_free_page(uintptr_t addr) {
-    uintptr_t addr_alg = addr & -FLASH_SECTOR_SIZE;
-    page_flash_t *p = NULL;
-    for (int r = 0; r < TOTAL_FLASH_PAGES; r++)
-    {
-        if ((!flash_pages[r].ready && !flash_pages[r].erase) || flash_pages[r].address == addr_alg) //first available
-        {
-            p = &flash_pages[r];
-            if (!flash_pages[r].ready && !flash_pages[r].erase)
-            {
-                memcpy(p->page, (uint8_t *)addr_alg, FLASH_SECTOR_SIZE);
-                ready_pages++;
-                p->address = addr_alg;
-                p->ready = true;
-            }
-            return p;
-        }
-    }
-    return NULL;
-}
-
-int flash_program_block(uintptr_t addr, const uint8_t *data, size_t len) {
-    uintptr_t addr_alg = addr & -FLASH_SECTOR_SIZE;
-    page_flash_t *p = NULL;
-    
-    if (!data || len == 0)
-        return HSM_ERR_NULL_PARAM;
-    
-    mutex_enter_blocking(&mtx_flash);
-    if (ready_pages == TOTAL_FLASH_PAGES) {
-        mutex_exit(&mtx_flash);
-        DEBUG_INFO("ERROR: ALL FLASH PAGES CACHED\r\n");
-        return HSM_ERR_NO_MEMORY;
-    }
-    if (!(p = find_free_page(addr)))
-    {
-        DEBUG_INFO("ERROR: FLASH CANNOT FIND A PAGE (rare error)\r\n");
-        mutex_exit(&mtx_flash);
-        return HSM_ERR_MEMORY_FATAL;
-    }
-    memcpy(&p->page[addr&(FLASH_SECTOR_SIZE-1)], data, len);
-    //printf("Flash: modified page %X with data %x at [%x] (top page %X)\r\n",addr_alg,data,addr&(FLASH_SECTOR_SIZE-1),addr);
-    mutex_exit(&mtx_flash);
-    return HSM_OK;
-}
-
-int flash_program_halfword (uintptr_t addr, uint16_t data) {
-    return flash_program_block(addr, (const uint8_t *)&data, sizeof(uint16_t));
-}
-
-int flash_program_word (uintptr_t addr, uint32_t data) {
-    return flash_program_block(addr,  (const uint8_t *)&data, sizeof(uint32_t));
-}
-
-int flash_program_uintptr (uintptr_t addr, uintptr_t data) {
-    return flash_program_block(addr,  (const uint8_t *)&data, sizeof(uintptr_t));
-}
-
-uint8_t *flash_read(uintptr_t addr) {
-    uintptr_t addr_alg = addr & -FLASH_SECTOR_SIZE;   
-    //mutex_enter_blocking(&mtx_flash);
-    if (ready_pages > 0) {
-        for (int r = 0; r < TOTAL_FLASH_PAGES; r++)
-        {
-            if (flash_pages[r].ready && flash_pages[r].address == addr_alg) {
-                uint8_t *v = &flash_pages[r].page[addr&(FLASH_SECTOR_SIZE-1)];
-                //mutex_exit(&mtx_flash);
-                return v;
-            }
-        }
-    }
-    uint8_t *v = (uint8_t *)addr;
-    //mutex_exit(&mtx_flash);
-    return v;
-}
-
-uintptr_t flash_read_uintptr(uintptr_t addr) {
-    uint8_t *p = flash_read(addr);
-    uintptr_t v = 0x0;
-    for (int i = 0; i < sizeof(uintptr_t); i++) {
-        v |= (uintptr_t)p[i]<<(8*i);
-    }
-    return v;
-}
-uint16_t flash_read_uint16(uintptr_t addr) {
-    uint8_t *p = flash_read(addr);
-    uint16_t v = 0x0;
-    for (int i = 0; i < sizeof(uint16_t); i++) {
-        v |= p[i]<<(8*i);
-    }
-    return v;
-}
-uint8_t flash_read_uint8(uintptr_t addr) {
-    return *flash_read(addr);
-}
-
-int flash_erase_page (uintptr_t addr, size_t page_size) {
-    uintptr_t addr_alg = addr & -FLASH_SECTOR_SIZE;
-    page_flash_t *p = NULL;
-    
-    mutex_enter_blocking(&mtx_flash);
-    if (ready_pages == TOTAL_FLASH_PAGES) {
-        mutex_exit(&mtx_flash);
-        DEBUG_INFO("ERROR: ALL FLASH PAGES CACHED\r\n");
-        return HSM_ERR_NO_MEMORY;
-    }
-    if (!(p = find_free_page(addr))) {
-        DEBUG_INFO("ERROR: FLASH CANNOT FIND A PAGE (rare error)\r\n");
-        mutex_exit(&mtx_flash);
-        return HSM_ERR_MEMORY_FATAL;
-    }
-    p->erase = true;
-    p->ready = false;
-    p->page_size = page_size;
-    mutex_exit(&mtx_flash);
-    
-    return HSM_OK;
-}
-
-bool flash_check_blank(const uint8_t *p_start, size_t size)
-{
-    const uint8_t *p;
-
-    for (p = p_start; p < p_start + size; p++) {
-        if (*p != 0xff)
-            return false;
-    }
-    return true;
-}
--- a/src/hsm/dkek.c
+++ b/src/hsm/dkek.c
@@ -0,0 +1,475 @@
+/* 
+ * 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 <string.h>
+#include "common.h"
+#include "stdlib.h"
+#include "pico/stdlib.h"
+#include "dkek.h"
+#include "crypto_utils.h"
+#include "random.h"
+#include "sc_hsm.h"
+#include "mbedtls/md.h"
+#include "mbedtls/cmac.h"
+#include "mbedtls/rsa.h"
+#include "mbedtls/ecdsa.h"
+#include "files.h"
+
+static uint8_t dkek[IV_SIZE+32];
+static uint8_t tmp_dkek[32];
+extern bool has_session_pin;
+extern uint8_t session_pin[32];
+
+int load_dkek() {
+    if (has_session_pin == false)
+        return CCID_NO_LOGIN;
+    file_t *tf = search_by_fid(EF_DKEK, NULL, SPECIFY_EF);
+    if (!tf)
+        return CCID_ERR_FILE_NOT_FOUND;
+    memcpy(dkek, file_read(tf->data+sizeof(uint16_t)), IV_SIZE+32);
+    int ret = aes_decrypt_cfb_256(session_pin, dkek, dkek+IV_SIZE, 32);
+    if (ret != 0)
+        return CCID_EXEC_ERROR;
+    return CCID_OK;
+}
+
+void release_dkek() {
+    memset(dkek, 0, sizeof(dkek));
+}
+
+void init_dkek() {
+    release_dkek();
+    memset(tmp_dkek, 0, sizeof(tmp_dkek));
+}
+
+int store_dkek_key() {
+    aes_encrypt_cfb_256(session_pin, dkek, dkek+IV_SIZE, 32);
+    file_t *tf = search_by_fid(EF_DKEK, NULL, SPECIFY_EF);
+    if (!tf)
+        return CCID_ERR_FILE_NOT_FOUND;
+    flash_write_data_to_file(tf, dkek, sizeof(dkek));
+    low_flash_available();
+    release_dkek();
+    return CCID_OK;
+}
+
+int save_dkek_key(const uint8_t *key) {
+    const uint8_t *iv = random_bytes_get(32);
+    memcpy(dkek, iv, IV_SIZE);
+    if (!key)
+        key = tmp_dkek;
+    memcpy(dkek+IV_SIZE, key, 32);
+    return store_dkek_key();
+}
+
+void import_dkek_share(const uint8_t *share) {
+    for (int i = 0; i < 32; i++)
+        tmp_dkek[i] ^= share[i];
+}
+
+int dkek_kcv(uint8_t *kcv) { //kcv 8 bytes
+    uint8_t hsh[32];
+    int r = load_dkek();
+    if (r != CCID_OK)
+        return r;
+    hash256(dkek+IV_SIZE, 32, hsh);
+    release_dkek();
+    memcpy(kcv, hsh, 8);
+    return CCID_OK;
+}
+
+int dkek_kenc(uint8_t *kenc) { //kenc 32 bytes
+    uint8_t buf[32+4];
+    int r = load_dkek();
+    if (r != CCID_OK)
+        return r;
+    memcpy(buf, dkek+IV_SIZE, 32);
+    release_dkek();
+    memcpy(buf+32, "\x0\x0\x0\x1", 4);
+    hash256(buf, sizeof(buf), kenc);
+    memset(buf, 0, sizeof(buf));
+    return CCID_OK;
+}
+
+int dkek_kmac(uint8_t *kmac) { //kmac 32 bytes
+    uint8_t buf[32+4];
+    int r = load_dkek();
+    if (r != CCID_OK)
+        return r;
+    memcpy(buf, dkek+IV_SIZE, 32);
+    release_dkek();
+    memcpy(buf+32, "\x0\x0\x0\x2", 4);
+    hash256(buf, sizeof(buf), kmac);
+    memset(buf, 0, sizeof(buf));
+    return CCID_OK;
+}
+
+int dkek_encrypt(uint8_t *data, size_t len) {
+    int r;
+    if ((r = load_dkek()) != CCID_OK)
+        return r;
+    r = aes_encrypt_cfb_256(dkek+IV_SIZE, dkek, data, len);
+    release_dkek();
+    return r;
+}
+
+int dkek_decrypt(uint8_t *data, size_t len) {
+    int r;
+    if ((r = load_dkek()) != CCID_OK)
+        return r;
+    r = aes_decrypt_cfb_256(dkek+IV_SIZE, dkek, data, len);
+    release_dkek();
+    return r;
+}
+
+int dkek_encode_key(void *key_ctx, int key_type, uint8_t *out, size_t *out_len) {
+    if (!(key_type & HSM_KEY_RSA) && !(key_type & HSM_KEY_EC) && !(key_type & HSM_KEY_AES))
+        return CCID_WRONG_DATA;
+        
+    uint8_t kb[8+2*4+2*4096/8+3+13]; //worst case: RSA-4096  (plus, 13 bytes padding)
+    memset(kb, 0, sizeof(kb));
+    int kb_len = 0;
+    uint8_t *algo = NULL;
+    uint8_t algo_len = 0;
+    uint8_t *allowed = NULL;
+    uint8_t allowed_len = 0;
+    uint8_t kenc[32];
+    memset(kenc, 0, sizeof(kenc));
+    dkek_kenc(kenc);
+    
+    uint8_t kcv[8];
+    memset(kcv, 0, sizeof(kcv));
+    dkek_kcv(kcv);
+    
+    uint8_t kmac[32];
+    memset(kmac, 0, sizeof(kmac));
+    dkek_kmac(kmac);
+    
+    if (key_type & HSM_KEY_AES) {
+        if (key_type & HSM_KEY_AES_128)
+            kb_len = 16;
+        else if (key_type & HSM_KEY_AES_192)
+            kb_len = 24;
+        else if (key_type & HSM_KEY_AES_256)
+            kb_len = 32;
+            
+        if (kb_len != 16 && kb_len != 24 && kb_len != 32)
+            return CCID_WRONG_DATA;
+        if (*out_len < 8+1+10+6+4+(2+32+14)+16)
+            return CCID_WRONG_LENGTH;
+        
+        put_uint16_t(kb_len, kb+8);
+        memcpy(kb+10, key_ctx, kb_len);
+        kb_len += 2;
+        
+        algo = "\x00\x08\x60\x86\x48\x01\x65\x03\x04\x01"; //2.16.840.1.101.3.4.1 (2+8)
+        algo_len = 10;
+        allowed = "\x00\x04\x10\x11\x18\x99"; //(2+4)
+        allowed_len = 6;
+    }
+    else if (key_type & HSM_KEY_RSA) {
+        if (*out_len < 8+1+12+6+(8+2*4+2*4096/8+3+13)+16) //13 bytes pading 
+            return CCID_WRONG_LENGTH;
+        mbedtls_rsa_context *rsa = (mbedtls_rsa_context *)key_ctx;
+        kb_len = 0;
+        put_uint16_t(mbedtls_rsa_get_len(rsa)*8, kb+8+kb_len); kb_len += 2;
+        
+        put_uint16_t(mbedtls_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 = "\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 
+            return CCID_WRONG_LENGTH;
+        mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *)key_ctx;
+        kb_len = 0;
+        put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.P)*8, kb+8+kb_len); kb_len += 2;
+        put_uint16_t(mbedtls_mpi_size(&ecdsa->grp.A), kb+8+kb_len); kb_len += 2;
+        mbedtls_mpi_write_binary(&ecdsa->grp.A, kb+8+kb_len, mbedtls_mpi_size(&ecdsa->grp.A)); kb_len += mbedtls_mpi_size(&ecdsa->grp.A);
+        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);
+        
+        algo = "\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);
+    *out_len += 8;
+    
+    if (key_type & HSM_KEY_AES)
+        out[*out_len] = 15;
+    else if (key_type & HSM_KEY_RSA)
+        out[*out_len] = 5;
+    else if (key_type & HSM_KEY_EC)
+        out[*out_len] = 12;
+    *out_len += 1;
+    
+    if (algo) {
+        memcpy(out+*out_len, algo, algo_len);
+        *out_len += algo_len;
+    }
+    else
+        *out_len += 2;
+    
+    if (allowed) {
+        memcpy(out+*out_len, allowed, allowed_len);
+        *out_len += allowed_len;
+    }
+    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;
+    //key already copied at kb+10
+    if (kb_len < kb_len_pad) {
+        kb[kb_len] = 0x80;
+    }
+    int r = aes_encrypt(kenc, NULL, 256, HSM_AES_MODE_CBC, kb, kb_len_pad);
+    if (r != CCID_OK)
+        return r;
+    
+    memcpy(out+*out_len, kb, kb_len_pad);
+    *out_len += kb_len_pad;
+
+    r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB), kmac, 256, out, *out_len, out+*out_len);
+    
+    *out_len += 16;
+    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;
+    return 0x0;
+}
+
+int dkek_decode_key(void *key_ctx, const uint8_t *in, size_t in_len, int *key_size_out) {
+    uint8_t kcv[8];
+    memset(kcv, 0, sizeof(kcv));
+    dkek_kcv(kcv);
+    
+    uint8_t kmac[32];
+    memset(kmac, 0, sizeof(kmac));
+    dkek_kmac(kmac);
+    
+    uint8_t kenc[32];
+    memset(kenc, 0, sizeof(kenc));
+    dkek_kenc(kenc);
+    
+    if (memcmp(kcv, in, 8) != 0)
+        return CCID_WRONG_DKEK;
+        
+    uint8_t signature[16];
+    int 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)
+        return CCID_WRONG_SIGNATURE;
+        
+    int key_type = in[8];
+    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)
+        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)
+        return CCID_WRONG_DATA;
+        
+    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;
+    
+    //Allowed algorithms
+    len = get_uint16_t(in, ofs);
+    ofs += len+2;
+    
+    //Access conditions
+    len = get_uint16_t(in, ofs);
+    ofs += len+2;
+    
+    //Key OID
+    len = get_uint16_t(in, ofs);
+    ofs += len+2;
+    
+    if ((in_len-16-ofs) % 16 != 0)
+        return CCID_WRONG_PADDING;
+    uint8_t kb[8+2*4+2*4096/8+3+13]; //worst case: RSA-4096  (plus, 13 bytes padding)
+    memset(kb, 0, sizeof(kb));
+    memcpy(kb, in+ofs, in_len-16-ofs);
+    r = aes_decrypt(kenc, NULL, 256, HSM_AES_MODE_CBC, kb, in_len-16-ofs);
+    if (r != CCID_OK)
+        return r;
+    
+    int key_size = get_uint16_t(kb, 8);
+    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_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;
+            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;
+            if (r != 0) {
+                mbedtls_rsa_free(rsa);
+                return CCID_WRONG_DATA;
+            }
+        }
+        else if (key_type == 6) {
+            //DP-1
+            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 += 2;
+            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 += 2;
+            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 += 2;
+        r = mbedtls_mpi_read_binary(&rsa->E, kb+ofs, len); ofs += len;
+        if (r != 0) {
+            mbedtls_rsa_free(rsa);
+            return CCID_WRONG_DATA;
+        }
+        
+        if (key_type == 5) {
+            r = mbedtls_rsa_import(rsa, &rsa->N, NULL, NULL, &rsa->D, &rsa->E);
+            if (r != 0) {
+                mbedtls_rsa_free(rsa);
+                return CCID_EXEC_ERROR;
+            }
+        }
+        else if (key_type == 6) {
+            r = mbedtls_rsa_import(rsa, NULL, &rsa->P, &rsa->Q, NULL, &rsa->E);
+            if (r != 0) {
+                mbedtls_rsa_free(rsa);
+                return CCID_EXEC_ERROR;
+            }
+        }
+        
+        r = mbedtls_rsa_complete(rsa);
+        if (r != 0) {
+            mbedtls_rsa_free(rsa);
+            return CCID_EXEC_ERROR;
+        }
+        r = mbedtls_rsa_check_privkey(rsa);
+        if (r != 0) {
+            mbedtls_rsa_free(rsa);
+            return CCID_EXEC_ERROR;
+        }
+    }
+    else if (key_type == 12) {
+        mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *)key_ctx;
+        mbedtls_ecdsa_init(ecdsa);
+        
+        //A
+        len = get_uint16_t(kb, ofs); ofs += len+2;
+        
+        //B
+        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);
+        if (ec_id == MBEDTLS_ECP_DP_NONE) {
+            mbedtls_ecdsa_free(ecdsa);
+            return CCID_WRONG_DATA;
+        }
+        ofs += len;
+        
+        //N
+        len = get_uint16_t(kb, ofs); ofs += len+2;
+        
+        //G
+        len = get_uint16_t(kb, ofs); ofs += len+2;
+        
+        //d
+        len = get_uint16_t(kb, ofs); ofs += 2;
+        r = mbedtls_ecp_read_key(ec_id, ecdsa, kb+ofs, len);
+        if (r != 0) {
+            mbedtls_ecdsa_free(ecdsa);
+            return CCID_EXEC_ERROR;
+        }
+    }
+    else if (key_type == 15) {
+        memcpy(key_ctx, kb+ofs, key_size);
+    }
+    return CCID_OK;
+}
--- a/src/hsm/dkek.h
+++ b/src/hsm/dkek.h
@@ -15,15 +15,22 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef _NEUG_H_
-#define _NEUG_H_
+#ifndef _DKEK_H_
+#define _DKEK_H_

-#define NEUG_PRE_LOOP 32
+extern int load_dkek();
+extern int save_dkek_key(const uint8_t *key);
+extern int store_dkek_key();
+extern void init_dkek();
+extern void release_dkek();
+extern void import_dkek_share(const uint8_t *share);
+extern int dkek_kcv(uint8_t *kcv);
+extern int dkek_encrypt(uint8_t *data, size_t len);
+extern int dkek_decrypt(uint8_t *data, size_t len);
+extern int dkek_encode_key(void *key_ctx, int key_type, uint8_t *out, size_t *out_len);
+extern int dkek_type_key(const uint8_t *in);
+extern int dkek_decode_key(void *key_ctx, const uint8_t *in, size_t in_len, int *key_size_out);

-void neug_init(uint32_t *buf, uint8_t size);
-uint32_t neug_get();
-void neug_flush(void);
-void neug_wait_full(void);
-void neug_fini(void);
+#define MAX_DKEK_ENCODE_KEY_BUFFER (8+1+12+6+(8+2*4+2*4096/8+3+13)+16)

-#endif
+#endif
--- a/src/hsm/files.c
+++ b/src/hsm/files.c
@@ -0,0 +1,60 @@
+/* 
+ * 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 "files.h"
+
+extern const uint8_t sc_hsm_aid[];
+extern int parse_token_info(const file_t *f, int mode);
+extern int parse_cvca(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 = 0x2f02    , .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF | FILE_DATA_FUNC,.data = (uint8_t *)parse_cvca, .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_DKEK   , .parent = 5, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0xff} }, //DKEK
+    /* 16 */ { .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
+    /* 17 */ { .fid = EF_PRKDFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.PrKDFs
+    /* 18 */ { .fid = EF_PUKDFS , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.PuKDFs
+    /* 19 */ { .fid = EF_CDFS   , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.CDFs
+    /* 20 */ { .fid = EF_AODFS  , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.AODFs
+    /* 21 */ { .fid = EF_DODFS  , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.DODFs
+    /* 22 */ { .fid = EF_SKDFS  , .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} }, //EF.SKDFs
+    ///* 23 */ { .fid = 0x0000, .parent = 0, .name = openpgpcard_aid, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} },
+    /* 24 */ { .fid = 0x0000, .parent = 5, .name = sc_hsm_aid, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} },
+    /* 25 */ { .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];
+file_t *file_pin1 = NULL;
+file_t *file_retries_pin1 = NULL;
+file_t *file_sopin = NULL;
+file_t *file_retries_sopin = NULL;
--- a/src/rng/random.h
+++ b/src/rng/random.h
@@ -16,20 +16,23 @@
 */


-#ifndef _RANDOM_H_
-#define _RANDOM_H_
+#ifndef _FILES_H_
+#define _FILES_H_

-void random_init (void);
-void random_fini (void);
+#include "file.h"

-/* 32-byte random bytes */
-const uint8_t *random_bytes_get (size_t);
-void random_bytes_free (const uint8_t *p);
+#define EF_DKEK     0x108F
+#define EF_PRKDFS   0x6040
+#define EF_PUKDFS   0x6041
+#define EF_CDFS     0x6042
+#define EF_AODFS    0x6043
+#define EF_DODFS    0x6044
+#define EF_SKDFS    0x6045
+#define EF_DEVOPS   0x100E

-/* 8-byte salt */
-void random_get_salt (uint8_t *p);
+extern file_t *file_pin1;
+extern file_t *file_retries_pin1;
+extern file_t *file_sopin;
+extern file_t *file_retries_sopin;

-/* iterator returning a byta at a time */
-int random_gen (void *arg, unsigned char *output, size_t output_len);
-
-#endif 
+#endif
--- a/src/hsm/hsm2040.c
+++ b/src/hsm/hsm2040.c
--- a/src/hsm/hsm2040.h
+++ b/src/hsm/hsm2040.h
@@ -1,160 +0,0 @@
-/* 
- * 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/>.
- */
-
-#ifndef _HSM2040_H_
-#define _HSM2040_H_
-
-#include "ccid.h"
-#include "tusb.h"
-#include "file.h"
-#include "pico/unique_id.h"
-
-#define USB_REQ_CCID        0xA1
-
-typedef struct app {
-    const uint8_t *aid;
-    int (*process_apdu)();
-    struct app* (*select_aid)();
-    int (*unload)();
-} app_t;
-
-extern int register_app(app_t * (*)());
-
-extern const uint8_t historical_bytes[];
-
-#define DEBUG_PAYLOAD(p,s) { \
-    printf("Payload %s (%d bytes):\r\n", #p,s);\
-    for (int i = 0; i < s; i += 16) {\
-        printf("%07Xh : ",i+p);\
-        for (int j = 0; j < 16; j++) {\
-            if (j < s-i) printf("%02X ",(p)[i+j]);\
-            else printf("   ");\
-            if (j == 7) printf(" ");\
-            } printf(":  "); \
-        for (int j = 0; j < MIN(16,s-i); j++) {\
-            printf("%c",(p)[i+j] == 0x0a || (p)[i+j] == 0x0d ? '\\' : (p)[i+j]);\
-            if (j == 7) printf(" ");\
-            }\
-            printf("\r\n");\
-        } printf("\r\n"); \
-    }
-    
-struct apdu {
-  uint8_t seq;
-
-  /* command APDU */
-  uint8_t *cmd_apdu_head;	/* CLS INS P1 P2 [ internal Lc ] */
-  uint8_t *cmd_apdu_data;
-  size_t cmd_apdu_data_len;	/* Nc, calculated by Lc field */
-  size_t expected_res_size;	/* Ne, calculated by Le field */
-
-  /* response APDU */
-  uint16_t sw;
-  uint16_t res_apdu_data_len;
-  uint8_t *res_apdu_data;
-};
-
-#define MAX_CMD_APDU_DATA_SIZE (24+4+512*4)
-#define MAX_RES_APDU_DATA_SIZE (5+9+512*4)
-#define CCID_MSG_HEADER_SIZE    10
-#define USB_LL_BUF_SIZE         64
-
-/* CCID thread */
-#define EV_CARD_CHANGE        1
-#define EV_TX_FINISHED        2 /* CCID Tx finished  */
-#define EV_EXEC_ACK_REQUIRED  4 /* OpenPGPcard Execution ACK required */
-#define EV_EXEC_FINISHED      8 /* OpenPGPcard Execution finished */
-#define EV_RX_DATA_READY     16 /* USB Rx data available  */
-
-/* OpenPGPcard thread */
-#define EV_MODIFY_CMD_AVAILABLE   1
-#define EV_VERIFY_CMD_AVAILABLE   2
-#define EV_CMD_AVAILABLE          4
-#define EV_EXIT                   8
-#define EV_PINPAD_INPUT_DONE     16
-
-enum ccid_state {
-    CCID_STATE_NOCARD,		/* No card available */
-    CCID_STATE_START,		/* Initial */
-    CCID_STATE_WAIT,		/* Waiting APDU */
-    
-    CCID_STATE_EXECUTE,		/* Executing command */
-    CCID_STATE_ACK_REQUIRED_0,	/* Ack required (executing)*/
-    CCID_STATE_ACK_REQUIRED_1,	/* Waiting user's ACK (execution finished) */
-    
-    CCID_STATE_EXITED,		/* CCID Thread Terminated */
-    CCID_STATE_EXEC_REQUESTED,	/* Exec requested */
-};
-
-#define CLS(a) a.cmd_apdu_head[0]
-#define INS(a) a.cmd_apdu_head[1]
-#define P1(a) a.cmd_apdu_head[2]
-#define P2(a) a.cmd_apdu_head[3]
-
-#define res_APDU apdu.res_apdu_data
-#define res_APDU_size apdu.res_apdu_data_len
-
-extern struct apdu apdu;
-
-uint16_t set_res_sw (uint8_t sw1, uint8_t sw2);
-
-
-static inline const uint16_t make_uint16_t(uint8_t b1, uint8_t b2) {
-    return (b1 << 8) | b2;
-}
-static inline const uint16_t get_uint16_t(const uint8_t *b, uint16_t offset) {
-    return make_uint16_t(b[offset], b[offset+1]);
-}
-static inline const void put_uint16_t(uint16_t n, uint8_t *b) {
-    *b++ = (n >> 8) & 0xff;
-    *b = n & 0xff;
-}
-
-
-#ifdef DEBUG
-void stdout_init (void);
-#define DEBUG_MORE 1
-/*
- * Debug functions in debug.c
- */
-void put_byte (uint8_t b);
-void put_byte_with_no_nl (uint8_t b);
-void put_short (uint16_t x);
-void put_word (uint32_t x);
-void put_int (uint32_t x);
-void put_string (const char *s);
-void put_binary (const char *s, int len);
-
-#define DEBUG_INFO(msg)	    put_string (msg)
-#define DEBUG_WORD(w)	    put_word (w)
-#define DEBUG_SHORT(h)	    put_short (h)
-#define DEBUG_BYTE(b)       put_byte (b)
-#define DEBUG_BINARY(s,len) put_binary ((const char *)s,len)
-#else
-#define DEBUG_INFO(msg)
-#define DEBUG_WORD(w)
-#define DEBUG_SHORT(h)
-#define DEBUG_BYTE(b)
-#define DEBUG_BINARY(s,len)
-#endif
-
-extern int flash_write_data_to_file(file_t *file, const uint8_t *data, uint16_t len);
-extern void low_flash_available();
-extern int flash_clear_file(file_t *file);
-
-extern pico_unique_board_id_t unique_id;
-#endif
--- a/src/hsm/sc_hsm.c
+++ b/src/hsm/sc_hsm.c
--- a/src/hsm/sc_hsm.h
+++ b/src/hsm/sc_hsm.h
@@ -20,46 +20,10 @@

 #include <stdlib.h>
 #include "pico/stdlib.h"
-#include "hsm2040.h"
+#include "ccid2040.h"

 extern const uint8_t sc_hsm_aid[];

-#define SW_BYTES_REMAINING_00()             set_res_sw (0x61, 0x00)
-#define SW_WARNING_STATE_UNCHANGED()        set_res_sw (0x62, 0x00)
-#define SW_PIN_BLOCKED()                    set_res_sw (0x63, 0x00)
-#define SW_EXEC_ERROR()                     set_res_sw (0x64, 0x00)
-#define SW_MEMORY_FAILURE()                 set_res_sw (0x65, 0x81)
-#define SW_WRONG_LENGTH()                   set_res_sw (0x67, 0x00)
-#define SW_WRONG_DATA()                     set_res_sw (0x67, 0x00)
-#define SW_LOGICAL_CHANNEL_NOT_SUPPORTED()  set_res_sw (0x68, 0x81)
-#define SW_SECURE_MESSAGING_NOT_SUPPORTED() set_res_sw (0x68, 0x82)
-#define SW_SECURITY_STATUS_NOT_SATISFIED()  set_res_sw (0x69, 0x82)
-#define SW_FILE_INVALID()                   set_res_sw (0x69, 0x83)
-#define SW_DATA_INVALID()                   set_res_sw (0x69, 0x84)
-#define SW_CONDITIONS_NOT_SATISFIED()       set_res_sw (0x69, 0x85)
-#define SW_COMMAND_NOT_ALLOWED()            set_res_sw (0x69, 0x86)
-#define SW_APPLET_SELECT_FAILED()           set_res_sw (0x69, 0x99)
-#define SW_FUNC_NOT_SUPPORTED()             set_res_sw (0x6A, 0x81)
-#define SW_FILE_NOT_FOUND()                 set_res_sw (0x6A, 0x82)
-#define SW_RECORD_NOT_FOUND()               set_res_sw (0x6A, 0x83)
-#define SW_FILE_FULL()                      set_res_sw (0x6A, 0x84)
-#define SW_INCORRECT_P1P2()                 set_res_sw (0x6A, 0x86)
-#define SW_REFERENCE_NOT_FOUND()            set_res_sw (0x6A, 0x88)
-#define SW_WRONG_P1P2()                     set_res_sw (0x6B, 0x00)
-#define SW_CORRECT_LENGTH_00()              set_res_sw (0x6C, 0x00)
-#define SW_INS_NOT_SUPPORTED()              set_res_sw (0x6D, 0x00)
-#define SW_CLA_NOT_SUPPORTED()              set_res_sw (0x6E, 0x00)
-#define SW_UNKNOWN()                        set_res_sw (0x6F, 0x00)
-#define SW_OK()                             set_res_sw (0x90, 0x00)
-
-#define HSM_OK                              0
-#define HSM_ERR_NO_MEMORY                   -1000
-#define HSM_ERR_MEMORY_FATAL                -1001
-#define HSM_ERR_NULL_PARAM                  -1002
-#define HSM_ERR_FILE_NOT_FOUND              -1003
-#define HSM_ERR_BLOCKED                     -1004
-#define HSM_NO_LOGIN                        -1005
-#define HSM_EXEC_ERROR                      -1006

 #define ALGO_RSA_RAW			0x20		/* RSA signature with external padding */
 #define ALGO_RSA_DECRYPT		0x21		/* RSA decrypt */
@@ -84,6 +48,19 @@ extern const uint8_t sc_hsm_aid[];
 #define ALGO_AES_CMAC		    0x18
 #define ALGO_AES_DERIVE		    0x99

+#define HSM_OPT_RRC                 0x0001
+#define HSM_OPT_TRANSPORT_PIN       0x0002
+#define HSM_OPT_SESSION_PIN         0x0004
+#define HSM_OPT_SESSION_PIN_EXPL    0x000C
+#define HSM_OPT_REPLACE_PKA         0x0008
+#define HSM_OPT_COMBINED_AUTH       0x0010
+#define HSM_OPT_RRC_RESET_ONLY      0x0020
+#define HSM_OPT_BOOTSEL_BUTTON      0x0100
+
+#define P15_KEYTYPE_RSA     0x30
+#define P15_KEYTYPE_ECC     0xA0
+#define P15_KEYTYPE_AES     0xA8
+
 extern int pin_reset_retries(const file_t *pin, bool);
 extern int pin_wrong_retry(const file_t *pin);

@@ -93,6 +70,4 @@ extern void double_hash_pin(const uint8_t *pin, size_t len, uint8_t output[32]);

 extern uint8_t session_pin[32], session_sopin[32];

-#define IV_SIZE 16
-
 #endif
--- a/src/hsm/version.h
+++ b/src/hsm/version.h
@@ -18,7 +18,7 @@
 #ifndef __VERSION_H_
 #define __VERSION_H_

-#define HSM_VERSION 0x0104
+#define HSM_VERSION 0x0200

 #define HSM_VERSION_MAJOR ((HSM_VERSION >> 8) & 0xff)
 #define HSM_VERSION_MINOR (HSM_VERSION & 0xff)
--- a/src/rng/neug.c
+++ b/src/rng/neug.c
@@ -1,182 +0,0 @@
-/* 
- * 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/>.
- */
- 
-//Part of the code is taken from GnuK (GPLv3)
-
-
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-#include "pico/stdlib.h"
-
-#include "neug.h"
-#include "hardware/structs/rosc.h"
-#include "hardware/gpio.h"
-#include "hardware/adc.h"
-#include "bsp/board.h"
-#include "pico/unique_id.h"
-
-void adc_start() {
-    adc_init();
-    adc_gpio_init(27);
-    adc_select_input(1);
-}
-
-void adc_stop() {
-}
-
-static uint64_t random_word = 0xcbf29ce484222325;
-static uint8_t ep_round = 0;
-
-static void ep_init() {
-    random_word = 0xcbf29ce484222325;
-    ep_round = 0;
-}
-
-/* Here, we assume a little endian architecture.  */
-static int ep_process () {
-    if (ep_round == 0) {
-        ep_init();
-    }
-    uint64_t word = 0x0;
-    for (int n = 0; n < 64; n++) {
-        uint8_t bit1, bit2;
-        do
-        {
-            bit1 = rosc_hw->randombit&0xff;
-            //sleep_ms(1);
-            bit2 = rosc_hw->randombit&0xff;
-        } while(bit1 == bit2);
-        word = (word << 1) | bit1;
-    }
-    random_word ^= word^board_millis()^adc_read();
-    random_word *= 0x00000100000001B3;
-    if (++ep_round == 8) {
-        ep_round = 0;
-        return 2; //2 words 
-    }
-    return 0;
-}
-
-static const uint32_t *ep_output() {
-    return (uint32_t *)&random_word;
-}
-
-struct rng_rb {
-    uint32_t *buf;
-    uint8_t head, tail;
-    uint8_t size;
-    unsigned int full :1;
-    unsigned int empty :1;
-};
-
-static void rb_init(struct rng_rb *rb, uint32_t *p, uint8_t size) {
-    rb->buf = p;
-    rb->size = size;
-    rb->head = rb->tail = 0;
-    rb->full = 0;
-    rb->empty = 1;
-}
-
-static void rb_add(struct rng_rb *rb, uint32_t v) {
-    rb->buf[rb->tail++] = v;
-    if (rb->tail == rb->size)
-        rb->tail = 0;
-    if (rb->tail == rb->head)
-        rb->full = 1;
-    rb->empty = 0;
-}
-
-static uint32_t rb_del(struct rng_rb *rb) {
-    uint32_t v = rb->buf[rb->head++];
-
-    if (rb->head == rb->size)
-        rb->head = 0;
-    if (rb->head == rb->tail)
-        rb->empty = 1;
-    rb->full = 0;
-
-    return v;
-}
-
-static struct rng_rb the_ring_buffer;
-
-void *neug_task() {
-    struct rng_rb *rb = &the_ring_buffer;
- 
-    int n;
-
-    if ((n = ep_process())) {
-	    int i;
-	    const uint32_t *vp;
-
-	    vp = ep_output();
-
-	    for (i = 0; i < n; i++) {
-	        rb_add (rb, *vp++);
-	        if (rb->full)
-		        break;
-	    }
-	}
-
-    return NULL;
-}
-
-void neug_init(uint32_t *buf, uint8_t size) {
-    pico_unique_board_id_t unique_id;
-    pico_get_unique_board_id(&unique_id);
-    const uint32_t *u = (const uint32_t *)unique_id.id;
-    struct rng_rb *rb = &the_ring_buffer;
-    int i;
-
-    rb_init(rb, buf, size);
-    
-    adc_start();
-    
-    ep_init();
-}
-
-void neug_flush(void) {
-    struct rng_rb *rb = &the_ring_buffer;
-    
-    while (!rb->empty)
-        rb_del (rb);
-}
-
-uint32_t neug_get(int kick) {
-    struct rng_rb *rb = &the_ring_buffer;
-    uint32_t v;
-
-    while (rb->empty)
-        neug_task();
-    v = rb_del(rb);
-
-    return v;
-}
-
-void neug_wait_full(void) { //should be called only on core1
-    struct rng_rb *rb = &the_ring_buffer;
-
-    while (!rb->full) {
-        sleep_ms(1);
-    }
-}
-
-void neug_fini(void) {
-    neug_get(1);
-}
-
--- a/src/rng/random.c
+++ b/src/rng/random.c
@@ -1,109 +0,0 @@
-/* 
- * 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 <stdint.h>
-#include <string.h>
-
-#include "neug.h"
-
-#define RANDOM_BYTES_LENGTH 32
-static uint32_t random_word[RANDOM_BYTES_LENGTH/sizeof (uint32_t)];
-
-void random_init(void) {
-    int i;
-
-    neug_init(random_word, RANDOM_BYTES_LENGTH/sizeof (uint32_t));
-
-    for (i = 0; i < NEUG_PRE_LOOP; i++)
-        neug_get();
-}
-
-void random_fini(void) {
-    neug_fini ();
-}
-
-/*
- * Return pointer to random 32-byte
- */
-void random_bytes_free (const uint8_t *p);
-#define MAX_RANDOM_BUFFER 1024
-const uint8_t * random_bytes_get(size_t len) {
-    if (len > MAX_RANDOM_BUFFER)
-        return NULL;
-    static uint32_t return_word[MAX_RANDOM_BUFFER/sizeof(uint32_t)];
-    for (int ix = 0; ix < len; ix += RANDOM_BYTES_LENGTH) {
-        neug_wait_full();
-        memcpy(return_word+ix/sizeof(uint32_t), random_word, RANDOM_BYTES_LENGTH);
-        random_bytes_free((const uint8_t *)random_word);
-    }
-    return (const uint8_t *)return_word;
-}
-
-/*
- * Free pointer to random 32-byte
- */
-void random_bytes_free(const uint8_t *p) {
-    (void)p;
-    memset(random_word, 0, RANDOM_BYTES_LENGTH);
-    neug_flush();
-}
-
-/*
- * Return 4-byte salt
- */
-void random_get_salt(uint8_t *p) {
-    uint32_t rnd;
-
-    rnd = neug_get();
-    memcpy(p, &rnd, sizeof (uint32_t));
-    rnd = neug_get();
-    memcpy(p + sizeof (uint32_t), &rnd, sizeof (uint32_t));
-}
-
-
-/*
- * Random byte iterator
- */
-int random_gen(void *arg, unsigned char *out, size_t out_len) {
-    uint8_t *index_p = (uint8_t *)arg;
-    uint8_t index = index_p ? *index_p : 0;
-    size_t n;
-
-    while (out_len) {
-        neug_wait_full();
-
-        n = RANDOM_BYTES_LENGTH - index;
-        if (n > out_len)
-	        n = out_len;
-
-        memcpy(out, ((unsigned char *)random_word) + index, n);
-        out += n;
-        out_len -= n;
-        index += n;
-
-        if (index >= RANDOM_BYTES_LENGTH) {
-	        index = 0;
-	        neug_flush();
-	    }
-    }
-
-    if (index_p)
-        *index_p = index;
-
-    return 0;
-}
--- a/src/usb/ccid-types.h
+++ b/src/usb/ccid-types.h
@@ -1,273 +0,0 @@
-/*
- * Copyright (C) 2009-2015 Frank Morgner
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-/**
- * @file
- */
-#ifndef _CCID_TYPES_H
-#define _CCID_TYPES_H
-
-#include "pico/types.h"
-#include "hardware/structs/usb.h"
-
-#define USB_REQ_CCID        0xA1
-
-#define CCID_CONTROL_ABORT                  0x01
-#define CCID_CONTROL_GET_CLOCK_FREQUENCIES  0x02
-#define CCID_CONTROL_GET_DATA_RATES 0x03
-
-#define CCID_OPERATION_VERIFY   0x00;
-#define CCID_OPERATION_MODIFY   0x01;
-#define CCID_ENTRY_VALIDATE     0x02
-
-#define CCID_BERROR_CMD_ABORTED 0xff /** Host aborted the current activity */
-#define CCID_BERROR_ICC_MUTE 0xfe /** CCID timed out while talking to the ICC */
-#define CCID_BERROR_XFR_PARITY_ERROR 0xfd /** Parity error while talking to the ICC */
-#define CCID_BERROR_XFR_OVERRUN 0xfc /** Overrun error while talking to the ICC */
-#define CCID_BERROR_HW_ERROR 0xfb /** An all inclusive hardware error occurred */
-#define CCID_BERROR_BAD_ATR_TS 0xf
-#define CCID_BERROR_BAD_ATR_TCK 0xf
-#define CCID_BERROR_ICC_PROTOCOL_NOT_SUPPORTED 0xf6
-#define CCID_BERROR_ICC_CLASS_NOT_SUPPORTED 0xf5
-#define CCID_BERROR_PROCEDURE_BYTE_CONFLICT 0xf4
-#define CCID_BERROR_DEACTIVATED_PROTOCOL 0xf3
-#define CCID_BERROR_BUSY_WITH_AUTO_SEQUENCE 0xf2 /** Automatic Sequence Ongoing */
-#define CCID_BERROR_PIN_TIMEOUT 0xf0
-#define CCID_BERROR_PIN_CANCELLED 0xef
-#define CCID_BERROR_CMD_SLOT_BUSY 0xe0 /** A second command was sent to a slot which was already processing a command. */
-#define CCID_BERROR_CMD_NOT_SUPPORTED 0x00
-#define CCID_BERROR_OK 0x00
-
-#define CCID_BSTATUS_OK_ACTIVE 0x00 /** No error. An ICC is present and active */
-#define CCID_BSTATUS_OK_INACTIVE 0x01 /** No error. ICC is present and inactive */
-#define CCID_BSTATUS_OK_NOICC 0x02 /** No error. No ICC is present */
-#define CCID_BSTATUS_ERROR_ACTIVE 0x40 /** Failed. An ICC is present and active */
-#define CCID_BSTATUS_ERROR_INACTIVE 0x41 /** Failed. ICC is present and inactive */
-#define CCID_BSTATUS_ERROR_NOICC 0x42 /** Failed. No ICC is present */
-
-#define CCID_WLEVEL_DIRECT __constant_cpu_to_le16(0) /** APDU begins and ends with this command */
-#define CCID_WLEVEL_CHAIN_NEXT_XFRBLOCK __constant_cpu_to_le16(1) /** APDU begins with this command, and continue in the next PC_to_RDR_XfrBlock */
-#define CCID_WLEVEL_CHAIN_END __constant_cpu_to_le16(2) /** abData field continues a command APDU and ends the APDU command */
-#define CCID_WLEVEL_CHAIN_CONTINUE __constant_cpu_to_le16(3) /** abData field continues a command APDU and another block is to follow */
-#define CCID_WLEVEL_RESPONSE_IN_DATABLOCK __constant_cpu_to_le16(0x10) /** empty abData field, continuation of response APDU is expected in the next RDR_to_PC_DataBlock */
-
-#define CCID_PIN_ENCODING_BIN   0x00
-#define CCID_PIN_ENCODING_BCD   0x01
-#define CCID_PIN_ENCODING_ASCII 0x02
-#define CCID_PIN_UNITS_BYTES    0x80
-#define CCID_PIN_JUSTIFY_RIGHT  0x04
-#define CCID_PIN_CONFIRM_NEW    0x01
-#define CCID_PIN_INSERT_OLD     0x02
-#define CCID_PIN_NO_MSG         0x00
-#define CCID_PIN_MSG1           0x01
-#define CCID_PIN_MSG2           0x02
-#define CCID_PIN_MSG_REF        0x03
-#define CCID_PIN_MSG_DEFAULT    0xff
-
-#define CCID_SLOTS_UNCHANGED    0x00
-#define CCID_SLOT1_CARD_PRESENT 0x01
-#define CCID_SLOT1_CHANGED      0x02
-#define CCID_SLOT2_CARD_PRESENT 0x04
-#define CCID_SLOT2_CHANGED      0x08
-#define CCID_SLOT3_CARD_PRESENT 0x10
-#define CCID_SLOT3_CHANGED      0x20
-#define CCID_SLOT4_CARD_PRESENT 0x40
-#define CCID_SLOT4_CHANGED      0x80
-
-#define CCID_EXT_APDU_MAX       (4 + 3 + 0xffff + 3)
-#define CCID_SHORT_APDU_MAX     (4 + 1 + 0xff + 1)
-
-typedef struct TU_ATTR_PACKED {
-	uint8_t  bLength;
-	uint8_t  bDescriptorType;
-	uint16_t bcdCCID;
-	uint8_t  bMaxSlotIndex;
-	uint8_t  bVoltageSupport;
-	uint32_t dwProtocols;
-	uint32_t dwDefaultClock;
-	uint32_t dwMaximumClock;
-	uint8_t  bNumClockSupport;
-	uint32_t dwDataRate;
-	uint32_t dwMaxDataRate;
-	uint8_t  bNumDataRatesSupported;
-	uint32_t dwMaxIFSD;
-	uint32_t dwSynchProtocols;
-	uint32_t dwMechanical;
-	uint32_t dwFeatures;
-	uint32_t dwMaxCCIDMessageLength;
-	uint8_t  bClassGetResponse;
-	uint8_t  bclassEnvelope;
-	uint16_t wLcdLayout;
-	uint8_t  bPINSupport;
-	uint8_t  bMaxCCIDBusySlots;
-} class_desc_ccid_t;
-
-struct abProtocolDataStructure_T0 {
-	uint8_t  bmFindexDindex;
-	uint8_t  bmTCCKST0;
-	uint8_t  bGuardTimeT0;
-	uint8_t  bWaitingIntegerT0;
-	uint8_t  bClockStop;
-} __packed;
-
-struct abProtocolDataStructure_T1 {
-	uint8_t  bmFindexDindex;
-	uint8_t  bmTCCKST1;
-	uint8_t  bGuardTimeT1;
-	uint8_t  bWaitingIntegersT1;
-	uint8_t  bClockStop;
-	uint8_t  bIFSC;
-	uint8_t  bNadValue;
-} __packed;
-
-struct abPINDataStucture_Verification {
-	uint8_t  bTimeOut;
-	uint8_t  bmFormatString;
-	uint8_t  bmPINBlockString;
-	uint8_t  bmPINLengthFormat;
-	uint16_t wPINMaxExtraDigit;
-	uint8_t  bEntryValidationCondition;
-	uint8_t  bNumberMessage;
-	uint16_t wLangId;
-	uint8_t  bMsgIndex;
-	uint8_t  bTeoPrologue1;
-	uint16_t bTeoPrologue2;
-} __packed;
-
-struct abPINDataStucture_Modification {
-	uint8_t  bTimeOut;
-	uint8_t  bmFormatString;
-	uint8_t  bmPINBlockString;
-	uint8_t  bmPINLengthFormat;
-	uint8_t  bInsertionOffsetOld;
-	uint8_t  bInsertionOffsetNew;
-	uint16_t wPINMaxExtraDigit;
-	uint8_t  bConfirmPIN;
-	uint8_t  bEntryValidationCondition;
-	uint8_t  bNumberMessage;
-	uint16_t wLangId;
-	uint8_t  bMsgIndex1;
-} __packed;
-
-struct PC_to_RDR_XfrBlock {
-	uint8_t  bMessageType;
-	uint32_t dwLength;
-	uint8_t  bSlot;
-	uint8_t  bSeq;
-	uint8_t  bBWI;
-	uint16_t wLevelParameter;
-} __packed;
-
-struct PC_to_RDR_IccPowerOff {
-	uint8_t  bMessageType;
-	uint32_t dwLength;
-	uint8_t  bSlot;
-	uint8_t  bSeq;
-	uint8_t  abRFU1;
-	uint16_t abRFU2;
-} __packed;
-
-struct PC_to_RDR_GetSlotStatus {
-	uint8_t  bMessageType;
-	uint32_t dwLength;
-	uint8_t  bSlot;
-	uint8_t  bSeq;
-	uint8_t  abRFU1;
-	uint16_t abRFU2;
-} __packed;
-
-struct PC_to_RDR_GetParameters {
-	uint8_t  bMessageType;
-	uint32_t dwLength;
-	uint8_t  bSlot;
-	uint8_t  bSeq;
-	uint8_t  abRFU1;
-	uint16_t abRFU2;
-} __packed;
-
-struct PC_to_RDR_ResetParameters {
-	uint8_t  bMessageType;
-	uint32_t dwLength;
-	uint8_t  bSlot;
-	uint8_t  bSeq;
-	uint8_t  abRFU1;
-	uint16_t abRFU2;
-} __packed;
-
-struct PC_to_RDR_SetParameters {
-	uint8_t  bMessageType;
-	uint32_t dwLength;
-	uint8_t  bSlot;
-	uint8_t  bSeq;
-	uint8_t  bProtocolNum;
-	uint16_t abRFU;
-} __packed;
-
-struct PC_to_RDR_Secure {
-	uint8_t  bMessageType;
-	uint32_t dwLength;
-	uint8_t  bSlot;
-	uint8_t  bSeq;
-	uint8_t  bBWI;
-	uint16_t wLevelParameter;
-} __packed;
-
-struct PC_to_RDR_IccPowerOn {
-	uint8_t  bMessageType;
-	uint32_t dwLength;
-	uint8_t  bSlot;
-	uint8_t  bSeq;
-	uint8_t  bPowerSelect;
-	uint16_t abRFU;
-} __packed;
-
-struct RDR_to_PC_SlotStatus {
-	uint8_t  bMessageType;
-	uint32_t dwLength;
-	uint8_t  bSlot;
-	uint8_t  bSeq;
-	uint8_t  bStatus;
-	uint8_t  bError;
-	uint8_t  bClockStatus;
-} __packed;
-
-struct RDR_to_PC_DataBlock {
-	uint8_t  bMessageType;
-	uint32_t dwLength;
-	uint8_t  bSlot;
-	uint8_t  bSeq;
-	uint8_t  bStatus;
-	uint8_t  bError;
-	uint8_t  bChainParameter;
-} __packed;
-
-struct RDR_to_PC_Parameters {
-	uint8_t  bMessageType;
-	uint32_t dwLength;
-	uint8_t  bSlot;
-	uint8_t  bSeq;
-	uint8_t  bStatus;
-	uint8_t  bError;
-	uint8_t  bProtocolNum;
-} __packed;
-
-struct RDR_to_PC_NotifySlotChange {
-	uint8_t  bMessageType;
-	uint8_t  bmSlotICCState; /* we support 1 slots, so we need 2*1 bits = 1 byte */
-} __packed;
-
-#endif
--- a/src/usb/ccid.h
+++ b/src/usb/ccid.h
@@ -1,71 +0,0 @@
-/* 
- * 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/>.
- */
-
-#ifndef _CCID_H_
-#define _CCID_H_
-
-#include "libopensc/ccid-types.h"
-
-static const struct ccid_class_descriptor desc_ccid = {
-    .bLength                = sizeof(struct ccid_class_descriptor),
-    .bDescriptorType        = 0x21,
-    .bcdCCID                = (0x0110),
-    .bMaxSlotIndex          = 0,
-    .bVoltageSupport        = 0x01,  // 5.0V
-    .dwProtocols            = (
-                              0x01|  // T=0
-                              0x02), // T=1
-    .dwDefaultClock         = (0xDFC),
-    .dwMaximumClock         = (0xDFC),
-    .bNumClockSupport       = 1,
-    .dwDataRate             = (0x2580),
-    .dwMaxDataRate          = (0x2580),
-    .bNumDataRatesSupported = 1,
-    .dwMaxIFSD              = (0xFF), // IFSD is handled by the real reader driver
-    .dwSynchProtocols       = (0),
-    .dwMechanical           = (0),
-    .dwFeatures             = (
-                              0x00000002|  // Automatic parameter configuration based on ATR data
-                              0x00000004|  // Automatic activation of ICC on inserting
-                              0x00000008|  // Automatic ICC voltage selection
-                              0x00000010|  // Automatic ICC clock frequency change
-                              0x00000020|  // Automatic baud rate change
-                              0x00000040|  // Automatic parameters negotiation
-                              0x00000080|  // Automatic PPS   
-                              0x00000400|  // Automatic IFSD exchange as first exchange
-                              0x00040000|  // Short and Extended APDU level exchange with CCID
-                              0x00100000), // USB Wake up signaling supported
-    .dwMaxCCIDMessageLength = (CCID_EXT_APDU_MAX),
-    .bClassGetResponse      = 0xFF,
-    .bclassEnvelope         = 0xFF,
-    .wLcdLayout             = 0x0,
-                              /*
-                              (
-                              0xFF00|   // Number of lines for the LCD display
-                              0x00FF),  // Number of characters per line
-                              */
-    .bPINSupport            = 0x0,
-                              /*
-                              0x1|      // PIN Verification supported
-                              0x2|      // PIN Modification supported
-                              0x10|     // PIN PACE Capabilities supported
-                              0x20,     // PIN PACE Verification supported
-                              */
-    .bMaxCCIDBusySlots      = 0x01,
-};
-
-#endif
--- a/src/usb/tusb_config.h
+++ b/src/usb/tusb_config.h
@@ -1,119 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Ha Thach (tinyusb.org)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- */
-
-#ifndef _TUSB_CONFIG_H_
-#define _TUSB_CONFIG_H_
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-//--------------------------------------------------------------------
-// COMMON CONFIGURATION
-//--------------------------------------------------------------------
-
-// defined by board.mk
-#ifndef CFG_TUSB_MCU
-  #error CFG_TUSB_MCU must be defined
-#endif
-
-// RHPort number used for device can be defined by board.mk, default to port 0
-#ifndef BOARD_DEVICE_RHPORT_NUM
-  #define BOARD_DEVICE_RHPORT_NUM     0
-#endif
-
-// RHPort max operational speed can defined by board.mk
-// Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed
-#ifndef BOARD_DEVICE_RHPORT_SPEED
-  #if (CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || \
-       CFG_TUSB_MCU == OPT_MCU_NUC505  || CFG_TUSB_MCU == OPT_MCU_CXD56 || CFG_TUSB_MCU == OPT_MCU_SAMX7X)
-    #define BOARD_DEVICE_RHPORT_SPEED   OPT_MODE_HIGH_SPEED
-  #else
-    #define BOARD_DEVICE_RHPORT_SPEED   OPT_MODE_FULL_SPEED
-  #endif
-#endif
-
-// Device mode with rhport and speed defined by board.mk
-#if   BOARD_DEVICE_RHPORT_NUM == 0
-  #define CFG_TUSB_RHPORT0_MODE     (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED)
-#elif BOARD_DEVICE_RHPORT_NUM == 1
-  #define CFG_TUSB_RHPORT1_MODE     (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED)
-#else
-  #error "Incorrect RHPort configuration"
-#endif
-
-#ifndef CFG_TUSB_OS
-#define CFG_TUSB_OS               OPT_OS_PICO
-#endif
-
-// CFG_TUSB_DEBUG is defined by compiler in DEBUG build
-// #define CFG_TUSB_DEBUG           0
-
-/* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
- * Tinyusb use follows macros to declare transferring memory so that they can be put
- * into those specific section.
- * e.g
- * - CFG_TUSB_MEM SECTION : __attribute__ (( section(".usb_ram") ))
- * - CFG_TUSB_MEM_ALIGN   : __attribute__ ((aligned(4)))
- */
-#ifndef CFG_TUSB_MEM_SECTION
-#define CFG_TUSB_MEM_SECTION
-#endif
-
-#ifndef CFG_TUSB_MEM_ALIGN
-#define CFG_TUSB_MEM_ALIGN          __attribute__ ((aligned(4)))
-#endif
-
-//--------------------------------------------------------------------
-// DEVICE CONFIGURATION
-//--------------------------------------------------------------------
-
-#ifndef CFG_TUD_ENDPOINT0_SIZE
-#define CFG_TUD_ENDPOINT0_SIZE    64
-#endif
-
-//------------- CLASS -------------//
-#define CFG_TUD_HID               0
-#define CFG_TUD_CDC               0
-#define CFG_TUD_MSC               0
-#define CFG_TUD_MIDI              0
-#define CFG_TUD_VENDOR            1
-
-// HID buffer size Should be sufficient to hold ID (if any) + Data
-#define CFG_TUD_HID_EP_BUFSIZE    16
-
-#define CFG_TUD_VENDOR_RX_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64)
-#define CFG_TUD_VENDOR_TX_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64)
-
-#include "pico/types.h"
-
-static inline uint16_t tu_u32_high16(uint32_t ui32) { return (uint16_t) (ui32 >> 16); }
-static inline uint16_t tu_u32_low16 (uint32_t ui32) { return (uint16_t) (ui32 & 0x0000ffffu); }
-
-#ifdef __cplusplus
- }
-#endif
-
-#endif /* _TUSB_CONFIG_H_ */
--- a/src/usb/usb_descriptors.c
+++ b/src/usb/usb_descriptors.c
@@ -1,209 +0,0 @@
-/* 
- * 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 "tusb.h"
-#include "usb_descriptors.h"
-#include "ccid.h"
-#include "pico/unique_id.h"
-#include "version.h"
-
-
-#ifndef USB_VID
-#define USB_VID   0xFEFF
-#endif
-#ifndef USB_PID
-#define USB_PID   0xFCFD
-#endif
-
-#define USB_BCD   0x0200
-
-#define USB_CONFIG_ATT_ONE TU_BIT(7)
-
-#define	MAX_USB_POWER		1
-
-
-//--------------------------------------------------------------------+
-// Device Descriptors
-//--------------------------------------------------------------------+
-tusb_desc_device_t const desc_device =
-{
-    .bLength            = sizeof(tusb_desc_device_t),
-    .bDescriptorType    = TUSB_DESC_DEVICE,
-    .bcdUSB             = (USB_BCD),
-
-    .bDeviceClass       = 0x00,
-    .bDeviceSubClass    = 0,
-    .bDeviceProtocol    = 0,
-    .bMaxPacketSize0    = CFG_TUD_ENDPOINT0_SIZE,
-
-    .idVendor           = (USB_VID),
-    .idProduct          = (USB_PID),
-    .bcdDevice          = HSM_VERSION,
-
-    .iManufacturer      = 1,
-    .iProduct           = 2,
-    .iSerialNumber      = 3,
-
-    .bNumConfigurations = 1
-};
-
-uint8_t const * tud_descriptor_device_cb(void)
-{
-    return (uint8_t const *) &desc_device;
-}
-
-tusb_desc_interface_t const desc_interface = 
-{
-    .bLength            = sizeof(tusb_desc_interface_t),
-    .bDescriptorType    = TUSB_DESC_INTERFACE,
-    .bInterfaceNumber   = 0,
-    .bAlternateSetting  = 0,
-    .bNumEndpoints      = 2,
-    .bInterfaceClass    = TUSB_CLASS_SMART_CARD,
-    .bInterfaceSubClass = 0,
-    .bInterfaceProtocol = 0,
-    .iInterface         = 5,
-};
-
-//--------------------------------------------------------------------+
-// Configuration Descriptor
-//--------------------------------------------------------------------+
-
-tusb_desc_configuration_t const desc_config  = 
-{
-    .bLength             = sizeof(tusb_desc_configuration_t),
-  	.bDescriptorType     = TUSB_DESC_CONFIGURATION,
-    .wTotalLength        = (sizeof(tusb_desc_configuration_t) + sizeof(tusb_desc_interface_t) + sizeof(struct ccid_class_descriptor) + 2*sizeof(tusb_desc_endpoint_t)),
-  	.bNumInterfaces      = 1,
-  	.bConfigurationValue = 1,
-  	.iConfiguration      = 4,
-  	.bmAttributes        = USB_CONFIG_ATT_ONE | TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP,
-  	.bMaxPower           = TUSB_DESC_CONFIG_POWER_MA(MAX_USB_POWER+1),
-};
-
-tusb_desc_endpoint_t const desc_ep1 = 
-{
-    .bLength             = sizeof(tusb_desc_endpoint_t),
-	.bDescriptorType     = TUSB_DESC_ENDPOINT,
-	.bEndpointAddress    = TUSB_DIR_IN_MASK | 1,
-	.bmAttributes.xfer   = TUSB_XFER_BULK,
-	.wMaxPacketSize.size = (64),
-	.bInterval           = 0
-};
-
-tusb_desc_endpoint_t const desc_ep2 = 
-{
-    .bLength             = sizeof(tusb_desc_endpoint_t),
-	.bDescriptorType     = TUSB_DESC_ENDPOINT,
-	.bEndpointAddress    = 2,
-	.bmAttributes.xfer   = TUSB_XFER_BULK,
-	.wMaxPacketSize.size = (64),
-	.bInterval           = 0
-};
-
-static uint8_t desc_config_extended[sizeof(tusb_desc_configuration_t) + sizeof(tusb_desc_interface_t) + sizeof(struct ccid_class_descriptor) + 2*sizeof(tusb_desc_endpoint_t)];
-
-uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
-{
-    (void) index; // for multiple configurations
-  
-    static uint8_t initd = 0;
-    if (initd == 0)
-    {
-        uint8_t *p = desc_config_extended;
-        memcpy(p, &desc_config, sizeof(tusb_desc_configuration_t)); p += sizeof(tusb_desc_configuration_t);
-        memcpy(p, &desc_interface, sizeof(tusb_desc_interface_t)); p += sizeof(tusb_desc_interface_t);
-        memcpy(p, &desc_ccid, sizeof(struct ccid_class_descriptor)); p += sizeof(struct ccid_class_descriptor);
-        memcpy(p, &desc_ep1, sizeof(tusb_desc_endpoint_t)); p += sizeof(tusb_desc_endpoint_t);
-        memcpy(p, &desc_ep2, sizeof(tusb_desc_endpoint_t)); p += sizeof(tusb_desc_endpoint_t);
-        initd = 1;
-    }
-    return (const uint8_t *)desc_config_extended;
-}
-
-#define BOS_TOTAL_LEN      (TUD_BOS_DESC_LEN)
-
-#define MS_OS_20_DESC_LEN  0xB2
-
-uint8_t const desc_bos[] =
-{
-    // total length, number of device caps
-    TUD_BOS_DESCRIPTOR(BOS_TOTAL_LEN, 2)
-};
-
-uint8_t const * tud_descriptor_bos_cb(void)
-{
-    return desc_bos;
-}
-
-//--------------------------------------------------------------------+
-// String Descriptors
-//--------------------------------------------------------------------+
-
-// array of pointer to string descriptors
-char const* string_desc_arr [] =
-{
-    (const char[]) { 0x09, 0x04 }, // 0: is supported language is English (0x0409)
-    "Pol Henarejos",                     // 1: Manufacturer
-    "Pico HSM",                       // 2: Product
-    "11223344",                      // 3: Serials, should use chip ID
-    "Pico HSM Config",               // 4: Vendor Interface
-    "Pico HSM Interface"
-};
-
-static uint16_t _desc_str[32];
-
-uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid)
-{
-    (void) langid;
-
-    uint8_t chr_count;
-
-    if (index == 0) {
-        memcpy(&_desc_str[1], string_desc_arr[0], 2);
-        chr_count = 1;
-    }
-    else  {
-        // Note: the 0xEE index string is a Microsoft OS 1.0 Descriptors.
-        // https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/microsoft-defined-usb-descriptors
-
-        if ( !(index < sizeof(string_desc_arr)/sizeof(string_desc_arr[0])) ) 
-            return NULL;
-
-        const char* str = string_desc_arr[index];
-        char unique_id_str[2 * PICO_UNIQUE_BOARD_ID_SIZE_BYTES + 1];
-        if (index == 3) {
-            pico_unique_board_id_t unique_id;
-            pico_get_unique_board_id(&unique_id);
-            pico_get_unique_board_id_string(unique_id_str, 2 * PICO_UNIQUE_BOARD_ID_SIZE_BYTES + 1);
-            str = unique_id_str;
-        }
-
-        chr_count = strlen(str);
-        if ( chr_count > 31 ) 
-            chr_count = 31;
-
-        // Convert ASCII string into UTF-16
-        for(uint8_t i=0; i<chr_count; i++) {
-            _desc_str[1+i] = str[i];
-        }
-    }
-
-    _desc_str[0] = (TUSB_DESC_STRING << 8 ) | (2*chr_count + 2);
-
-    return _desc_str;
-}
--- a/src/usb/usb_descriptors.h
+++ b/src/usb/usb_descriptors.h
@@ -1,29 +0,0 @@
-/* 
- * 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/>.
- */
-
-#ifndef USB_DESCRIPTORS_H_
-#define USB_DESCRIPTORS_H_
-
-enum
-{
-  VENDOR_REQUEST_WEBUSB = 1,
-  VENDOR_REQUEST_MICROSOFT = 2
-};
-
-extern uint8_t const desc_ms_os_20[];
-
-#endif /* USB_DESCRIPTORS_H_ */
Author	SHA1	Message	Date
Pol Henarejos	86298f3421	Upgrading to version 2.0.	2022-04-19 19:24:10 +02:00
Pol Henarejos	77971ac7e6	Using MBEDTLS from pico ccid. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-19 19:19:16 +02:00
Pol Henarejos	302f287967	Moving EAC and crypto to core. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-19 19:16:29 +02:00
Pol Henarejos	b9c08d72c4	Update .gitmodules Updating module for pico-ccid	2022-04-19 18:42:48 +02:00
Pol Henarejos	522860f736	Splitting the core onto another repo, which can be reused by other smart applications. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-19 18:39:52 +02:00
Pol Henarejos	b09fc75913	CVCert is burn only if it does not exist. This check is only executed for first configuration. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-14 18:31:39 +02:00
Pol Henarejos	1b010c8a68	Specifying POST method Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-14 17:11:51 +02:00
Pol Henarejos	e2f424d4ab	No more in the repo Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-14 01:06:50 +02:00
Pol Henarejos	b9fb224d62	Adding a tool to burn device CVC. It generates a new keypair and sends the public key to Pico HSM CA, which signs the request. The certificate, CA and private key are burned onto the firmware. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-14 01:03:03 +02:00
Pol Henarejos	69e869852e	Rewritten keypair_gen response (more friendly). Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-13 19:03:33 +02:00
Pol Henarejos	618966b742	Sanity check for keypair gen. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-13 18:49:13 +02:00
Pol Henarejos	b68920ff45	Added walker function for TLV parsing. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-13 16:55:34 +02:00
Pol Henarejos	9dfe0ee7b3	Clear session pin on unload and new session. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-13 14:25:44 +02:00
Pol Henarejos	da6c578973	Fix tag_len computation for all TLV. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-13 14:14:06 +02:00
Pol Henarejos	49d9ec7cf9	Session pin is randomized. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-13 14:12:14 +02:00
Pol Henarejos	af07f1d549	Added INS for session pin generation (needs randomization). Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-11 19:47:43 +02:00
Pol Henarejos	db5f5fd435	When working with SM, wrap() manipulates res_APDU. Thus, we cannot change the pointer of res_APDU anymore. Everything must be memcpy-ed. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-11 15:11:42 +02:00
Pol Henarejos	7232625bab	Merge branch 'master' into eac	2022-04-11 15:09:33 +02:00
Pol Henarejos	1557a4a039	Fix when generating keypair, which could produce wrong flash save in particular cases of concurrency. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-11 15:09:20 +02:00
Pol Henarejos	b61575bbc3	Adding some mutex to improve concurrency. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-11 15:08:10 +02:00
Pol Henarejos	3781777138	Adding some kind of permanent flash memory that does not wipe out when initializing. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-11 11:37:41 +02:00
Pol Henarejos	2f1f8e0c90	Fix parsing TLV in signatures. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-11 01:44:18 +02:00
Pol Henarejos	c4c2bf86ba	Fix response APDU in secure channel. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-11 01:38:15 +02:00
Pol Henarejos	f26668b81d	Fixed IV computation. IV is computed encrypting macCounter with a initial IV=0x0000. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-11 01:16:20 +02:00
Pol Henarejos	964af6a064	Adding wrap() to encrypt and sign response APDU. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-10 20:58:54 +02:00
Pol Henarejos	c3a93a46ba	Adding unwrap(), to decrypt and verify secure APDU. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-10 20:23:36 +02:00
Pol Henarejos	57d593561a	Moving all SM stuff to EAC. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-10 19:00:52 +02:00
Pol Henarejos	c098d80524	Adding private key of termca. It is the worst thing I can do, but first I need to develop the secure channel, which uses the private key of device. Later, I will figure out how to generate the private key and certificate during initialization, but it will be difficult, as it needs to be signed by the CA. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-10 01:55:57 +02:00
Pol Henarejos	6c892af9f1	Adding authentication command. Not finished. Needs lot of work. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-09 23:44:45 +02:00
Pol Henarejos	b545a1618b	Added Manage Security Environment command. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-09 20:50:00 +02:00
Pol Henarejos	dec3d54ddd	Adding more SW codes. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-09 20:29:13 +02:00
Pol Henarejos	ce4d0bf102	INS 54h is also occupied too... let's try with 64h. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-08 00:38:03 +02:00
Pol Henarejos	4e6bada892	Fix first AID load. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-08 00:29:15 +02:00
Pol Henarejos	98ad2e3d55	Fix returning card data when selected AID. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-07 23:32:56 +02:00
Pol Henarejos	e686b42934	Merge branch 'master' into eac	2022-04-07 18:34:40 +02:00
Pol Henarejos	239e01c3f8	Update extra_command.md Using new extra INS, from 0x88 to 0x54	2022-04-07 18:34:14 +02:00
Pol Henarejos	0d839c3136	Merge branch 'master' into eac	2022-04-07 18:32:49 +02:00
Pol Henarejos	4a57698173	Moving out INS_EXTRAS from 0x88 (taken by ISO 7816) to 0x54 (presumably free). Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-07 18:32:31 +02:00
Pol Henarejos	cc3bfad00a	Merge branch 'master' into eac	2022-04-07 18:18:50 +02:00
Pol Henarejos	468051288c	Upgrading to version 1.12. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-07 18:18:24 +02:00
Pol Henarejos	565ea12d88	Added dynamic option to enable/disable press to confirm. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-07 18:18:24 +02:00
Pol Henarejos	1c7ef50568	Added custom INS (named EXTRAS) to support different extra commands. At this moment: - 0xA: gets/sets the datetime. - 0x6: enables/disables press to confirm (BOOTSEL). It allows other dynamic device options. At this moment, only press to confirm option is available. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-07 18:18:24 +02:00
Pol Henarejos	878eae9787	Added press button to confirm. Everytime a private/secret key is loaded, the Pico HSM waits for BOOTSEL button press. This mechanism guarantees that no private/secret operations are made without user consent. To confirm the operation, the user must press the BOOTSEL button. In the meanwhile, the device gets into waiting state and no other operation is performed. After release the button, the operation continues normally. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-07 18:18:24 +02:00
Pol Henarejos	24b1d6807b	Added support for reading binary data. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-07 18:18:24 +02:00
Pol Henarejos	6bc081a1e1	Added support to write arbitrary data EF. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-07 18:18:24 +02:00
Pol Henarejos	afb16fff65	Fix with ASN1 encapsulation for keypair generation. It only affects RSA 4096 bits. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-07 18:18:24 +02:00
Pol Henarejos	cf81a82645	Added a new custom APDU (88h) for setting and retrieving datetime. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-07 18:18:24 +02:00
Pol Henarejos	dc820a60ae	Fixed class with USB-ICC specs, for legacy reasons. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-07 18:18:24 +02:00
Pol Henarejos	c57cc139f6	Update README.md	2022-04-07 00:10:09 +02:00
Pol Henarejos	79426f35cd	Update extra_command.md Added dynamic options and press-to-confirm enabling/disabling.	2022-04-07 00:06:44 +02:00
Pol Henarejos	502a7ba81c	Create store_data.md	2022-04-06 23:56:29 +02:00
Pol Henarejos	deef209687	Update README.md Added press-to-confirm description. Added links to storage binary data. Added links to extra command to enable/disable button. Added links to setting/getting datetime.	2022-04-06 19:52:10 +02:00
Pol Henarejos	bb09f212d2	Create extra_command.md Add get/set datetime explanation.	2022-04-06 19:51:05 +02:00
Pol Henarejos	1e6556ebdd	Upgrading to version 1.12. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-06 19:16:28 +02:00
Pol Henarejos	cfd86df45e	Update README.md Added led blink meaning.	2022-04-06 17:25:07 +02:00
Pol Henarejos	c16a7a3c5c	Added dynamic option to enable/disable press to confirm. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-06 15:14:23 +02:00
Pol Henarejos	7060d2d2ca	Added custom INS (named EXTRAS) to support different extra commands. At this moment: - 0xA: gets/sets the datetime. - 0x6: enables/disables press to confirm (BOOTSEL). It allows other dynamic device options. At this moment, only press to confirm option is available. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-06 14:41:09 +02:00
Pol Henarejos	532d79bcc5	Added press button to confirm. Everytime a private/secret key is loaded, the Pico HSM waits for BOOTSEL button press. This mechanism guarantees that no private/secret operations are made without user consent. To confirm the operation, the user must press the BOOTSEL button. In the meanwhile, the device gets into waiting state and no other operation is performed. After release the button, the operation continues normally. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-06 14:38:22 +02:00
Pol Henarejos	770097d6ab	Added support for reading binary data. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-05 18:07:20 +02:00
Pol Henarejos	ce2a1c21de	Added support to write arbitrary data EF. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-05 17:28:22 +02:00
Pol Henarejos	d16c9b2324	Update README.md Adding operation time for RSA (signature and decrypt). It is relevant for RSA 3K and 4K.	2022-04-04 22:27:33 +02:00
Pol Henarejos	6e1c47ddf4	Fix with ASN1 encapsulation for keypair generation. It only affects RSA 4096 bits. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-04 22:00:29 +02:00
Pol Henarejos	f1630023c7	Update README.md Added keygen time for 3k and 4k.	2022-04-04 21:56:40 +02:00
Pol Henarejos	d49e7be972	Added a new custom APDU (88h) for setting and retrieving datetime. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-04 15:48:04 +02:00
Pol Henarejos	13d17fc4f7	Fixed class with USB-ICC specs, for legacy reasons. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-04 15:46:53 +02:00
Pol Henarejos	d41a488eda	Adding support for Transport PIN. Adding support for initialize options.	2022-04-04 10:07:23 +02:00
Pol Henarejos	375a18ebac	Update README.md Fix RSA 4096 doc link.	2022-04-04 10:04:47 +02:00
Pol Henarejos	20216ac4ba	Update README.md	2022-04-04 10:01:16 +02:00
Pol Henarejos	d27d8b0c5b	Upgrading to version 1.10 Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-04 09:57:19 +02:00
Pol Henarejos	a619527482	Adding P1=0x2 and P1=0x3 for reset retry counter. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-03 20:59:50 +02:00
Pol Henarejos	85ff92c4de	Adding check for device options whether it can reset retry counter with PIN or without. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-03 20:40:16 +02:00
Pol Henarejos	b1121718db	Adding capability to reset retry counter without new PIN Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-03 20:37:16 +02:00
Pol Henarejos	2905dcc8c0	Adding custom command to set datetime. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-04-03 19:57:56 +02:00
Pol Henarejos	c9855f7214	Fix displaying device options. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 19:43:33 +02:00
Pol Henarejos	853b8f29a2	Fix returning kcv when pin is not provided. It always return 0x0 Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 19:31:56 +02:00
Pol Henarejos	d5378ffa41	If has_session_pin is true, it returns sw_ok Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 19:31:22 +02:00
Pol Henarejos	4400eba974	Fix returning kcv Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 19:31:02 +02:00
Pol Henarejos	0cc656c6c0	Adding transport PIN option. It does not allow to authenticate and returns sw code 0x6984 Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 19:12:56 +02:00
Pol Henarejos	c9b32ab5d0	Fix return pin blocked sw code. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 18:59:54 +02:00
Pol Henarejos	f9ffd39661	Adding EF_DEVOPS to store the device options during the initialization. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 18:56:42 +02:00
Pol Henarejos	bfc12d6856	Renaming files Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 18:27:00 +02:00
Pol Henarejos	11874b52de	Merge branch 'master' into eac	2022-03-31 14:46:28 +02:00
Pol Henarejos	b4e928588e	Updating tools to 1.8 Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 14:32:57 +02:00
Pol Henarejos	33a2222cd8	Revert "PIN remaining tries only returned when user is not logged in. If so, it returns always OK." This reverts commit `86e38419ac`.	2022-03-31 14:30:50 +02:00
Pol Henarejos	923e05a36c	Revert "Also for SOPIN." This reverts commit `ad66170379`.	2022-03-31 14:30:50 +02:00
Pol Henarejos	b5cc4d6fd7	Update README.md	2022-03-31 13:32:18 +02:00
Pol Henarejos	25291f978f	Create rsa_4096.md	2022-03-31 13:23:02 +02:00
Pol Henarejos	ad66170379	Also for SOPIN. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 13:18:56 +02:00
Pol Henarejos	86e38419ac	PIN remaining tries only returned when user is not logged in. If so, it returns always OK. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 13:17:16 +02:00
Pol Henarejos	1a5e6a7edc	Merge branch 'eac'. Support for PKCS#12 imports with SCS3.	2022-03-31 11:37:50 +02:00
Pol Henarejos	7cf166d615	Upgrading to version 1.8 Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 11:18:52 +02:00
Pol Henarejos	413c3e0208	Fix update ef when offset is required. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 01:08:39 +02:00
Pol Henarejos	7410498df1	Fix with RSA CRT import mode (keytype 6). In RSA CRT import, the N parameter shall not be imported. Otherwise, mbedtls will fail (it is deduced from N=PQ). Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-31 00:24:50 +02:00
Pol Henarejos	7aee18110e	Fix kmac and kenc computation. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-30 23:59:06 +02:00
Pol Henarejos	7aca7b323a	Fix loading kcv, kenc and kmac. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-30 23:21:23 +02:00
Pol Henarejos	4651a0e224	Adding AES wrapping/unwrapping Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-30 01:33:54 +02:00
Pol Henarejos	d018e3b9b9	Adding RSA and EC wrap/unwrap, compatible with SC HSM wrap format. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-30 00:59:37 +02:00
Pol Henarejos	1c272842a7	Adding dkek_decode_key for unwrapping. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-29 20:18:08 +02:00
Pol Henarejos	0141e0ab4e	Adding ec curve find from prime. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-29 20:17:42 +02:00
Pol Henarejos	e7d8695394	Added length checks. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-29 19:16:15 +02:00
Pol Henarejos	6876edea5a	Some fix in encode key Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-29 19:06:00 +02:00
Pol Henarejos	2e655d6341	Fixes with AES encryption Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-29 18:25:47 +02:00
Pol Henarejos	2f4cca19c4	Moving some dkek crypt stuff to dkek. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-29 13:45:28 +02:00
Pol Henarejos	5eb74d8ca3	Adding encode_key with dkek (for wrapping). Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-29 13:45:07 +02:00
Pol Henarejos	7b0d5a6700	Fix loading aes key in decrypt function Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-29 09:35:06 +02:00
Pol Henarejos	427260663f	Replacing CFB to CBC AES proc Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-29 09:34:44 +02:00
Pol Henarejos	047a443536	Adding dkek procedures to wrap/unwrap. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-28 17:38:15 +02:00
Pol Henarejos	7a9ee8145d	Adding headers to random.h Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-28 17:38:02 +02:00
Pol Henarejos	2535d0e537	Adding generic aes encryption/decryption. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-28 17:37:53 +02:00
Pol Henarejos	6fe7d7991b	Len of CMAC is always 16. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-28 17:37:24 +02:00
Pol Henarejos	d061958f90	Moving hash to other file. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-28 16:02:28 +02:00
Pol Henarejos	3112200eb6	Merge branch 'eac'	2022-03-28 14:04:05 +02:00
Pol Henarejos	69a406832d	Adding hsm initializing options Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-28 01:37:36 +02:00
Pol Henarejos	cd4ceb0a61	Fix returning current dkeks when the device is initialized without dkeks. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-28 01:37:19 +02:00
Pol Henarejos	450ec5dec1	Also list PRKD files. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-27 20:47:11 +02:00
Pol Henarejos	c7abd1a067	Adding DKEK report Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-27 20:27:10 +02:00
Pol Henarejos	c6d87756ab	Adding SOPIN verification. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-27 19:00:21 +02:00
Pol Henarejos	0916489388	Initialization now returns free memory if no parameters are given. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-27 18:53:41 +02:00
Pol Henarejos	b1e83c92e9	Adding cvcerts and dica Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-27 18:15:16 +02:00
Pol Henarejos	d01e06aa11	2F02 returns terminal's cvcert and DICA. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-27 18:15:06 +02:00
Pol Henarejos	464107b13f	Adding tag 85 for FCP when selecting applet Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-27 12:26:36 +02:00
Pol Henarejos	e431b25fc1	Not used Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-27 12:26:36 +02:00
Pol Henarejos	e4ed917c1c	Updating to v1.6 Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-27 12:26:35 +02:00
Pol Henarejos	ade3e6d2fb	Added sanity check for some boards without led. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-27 12:26:35 +02:00
Pol Henarejos	d12d18261f	Changing name of generic pico. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>	2022-03-27 12:26:35 +02:00
Pol Henarejos	525b4439c9	Update README.md	2022-03-25 16:56:53 +01:00