Upgrade to v6.4

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,50 @@
+## Summary
+
+Describe in plain language what this PR does and why.
+
+- What problem does it solve?
+- Is it a bug fix, a new feature, a cleanup/refactor…?
+
+
+## Details / Impact
+
+Please include any relevant details:
+
+- Hardware / board(s) tested:
+- Firmware / commit/base version:
+- Security impact (if any):
+  - e.g. changes PIN handling, touches key storage, affects attestation, etc.
+- Behavior changes:
+  - e.g. new command, new API surface, different defaults, etc.
+
+
+## Testing
+
+How did you test this change?
+
+- Steps to reproduce / validate:
+- Expected vs actual results:
+- Any logs / traces (please remove secrets):
+
+
+## Licensing confirmation (required)
+
+By checking the box below, you confirm ALL of the following:
+
+- You are the author of this contribution, or you have the right to contribute it.
+- You have read `CONTRIBUTING.md`.
+- You agree that this contribution may be merged, used, modified, and redistributed:
+  - under the AGPLv3 Community Edition, **and**
+  - under any proprietary / commercial / Enterprise editions of this project,
+    now or in the future.
+- You understand that submitting this PR does not create any support obligation,
+  SLA, or guarantee of merge.
+
+**I confirm the above licensing terms:**
+
+- [ ] Yes, I agree
+
+
+## Anything else?
+
+Optional: mention known limitations, follow-ups, or if this is related to an existing Issue.

.github/workflows/codeql.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master", "development" ]
+    branches: [ "master", "development", "development-eddsa" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master", "development" ]
+    branches: [ "master", "development", "development-eddsa" ]
   schedule:
     - cron: '23 5 * * 4'
   workflow_dispatch:
@@ -36,6 +36,7 @@ jobs:
         language: [ 'cpp', 'python' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+        mode: [ 'pico', 'local' ]
 
     steps:
     - name: Checkout repository
@@ -43,7 +44,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -67,7 +68,7 @@ jobs:
 
     - run: |
        echo "Run, Build Application using script"
-       ./workflows/autobuild.sh
+       ./workflows/autobuild.sh ${{ matrix.mode }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/nightly.yml

@@ -0,0 +1,42 @@
+name: "Nightly deploy"
+
+on:
+  schedule:
+    - cron: '0 2 * * *'
+  workflow_dispatch:
+
+jobs:
+  nightly:
+    name: Deploy nightly
+    strategy:
+      fail-fast: false
+      matrix:
+        refs: [master, development]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ matrix.refs }}
+          submodules: 'recursive'
+      - name: Restore private key
+        run: |
+          echo "${{ secrets.PRIVATE_KEY_B64 }}" | base64 -d > private.pem
+          chmod 600 private.pem
+      - name : Build
+        env:
+          PICO_SDK_PATH: ../pico-sdk
+          SECURE_BOOT_PKEY: ../private.pem
+        run: |
+           ./workflows/autobuild.sh pico
+           ./build_pico_hsm.sh --no-eddsa
+           ./workflows/autobuild.sh esp32
+      - name: Delete private key
+        run: rm private.pem
+      - name: Update nightly release
+        uses: pyTooling/Actions/releaser@v6.7.0
+        with:
+          tag: nightly-${{ matrix.refs }}
+          rm: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: release/*.*

.github/workflows/test.yml

@@ -13,10 +13,10 @@ name: "Emulation and test"
 
 on:
   push:
-    branches: [ "master", "development" ]
+    branches: [ "master", "development", "development-eddsa" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master", "development" ]
+    branches: [ "master", "development", "development-eddsa" ]
   schedule:
     - cron: '23 5 * * 4'
   workflow_dispatch:
@@ -36,7 +36,7 @@ jobs:
         mkdir -p artifacts
         docker save pico-hsm-test:bullseye -o artifacts/docker-image.tar
     - name: Temporarily save image
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: docker-artifact
         path: artifacts
@@ -54,7 +54,7 @@ jobs:
       with:
         submodules: recursive
     - name: Retrieve saved image
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: docker-artifact
         path: artifacts

CMakeLists.txt

@@ -1,113 +1,134 @@
- #
- # 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/>.
- #
+#
+# 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/>.
+#
 
 cmake_minimum_required(VERSION 3.13)
 
-if(ENABLE_EMULATION)
+set(USB_VID 0x2E8A)
+set(USB_PID 0x10FD)
+
+if(ESP_PLATFORM)
+    set(EXTRA_COMPONENT_DIRS pico-keys-sdk/config/esp32/components src/hsm)
+    include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 else()
-include(pico_sdk_import.cmake)
+    if(NOT ENABLE_EMULATION)
+        set(PICO_USE_FASTEST_SUPPORTED_CLOCK 1)
+        include(pico_sdk_import.cmake)
+    endif()
+
+    project(pico_hsm C CXX ASM)
+
+    set(CMAKE_C_STANDARD 11)
+    set(CMAKE_CXX_STANDARD 17)
+
+    if(NOT DEFINED __FOR_CI)
+        set(__FOR_CI 0)
+    endif()
+    if(__FOR_CI)
+        add_definitions(-D__FOR_CI)
+    endif()
+
+    add_executable(pico_hsm)
 endif()
-
-project(pico_hsm C CXX ASM)
-
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 17)
-
-if(ENABLE_EMULATION)
-else()
-pico_sdk_init()
-endif()
-
-if (NOT DEFINED __FOR_CI)
-    set(__FOR_CI 0)
-endif()
-if (__FOR_CI)
-    add_definitions(-D__FOR_CI)
-endif()
-
-add_executable(pico_hsm)
-
-set(SOURCES ${SOURCES}
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/sc_hsm.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_select.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_list_keys.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_read_binary.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_verify.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_reset_retry.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_challenge.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_external_authenticate.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_mse.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_initialize.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_key_domain.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_key_wrap.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_keypair_gen.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_update_ef.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_delete_file.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_change_pin.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_key_gen.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_signature.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_key_unwrap.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_decrypt_asym.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_cipher_sym.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_derive_asym.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_extras.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_general_authenticate.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_session_pin.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_puk_auth.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_pso.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_bip_slip.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cvc.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/files.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/kek.c
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm/oid.c
-
-        )
 set(USB_ITF_CCID 1)
+set(USB_ITF_WCID 1)
 include(pico-keys-sdk/pico_keys_sdk_import.cmake)
-
-set(INCLUDES ${INCLUDES}
-        ${CMAKE_CURRENT_LIST_DIR}/src/hsm
-        )
-
-target_sources(pico_hsm PUBLIC ${SOURCES})
-target_include_directories(pico_hsm PUBLIC ${INCLUDES})
-
-target_compile_options(pico_hsm PUBLIC
-    -Wall
-    -Werror
+if(NOT ESP_PLATFORM)
+    set(SOURCES ${PICO_KEYS_SOURCES})
+endif()
+set(SOURCES ${SOURCES}
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/sc_hsm.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_select.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_list_keys.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_read_binary.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_verify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_reset_retry.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_challenge.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_external_authenticate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_mse.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_initialize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_key_domain.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_key_wrap.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_keypair_gen.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_update_ef.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_delete_file.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_change_pin.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_key_gen.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_signature.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_key_unwrap.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_decrypt_asym.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_cipher_sym.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_derive_asym.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_extras.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_general_authenticate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_session_pin.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_puk_auth.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_pso.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_bip_slip.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cvc.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/files.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/kek.c
 )
 
-if(ENABLE_EMULATION)
+SET_VERSION(ver_major ver_minor "${CMAKE_CURRENT_LIST_DIR}/src/hsm/version.h" 3)
 
-target_compile_options(pico_hsm PUBLIC
-        -fdata-sections
-        -ffunction-sections
-        )
-if(APPLE)
-target_link_options(pico_hsm PUBLIC
-        -Wl,-dead_strip
-        )
-else()
-target_link_options(pico_hsm PUBLIC
-        -Wl,--gc-sections
-        )
-endif (APPLE)
-else()
-pico_add_extra_outputs(pico_hsm)
-
-target_link_libraries(pico_hsm PRIVATE pico_keys_sdk pico_stdlib pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id hardware_rtc tinyusb_device tinyusb_board)
+if(ESP_PLATFORM)
+    project(pico_hsm)
+endif()
+
+set(INCLUDES ${INCLUDES}
+    ${CMAKE_CURRENT_LIST_DIR}/src/hsm
+)
+if(NOT ESP_PLATFORM)
+    target_sources(pico_hsm PUBLIC ${SOURCES})
+    target_include_directories(pico_hsm PUBLIC ${INCLUDES})
+
+    target_compile_options(pico_hsm PUBLIC
+        -Wall
+    )
+    if(NOT MSVC)
+        target_compile_options(pico_hsm PUBLIC
+            -Werror
+        )
+    endif()
+
+    if(ENABLE_EMULATION)
+        if(NOT MSVC)
+            target_compile_options(pico_hsm PUBLIC
+                -fdata-sections
+                -ffunction-sections
+            )
+        endif()
+        if(APPLE)
+            target_link_options(pico_hsm PUBLIC
+                -Wl,-dead_strip
+            )
+        elseif(MSVC)
+            target_compile_options(pico_hsm PUBLIC
+                -WX
+            )
+
+            target_link_libraries(pico_hsm PUBLIC wsock32 ws2_32 Bcrypt)
+        else()
+            target_link_options(pico_hsm PUBLIC
+                -Wl,--gc-sections
+            )
+        endif(APPLE)
+        target_link_libraries(pico_hsm PRIVATE pico_keys_sdk pthread m mbedtls)
+    else()
+        pico_add_extra_outputs(${CMAKE_PROJECT_NAME})
+    endif()
 endif()

CONTRIBUTING.md

@@ -0,0 +1,105 @@
+# Contributing
+
+Thank you for your interest in contributing to this project.
+
+This repository is published in two forms:
+- a Community Edition released under AGPLv3, and
+- a proprietary / commercial / Enterprise Edition offered to organizations.
+
+To keep that model legally clean, we need to be explicit about how contributions can be used.
+
+By opening a pull request, you agree to all of the following:
+
+1. **You have the right to contribute this code.**
+   You are either the original author of the contribution, or you have obtained the necessary rights/permissions to contribute it under these terms.
+
+2. **Dual licensing permission.**
+   You agree that your contribution may be:
+   - merged into this repository, and
+   - used, copied, modified, sublicensed, and redistributed
+     - under the AGPLv3 Community Edition, and
+     - under any proprietary / commercial / Enterprise editions of this project,
+       now or in the future.
+
+   In other words: you are granting the project maintainer(s) the right to include
+   your contribution in both the open-source (AGPLv3) codebase and in closed-source /
+   commercially licensed builds, without any additional approval or payment.
+
+3. **Attribution.**
+   The maintainers may keep or add attribution lines such as
+   `Copyright (c) <your name>` or an AUTHORS / CONTRIBUTORS list.
+   The maintainers may also make changes for clarity, style, security, refactoring,
+   or integration reasons.
+
+4. **No automatic SLA.**
+   Submitting a pull request does *not* create any support obligation,
+   service-level agreement, warranty, or guarantee that the contribution
+   will be reviewed, merged, or maintained.
+
+5. **Potential rejection for business reasons.**
+   Features that fall under "Enterprise / Commercial" functionality
+   (e.g. multi-tenant provisioning at scale, centralized audit trails,
+   corporate policy enforcement, attestation/branding flows, key escrow / dual-control,
+   etc.) may be declined for the public AGPLv3 tree even if technically valid.
+   That is normal: some functionality is intentionally offered only
+   under commercial terms.
+
+If you are not comfortable with these terms, **do not open a pull request yet.**
+Instead, please open an Issue to start a discussion.
+
+## How to contribute (technical side)
+
+### 1. Bug reports / issues
+- Please include:
+  - hardware / board revision
+  - firmware / commit hash
+  - exact steps to reproduce
+  - expected vs actual behavior
+  - logs / traces if available (strip secrets)
+
+Security-sensitive findings: do **not** post publicly.
+Send a short report by email instead so it can be triaged responsibly.
+
+### 2. Small fixes / minor improvements
+- You can open a PR directly for:
+  - bug fixes
+  - portability fixes / new board definitions
+  - clarifications in code comments
+  - build / tooling cleanup
+  - documentation of existing behavior
+
+Please keep PRs focused (one logical change per PR if possible).
+
+### 3. Larger features / behavior changes
+- Please open an Issue first and describe:
+  - what problem you're solving (not just "add feature X")
+  - impact on existing flows / security model
+  - any new dependencies
+
+This helps avoid doing a bunch of work on something that won't be accepted
+in the Community Edition.
+
+### 4. Coding style / security posture
+- Aim for clarity and small, auditable changes. This code runs in places
+  where secrets live.
+- No debug backdoors, no "just for testing" shortcuts left enabled.
+- Keep external dependencies minimal and license-compatible
+  (MIT / Apache 2.0 / similarly permissive is usually fine).
+
+### 5. Commit / PR format
+- Use descriptive commit messages ("Fix PIN retry counter wrap" is better than "fix stuff").
+- In the PR description, please include a short summary of what was changed and why.
+- At the bottom of the PR description, **copy/paste and confirm the licensing line below**:
+
+  > I confirm that I have read `CONTRIBUTING.md` and I agree that this contribution may be used under both the AGPLv3 Community Edition and any proprietary / commercial / Enterprise editions of this project, now or in the future.
+
+A PR without that confirmation may be delayed or closed without merge.
+
+## Thank you
+
+This project exists because people build on it, break it, fix it,
+and push it into places it wasn't originally designed to go.
+
+Whether you are here for research, hacking on hardware,
+rolling out secure keys for a team, or building a commercial product:
+thank you for helping improve it.

Dockerfile

@@ -18,7 +18,7 @@ WORKDIR /home/builduser
 
 VOLUME /home/builduser/release
 
-ARG VERSION_PICO_SDK 1.4.0
+ARG VERSION_PICO_SDK 2.0.0
 
 RUN mkdir -p /home/builduser/Devel/pico
 RUN cd /home/builduser/Devel/pico \
@@ -29,8 +29,8 @@ RUN cd /home/builduser/Devel/pico \
 
 RUN pip install cryptography
 
-ARG VERSION_MAJOR 2
-ARG VERSION_MINOR 6
+ARG VERSION_MAJOR 4
+ARG VERSION_MINOR 2
 
 RUN cd /home/builduser \
 	&& git clone https://github.com/polhenarejos/pico-hsm.git \
@@ -46,7 +46,7 @@ ENV PICO_SDK_PATH /home/builduser/Devel/pico/pico-sdk
 ARG USB_VID 0xfeff
 ARG USB_PID 0xfcfd
 
-ARG PICO_BOARD waveshare_rp2040_zero 
+ARG PICO_BOARD waveshare_rp2040_zero
 
 RUN cd /home/builduser/pico-hsm \
 	&& cd build_release \

ENTERPRISE.md

@@ -0,0 +1,116 @@
+# Enterprise / Commercial Edition
+
+This project is offered under two editions:
+
+## 1. Community Edition (FOSS)
+
+The Community Edition is released under the GNU Affero General Public License v3 (AGPLv3).
+
+Intended for:
+- individual users and researchers
+- evaluation / prototyping
+- internal lab / security testing
+
+You are allowed to:
+- read and study the source code
+- modify it
+- run it internally
+
+Obligations under AGPLv3:
+- If you distribute modified firmware/binaries/libraries to third parties, you must provide the corresponding source code of your modifications.
+- If you run a modified version of this project as a network-accessible service (internal or external), you must offer the source code of those modifications to the users of that service.
+- No warranty, no support, no SLA.
+- Enterprise features (bulk provisioning, multi-user policy enforcement, device inventory / revocation, corporate PIN rules, custom attestation/identity, etc.) are NOT included.
+
+The Community Edition will continue to exist.
+
+## 2. Enterprise / Commercial Edition
+
+The Enterprise / Commercial Edition is a proprietary license for organizations that need to:
+
+- deploy this in production at scale (multiple devices / multiple users / multiple teams)
+- integrate it into their own physical product or appliance
+- run it as an internal service (VM / container / private cloud "HSM / auth backend") for multiple internal teams or tenants
+- enforce internal security policy (admin vs user roles, mandatory PIN rules, secure offboarding / revocation)
+- avoid any AGPLv3 disclosure obligations for their own modifications and integration code
+
+### What the Enterprise Edition provides
+
+**Base license package (always included):**
+- **Commercial license (proprietary).**
+  You may run and integrate the software/firmware in production — including virtualized / internal-cloud style deployments — without being required to disclose derivative source code under AGPLv3.
+- **Official signed builds.**
+  You receive signed builds from the original developer so you can prove integrity and provenance.
+- **Onboarding call (up to 1 hour).**
+  A live remote session to get you from "we have it" to "it’s actually running in our environment" with minimal guesswork.
+
+**Optional enterprise components (available on demand, scoped and priced per customer):**
+- **Production / multi-user readiness.**
+  Permission to operate the system with multiple users, multiple devices and multiple teams in real environments.
+- **Bulk / fleet provisioning.**
+  Automated enrollment for many tokens/devices/users at once (CSV / directory import), scripted onboarding of new users, initial PIN assignment / reset workflows, and role-based access (admin vs user).
+- **Policy & lifecycle tooling.**
+  Corporate PIN policy enforcement, per-user / per-team access control, device inventory / traceability, and secure revocation / retirement when someone leaves.
+- **Custom attestation / per-organization identity.**
+  Per-company certificate chains and attestation keys so devices can prove "this token/HSM is officially ours," including anti-cloning / unique device identity for OEM and fleet use.
+- **Virtualization / internal cloud deployment support.**
+  Guidance and components to run this as an internal service (VM, container, private-cloud HSM/auth backend) serving multiple internal teams or tenants under your brand.
+- **Post-quantum (PQC) key material handling.**
+  Integration/roadmap support for PQC algorithms (auth / signing) and secure PQC key storage inside the device or service.
+- **Hierarchical deterministic key derivation (HD).**
+  Wallet-style hierarchical key trees (BIP32-like concepts adapted to this platform) for issuing per-user / per-tenant / per-purpose subkeys without exporting the root secret — e.g. embedded wallet logic, tenant isolation, firmware signing trees, large fleets.
+- **Cryptographically signed audit trail / tamper-evident event logging.**
+  High-assurance logging of sensitive actions (key use, provisioning, PIN resets, revocations) with integrity protection for forensic / compliance needs.
+- **Dual-control / two-person approval ("four-eyes").**
+  Require multi-party authorization for high-risk actions such as firmware signing, key export, or critical configuration changes — standard in high-assurance / regulated environments.
+- **Secure key escrow / disaster recovery design.**
+  Split-secret or escrowed backup strategies so you don’t lose critical signing keys if a single admin disappears or hardware is lost.
+- **Release-signing / supply-chain hardening pipeline.**
+  Reference tooling and process so every production firmware/binary is signed with hardware-backed keys, proving origin and preventing tampering in transit or at manufacturing.
+- **Policy-locked hardened mode ("FIPS-style profile").**
+  Restricted algorithms, debug disabled, no raw key export, tamper-evident configuration for regulated / high-assurance deployments.
+- **Priority support / security response SLA.**
+  A direct line and guaranteed response window for production-impacting security issues.
+- **White-label demo / pre-sales bundle.**
+  Branded demo firmware + safe onboarding script so you can show "your product" to your own customers without exposing real production secrets.
+
+These components are NOT automatically bundled. They are available case-by-case depending on your use case and are priced separately.
+
+### Licensing models
+
+- **Internal Use License**
+  Internal production use within one legal entity (your company), including internal private cloud / virtualized deployments for multiple internal teams.
+  Optional enterprise components can be added as needed.
+
+- **OEM / Redistribution / Service License**
+  Integration into a product/appliance you ship to customers, OR operating this as a managed service / hosted feature for external clients or third parties.
+  Optional enterprise components (attestation branding, PQC support, HD key derivation, multi-tenant service hardening, audit trail, etc.) can be added as required.
+
+Pricing depends on scope, fleet size, number of users/tenants, regulatory requirements, and which optional components you select.
+
+### Request a quote
+
+Email: pol@henarejos.me
+Subject: `ENTERPRISE LICENSE <your company name>`
+
+Please include:
+- Company name and country
+- Intended use:
+  - Internal private deployment
+  - OEM / external service to third parties
+- Approximate scale (number of devices/tokens, number of users/tenants)
+- Which optional components you are interested in (bulk provisioning, policy & lifecycle tooling, attestation branding / anti-cloning, virtualization/cloud, PQC, HD key derivation, audit trail, dual-control, key escrow, supply-chain signing, hardened mode, SLA, white-label demo)
+
+You will receive:
+1. A short commercial license agreement naming your company.
+2. Access to the base package (and any optional components agreed).
+3. Scheduling of the onboarding call.
+
+## Why Enterprise exists
+
+- Companies often need hardware-backed security (HSM, FIDO2, OpenPGP, etc.) under their own control, but cannot or will not open-source their internal security workflows.
+- They also need multi-user / fleet-management features that hobby users do not.
+- The commercial license funds continued development, maintenance and new hardware support.
+
+The Community Edition remains AGPLv3.
+The Enterprise Edition is for production, scale, and legal clarity.

LICENSE

@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
+software for all its users.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     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
+    it under the terms of the GNU Affero General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     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.
+    GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -1,174 +1,196 @@
-# Raspberry Pico HSM
-This is a project to create a Hardware Security Module (HSM) with a Raspberry Pico. It converts your Pico board into a HSM which is able to generate and store private keys, encrypt or decrypt with AES or signing data without to disclose the private key. In detail, the private key never leaves the board and it cannot be retrieved as it is encrypted in the flash memory.
+# Pico HSM
+This project aims to transform a Raspberry Pi Pico or ESP32 microcontroller into a Hardware Security Module (HSM). The modified Pico or ESP32 board will be capable of generating and storing private keys, performing AES encryption or decryption, and signing data without exposing the private key. Specifically, the private key remains securely on the board and cannot be retrieved since it is encrypted within the flash memory.
 
 ## Capabilities
 ### > Key generation and encrypted storage
-Private and secret keys are stored with a master AES 256 key (MKEK). The MKEK is, at the same time, encrypted with a hashed and salted version of the PIN.
+Private and secret keys are secured using a master AES 256 key (MKEK). The MKEK is encrypted with a hashed and salted version of the PIN.
 **No private/secret keys, DKEK or PIN are stored in plain text ever. Never.**
 
-### > RSA key generation from 1024 to 4096 bits
-RSA key generation in place for 1024, 2048, 3072 and 4096 bits. Private keys never leave the device.
+### > RSA Key Generation (1024 to 4096 Bits)
+RSA key generation is supported for 1024, 2048, 3072, and 4096 bits. Private keys never leave the device.
 
-### > ECDSA key generation from 192 to 521 bits
-ECDSA key generation in place for different curves, from 192 to 521 bits.
+### > ECDSA Key Generation (192 to 521 Bits)
+ECDSA key generation supports various curves from 192 to 521 bits.
 
-### > ECC curves
-It supports secp192r1, secp256r1, secp384r1, secp521r1, brainpoolP256r1, brainpoolP384r1, brainpoolP512r1, secp192k1 (insecure), secp256k1 curves. Also Curve25519 and Curve448.
+### > ECC Curves
+Supported ECC curves include secp192r1, secp256r1, secp384r1, secp521r1, brainpoolP256r1, brainpoolP384r1, brainpoolP512r1, secp192k1 (insecure), secp256k1, Curve25519, and Curve448.
 
-### > SHA1, SHA224, SHA256, SHA384, SHA512 digests
-ECDSA and RSA signature can be combined with SHA digest in place.
+### > SHA Digests
+ECDSA and RSA signatures can be combined with SHA-1, SHA-224, SHA-256, SHA-384, and SHA-512 digests.
 
-### > Multiple RSA signature algorithms
-It supports RSA-PSS, RSA-PKCS and raw RSA signatures.
+### > Multiple RSA Signature Algorithms
+Supported RSA signature algorithms include RSA-PSS, RSA-PKCS, and raw RSA signatures.
 
-### > ECDSA raw and hash signature
-ECDSA signatures can be in raw or pre-hashed formats.
+### > ECDSA Signatures
+ECDSA signatures can be raw or pre-hashed.
 
-### > ECDH key derivation
-It supports the calculation of shared secrets with ECDH algorithm.
+### > ECDH Key Derivation
+Supports the ECDH algorithm for calculating shared secrets.
 
-### > EC private key derivation
-It allows ECDSA key derivation.[^1]
+### > EC Private Key Derivation
+Allows ECDSA key derivation.
 
-### > RSA-OEP and RSA-X-509 decryption
-It allows private decryption in place with RSA-OEP and RSA-X-509 algorithms.
+### > RSA Decryption
+Supports RSA-OEP and RSA-X.509 decryption.
 
-### > AES key generation
-It supports AES key generation in place with keys of 128, 192 and 256 bits.
+### > AES Key Generation
+Supports AES key generation with keys of 128, 192, and 256 bits.
 
-### > AES-CBC encryption/decryption
-Legacy AES encryption and decryption is performed in place.
+### > AES-CBC Encryption/Decryption
+Performs AES-CBC encryption and decryption.
 
-### > AES ECB, CBC, CFB, OFB, XTS, CTR, GCM and CCM
-Advanced AES encryption and decryption with multiples modes and customized IV/nonce and additional authenticated data (AAD).[^4]
+### > Advanced AES Modes
+Supports AES encryption and decryption in ECB, CBC, CFB, OFB, XTS, CTR, GCM, and CCM modes, with customizable IV/nonce and additional authenticated data (AAD).[^4]
 
-### > AES key generation of 128, 192, 256 and 512 bits.
-Besides 128, 192 and 256 bits, Pico HSM also supports key generation of 512 bits (64 bytes). These keys are specially indicated for running AES XTS, where two keys of 256 bits are concatenated.
+### > AES Key Generation (128, 192, 256, 512 Bits)
+Supports AES key generation up to 512 bits, useful for AES XTS where two 256-bit keys are concatenated.
 
 ### > CMAC
-It supports AES-CMAC authentication.[^1]
+Supports AES-CMAC authentication.[^1]
 
-### > AES derivation
-It supports AES secret key derivation.[^1]
+### > AES Secret Key Derivation
+Supports AES secret key derivation.[^1]
 
-### > PIN authorization
-Private and secret keys cannot be used without prior PIN authentication. It supports alphanumeric PIN.
+### > PIN Authorization
+Private and secret keys require prior PIN authentication. Supports alphanumeric PINs.
 
-### > PKCS11 compliant interface
-The module can be interfaced with PKCS11 standard.
+### > PKCS11 Compliant Interface
+Interfacing with the PKCS11 standard is supported.
 
-### > HRNG (hardware random number generator)
-It contains a harware random number generator properly modeled to guarantee maximum entropy.
+### > Hardware Random Number Generator (HRNG)
+Contains an HRNG designed for maximum entropy.
 
-### > Device Key Encryption Key (DKEK) shares
-It supports DKEK share imports. DKEK are used to wrap, unwrap and encrypt private and secret keys in the device.
+### > Device Key Encryption Key (DKEK) Shares
+Supports importing DKEK shares to wrap, unwrap, and encrypt keys.
 
-### > DKEK n-of-m threshold scheme
-It supports a n-of-m threshold scheme to minimize outage when a DKEK custodian is not available during the import process.
+### > DKEK n-of-m Threshold Scheme
+Supports an n-of-m threshold scheme to prevent outages when a DKEK custodian is unavailable.
 
-### > USB/CCID support with OpenSC, openssl, etc.
-Pico HSM has a full USB CCID stack to communicate with the host via OpenSC and PCSC. It allows the use of frontend applications such as OpenSSL via PKCS11 module.
+### > USB/CCID Support
+Full USB CCID stack for communication with the host via OpenSC and PCSC, allowing the use of frontend applications like OpenSSL via the PKCS11 module.
 
-### > Extended APDU support
-It supports extended APDU packets, which allows up to 65535 bytes.
+### > Extended APDU Support
+Supports extended APDU packets, allowing up to 65535 bytes.
 
 ### > CV Certificates
-Pico HSM manipulates CVC certificates and requests to minimize the storage of internal certificates.
+Handles CVC certificates and requests to minimize internal certificate storage.
 
 ### > Attestation
-Every generated key is attached to a certificate, signed by an external PKI to ensure that a particular key is effectively generated by this specific device.
+Each generated key is attached to a certificate signed by an external PKI, ensuring the key was generated by the specific device.
 
-### > Import external private keys and certificates
-It allows private key and certificates import via WKY or PKCS#12 files.[^2][^3]
+### > Import External Keys and Certificates
+Allows importing private keys and certificates via WKY or PKCS#12 files.[^2][^3]
 
-### > Tranport PIN
-It allows transport PIN for provisioning and forcing to set a new PIN.[^2] It is a tampered mechanism that ensures the device has not been unsealed during the transportation from the issuer to the legitimate user.
+### > Transport PIN
+Allows a transport PIN for provisioning, ensuring the device has not been tampered with during transportation.[^2]
 
-### > Press-to-confirm button
-It allows the use of BOOTSEL button to confirm operations with private/secret keys, such as signatures and decryption. When a private/secret key is loaded, the user has 15 seconds to press the button to confirm the operation.
-This feature protects the user from unwanted uses from background applications that may sign data without user notice.
+### > Press-to-Confirm Button
+Uses the BOOTSEL button to confirm operations with private/secret keys, providing a 15-second window to confirm the operation to protect against unauthorized use.
 
-### > Store and retrieve binary data
-It allows the storage of arbitrary files with binary data.
+### > Store and Retrieve Binary Data
+Allows the storage of arbitrary binary data files.
 
-### > Real time clock (RTC)
-Pico HSM has a RTC with external datetime setting and getting.
+### > Real-Time Clock (RTC)
+Includes an RTC with external date and time setting and retrieval.
 
-### > Secure Messaging (secure channel)
-Pico HSM supports secure channel, where the data packets between the host and device are encrypted to avoid man-in-the-middle attacks.
+### > Secure Messaging
+Supports secure channels to encrypt data packets between the host and device, preventing man-in-the-middle attacks.
 
 ### > Session PIN
-A specific session PIN can be set during the session opening to avoid the systemmatic use of PIN.
+A specific session PIN can be set during session opening to avoid systematic PIN usage.
 
-### > PKI CVCert remote issuing for Secure Message
+### > PKI CVCert Remote Issuing for Secure Messaging
 Secure channel messages are secured with a certificate issued by an external PKI.
 
-### > Multiple key domains
-Key domains are domains to store separate private/secret keys. Each domain is protected by a DKEK, independent from the other domains. Private/secret keys can be generated in different key domains to be used with separated DKEK.
-Therefore, a single device may contain different domains with independent keys.
+### > Multiple Key Domains
+Supports separate key domains protected by independent DKEKs, allowing different keys in different domains.
 
-### > Key usage counter
-A key usage counter is a counter that is reduced by 1 everytime that the private/secret key is used for signing, decrypting, derivation, etc. When it reaches 0, the key is disabled and cannot be used anymore.
+### > Key Usage Counter
+Tracks and limits the usage of private/secret keys, disabling keys once their usage counter reaches zero.
 
-Key usage can also be used to perform and auditory and track the usage of a particular key.
-
-### > Public Key Authentication
-Public Key Authentication (PKA) allows to authenticate by using a secondary device with a private key and a registered public key in the primary device. A challenge is generated by the primary Pico HSM and given to the secondary for signature. The secondary device signs the challenge and returns the signature. Then, the primary device verifies the signature with the registered public key and if it is valid, it grants full access, as normal PIN authentication.
-
-In PKA, the PIN is used for protecting the MKEK, as classic method with only PIN, and PKA is used for adding an extra security layer. Therefore, this mechanism provides a higher degree of security, since it needs a secondary Pico HSM to authenticate the primary one.
+### > Public Key Authentication (PKA)
+Supports PKA for enhanced security, requiring a secondary device for authentication using a challenge-response mechanism.
 
 ### > Secure Lock
-An extra layer can be added to the device by adding a private key stored on the computer to lock that Pico HSM to the specific computer. The content will be completely encrypted with a private key only available from a specific computer.
+Adds an extra layer of security by locking the Pico HSM to a specific computer using a private key.
 
 ### > ChaCha20-Poly1305
-This is a novel fast and efficient symmetric encryption algorithm. Similarly to AES, it can be used to cipher your private data.[^4]
+Supports the ChaCha20-Poly1305 encryption algorithm for secure data encryption.[^4]
 
 ### > X25519 and X448
-Both cruves Curve25519 and Curve448 are supported for doing DH X25519 and X448. Remember that cannot be used for signing.
+Supports DH X25519 and X448 for key agreement, though these cannot be used for signing.
 
-### > Key Derivation Functions: HKDF, PBKDF2 and X963-KDF
-It supports symmetric key derivations from different standards and RFC.
+### > Key Derivation Functions
+Supports HKDF, PBKDF2, and X963-KDF for symmetric key derivation.
 
 ### > HMAC
-It supports performing HMAC from a secret key on an arbitrary data with SHA digest algorithm.
+Supports HMAC generation with SHA digest algorithms.
 
 ### > CMAC
-Similarly to HMAC, Pico HSM also supports CMAC with AES algorithm for keys of 128, 192 and 256 bits.
+Supports CMAC with AES for keys of 128, 192, and 256 bits.
 
 ### > XKEK
-Besides DKEK, it supports a more advanced scheme to share keys. Based on private key domains, it is possible to wrap and unwrap private and secret keys inside the domain to only authorized devices. If a device outside the domain tries to unwrap a key, it will fail.
+Supports an advanced key sharing scheme (XKEK) for securely wrapping and unwrapping keys within authorized domains.
 
-### > MKEK
-A Master Key Encryption Key is used to store safely all the keys. This key is also ciphered with an ephemereal key derived from the hashed PIN. Therefore, we can ensure all the keys are encrypted and stored.
+### > Master Key Encryption Key (MKEK)
+Uses an MKEK to securely store all keys, encrypted with an ephemeral key derived from the hashed PIN.
 
-### > Hierarchical Deterministic key generation
-It supports **BIP32** for asymmetric deterministic key derivation and **SLIP10** for symmetric key derivation. With it, crypto wallets can be deployed with Pico HSM, as infinite keys can be derived for signature and symmetric encryption. Curves NIST 256 and Koblitz 256 are supported for master key generation.[^4]
+### > Hierarchical Deterministic Key Generation
+Supports BIP32 for asymmetric key derivation and SLIP10 for symmetric key derivation, enabling crypto wallet deployment with infinite key generation. Supports NIST 256 and Koblitz 256 curves for master key generation.[^4]
+
+### > One Time Programming (OTP) Storage
+The OTP securely stores the MKEK (Master Key Encryption Key) and Device Key permanently, making it inaccessible from external interfaces. This ensures that the key is protected against unauthorized access and tampering.
+
+### > Secure Boot
+Secure Boot ensures only authenticated firmware can run on the device, verifying each firmware’s digital signature to block unauthorized code.
+
+### > Secure Lock
+Secure Lock restricts the device to the manufacturer’s firmware only, locking out debug access and preventing any further boot key installations.
+
+### > Rescue Interface
+ A built-in rescue interface allows recovery of the device if it becomes unresponsive or undetectable. This feature provides a way to restore the device to operational status without compromising security.
+
+### > LED Customization
+ The LED can be customized to reflect device status and user preferences, offering flexible color and brightness options for an enhanced user experience.
 
 [^1]: PKCS11 modules (`pkcs11-tool` and `sc-tool`) do not support CMAC and key derivation. It must be processed through raw APDU command (`opensc-tool -s`).
 [^2]: Available via SCS3 tool. See [SCS3](/doc/scs3.md "SCS3") for more information.
 [^3]: Imports are available only if the Pico HSM is previously initialized with a DKEK and DKEK shares are available during the import process.
 [^4]: Available by using PicoHSM python tool.
 
+### > ESP32-S3 support
+Pico HSM also supports ESP32-S3 boards, which add secure storage, flash encryption and secure boot.
+
+### > Dynamic VID/PID
+Supports setting VID & PID on-the-fly. U
+
+### > Rescue Pico HSM
+Pico HSM Tool implements a new CCID stack to rescue the Pico HSM in case it has wrong VID/PID values and it is not recognized by the OS.
+
 ## Security considerations
-All secret keys (asymmetric and symmetric) are stored encrypted in the flash memory of the Raspberry Pico. DKEK is used as a 256 bit AES key to protect private and secret keys. Keys are never stored in RAM except for signature and decryption operations and only during the process. All keys (including DKEK) are loaded and cleared every time to avoid potential security flaws.
+All secret keys (both asymmetric and symmetric) are encrypted and stored in the flash memory. The MKEK, a 256-bit AES key, is used to protect these private and secret keys. Keys are held in RAM only during signature and decryption operations, and are loaded and cleared each time to avoid potential security vulnerabilities.
 
-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.
+The MKEK itself is encrypted using a doubly salted and hashed PIN, and the PIN is hashed in memory during sessions. This ensures that the PIN is never stored in plaintext, neither in flash memory nor in RAM. However, if no secure channel is used, the PIN may be transmitted in plaintext from the host to the HSM.
 
-If the Pico is stolen the contents of private and secret keys cannot be read without the PIN, even if the flash memory is dumped.
+DKEKs are used during the export and import of private/secret keys and are part of a Key Domain. A Key Domain is a set of secret/private keys that share the same DKEK. These are also shared by the custodians and are not specific to Pico HSM. Therefore, if a key does not belong to a Key Domain (and thus lacks a DKEK), it cannot be exported.
+
+In the event that the Pico is stolen, the private and secret key contents cannot be accessed without the PIN, even if the flash memory is dumped.
+
+### RP2350 and ESP32-S3
+RP2350 and ESP32-S3 microcontrollers are equipped with advanced security features, including Secure Boot and Secure Lock, ensuring that firmware integrity and authenticity are tightly controlled. Both devices support the storage of the Master Key Encryption Key (MKEK) in an OTP (One-Time Programmable) memory region, making it permanently inaccessible for external access or tampering. This secure, non-volatile region guarantees that critical security keys are embedded into the hardware, preventing unauthorized access and supporting robust defenses against code injection or firmware modification. Together, Secure Boot and Secure Lock enforce firmware authentication, while the MKEK in OTP memory solidifies the foundation for secure operations.
 
 ## Download
-Please, go to the Release page and download the UF2 file for your board.
+**If you own an ESP32-S3 board, go to [ESP32 Flasher](https://www.picokeys.com/esp32-flasher/) for flashing your Pico HSM.**
 
-Note that UF2 files are shiped with a dummy VID/PID to avoid license issues (FEFF:FCFD). If you are planning to use it with OpenSC or similar, you should modify Info.plist of CCID driver to add these VID/PID or use the [Pico Patcher tool](https://www.picokeys.com/pico-patcher/).
+If you own a Raspberry Pico (RP2040 or RP2350), go to [Download page](https://www.picokeys.com/getting-started/). If your board is mounted with the RP2040, then select Pico. If your board is mounted with the RP2350 or RP2354, select Pico2.
 
-Alternatively you can use the legacy VID/PID patcher as follows:
-`./patch_vidpid.sh VID:PID input_hsm_file.uf2 output_hsm_file.uf2`
+UF2 files are shiped with a VID/PID granted by RaspberryPi (2E8A:10FD). If you plan to use it with OpenSC or similar tools, you should modify Info.plist of CCID driver to add these VID/PID or use the [PicoKey App](https://www.picokeys.com/picokeyapp/ "PicoKey App").
 
-You can use whatever VID/PID (i.e., 234b:0000 from FISJ), but remember that you are not authorized to distribute the binary with a VID/PID that you do not own.
+You can use whatever VID/PID for internal purposes, but remember that you are not authorized to distribute the binary with a VID/PID that you do not own.
 
-Note that the pure-browser option [Pico Patcher tool](https://www.picokeys.com/pico-patcher/) is the most recommended. 
+Note that the [PicoKey App](https://www.picokeys.com/picokeyapp/ "PicoKey App") is the most recommended.
 
-## Build
+## Build for Raspberry Pico
 Before building, ensure you have installed the toolchain for the Pico and the Pico SDK is properly located in your drive.
 
 ```
@@ -182,17 +204,34 @@ make
 ```
 Note that `PICO_BOARD`, `USB_VID` and `USB_PID` are optional. If not provided, `pico` board and VID/PID `FEFF:FCFD` will be used.
 
-After `make` ends, the binary file `pico_hsm.uf2` will be generated. Put your pico board into loading mode, by pushing `BOOTSEL` button while pluging on, and copy the UF2 to the new fresh usb mass storage Pico device. Once copied, the pico mass storage will be disconnected automatically and the pico board will reset with the new firmware. A blinking led will indicate the device is ready to work.
+Additionally, you can pass the `VIDPID=value` parameter to build the firmware with a known VID/PID. The supported values are:
+
+- `NitroHSM`
+- `NitroFIDO2`
+- `NitroStart`
+- `NitroPro`
+- `Nitro3`
+- `Yubikey5`
+- `YubikeyNeo`
+- `YubiHSM`
+- `Gnuk`
+- `GnuPG`
+
+After running `make`, the binary file `pico_hsm.uf2` will be generated. To load this onto your Pico board:
+
+1. Put the Pico board into loading mode by holding the `BOOTSEL` button while plugging it in.
+2. Copy the `pico_hsm.uf2` file to the new USB mass storage device that appears.
+3. Once the file is copied, the Pico mass storage device will automatically disconnect, and the Pico board will reset with the new firmware.
+4. A blinking LED will indicate that the device is ready to work.
 
 ### Docker
 Independent from your Linux distribution or when using another OS that supports Docker, you could build a specific pico-hsm version in a Linux container.
 
-
 ```
 sudo docker build \
-    --build-arg VERSION_PICO_SDK=1.5.0 \
-    --build-arg VERSION_MAJOR=3 \
-    --build-arg VERSION_MINOR=4 \
+    --build-arg VERSION_PICO_SDK=2.0.0 \
+    --build-arg VERSION_MAJOR=5 \
+    --build-arg VERSION_MINOR=0 \
     --build-arg PICO_BOARD=waveshare_rp2040_zero \
     --build-arg USB_VID=0xfeff \
     --build-arg USB_PID=0xfcfd \
@@ -209,36 +248,31 @@ sudo docker rm mybuild
 ```
 
 ## Usage
-The firmware uploaded to the Pico contains a reader and a virtual smart card. It is like having a physical reader with an inserted SIM card.
-We recommend the use of [OpenSC](http://github.com/opensc/opensc/ "OpenSC") to communicate with the reader. If it is not installed, you can download and build it or install the binaries for your system. The first command is to ensure that the Pico is detected as a HSM:
-```
+The firmware uploaded to the Pico contains a reader and a virtual smart card, similar to having a physical reader with an inserted SIM card. We recommend using [OpenSC](http://github.com/opensc/opensc/ "OpenSC") to communicate with the reader. If OpenSC is not installed, you can download and build it or install the binaries for your system.
+
+To ensure that the Pico is detected as an HSM, use the following command:
+```sh
 opensc-tool -an
 ```
-It should return a text like the following:
-```
+It should return a text similar to:
+```sh
 Using reader with a card: Free Software Initiative of Japan Gnuk
 3b:fe:18:00:00:81:31:fe:45:80:31:81:54:48:53:4d:31:73:80:21:40:81:07:fa
 SmartCard-HSM
 ```
 The name of the reader may vary if you modified the VID/PID.
 
-For initialization and asymmetric operations, check [doc/usage.md](/doc/usage.md).
+For further details and operations, refer to the following documentation:
 
-For signing and verification operations, check [doc/sign-verify.md](/doc/sign-verify.md).
-
-For asymmetric encryption and decryption, check [doc/asymmetric-ciphering.md](/doc/asymmetric-ciphering.md).
-
-For backup, restore and DKEK share management, check [doc/backup-and-restore.md](/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/scs3.md](/doc/scs3.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).
-
-For Public Key Authentication, check [doc/public_key_authentication.md](/doc/public_key_authentication.md).
+- Initialization and Asymmetric Operations [doc/usage.md](/doc/usage.md)
+- Signing and Verification Operations [doc/sign-verify.md](/doc/sign-verify.md)
+- Asymmetric Encryption and Decryption [doc/asymmetric-ciphering.md](/doc/asymmetric-ciphering.md)
+- Backup, Restore, and DKEK Share Management [doc/backup-and-restore.md](/doc/backup-and-restore.md)
+- AES Key Generation, Encryption, and Decryption [doc/aes.md](/doc/aes.md)
+- 4096 Bits RSA Support [doc/scs3.md](/doc/scs3.md)
+- Storing and Retrieving Arbitrary Data [doc/store_data.md](/doc/store_data.md)
+- Extra Options (e.g., set/get real datetime, enable/disable press-to-confirm button [doc/extra_command.md](/doc/extra_command.md)
+- Public Key Authentication [doc/public_key_authentication.md](/doc/public_key_authentication.md)
 
 ## Operation time
 ### Keypair generation
@@ -260,14 +294,17 @@ Generating EC keys is almost instant. RSA keypair generation takes some time, sp
 | 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).
+The Raspberry Pico includes a BOOTSEL button used for loading firmware initially. Once the Pico HSM firmware is running, this button can be repurposed for additional functionalities. Specifically, the Pico HSM utilizes this button to confirm private and secret operations, a feature that is optional but highly recommended for enhanced security.
 
-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.
+When enabled, each time a private or secret key operation is initiated, the Pico HSM enters a waiting state where it awaits user confirmation by pressing the BOOTSEL button. During this waiting period, the Pico HSM's LED remains mostly illuminated but blinks off briefly every second, signaling to the user to press the button for confirmation. If no action is taken, the Pico HSM will continue to wait indefinitely. This operation mode includes periodic timeout commands sent to the host to prevent the session from timing out prematurely.
 
-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.
+This feature adds an additional layer of security by requiring physical user intervention for sensitive operations such as signing or decrypting data. It mitigates risks associated with unauthorized applications or scripts using the Pico HSM without user awareness. However, it is not recommended for server environments or other automated settings where physical access to press the button may not be practical.
+
+For more details on configuring and using this feature, refer to the [doc/extra_command.md](/doc/extra_command.md) document.
 
 ## 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.
 
@@ -290,18 +327,60 @@ While processing, the Pico HSM is busy and cannot receive additional commands un
 
 ## 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.
+The Pico HSM uses either the `sc-hsm` driver from [OpenSC](https://github.com/OpenSC/OpenSC/) or the `sc-hsm-embedded` driver from [CardContact](https://github.com/CardContact/sc-hsm-embedded/) to interface with external applications. These drivers employ the standardized PKCS#11 interface, making it compatible with various cryptographic engines that support PKCS#11, such as OpenSSL, P11 library, or pkcs11-tool.
 
-Pico HSM relies on PKCS#15 structure to store and manipulate the internal files (PINs, private keys, certificates, etc.) and directories. Therefore, it accepts the commands from `pkcs15-tool`. For instance, `pkcs15-tool -D` will list all elements stored in the Pico HSM.
+Internally, the Pico HSM organizes and manages its data using the PKCS#15 structure, which includes elements like PINs, private keys, and certificates. Commands can be issued to interact with these stored elements using tools such as `pkcs15-tool`. For example, `pkcs15-tool -D` lists all elements stored within the Pico HSM.
 
-The way to communicate is exactly the same as with other cards, such as OpenPGP or similar.
+Communication with the Pico HSM follows the same protocols and methods used with other smart cards, such as OpenPGP cards or similar devices.
 
-For an advanced usage, see the docs and examples.
+For advanced usage scenarios, refer to the documentation and examples provided. Additionally, the Pico HSM supports the SCS3 tool for more sophisticated operations and includes features like multiple key domains. For detailed information on SCS3 usage, refer to [SCS3 documentation](/doc/scs3.md).
 
-Pico HSM also supports SCS3 tool for advanced use and multiple key domain. See [SCS3](/doc/scs3.md) for more information.
+## License and Commercial Use
 
-### 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.
+This project is available under two editions:
+
+**Community Edition (FOSS)**
+- Released under the GNU Affero General Public License v3 (AGPLv3).
+- You are free to study, modify, and run the code, including for internal evaluation.
+- If you distribute modified binaries/firmware, OR if you run a modified version of this project as a network-accessible service, you must provide the corresponding source code to the users of that binary or service, as required by AGPLv3.
+- No warranty. No SLA. No guaranteed support.
+
+**Enterprise / Commercial Edition**
+- Proprietary license for organizations that want to:
+  - run this in production with multiple users/devices,
+  - integrate it into their own product/appliance,
+  - enforce corporate policies (PIN policy, admin/user roles, revocation),
+  - deploy it as an internal virtualized / cloud-style service,
+  - and *not* be required to publish derivative source code.
+- Base package includes:
+  - commercial license (no AGPLv3 disclosure obligation for your modifications / integration)
+  - onboarding call
+  - access to officially signed builds
+- Optional / on-demand enterprise components that can be added case-by-case:
+  - ability to operate in multi-user / multi-device environments
+  - device inventory, traceability and secure revocation/offboarding
+  - custom attestation, per-organization device identity / anti-cloning
+  - virtualization / internal "HSM or auth backend" service for multiple teams or tenants
+  - post-quantum (PQC) key material handling and secure PQC credential storage
+  - hierarchical deterministic key derivation (HD wallet–style key trees for per-user / per-tenant keys, firmware signing trees, etc.)
+  - cryptographically signed audit trail / tamper-evident logging
+  - dual-control / two-person approval for high-risk operations
+  - secure key escrow / disaster recovery strategy
+  - release-signing / supply-chain hardening toolchain
+  - policy-locked hardened mode ("FIPS-style profile")
+  - priority security-response SLA
+  - white-label demo / pre-sales bundle
+
+Typical licensing models:
+- Internal use (single legal entity, including internal private cloud / virtualized deployments).
+- OEM / Redistribution / Service (ship in your product OR offer it as a service to third parties).
+
+These options are scoped and priced individually depending on which components you actually need.
+
+For commercial licensing and enterprise features, email pol@henarejos.me
+Subject: `ENTERPRISE LICENSE <your company name>`
+
+See `ENTERPRISE.md` for details.
 
 ## Credits
 Pico HSM uses the following libraries or portion of code:

build_pico_hsm.sh

@@ -1,57 +1,25 @@
 #!/bin/bash
 
-VERSION_MAJOR="3"
-VERSION_MINOR="6"
+VERSION_MAJOR="6"
+VERSION_MINOR="4"
+SUFFIX="${VERSION_MAJOR}.${VERSION_MINOR}"
+#if ! [[ -z "${GITHUB_SHA}" ]]; then
+#    SUFFIX="${SUFFIX}.${GITHUB_SHA}"
+#fi
 
-rm -rf release/*
+mkdir -p build_release
+mkdir -p release
+rm -rf -- release/*
 cd build_release
 
-for board in adafruit_feather_rp2040 \
-    adafruit_itsybitsy_rp2040 \
-    adafruit_kb2040 \
-    adafruit_macropad_rp2040 \
-    adafruit_qtpy_rp2040 \
-    adafruit_trinkey_qt2040 \
-    arduino_nano_rp2040_connect \
-    datanoisetv_rp2040_dsp \
-    eetree_gamekit_rp2040 \
-    garatronic_pybstick26_rp2040 \
-    melopero_shake_rp2040 \
-    nullbits_bit_c_pro \
-    pico \
-    pico_w \
-    pimoroni_badger2040 \
-    pimoroni_interstate75 \
-    pimoroni_keybow2040 \
-    pimoroni_motor2040 \
-    pimoroni_pga2040 \
-    pimoroni_picolipo_4mb \
-    pimoroni_picolipo_16mb \
-    pimoroni_picosystem \
-    pimoroni_plasma2040 \
-    pimoroni_servo2040 \
-    pimoroni_tiny2040 \
-    pimoroni_tiny2040_2mb \
-    pololu_3pi_2040_robot \
-    seeed_xiao_rp2040 \
-    solderparty_rp2040_stamp \
-    solderparty_rp2040_stamp_carrier \
-    solderparty_rp2040_stamp_round_carrier \
-    sparkfun_micromod \
-    sparkfun_promicro \
-    sparkfun_thingplus \
-    vgaboard \
-    waveshare_rp2040_lcd_0.96 \
-    waveshare_rp2040_lcd_1.28 \
-    waveshare_rp2040_one \
-    waveshare_rp2040_plus_4mb \
-    waveshare_rp2040_plus_16mb \
-    waveshare_rp2040_zero \
-    wiznet_w5100s_evb_pico
-do
-    rm -rf *
-    PICO_SDK_PATH=~/Devel/pico/pico-sdk cmake .. -DPICO_BOARD=$board
-    make -kj20
-    mv pico_hsm.uf2 ../release/pico_hsm_$board-$VERSION_MAJOR.$VERSION_MINOR.uf2
+PICO_SDK_PATH="${PICO_SDK_PATH:-../../pico-sdk}"
+SECURE_BOOT_PKEY="${SECURE_BOOT_PKEY:-../../ec_private_key.pem}"
+boards=("pico" "pico2")
 
+for board_name in "${boards[@]}"
+do
+    rm -rf -- ./*
+    PICO_SDK_PATH="${PICO_SDK_PATH}" cmake .. -DPICO_BOARD=$board_name -DSECURE_BOOT_PKEY=${SECURE_BOOT_PKEY}
+    make -j`nproc`
+    mv pico_hsm.uf2 ../release/pico_hsm_$board_name-$SUFFIX.uf2
 done

doc/scs3.md

@@ -13,7 +13,8 @@ However, SCS3 only works with those HSM manufactured by CardContact. The check i
 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`.
 
 ```
-ESPICOHSMCA00001: new CVC(new ByteString("7F218201BA7F4E8201725F290100421045535049434F48534D434130303030317F4982011D060A04007F000702020202038120FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF8220FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC83205AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B8441046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F58520FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC6325518641046A82C0A4FEAF41D6A1336AE7E992D81AD4F827929145DD0D777E1AB63D7E3325C8F7DAC0F74B6EAE13A72F6366777EC133AC5C28F456868E5F2C315044EB54EF8701015F201045535049434F48534D434130303030317F4C12060904007F0007030102025305C0000000005F25060202000801085F24060203000801085F3740601E974F57DDE060875FE6121AEF5BC02E10FC655311C7A32CA822FD18E53A80298EDC56E0D5EBF38FB470DC12987B1600AE91A0ADB5B22C4D80080782E278AD", HEX))
+ESPICOHSMCA00001: new CVC(new ByteString("7F218201BA7F4E8201725F290100421045535049434F48534D434130303030317F4982011D060A04007F000702020202038120FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF8220FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC83205AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B8441046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F58520FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC6325518641046A82C0A4FEAF41D6A1336AE7E992D81AD4F827929145DD0D777E1AB63D7E3325C8F7DAC0F74B6EAE13A72F6366777EC133AC5C28F456868E5F2C315044EB54EF8701015F201045535049434F48534D434130303030317F4C12060904007F0007030102025305C0000000005F25060202000801085F24060203000801085F3740601E974F57DDE060875FE6121AEF5BC02E10FC655311C7A32CA822FD18E53A80298EDC56E0D5EBF38FB470DC12987B1600AE91A0ADB5B22C4D80080782E278AD", HEX)),
+ESPICOHSMCA00002: new CVC(new ByteString("7F218201BA7F4E8201725F290100421045535049434F48534D434130303030327F4982011D060A04007F000702020202038120FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F822000000000000000000000000000000000000000000000000000000000000000008320000000000000000000000000000000000000000000000000000000000000000784410479BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B88520FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141864104FD4DDCD165DD64494F5F1DB76CDAE4E6BD10DA59BF6D48B684E9D50BCC4C2114D2A8BC7C9C1ACAA24C982B1383D4D02E0F32323F657E146E8A051DEB7F6CD40C8701015F201045535049434F48534D434130303030327F4C12060904007F0007030102025305C0000000045F25060205000400065F24060308000302065F3740472AA7A7945F6352F8A65388C2810AEFB657356FFD31CBB2FCC516BC4ECC953D0BACA935B22D73F49802DD9E9DE6439FD8AEA18BD71E1439ABF458C085BD70C8", HEX))
 ```
 
 Therefore, the whole variable becomes:
@@ -22,7 +23,8 @@ Therefore, the whole variable becomes:
 SmartCardHSM.rootCerts = {
 	DESRCACC100001: new CVC(new ByteString("7F218201B47F4E82016C5F290100420E44455352434143433130303030317F4982011D060A04007F000702020202038120A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E537782207D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9832026DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B68441048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F0469978520A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A78641046D025A8026CDBA245F10DF1B72E9880FFF746DAB40A43A3D5C6BEBF27707C30F6DEA72430EE3287B0665C1EAA6EAA4FA26C46303001983F82BD1AA31E03DA0628701015F200E44455352434143433130303030317F4C10060B2B0601040181C31F0301015301C05F25060102010100095F24060302010100085F37409DBB382B1711D2BAACB0C623D40C6267D0B52BA455C01F56333DC9554810B9B2878DAF9EC3ADA19C7B065D780D6C9C3C2ECEDFD78DEB18AF40778ADF89E861CA", HEX)),
 	UTSRCACC100001: new CVC(new ByteString("7F218201B47F4E82016C5F290100420E55545352434143433130303030317F4982011D060A04007F000702020202038120A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E537782207D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9832026DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B68441048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F0469978520A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7864104A041FEB2FD116B2AD19CA6B7EACD71C9892F941BB88D67DCEEC92501F070011957E22122BA6C2CF5FF02936F482E35A6129CCBBA8E9383836D3106879C408EF08701015F200E55545352434143433130303030317F4C10060B2B0601040181C31F0301015301C05F25060102010100095F24060302010100085F3740914DD0FA00615C44048D1467435400423A4AD1BD37FD98D6DE84FD8037489582325C72956D4FDFABC6EDBA48184A754F37F1BE5142DD1C27D66569308CE19AAF", HEX)),
-	ESPICOHSMCA00001: new CVC(new ByteString("7F218201BA7F4E8201725F290100421045535049434F48534D434130303030317F4982011D060A04007F000702020202038120FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF8220FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC83205AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B8441046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F58520FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC6325518641046A82C0A4FEAF41D6A1336AE7E992D81AD4F827929145DD0D777E1AB63D7E3325C8F7DAC0F74B6EAE13A72F6366777EC133AC5C28F456868E5F2C315044EB54EF8701015F201045535049434F48534D434130303030317F4C12060904007F0007030102025305C0000000005F25060202000801085F24060203000801085F3740601E974F57DDE060875FE6121AEF5BC02E10FC655311C7A32CA822FD18E53A80298EDC56E0D5EBF38FB470DC12987B1600AE91A0ADB5B22C4D80080782E278AD", HEX))
+	ESPICOHSMCA00001: new CVC(new ByteString("7F218201BA7F4E8201725F290100421045535049434F48534D434130303030317F4982011D060A04007F000702020202038120FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF8220FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC83205AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B8441046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F58520FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC6325518641046A82C0A4FEAF41D6A1336AE7E992D81AD4F827929145DD0D777E1AB63D7E3325C8F7DAC0F74B6EAE13A72F6366777EC133AC5C28F456868E5F2C315044EB54EF8701015F201045535049434F48534D434130303030317F4C12060904007F0007030102025305C0000000005F25060202000801085F24060203000801085F3740601E974F57DDE060875FE6121AEF5BC02E10FC655311C7A32CA822FD18E53A80298EDC56E0D5EBF38FB470DC12987B1600AE91A0ADB5B22C4D80080782E278AD", HEX)),
+	ESPICOHSMCA00002: new CVC(new ByteString("7F218201BA7F4E8201725F290100421045535049434F48534D434130303030327F4982011D060A04007F000702020202038120FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F822000000000000000000000000000000000000000000000000000000000000000008320000000000000000000000000000000000000000000000000000000000000000784410479BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B88520FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141864104FD4DDCD165DD64494F5F1DB76CDAE4E6BD10DA59BF6D48B684E9D50BCC4C2114D2A8BC7C9C1ACAA24C982B1383D4D02E0F32323F657E146E8A051DEB7F6CD40C8701015F201045535049434F48534D434130303030327F4C12060904007F0007030102025305C0000000045F25060205000400065F24060308000302065F3740472AA7A7945F6352F8A65388C2810AEFB657356FFD31CBB2FCC516BC4ECC953D0BACA935B22D73F49802DD9E9DE6439FD8AEA18BD71E1439ABF458C085BD70C8", HEX))
 }
 ```
 
@@ -33,15 +35,15 @@ Similarly, replace the line `1531` in file `scs3/keymanager/keymanager.js` with:
 ```
 
 
-Alternatively, this patch [scs3.patch.txt](https://github.com/polhenarejos/pico-hsm/files/9415877/scs3.patch.txt) can be applied.
+Alternatively, this patch [scs3.patch.txt](https://github.com/user-attachments/files/20274013/scs3.patch.txt) can be applied.
 
 After this ammendment, the program can be started and the KeyManager can be invoked (CTRL+M) and it will output something similar to:
 ```
 >load("keymanager/keymanager.js");
 
 SmartCard-HSM Version 2.6 on JCOP          Free memory 215512 byte
-Issuer Certificate : CVC id-AT DV (official domestic) CAR=ESPICOHSMCA00001 CHR=ESPICOHSMDV00001 CED=18 / d’agost / 2022 CXD=14 / de juny / 2023 
-Device Certificate : CVC id-AT Terminal CAR=ESPICOHSMDV00001 CHR=ESPICOHSMTRYZRGW CED=22 / d’agost / 2022 CXD=22 / d’agost / 2023 
+Issuer Certificate : CVC id-AT DV (official domestic) CAR=ESPICOHSMCA00001 CHR=ESPICOHSMDV00001 CED=18 / d’agost / 2022 CXD=14 / de juny / 2023
+Device Certificate : CVC id-AT Terminal CAR=ESPICOHSMDV00001 CHR=ESPICOHSMTRYZRGW CED=22 / d’agost / 2022 CXD=22 / d’agost / 2023
 Default Key Domain : 223CD8D8F794889AC163305881BF8C04960BBB8658120491F1C0601F6BF97183
 -------------------------------------------------------------------
 Please right-click on nodes in the outline to see possible actions.

doc/usage.md

@@ -28,9 +28,9 @@ PIN=648219
 [^1]: `openssl version -a` will return the `OPENSSLDIR`, which contains `openssl.cnf` file and `ENGINESDIR`, which contains the p11 engine.
 
 ## Initialization
-The first step is to initialize the HSM. To do so, use the `pico-hsm-tool.py` in `tools` folder:
+The first step is to initialize the HSM. To do so, use:
 ```
-$ python3 tools/pico-hsm-tool.py --pin 648219 initialize --so-pin 57621880
+$ sc-hsm-tool --initialize --so-pin 3537363231383830 --pin 648219
 ```
 The PIN number is used to manage all private keys in the device. It supports three attemps. After the third PIN failure, it gets blocked.
 The PIN accepts from 6 to 16 characters.

pico_sdk_import.cmake

@@ -18,9 +18,20 @@ if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_PATH} AND (NOT PICO_SDK_FETCH_FROM_GIT_P
     message("Using PICO_SDK_FETCH_FROM_GIT_PATH from environment ('${PICO_SDK_FETCH_FROM_GIT_PATH}')")
 endif ()
 
+if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_TAG} AND (NOT PICO_SDK_FETCH_FROM_GIT_TAG))
+    set(PICO_SDK_FETCH_FROM_GIT_TAG $ENV{PICO_SDK_FETCH_FROM_GIT_TAG})
+    message("Using PICO_SDK_FETCH_FROM_GIT_TAG from environment ('${PICO_SDK_FETCH_FROM_GIT_TAG}')")
+endif ()
+
+if (PICO_SDK_FETCH_FROM_GIT AND NOT PICO_SDK_FETCH_FROM_GIT_TAG)
+  set(PICO_SDK_FETCH_FROM_GIT_TAG "master")
+  message("Using master as default value for PICO_SDK_FETCH_FROM_GIT_TAG")
+endif()
+
 set(PICO_SDK_PATH "${PICO_SDK_PATH}" CACHE PATH "Path to the Raspberry Pi Pico SDK")
 set(PICO_SDK_FETCH_FROM_GIT "${PICO_SDK_FETCH_FROM_GIT}" CACHE BOOL "Set to ON to fetch copy of SDK from git if not otherwise locatable")
 set(PICO_SDK_FETCH_FROM_GIT_PATH "${PICO_SDK_FETCH_FROM_GIT_PATH}" CACHE FILEPATH "location to download SDK")
+set(PICO_SDK_FETCH_FROM_GIT_TAG "${PICO_SDK_FETCH_FROM_GIT_TAG}" CACHE FILEPATH "release tag for SDK")
 
 if (NOT PICO_SDK_PATH)
     if (PICO_SDK_FETCH_FROM_GIT)
@@ -29,11 +40,22 @@ if (NOT PICO_SDK_PATH)
         if (PICO_SDK_FETCH_FROM_GIT_PATH)
             get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_SDK_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
         endif ()
-        FetchContent_Declare(
-                pico_sdk
-                GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
-                GIT_TAG master
-        )
+        # GIT_SUBMODULES_RECURSE was added in 3.17
+        if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17.0")
+            FetchContent_Declare(
+                    pico_sdk
+                    GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
+                    GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG}
+                    GIT_SUBMODULES_RECURSE FALSE
+            )
+        else ()
+            FetchContent_Declare(
+                    pico_sdk
+                    GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
+                    GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG}
+            )
+        endif ()
+
         if (NOT pico_sdk)
             message("Downloading Raspberry Pi Pico SDK")
             FetchContent_Populate(pico_sdk)

sdkconfig.defaults

@@ -0,0 +1,57 @@
+# This file was generated using idf.py save-defconfig. It can be edited manually.
+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
+#
+IGNORE_UNKNOWN_FILES_FOR_MANAGED_COMPONENTS=y
+
+CONFIG_TINYUSB=y
+CONFIG_TINYUSB_TASK_STACK_SIZE=16384
+
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="pico-keys-sdk/config/esp32/partitions.csv"
+CONFIG_PARTITION_TABLE_FILENAME="pico-keys-sdk/config/esp32/partitions.csv"
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_MODE_PERF=y
+COMPILER_OPTIMIZATION="Performance"
+
+CONFIG_MBEDTLS_CMAC_C=y
+CONFIG_MBEDTLS_CHACHA20_C=y
+CONFIG_MBEDTLS_POLY1305_C=y
+CONFIG_MBEDTLS_CHACHAPOLY_C=y
+CONFIG_MBEDTLS_HKDF_C=y
+CONFIG_MBEDTLS_HARDWARE_ECC=y
+CONFIG_MBEDTLS_HARDWARE_GCM=y
+# CONFIG_MBEDTLS_HARDWARE_MPI is not set
+CONFIG_MBEDTLS_HARDWARE_SHA=y
+CONFIG_MBEDTLS_HARDWARE_AES=y
+# CONFIG_MBEDTLS_ROM_MD5 is not set
+CONFIG_MBEDTLS_SHA512_C=y
+CONFIG_MBEDTLS_TLS_DISABLED=y
+# CONFIG_MBEDTLS_TLS_ENABLED is not set
+# CONFIG_ESP_TLS_USE_DS_PERIPHERAL is not set
+# CONFIG_ESP_WIFI_ENABLED is not set
+# CONFIG_ESP_WIFI_MBEDTLS_CRYPTO is not set
+# CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT is not set
+# CONFIG_ESP_WIFI_MBEDTLS_CRYPTO is not set
+# CONFIG_MBEDTLS_PSK_MODES is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_RSA is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA is not set
+# CONFIG_MBEDTLS_SSL_RENEGOTIATION is not set
+# CONFIG_MBEDTLS_SSL_PROTO_TLS1_2 is not set
+# CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set
+# CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set
+# CONFIG_MBEDTLS_SSL_ALPN is not set
+# CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS is not set
+# CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS is not set
+# CONFIG_ESP_WIFI_ENABLE_WPA3_SAE is not set
+# CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA is not set
+# CONFIG_ESP_WIFI_ENABLE_WPA3_SAE is not set
+# CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA is not set
+
+CONFIG_ESP_COREDUMP_ENABLE_TO_UART=y

src/hsm/CMakeLists.txt

@@ -0,0 +1,6 @@
+idf_component_register(
+    SRCS ${SOURCES}
+    INCLUDE_DIRS .
+    REQUIRES mbedtls efuse pico-keys-sdk
+)
+idf_component_set_property(${COMPONENT_NAME} WHOLE_ARCHIVE ON)

src/hsm/cmd_bip_slip.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "sc_hsm.h"
@@ -38,7 +38,7 @@ int node_derive_bip_child(const mbedtls_ecp_keypair *parent,
     mbedtls_mpi_init(&kchild);
     if (i[0] >= 0x80) {
         if (mbedtls_mpi_cmp_int(&parent->d, 0) == 0) {
-            return CCID_ERR_NULL_PARAM;
+            return PICOKEY_ERR_NULL_PARAM;
         }
         data[0] = 0x00;
         mbedtls_mpi_write_binary(&parent->d, data + 1, 32);
@@ -72,19 +72,19 @@ int node_derive_bip_child(const mbedtls_ecp_keypair *parent,
     memcpy(cchild, iR, 32);
     mbedtls_mpi_free(&il);
     mbedtls_mpi_free(&kchild);
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int sha256_ripemd160(const uint8_t *buffer, size_t buffer_len, uint8_t *output) {
     mbedtls_md(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), buffer, buffer_len, output);
     mbedtls_md(mbedtls_md_info_from_type(MBEDTLS_MD_RIPEMD160), output, 32, output);
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int sha256_sha256(const uint8_t *buffer, size_t buffer_len, uint8_t *output) {
     mbedtls_md(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), buffer, buffer_len, output);
     mbedtls_md(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), output, 32, output);
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int node_fingerprint_bip(mbedtls_ecp_keypair *ctx, uint8_t fingerprint[4]) {
@@ -98,7 +98,7 @@ int node_fingerprint_bip(mbedtls_ecp_keypair *ctx, uint8_t fingerprint[4]) {
                                    sizeof(buffer));
     sha256_ripemd160(buffer, sizeof(buffer), buffer);
     memcpy(fingerprint, buffer, 4);
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int node_fingerprint_slip(mbedtls_ecp_keypair *ctx, uint8_t fingerprint[4]) {
@@ -106,22 +106,22 @@ int node_fingerprint_slip(mbedtls_ecp_keypair *ctx, uint8_t fingerprint[4]) {
     mbedtls_mpi_write_binary(&ctx->d, buffer, sizeof(buffer));
     sha256_ripemd160(buffer, sizeof(buffer), buffer);
     memcpy(fingerprint, buffer, 4);
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
-int load_master_bip(uint32_t mid, mbedtls_ecp_keypair *ctx, uint8_t chain[32],
+int load_master_bip(uint16_t mid, mbedtls_ecp_keypair *ctx, uint8_t chain[32],
                     uint8_t key_type[1]) {
     uint8_t mkey[65];
     mbedtls_ecp_keypair_init(ctx);
-    file_t *ef = search_dynamic_file(EF_MASTER_SEED | mid);
+    file_t *ef = search_file(EF_MASTER_SEED | mid);
     if (!file_has_data(ef)) {
-        return CCID_ERR_FILE_NOT_FOUND;
+        return PICOKEY_ERR_FILE_NOT_FOUND;
     }
     memcpy(mkey, file_get_data(ef), sizeof(mkey));
     int r = mkek_decrypt(mkey + 1,
                          sizeof(mkey) - 1);
-    if (r != CCID_OK) {
-        return CCID_EXEC_ERROR;
+    if (r != PICOKEY_OK) {
+        return PICOKEY_EXEC_ERROR;
     }
     if (mkey[0] == 0x1 || mkey[0] == 0x2) {
         if (mkey[0] == 0x1) {
@@ -131,7 +131,7 @@ int load_master_bip(uint32_t mid, mbedtls_ecp_keypair *ctx, uint8_t chain[32],
             mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1);
         }
         else {
-            return CCID_WRONG_DATA;
+            return PICOKEY_WRONG_DATA;
         }
 
         mbedtls_mpi_read_binary(&ctx->d, mkey + 1, 32);
@@ -143,11 +143,11 @@ int load_master_bip(uint32_t mid, mbedtls_ecp_keypair *ctx, uint8_t chain[32],
         memcpy(chain, mkey + 1, 32);
     }
     key_type[0] = mkey[0];
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int node_derive_path(const uint8_t *path,
-                     size_t path_len,
+                     uint16_t path_len,
                      mbedtls_ecp_keypair *ctx,
                      uint8_t chain[32],
                      uint8_t fingerprint[4],
@@ -155,25 +155,27 @@ int node_derive_path(const uint8_t *path,
                      uint8_t last_node[4],
                      uint8_t key_type[1]) {
     uint8_t *tag_data = NULL, *p = NULL;
-    size_t tag_len = 0;
-    uint16_t tag = 0x0;
+    uint16_t tag_len = 0, tag = 0x0;
     uint8_t node = 0, N[64] = { 0 };
     int r = 0;
     memset(last_node, 0, 4);
     memset(fingerprint, 0, 4);
-    for (; walk_tlv(path, path_len, &p, &tag, &tag_len, &tag_data); node++) {
+
+    asn1_ctx_t ctxi;
+    asn1_ctx_init((uint8_t *)path, path_len, &ctxi);
+    for (; walk_tlv(&ctxi, &p, &tag, &tag_len, &tag_data); node++) {
         if (tag == 0x02) {
             if ((node == 0 && tag_len != 1) || (node != 0 && tag_len != 4)) {
-                return CCID_WRONG_DATA;
+                return PICOKEY_WRONG_DATA;
             }
             if (node == 0) {
-                if ((r = load_master_bip(tag_data[0], ctx, chain, key_type)) != CCID_OK) {
+                if ((r = load_master_bip(tag_data[0], ctx, chain, key_type)) != PICOKEY_OK) {
                     return r;
                 }
             }
             else if (node > 0) {
                 node_fingerprint_bip(ctx, fingerprint);
-                if ((r = node_derive_bip_child(ctx, chain, tag_data, ctx, chain)) != CCID_OK) {
+                if ((r = node_derive_bip_child(ctx, chain, tag_data, ctx, chain)) != PICOKEY_OK) {
                     return r;
                 }
                 memcpy(last_node, tag_data, 4);
@@ -181,7 +183,7 @@ int node_derive_path(const uint8_t *path,
         }
         else if (tag == 0x04) {
             if (node == 0) {
-                return CCID_WRONG_DATA;
+                return PICOKEY_WRONG_DATA;
             }
             else if (node > 0) {
                 node_fingerprint_slip(ctx, fingerprint);
@@ -200,7 +202,7 @@ int node_derive_path(const uint8_t *path,
     if (nodes) {
         *nodes = node;
     }
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int cmd_bip_slip() {
@@ -231,7 +233,7 @@ int cmd_bip_slip() {
             random_gen(NULL, seed, seed_len);
         }
         else {
-            seed_len = MIN(apdu.nc, 64);
+            seed_len = MIN((uint8_t)apdu.nc, 64);
             memcpy(seed, apdu.data, seed_len);
         }
         if (p1 == 0x1 || p1 == 0x2) {
@@ -251,11 +253,11 @@ int cmd_bip_slip() {
         mkey[0] = p1;
         file_t *ef = file_new(EF_MASTER_SEED | p2);
         int r = mkek_encrypt(mkey + 1, sizeof(mkey) - 1);
-        if (r != CCID_OK) {
+        if (r != PICOKEY_OK) {
             return SW_EXEC_ERROR();
         }
-        r = flash_write_data_to_file(ef, mkey, sizeof(mkey));
-        if (r != CCID_OK) {
+        r = file_put_data(ef, mkey, sizeof(mkey));
+        if (r != PICOKEY_OK) {
             return SW_EXEC_ERROR();
         }
         low_flash_available();
@@ -268,8 +270,8 @@ int cmd_bip_slip() {
         uint8_t chain[32] = { 0 }, fgpt[4] = { 0 }, last_node[4] = { 0 }, key_type = 0, nodes = 0;
         size_t olen = 0;
         int r =
-            node_derive_path(apdu.data, apdu.nc, &ctx, chain, fgpt, &nodes, last_node, &key_type);
-        if (r != CCID_OK) {
+            node_derive_path(apdu.data, (uint16_t)apdu.nc, &ctx, chain, fgpt, &nodes, last_node, &key_type);
+        if (r != PICOKEY_OK) {
             mbedtls_ecp_keypair_free(&ctx);
             return SW_EXEC_ERROR();
         }
@@ -292,7 +294,7 @@ int cmd_bip_slip() {
                                            pubkey,
                                            sizeof(pubkey));
             memcpy(res_APDU + res_APDU_size, pubkey, olen);
-            res_APDU_size += olen;
+            res_APDU_size += (uint16_t)olen;
         }
         else if (key_type == 0x3) {
             sha256_sha256(chain, 32, chain);
@@ -308,14 +310,14 @@ int cmd_bip_slip() {
     else if (p1 == 0x10) {
         uint8_t chain[32] = { 0 }, fgpt[4] = { 0 }, last_node[4] = { 0 }, nodes = 0;
         int r = node_derive_path(apdu.data,
-                                 apdu.nc,
+                                 (uint16_t)apdu.nc,
                                  &hd_context,
                                  chain,
                                  fgpt,
                                  &nodes,
                                  last_node,
                                  &hd_keytype);
-        if (r != CCID_OK) {
+        if (r != PICOKEY_OK) {
             mbedtls_ecp_keypair_free(&hd_context);
             return SW_EXEC_ERROR();
         }

src/hsm/cmd_challenge.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "random.h"
@@ -27,8 +27,8 @@ int cmd_challenge() {
         return SW_WRONG_LENGTH();
     }
     memcpy(res_APDU, rb, apdu.ne);
-    challenge_len = MIN(apdu.ne, sizeof(challenge));
+    challenge_len = (uint8_t)MIN(apdu.ne, sizeof(challenge));
     memcpy(challenge, rb, challenge_len);
-    res_APDU_size = apdu.ne;
+    res_APDU_size = (uint16_t)apdu.ne;
     return SW_OK();
 }

src/hsm/cmd_change_pin.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "crypto_utils.h"
@@ -35,35 +35,35 @@ int cmd_change_pin() {
             if (!file_has_data(file_pin)) {
                 return SW_REFERENCE_NOT_FOUND();
             }
-            uint8_t pin_len = file_read_uint8(file_get_data(file_pin));
+            uint8_t pin_len = file_read_uint8(file_pin);
             int r = check_pin(file_pin, apdu.data, pin_len);
             if (r != 0x9000) {
                 return r;
             }
             uint8_t mkek[MKEK_SIZE];
             r = load_mkek(mkek); //loads the MKEK with old pin
-            if (r != CCID_OK) {
+            if (r != PICOKEY_OK) {
                 return SW_EXEC_ERROR();
             }
             //encrypt MKEK with new pin
 
             if (P2(apdu) == 0x81) {
-                hash_multi(apdu.data + pin_len, apdu.nc - pin_len, session_pin);
+                hash_multi(apdu.data + pin_len, (uint16_t)(apdu.nc - pin_len), session_pin);
                 has_session_pin = true;
             }
             else if (P2(apdu) == 0x88) {
-                hash_multi(apdu.data + pin_len, apdu.nc - pin_len, session_sopin);
+                hash_multi(apdu.data + pin_len, (uint16_t)(apdu.nc - pin_len), session_sopin);
                 has_session_sopin = true;
             }
             r = store_mkek(mkek);
             release_mkek(mkek);
-            if (r != CCID_OK) {
+            if (r != PICOKEY_OK) {
                 return SW_EXEC_ERROR();
             }
             uint8_t dhash[33];
-            dhash[0] = apdu.nc - pin_len;
-            double_hash_pin(apdu.data + pin_len, apdu.nc - pin_len, dhash + 1);
-            flash_write_data_to_file(file_pin, dhash, sizeof(dhash));
+            dhash[0] = (uint8_t)apdu.nc - pin_len;
+            double_hash_pin(apdu.data + pin_len, (uint16_t)(apdu.nc - pin_len), dhash + 1);
+            file_put_data(file_pin, dhash, sizeof(dhash));
             low_flash_available();
             return SW_OK();
         }

src/hsm/cmd_cipher_sym.c

@@ -3,28 +3,27 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
+#include "sc_hsm.h"
 #include "mbedtls/aes.h"
 #include "mbedtls/cmac.h"
 #include "mbedtls/hkdf.h"
 #include "mbedtls/chachapoly.h"
 #include "mbedtls/gcm.h"
-#include "md_wrap.h"
+//#include "mbedtls/md_wrap.h"
 #include "mbedtls/md.h"
 #include "crypto_utils.h"
-#include "sc_hsm.h"
 #include "kek.h"
 #include "asn1.h"
 #include "oid.h"
@@ -43,7 +42,7 @@ extern uint8_t hd_keytype;
 
 static int pkcs5_parse_pbkdf2_params(const mbedtls_asn1_buf *params,
                                      mbedtls_asn1_buf *salt, int *iterations,
-                                     int *keylen, mbedtls_md_type_t *md_type) {
+                                     uint16_t *keylen, mbedtls_md_type_t *md_type) {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     mbedtls_asn1_buf prf_alg_oid;
     unsigned char *p = params->p;
@@ -78,7 +77,7 @@ static int pkcs5_parse_pbkdf2_params(const mbedtls_asn1_buf *params,
         return 0;
     }
 
-    if ((ret = mbedtls_asn1_get_int(&p, end, keylen)) != 0) {
+    if ((ret = mbedtls_asn1_get_int(&p, end, (int *)keylen)) != 0) {
         if (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) {
             return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PKCS5_INVALID_FORMAT, ret);
         }
@@ -106,11 +105,11 @@ static int pkcs5_parse_pbkdf2_params(const mbedtls_asn1_buf *params,
 
 /* Taken from https://github.com/Mbed-TLS/mbedtls/issues/2335 */
 int mbedtls_ansi_x963_kdf(mbedtls_md_type_t md_type,
-                          size_t input_len,
+                          uint16_t input_len,
                           uint8_t *input,
-                          size_t shared_info_len,
+                          uint16_t shared_info_len,
                           uint8_t *shared_info,
-                          size_t output_len,
+                          uint16_t output_len,
                           uint8_t *output) {
     mbedtls_md_context_t md_ctx;
     const mbedtls_md_info_t *md_info = NULL;
@@ -134,7 +133,7 @@ int mbedtls_ansi_x963_kdf(mbedtls_md_type_t md_type,
     }
 
     // keydatalen equals output_len
-    hashlen = md_info->size;
+    hashlen = mbedtls_md_get_size(md_info);
     if (output_len >= hashlen * ((1ULL << 32) - 1)) {
         return exit_code;
     }
@@ -144,10 +143,7 @@ int mbedtls_ansi_x963_kdf(mbedtls_md_type_t md_type,
         mbedtls_md_update(&md_ctx, input, input_len);
 
         //TODO: be careful with architecture little vs. big
-        counter_buf[0] = (uint8_t) ((counter >> 24) & 0xff);
-        counter_buf[1] = (uint8_t) ((counter >> 16) & 0xff);
-        counter_buf[2] = (uint8_t) ((counter >> 8) & 0xff);
-        counter_buf[3] = (uint8_t) ((counter >> 0) & 0xff);
+        put_uint32_t_be(counter, counter_buf);
 
         mbedtls_md_update(&md_ctx, counter_buf, 4);
 
@@ -163,15 +159,14 @@ int mbedtls_ansi_x963_kdf(mbedtls_md_type_t md_type,
 }
 
 int cmd_cipher_sym() {
-    int key_id = P1(apdu);
-    int algo = P2(apdu);
+    uint8_t key_id = P1(apdu), algo = P2(apdu);
     if (!isUserAuthenticated) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
     if (wait_button_pressed() == true) { // timeout
         return SW_SECURE_MESSAGE_EXEC_ERROR();
     }
-    file_t *ef = search_dynamic_file((KEY_PREFIX << 8) | key_id);
+    file_t *ef = search_file((KEY_PREFIX << 8) | key_id);
     if (hd_keytype == 0) {
         if (!ef) {
             return SW_FILE_NOT_FOUND();
@@ -180,7 +175,7 @@ int cmd_cipher_sym() {
             return SW_CONDITIONS_NOT_SATISFIED();
         }
     }
-    int key_size = file_get_size(ef);
+    uint16_t key_size = file_get_size(ef);
     uint8_t kdata[64]; //maximum AES key size
     memcpy(kdata, file_get_data(ef), key_size);
     if (hd_keytype == 0 && mkek_decrypt(kdata, key_size) != 0) {
@@ -229,7 +224,7 @@ int cmd_cipher_sym() {
                 return SW_EXEC_ERROR();
             }
         }
-        res_APDU_size = apdu.nc;
+        res_APDU_size = (uint16_t)apdu.nc;
     }
     else if (algo == ALGO_AES_CMAC) {
         const mbedtls_cipher_info_t *cipher_info;
@@ -267,23 +262,22 @@ int cmd_cipher_sym() {
         if (r != 0) {
             return SW_EXEC_ERROR();
         }
-        res_APDU_size = apdu.nc;
+        res_APDU_size = (uint16_t)apdu.nc;
     }
     else if (algo == ALGO_EXT_CIPHER_ENCRYPT || algo == ALGO_EXT_CIPHER_DECRYPT) {
-        size_t oid_len = 0, aad_len = 0, iv_len = 0, enc_len = 0;
-        uint8_t *oid = NULL, *aad = NULL, *iv = NULL, *enc = NULL;
-        if (!asn1_find_tag(apdu.data, apdu.nc, 0x6, &oid_len,
-                           &oid) || oid_len == 0 || oid == NULL) {
+        asn1_ctx_t ctxi, oid = {0}, enc = {0}, iv = {0}, aad = {0};
+        asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
+        if (!asn1_find_tag(&ctxi, 0x6, &oid) || asn1_len(&oid) == 0) {
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
             return SW_WRONG_DATA();
         }
-        asn1_find_tag(apdu.data, apdu.nc, 0x81, &enc_len, &enc);
-        asn1_find_tag(apdu.data, apdu.nc, 0x82, &iv_len, &iv);
-        asn1_find_tag(apdu.data, apdu.nc, 0x83, &aad_len, &aad);
+        asn1_find_tag(&ctxi, 0x81, &enc);
+        asn1_find_tag(&ctxi, 0x82, &iv);
+        asn1_find_tag(&ctxi, 0x83, &aad);
         uint8_t tmp_iv[16];
         memset(tmp_iv, 0, sizeof(tmp_iv));
-        if (memcmp(oid, OID_CHACHA20_POLY1305, oid_len) == 0) {
-            if (algo == ALGO_EXT_CIPHER_DECRYPT && enc_len < 16) {
+        if (memcmp(oid.data, OID_CHACHA20_POLY1305, oid.len) == 0) {
+            if (algo == ALGO_EXT_CIPHER_DECRYPT && enc.len < 16) {
                 mbedtls_platform_zeroize(kdata, sizeof(kdata));
                 return SW_WRONG_DATA();
             }
@@ -293,22 +287,22 @@ int cmd_cipher_sym() {
             mbedtls_chachapoly_setkey(&ctx, kdata);
             if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
                 r = mbedtls_chachapoly_encrypt_and_tag(&ctx,
-                                                       enc_len,
-                                                       iv ? iv : tmp_iv,
-                                                       aad,
-                                                       aad_len,
-                                                       enc,
+                                                       enc.len,
+                                                       asn1_len(&iv) > 0 ? iv.data : tmp_iv,
+                                                       aad.data,
+                                                       aad.len,
+                                                       enc.data,
                                                        res_APDU,
-                                                       res_APDU + enc_len);
+                                                       res_APDU + enc.len);
             }
             else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
                 r = mbedtls_chachapoly_auth_decrypt(&ctx,
-                                                    enc_len - 16,
-                                                    iv ? iv : tmp_iv,
-                                                    aad,
-                                                    aad_len,
-                                                    enc + enc_len - 16,
-                                                    enc,
+                                                    enc.len - 16,
+                                                    asn1_len(&iv) > 0 ? iv.data : tmp_iv,
+                                                    aad.data,
+                                                    aad.len,
+                                                    enc.data + enc.len - 16,
+                                                    enc.data,
                                                     res_APDU);
             }
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
@@ -320,60 +314,60 @@ int cmd_cipher_sym() {
                 return SW_EXEC_ERROR();
             }
             if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
-                res_APDU_size = enc_len + 16;
+                res_APDU_size = enc.len + 16;
             }
             else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
-                res_APDU_size = enc_len - 16;
+                res_APDU_size = enc.len - 16;
             }
         }
-        else if (memcmp(oid, OID_DIGEST, 7) == 0) {
+        else if (memcmp(oid.data, OID_DIGEST, 7) == 0) {
             const mbedtls_md_info_t *md_info = NULL;
-            if (memcmp(oid, OID_HMAC_SHA1, oid_len) == 0) {
+            if (memcmp(oid.data, OID_HMAC_SHA1, oid.len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
             }
-            else if (memcmp(oid, OID_HMAC_SHA224, oid_len) == 0) {
+            else if (memcmp(oid.data, OID_HMAC_SHA224, oid.len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA224);
             }
-            else if (memcmp(oid, OID_HMAC_SHA256, oid_len) == 0) {
+            else if (memcmp(oid.data, OID_HMAC_SHA256, oid.len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
             }
-            else if (memcmp(oid, OID_HMAC_SHA384, oid_len) == 0) {
+            else if (memcmp(oid.data, OID_HMAC_SHA384, oid.len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384);
             }
-            else if (memcmp(oid, OID_HMAC_SHA512, oid_len) == 0) {
+            else if (memcmp(oid.data, OID_HMAC_SHA512, oid.len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
             }
             if (md_info == NULL) {
                 return SW_WRONG_DATA();
             }
-            int r = mbedtls_md_hmac(md_info, kdata, key_size, enc, enc_len, res_APDU);
+            int r = mbedtls_md_hmac(md_info, kdata, key_size, enc.data, enc.len, res_APDU);
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
             if (r != 0) {
                 return SW_EXEC_ERROR();
             }
-            res_APDU_size = md_info->size;
+            res_APDU_size = mbedtls_md_get_size(md_info);
         }
-        else if (memcmp(oid, OID_HKDF_SHA256,
-                        oid_len) == 0 ||
-                 memcmp(oid, OID_HKDF_SHA384,
-                        oid_len) == 0 || memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) {
+        else if (memcmp(oid.data, OID_HKDF_SHA256,
+                        oid.len) == 0 ||
+                 memcmp(oid.data, OID_HKDF_SHA384,
+                        oid.len) == 0 || memcmp(oid.data, OID_HKDF_SHA512, oid.len) == 0) {
             const mbedtls_md_info_t *md_info = NULL;
-            if (memcmp(oid, OID_HKDF_SHA256, oid_len) == 0) {
+            if (memcmp(oid.data, OID_HKDF_SHA256, oid.len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
             }
-            else if (memcmp(oid, OID_HKDF_SHA384, oid_len) == 0) {
+            else if (memcmp(oid.data, OID_HKDF_SHA384, oid.len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384);
             }
-            else if (memcmp(oid, OID_HKDF_SHA512, oid_len) == 0) {
+            else if (memcmp(oid.data, OID_HKDF_SHA512, oid.len) == 0) {
                 md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
             }
             int r = mbedtls_hkdf(md_info,
-                                 iv,
-                                 iv_len,
+                                 iv.data,
+                                 iv.len,
                                  kdata,
                                  key_size,
-                                 enc,
-                                 enc_len,
+                                 enc.data,
+                                 enc.len,
                                  res_APDU,
                                  apdu.ne > 0 &&
                                  apdu.ne < 65536 ? apdu.ne : mbedtls_md_get_size(md_info));
@@ -381,13 +375,14 @@ int cmd_cipher_sym() {
             if (r != 0) {
                 return SW_EXEC_ERROR();
             }
-            res_APDU_size = apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : mbedtls_md_get_size(md_info);
+            res_APDU_size = apdu.ne > 0 && apdu.ne < 65536 ? (uint16_t)apdu.ne : (uint16_t)mbedtls_md_get_size(md_info);
         }
-        else if (memcmp(oid, OID_PKCS5_PBKDF2, oid_len) == 0) {
-            int iterations = 0, keylen = 0;
+        else if (memcmp(oid.data, OID_PKCS5_PBKDF2, oid.len) == 0) {
+            int iterations = 0;
+            uint16_t keylen = 0;
             mbedtls_asn1_buf salt,
                              params =
-            { .p = enc, .len = enc_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) };
+            { .p = enc.data, .len = enc.len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) };
             mbedtls_md_type_t md_type = MBEDTLS_MD_SHA1;
 
             int r = pkcs5_parse_pbkdf2_params(&params, &salt, &iterations, &keylen, &md_type);
@@ -409,60 +404,54 @@ int cmd_cipher_sym() {
             if (r != 0) {
                 return SW_EXEC_ERROR();
             }
-            res_APDU_size = keylen ? keylen : (apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32);
+            res_APDU_size = keylen ? keylen : (apdu.ne > 0 && apdu.ne < 65536 ? (uint16_t)apdu.ne : 32);
         }
-        else if (memcmp(oid, OID_PKCS5_PBES2, oid_len) == 0) {
+        else if (memcmp(oid.data, OID_PKCS5_PBES2, oid.len) == 0) {
             size_t olen = 0;
             mbedtls_asn1_buf params =
-                {.p = aad, .len = aad_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)};
-            int r = mbedtls_pkcs5_pbes2_ext(&params,
-                                        algo == ALGO_EXT_CIPHER_ENCRYPT ? MBEDTLS_PKCS5_ENCRYPT : MBEDTLS_PKCS5_DECRYPT,
-                                        kdata,
-                                        key_size,
-                                        enc,
-                                        enc_len,
-                                        res_APDU, 4096, &olen);
+                {.p = aad.data, .len = aad.len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)};
+            int r = mbedtls_pkcs5_pbes2_ext(&params, algo == ALGO_EXT_CIPHER_ENCRYPT ? MBEDTLS_PKCS5_ENCRYPT : MBEDTLS_PKCS5_DECRYPT, kdata, key_size, enc.data, enc.len, res_APDU, MAX_APDU_DATA, &olen);
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
             if (r != 0) {
                 return SW_WRONG_DATA();
             }
-            res_APDU_size = olen;
+            res_APDU_size = (uint16_t)olen;
         }
-        else if (memcmp(oid, OID_KDF_X963, oid_len) == 0) {
+        else if (memcmp(oid.data, OID_KDF_X963, oid.len) == 0) {
             mbedtls_md_type_t md_type = MBEDTLS_MD_SHA1;
-            if (memcmp(enc, OID_HMAC_SHA1, enc_len) == 0) {
+            if (memcmp(enc.data, OID_HMAC_SHA1, enc.len) == 0) {
                 md_type = MBEDTLS_MD_SHA1;
             }
-            else if (memcmp(enc, OID_HMAC_SHA224, enc_len) == 0) {
+            else if (memcmp(enc.data, OID_HMAC_SHA224, enc.len) == 0) {
                 md_type = MBEDTLS_MD_SHA224;
             }
-            else if (memcmp(enc, OID_HMAC_SHA256, enc_len) == 0) {
+            else if (memcmp(enc.data, OID_HMAC_SHA256, enc.len) == 0) {
                 md_type = MBEDTLS_MD_SHA256;
             }
-            else if (memcmp(enc, OID_HMAC_SHA384, enc_len) == 0) {
+            else if (memcmp(enc.data, OID_HMAC_SHA384, enc.len) == 0) {
                 md_type = MBEDTLS_MD_SHA384;
             }
-            else if (memcmp(enc, OID_HMAC_SHA512, enc_len) == 0) {
+            else if (memcmp(enc.data, OID_HMAC_SHA512, enc.len) == 0) {
                 md_type = MBEDTLS_MD_SHA512;
             }
             int r = mbedtls_ansi_x963_kdf(md_type,
                                           key_size,
                                           kdata,
-                                          aad_len,
-                                          aad,
-                                          apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32,
+                                          aad.len,
+                                          aad.data,
+                                          apdu.ne > 0 && apdu.ne < 65536 ? (uint16_t)apdu.ne : 32,
                                           res_APDU);
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
             if (r != 0) {
                 return SW_WRONG_DATA();
             }
-            res_APDU_size = apdu.ne > 0 && apdu.ne < 65536 ? apdu.ne : 32;
+            res_APDU_size = apdu.ne > 0 && apdu.ne < 65536 ? (uint16_t)apdu.ne : 32;
         }
-        else if (memcmp(oid, OID_NIST_AES, 8) == 0) {
-            if (oid_len != 9) {
+        else if (memcmp(oid.data, OID_NIST_AES, 8) == 0) {
+            if (oid.len != 9) {
                 return SW_WRONG_DATA();
             }
-            uint8_t aes_algo = oid[8],
+            uint8_t aes_algo = oid.data[8],
                     mode =
                 (algo == ALGO_EXT_CIPHER_ENCRYPT ? MBEDTLS_AES_ENCRYPT : MBEDTLS_AES_DECRYPT);
             if ((aes_algo >= 0x01 && aes_algo <= 0x09 && key_size != 16) ||
@@ -473,9 +462,9 @@ int cmd_cipher_sym() {
             mbedtls_aes_context ctx;
             int r = 0;
             mbedtls_aes_init(&ctx);
-            if (iv == NULL || iv_len == 0) {
-                iv = tmp_iv;
-                iv_len = sizeof(tmp_iv);
+            if (asn1_len(&iv) == 0) {
+                iv.data = tmp_iv;
+                iv.len = sizeof(tmp_iv);
             }
             if (aes_algo == 0x01 || aes_algo == 0x15 || aes_algo == 0x29) { /* ECB */
                 if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
@@ -485,12 +474,12 @@ int cmd_cipher_sym() {
                     r = mbedtls_aes_setkey_dec(&ctx, kdata, key_size * 8);
                 }
                 mbedtls_platform_zeroize(kdata, sizeof(kdata));
-                r = mbedtls_aes_crypt_ecb(&ctx, mode, enc, res_APDU);
+                r = mbedtls_aes_crypt_ecb(&ctx, mode, enc.data, res_APDU);
                 mbedtls_aes_free(&ctx);
                 if (r != 0) {
                     return SW_EXEC_ERROR();
                 }
-                res_APDU_size = MIN(enc_len, 16); // ECB operates with 16-byte blocks
+                res_APDU_size = MIN(enc.len, 16); // ECB operates with 16-byte blocks
             }
             else if (aes_algo == 0x02 || aes_algo == 0x16 || aes_algo == 0x2A) { /* CBC */
                 if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
@@ -503,34 +492,34 @@ int cmd_cipher_sym() {
                     return SW_EXEC_ERROR();
                 }
                 mbedtls_platform_zeroize(kdata, sizeof(kdata));
-                r = mbedtls_aes_crypt_cbc(&ctx, mode, enc_len, iv, enc, res_APDU);
+                r = mbedtls_aes_crypt_cbc(&ctx, mode, enc.len, iv.data, enc.data, res_APDU);
                 mbedtls_aes_free(&ctx);
                 if (r != 0) {
                     return SW_EXEC_ERROR();
                 }
-                res_APDU_size = enc_len;
+                res_APDU_size = enc.len;
             }
             else if (aes_algo == 0x03 || aes_algo == 0x17 || aes_algo == 0x2B) { /* OFB */
                 size_t iv_off = 0;
                 r = mbedtls_aes_setkey_enc(&ctx, kdata, key_size * 8);
                 mbedtls_platform_zeroize(kdata, sizeof(kdata));
-                r = mbedtls_aes_crypt_ofb(&ctx, enc_len, &iv_off, iv, enc, res_APDU);
+                r = mbedtls_aes_crypt_ofb(&ctx, enc.len, &iv_off, iv.data, enc.data, res_APDU);
                 mbedtls_aes_free(&ctx);
                 if (r != 0) {
                     return SW_EXEC_ERROR();
                 }
-                res_APDU_size = enc_len;
+                res_APDU_size = enc.len;
             }
             else if (aes_algo == 0x04 || aes_algo == 0x18 || aes_algo == 0x2C) { /* CFB */
                 size_t iv_off = 0;
                 r = mbedtls_aes_setkey_enc(&ctx, kdata, key_size * 8);
                 mbedtls_platform_zeroize(kdata, sizeof(kdata));
-                r = mbedtls_aes_crypt_cfb128(&ctx, mode, enc_len, &iv_off, iv, enc, res_APDU);
+                r = mbedtls_aes_crypt_cfb128(&ctx, mode, enc.len, &iv_off, iv.data, enc.data, res_APDU);
                 mbedtls_aes_free(&ctx);
                 if (r != 0) {
                     return SW_EXEC_ERROR();
                 }
-                res_APDU_size = enc_len;
+                res_APDU_size = enc.len;
             }
             else if (aes_algo == 0x06 || aes_algo == 0x1A || aes_algo == 0x2E) { /* GCM */
                 mbedtls_aes_free(&ctx); // No AES ctx used
@@ -541,29 +530,29 @@ int cmd_cipher_sym() {
                 if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
                     r = mbedtls_gcm_crypt_and_tag(&gctx,
                                                   MBEDTLS_GCM_ENCRYPT,
-                                                  enc_len,
-                                                  iv,
-                                                  iv_len,
-                                                  aad,
-                                                  aad_len,
-                                                  enc,
+                                                  enc.len,
+                                                  iv.data,
+                                                  iv.len,
+                                                  aad.data,
+                                                  aad.len,
+                                                  enc.data,
                                                   res_APDU,
                                                   16,
-                                                  res_APDU + enc_len);
-                    res_APDU_size = enc_len + 16;
+                                                  res_APDU + enc.len);
+                    res_APDU_size = enc.len + 16;
                 }
                 else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
                     r = mbedtls_gcm_auth_decrypt(&gctx,
-                                                 enc_len - 16,
-                                                 iv,
-                                                 iv_len,
-                                                 aad,
-                                                 aad_len,
-                                                 enc + enc_len - 16,
+                                                 enc.len - 16,
+                                                 iv.data,
+                                                 iv.len,
+                                                 aad.data,
+                                                 aad.len,
+                                                 enc.data + enc.len - 16,
                                                  16,
-                                                 enc,
+                                                 enc.data,
                                                  res_APDU);
-                    res_APDU_size = enc_len - 16;
+                    res_APDU_size = enc.len - 16;
                 }
                 mbedtls_gcm_free(&gctx);
                 if (r != 0) {
@@ -575,12 +564,12 @@ int cmd_cipher_sym() {
                 uint8_t stream_block[16];
                 r = mbedtls_aes_setkey_enc(&ctx, kdata, key_size * 8);
                 mbedtls_platform_zeroize(kdata, sizeof(kdata));
-                r = mbedtls_aes_crypt_ctr(&ctx, enc_len, &iv_off, iv, stream_block, enc, res_APDU);
+                r = mbedtls_aes_crypt_ctr(&ctx, enc.len, &iv_off, iv.data, stream_block, enc.data, res_APDU);
                 mbedtls_aes_free(&ctx);
                 if (r != 0) {
                     return SW_EXEC_ERROR();
                 }
-                res_APDU_size = enc_len;
+                res_APDU_size = enc.len;
             }
             else if (aes_algo == 0x07 || aes_algo == 0x1B || aes_algo == 0x2F) { /* CCM */
                 mbedtls_aes_free(&ctx); // No AES ctx used
@@ -590,35 +579,35 @@ int cmd_cipher_sym() {
                 if (r != 0) {
                     return SW_EXEC_ERROR();
                 }
-                if (iv_len == 16) {
-                    iv_len = 12;
+                if (iv.len == 16) {
+                    iv.len = 12;
                 }
                 mbedtls_platform_zeroize(kdata, sizeof(kdata));
                 if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
                     r = mbedtls_ccm_encrypt_and_tag(&gctx,
-                                                    enc_len,
-                                                    iv,
-                                                    iv_len,
-                                                    aad,
-                                                    aad_len,
-                                                    enc,
+                                                    enc.len,
+                                                    iv.data,
+                                                    iv.len,
+                                                    aad.data,
+                                                    aad.len,
+                                                    enc.data,
                                                     res_APDU,
-                                                    res_APDU + enc_len,
+                                                    res_APDU + enc.len,
                                                     16);
-                    res_APDU_size = enc_len + 16;
+                    res_APDU_size = enc.len + 16;
                 }
                 else if (algo == ALGO_EXT_CIPHER_DECRYPT) {
                     r = mbedtls_ccm_auth_decrypt(&gctx,
-                                                 enc_len - 16,
-                                                 iv,
-                                                 iv_len,
-                                                 aad,
-                                                 aad_len,
-                                                 enc,
+                                                 enc.len - 16,
+                                                 iv.data,
+                                                 iv.len,
+                                                 aad.data,
+                                                 aad.len,
+                                                 enc.data,
                                                  res_APDU,
-                                                 enc + enc_len - 16,
+                                                 enc.data + enc.len - 16,
                                                  16);
-                    res_APDU_size = enc_len - 16;
+                    res_APDU_size = enc.len - 16;
                 }
                 mbedtls_ccm_free(&gctx);
                 if (r != 0) {
@@ -626,19 +615,18 @@ int cmd_cipher_sym() {
                 }
             }
         }
-        else if (memcmp(oid, OID_IEEE_ALG, 8) == 0) {
-            if (oid_len != 9) {
+        else if (memcmp(oid.data, OID_IEEE_ALG, 8) == 0) {
+            if (oid.len != 9) {
                 return SW_WRONG_DATA();
             }
-            uint8_t aes_algo = oid[8],
+            uint8_t aes_algo = oid.data[8],
                     mode =
                 (algo == ALGO_EXT_CIPHER_ENCRYPT ? MBEDTLS_AES_ENCRYPT : MBEDTLS_AES_DECRYPT);
             int r = 0;
-            uint8_t tmp_iv[16];
             memset(tmp_iv, 0, sizeof(tmp_iv));
-            if (iv == NULL || iv_len == 0) {
-                iv = tmp_iv;
-                iv_len = sizeof(tmp_iv);
+            if (asn1_len(&iv) == 0) {
+                iv.data = tmp_iv;
+                iv.len = sizeof(tmp_iv);
             }
             if ((aes_algo == 0x01 && key_size != 32) || (aes_algo == 0x02 && key_size != 64)) {
                 return SW_WRONG_DATA();
@@ -652,14 +640,14 @@ int cmd_cipher_sym() {
                 r = mbedtls_aes_xts_setkey_dec(&ctx, kdata, key_size * 8);
             }
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
-            r = mbedtls_aes_crypt_xts(&ctx, mode, enc_len, iv, enc, res_APDU);
+            r = mbedtls_aes_crypt_xts(&ctx, mode, enc.len, iv.data, enc.data, res_APDU);
             mbedtls_aes_xts_free(&ctx);
             if (r != 0) {
                 return SW_EXEC_ERROR();
             }
-            res_APDU_size = enc_len;
+            res_APDU_size = enc.len;
         }
-        else if (memcmp(oid, OID_HD, 11) == 0) {
+        else if (memcmp(oid.data, OID_HD, 11) == 0) {
             mbedtls_aes_context ctx;
             int r = 0;
             uint8_t mode =
@@ -667,6 +655,7 @@ int cmd_cipher_sym() {
                     secret[64] = { 0 };
             mbedtls_aes_init(&ctx);
             if (hd_keytype != 0x3) {
+                mbedtls_ecp_keypair_free(&hd_context);
                 return SW_INCORRECT_PARAMS();
             }
             key_size = 32;
@@ -674,16 +663,16 @@ int cmd_cipher_sym() {
             r = mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA512),
                                 kdata,
                                 key_size,
-                                aad,
-                                aad_len,
+                                aad.data,
+                                aad.len,
                                 secret);
             mbedtls_platform_zeroize(kdata, sizeof(kdata));
             if (r != 0) {
                 return SW_EXEC_ERROR();
             }
-            if (iv == tmp_iv || iv_len == 0) {
-                iv = secret + 32;
-                iv_len = 16;
+            if (iv.data == tmp_iv || iv.len == 0) {
+                iv.data = secret + 32;
+                iv.len = 16;
             }
             if (algo == ALGO_EXT_CIPHER_ENCRYPT) {
                 r = mbedtls_aes_setkey_enc(&ctx, secret, key_size * 8);
@@ -694,13 +683,13 @@ int cmd_cipher_sym() {
             if (r != 0) {
                 return SW_EXEC_ERROR();
             }
-            r = mbedtls_aes_crypt_cbc(&ctx, mode, enc_len, iv, enc, res_APDU);
+            r = mbedtls_aes_crypt_cbc(&ctx, mode, enc.len, iv.data, enc.data, res_APDU);
             mbedtls_aes_free(&ctx);
             if (r != 0) {
                 return SW_EXEC_ERROR();
             }
-            res_APDU_size = enc_len;
-            mbedtls_ecdsa_free(&hd_context);
+            res_APDU_size = enc.len;
+            mbedtls_ecp_keypair_free(&hd_context);
             hd_keytype = 0;
         }
         else {

src/hsm/cmd_decrypt_asym.c

@@ -3,22 +3,21 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
+#include "sc_hsm.h"
 #include "mbedtls/ecdh.h"
 #include "crypto_utils.h"
-#include "sc_hsm.h"
 #include "kek.h"
 #include "files.h"
 #include "asn1.h"
@@ -27,12 +26,12 @@
 #include "oid.h"
 
 int cmd_decrypt_asym() {
-    int key_id = P1(apdu);
+    uint8_t key_id = P1(apdu);
     uint8_t p2 = P2(apdu);
     if (!isUserAuthenticated) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
-    file_t *ef = search_dynamic_file((KEY_PREFIX << 8) | key_id);
+    file_t *ef = search_file((KEY_PREFIX << 8) | key_id);
     if (!ef) {
         return SW_FILE_NOT_FOUND();
     }
@@ -49,14 +48,14 @@ int cmd_decrypt_asym() {
             mbedtls_rsa_set_padding(&ctx, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA256);
         }
         int r = load_private_key_rsa(&ctx, ef);
-        if (r != CCID_OK) {
+        if (r != PICOKEY_OK) {
             mbedtls_rsa_free(&ctx);
-            if (r == CCID_VERIFICATION_FAILED) {
+            if (r == PICOKEY_VERIFICATION_FAILED) {
                 return SW_SECURE_MESSAGE_EXEC_ERROR();
             }
             return SW_EXEC_ERROR();
         }
-        int key_size = file_get_size(ef);
+        uint16_t key_size = file_get_size(ef);
         if (apdu.nc < key_size) { //needs padding
             memset(apdu.data + apdu.nc, 0, key_size - apdu.nc);
         }
@@ -64,7 +63,7 @@ int cmd_decrypt_asym() {
             size_t olen = apdu.nc;
             r = mbedtls_rsa_pkcs1_decrypt(&ctx, random_gen, NULL, &olen, apdu.data, res_APDU, 512);
             if (r == 0) {
-                res_APDU_size = olen;
+                res_APDU_size = (uint16_t)olen;
             }
         }
         else {
@@ -84,7 +83,7 @@ int cmd_decrypt_asym() {
         if (wait_button_pressed() == true) { //timeout
             return SW_SECURE_MESSAGE_EXEC_ERROR();
         }
-        int key_size = file_get_size(ef);
+        uint16_t key_size = file_get_size(ef);
         uint8_t *kdata = (uint8_t *) calloc(1, key_size);
         memcpy(kdata, file_get_data(ef), key_size);
         if (mkek_decrypt(kdata, key_size) != 0) {
@@ -111,15 +110,18 @@ int cmd_decrypt_asym() {
         }
         r = -1;
         if (p2 == ALGO_EC_DH) {
+            *(apdu.data - 1) = (uint8_t)apdu.nc;
             r = mbedtls_ecdh_read_public(&ctx, apdu.data - 1, apdu.nc + 1);
         }
         else if (p2 == ALGO_EC_DH_XKEK) {
-            size_t pub_len = 0;
-            const uint8_t *pub = cvc_get_pub(apdu.data, apdu.nc, &pub_len);
+            uint16_t pub_len = 0;
+            const uint8_t *pub = cvc_get_pub(apdu.data, (uint16_t)apdu.nc, &pub_len);
             if (pub) {
-                size_t t86_len = 0;
+                uint16_t t86_len = 0;
                 const uint8_t *t86 = cvc_get_field(pub, pub_len, &t86_len, 0x86);
+                uint8_t *t86w = (uint8_t *)t86;
                 if (t86) {
+                    *(t86w - 1) = (uint8_t)t86_len;
                     r = mbedtls_ecdh_read_public(&ctx, t86 - 1, t86_len + 1);
                 }
             }
@@ -140,45 +142,43 @@ int cmd_decrypt_asym() {
             return SW_EXEC_ERROR();
         }
         if (p2 == ALGO_EC_DH) {
-            res_APDU_size = olen + 1;
+            res_APDU_size = (uint16_t)(olen + 1);
         }
         else {
             res_APDU_size = 0;
-            size_t ext_len = 0;
+            uint16_t ext_len = 0;
             const uint8_t *ext = NULL;
-            if ((ext = cvc_get_ext(apdu.data, apdu.nc, &ext_len)) == NULL) {
+            if ((ext = cvc_get_ext(apdu.data, (uint16_t)apdu.nc, &ext_len)) == NULL) {
                 return SW_WRONG_DATA();
             }
-            uint8_t *p = NULL, *tag_data = NULL, *kdom_uid = NULL;
+            uint8_t *p = NULL;
             uint16_t tag = 0;
-            size_t tag_len = 0, kdom_uid_len = 0;
-            while (walk_tlv(ext, ext_len, &p, &tag, &tag_len, &tag_data)) {
+            asn1_ctx_t ctxi, ctxo = { 0 }, kdom_uid = { 0 };
+            asn1_ctx_init((uint8_t *)ext, ext_len, &ctxi);
+            while (walk_tlv(&ctxi, &p, &tag, &ctxo.len, &ctxo.data)) {
                 if (tag == 0x73) {
-                    size_t oid_len = 0;
-                    uint8_t *oid_data = NULL;
-                    if (asn1_find_tag(tag_data, tag_len, 0x6, &oid_len,
-                                      &oid_data) == true &&
-                        oid_len == strlen(OID_ID_KEY_DOMAIN_UID) &&
-                        memcmp(oid_data, OID_ID_KEY_DOMAIN_UID,
+                    asn1_ctx_t oid = {0};
+                    if (asn1_find_tag(&ctxo, 0x6, &oid) == true &&
+                        oid.len == strlen(OID_ID_KEY_DOMAIN_UID) &&
+                        memcmp(oid.data, OID_ID_KEY_DOMAIN_UID,
                                strlen(OID_ID_KEY_DOMAIN_UID)) == 0) {
-                        if (asn1_find_tag(tag_data, tag_len, 0x80, &kdom_uid_len,
-                                          &kdom_uid) == false) {
+                        if (asn1_find_tag(&ctxo, 0x80, &kdom_uid) == false) {
                             return SW_WRONG_DATA();
                         }
                         break;
                     }
                 }
             }
-            if (kdom_uid_len == 0 || kdom_uid == NULL) {
+            if (asn1_len(&kdom_uid) == 0) {
                 return SW_WRONG_DATA();
             }
-            for (int n = 0; n < MAX_KEY_DOMAINS; n++) {
-                file_t *tf = search_dynamic_file(EF_XKEK + n);
+            for (uint8_t n = 0; n < MAX_KEY_DOMAINS; n++) {
+                file_t *tf = search_file(EF_XKEK + n);
                 if (tf) {
-                    if (file_get_size(tf) == kdom_uid_len &&
-                        memcmp(file_get_data(tf), kdom_uid, kdom_uid_len) == 0) {
+                    if (file_get_size(tf) == kdom_uid.len &&
+                        memcmp(file_get_data(tf), kdom_uid.data, kdom_uid.len) == 0) {
                         file_new(EF_DKEK + n);
-                        if (store_dkek_key(n, res_APDU + 1) != CCID_OK) {
+                        if (store_dkek_key(n, res_APDU + 1) != PICOKEY_OK) {
                             return SW_EXEC_ERROR();
                         }
                         mbedtls_platform_zeroize(res_APDU, 32);

src/hsm/cmd_delete_file.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "sc_hsm.h"
@@ -25,20 +25,20 @@ int cmd_delete_file() {
 
     if (apdu.nc == 0) {
         ef = currentEF;
-        if (!(ef = search_dynamic_file(ef->fid))) {
+        if (!(ef = search_file(ef->fid))) {
             return SW_FILE_NOT_FOUND();
         }
     }
     else {
-        uint16_t fid = (apdu.data[0] << 8) | apdu.data[1];
-        if (!(ef = search_dynamic_file(fid))) {
+        uint16_t fid = get_uint16_t_be(apdu.data);
+        if (!(ef = search_file(fid))) {
             return SW_FILE_NOT_FOUND();
         }
     }
     if (!authenticate_action(ef, ACL_OP_DELETE_SELF)) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
-    if (delete_file(ef) != CCID_OK) {
+    if (delete_file(ef) != PICOKEY_OK) {
         return SW_EXEC_ERROR();
     }
     return SW_OK();

src/hsm/cmd_derive_asym.c

@@ -3,22 +3,21 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
+#include "sc_hsm.h"
 #include "mbedtls/ecdsa.h"
 #include "crypto_utils.h"
-#include "sc_hsm.h"
 #include "cvc.h"
 
 #define MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED -0x006E
@@ -43,7 +42,7 @@ int cmd_derive_asym() {
     if (!isUserAuthenticated) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
-    if (!(fkey = search_dynamic_file((KEY_PREFIX << 8) | key_id)) || !file_has_data(fkey)) {
+    if (!(fkey = search_file((KEY_PREFIX << 8) | key_id)) || !file_has_data(fkey)) {
         return SW_FILE_NOT_FOUND();
     }
     if (key_has_purpose(fkey, ALGO_EC_DERIVE) == false) {
@@ -53,14 +52,14 @@ int cmd_derive_asym() {
         return SW_WRONG_LENGTH();
     }
     if (apdu.data[0] == ALGO_EC_DERIVE) {
-        mbedtls_ecdsa_context ctx;
-        mbedtls_ecdsa_init(&ctx);
+        mbedtls_ecp_keypair ctx;
+        mbedtls_ecp_keypair_init(&ctx);
 
         int r;
-        r = load_private_key_ecdsa(&ctx, fkey);
-        if (r != CCID_OK) {
-            mbedtls_ecdsa_free(&ctx);
-            if (r == CCID_VERIFICATION_FAILED) {
+        r = load_private_key_ec(&ctx, fkey);
+        if (r != PICOKEY_OK) {
+            mbedtls_ecp_keypair_free(&ctx);
+            if (r == PICOKEY_VERIFICATION_FAILED) {
                 return SW_SECURE_MESSAGE_EXEC_ERROR();
             }
             return SW_EXEC_ERROR();
@@ -70,7 +69,7 @@ int cmd_derive_asym() {
         mbedtls_mpi_init(&nd);
         r = mbedtls_mpi_read_binary(&a, apdu.data + 1, apdu.nc - 1);
         if (r != 0) {
-            mbedtls_ecdsa_free(&ctx);
+            mbedtls_ecp_keypair_free(&ctx);
             mbedtls_mpi_free(&a);
             mbedtls_mpi_free(&nd);
             return SW_DATA_INVALID();
@@ -78,22 +77,22 @@ int cmd_derive_asym() {
         r = mbedtls_mpi_add_mod(&ctx.grp, &nd, &ctx.d, &a);
         mbedtls_mpi_free(&a);
         if (r != 0) {
-            mbedtls_ecdsa_free(&ctx);
+            mbedtls_ecp_keypair_free(&ctx);
             mbedtls_mpi_free(&nd);
             return SW_EXEC_ERROR();
         }
         r = mbedtls_mpi_copy(&ctx.d, &nd);
         mbedtls_mpi_free(&nd);
         if (r != 0) {
-            mbedtls_ecdsa_free(&ctx);
+            mbedtls_ecp_keypair_free(&ctx);
             return SW_EXEC_ERROR();
         }
         r = store_keys(&ctx, PICO_KEYS_KEY_EC, dest_id);
-        if (r != CCID_OK) {
-            mbedtls_ecdsa_free(&ctx);
+        if (r != PICOKEY_OK) {
+            mbedtls_ecp_keypair_free(&ctx);
             return SW_EXEC_ERROR();
         }
-        mbedtls_ecdsa_free(&ctx);
+        mbedtls_ecp_keypair_free(&ctx);
     }
     else {
         return SW_WRONG_DATA();

src/hsm/cmd_external_authenticate.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "crypto_utils.h"
@@ -34,7 +34,7 @@ int cmd_external_authenticate() {
     if (apdu.nc == 0) {
         return SW_WRONG_LENGTH();
     }
-    file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF);
+    file_t *ef_puk = search_file(EF_PUKAUT);
     if (!file_has_data(ef_puk)) {
         return SW_FILE_NOT_FOUND();
     }
@@ -46,7 +46,7 @@ int cmd_external_authenticate() {
     hash256(input, dev_name_len + challenge_len, hash);
     int r =
         puk_verify(apdu.data,
-                   apdu.nc,
+                   (uint16_t)apdu.nc,
                    hash,
                    32,
                    file_get_data(ef_puk_aut),

src/hsm/cmd_extras.c

@@ -3,71 +3,104 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
-#include "mbedtls/ecdh.h"
 #include "sc_hsm.h"
-#ifndef ENABLE_EMULATION
-#include "hardware/rtc.h"
+#include "mbedtls/ecdh.h"
+#ifdef PICO_PLATFORM
+#include "pico/aon_timer.h"
+#include "hardware/watchdog.h"
+#else
+#include <sys/time.h>
+#include <time.h>
 #endif
 #include "files.h"
 #include "random.h"
 #include "kek.h"
 #include "mbedtls/hkdf.h"
 #include "mbedtls/chachapoly.h"
+#ifdef PICO_RP2350
+#include "otp.h"
+#endif
+
+#define CMD_DATETIME 0xA
+#define CMD_DYNOPS 0x6
+#define CMD_SECURE_LOCK 0x3A
+#define CMD_REBOOT 0xFB
+#define SECURE_LOCK_KEY_AGREEMENT 0x1
+#define SECURE_LOCK_ENABLE 0x2
+#define SECURE_LOCK_MASK 0x3
+#define SECURE_LOCK_DISABLE 0x4
+#define CMD_PHY 0x1B
+#define CMD_OTP 0x4C
+#define CMD_MEMORY 0x5
 
 int cmd_extras() {
-    if (P1(apdu) == 0xA) { //datetime operations
+    int cmd = P1(apdu);
+#ifndef ENABLE_EMULATION
+    // Only allow change PHY without PIN
+    if (!isUserAuthenticated && cmd != CMD_PHY && cmd != CMD_MEMORY) {
+        return SW_SECURITY_STATUS_NOT_SATISFIED();
+    }
+#endif
+    //check button (if enabled)
+    if (wait_button_pressed() == true) {
+        return SW_SECURE_MESSAGE_EXEC_ERROR();
+    }
+    if (cmd == CMD_DATETIME) { //datetime operations
         if (P2(apdu) != 0x0) {
             return SW_INCORRECT_P1P2();
         }
         if (apdu.nc == 0) {
-#ifndef ENABLE_EMULATION
-            datetime_t dt;
-            if (!rtc_get_datetime(&dt)) {
-                return SW_EXEC_ERROR();
-            }
-            res_APDU[res_APDU_size++] = dt.year >> 8;
-            res_APDU[res_APDU_size++] = dt.year & 0xff;
-            res_APDU[res_APDU_size++] = dt.month;
-            res_APDU[res_APDU_size++] = dt.day;
-            res_APDU[res_APDU_size++] = dt.dotw;
-            res_APDU[res_APDU_size++] = dt.hour;
-            res_APDU[res_APDU_size++] = dt.min;
-            res_APDU[res_APDU_size++] = dt.sec;
+#ifdef PICO_PLATFORM
+            struct timespec tv;
+            aon_timer_get_time(&tv);
+#else
+            struct timeval tv;
+            gettimeofday(&tv, NULL);
 #endif
+            struct tm *tm = localtime(&tv.tv_sec);
+            res_APDU_size += put_uint16_t_be(tm->tm_year + 1900, res_APDU);
+            res_APDU[res_APDU_size++] = tm->tm_mon;
+            res_APDU[res_APDU_size++] = tm->tm_mday;
+            res_APDU[res_APDU_size++] = tm->tm_wday;
+            res_APDU[res_APDU_size++] = tm->tm_hour;
+            res_APDU[res_APDU_size++] = tm->tm_min;
+            res_APDU[res_APDU_size++] = tm->tm_sec;
         }
         else {
             if (apdu.nc != 8) {
                 return SW_WRONG_LENGTH();
             }
-#ifndef ENABLE_EMULATION
-            datetime_t dt;
-            dt.year = (apdu.data[0] << 8) | (apdu.data[1]);
-            dt.month = apdu.data[2];
-            dt.day = apdu.data[3];
-            dt.dotw = apdu.data[4];
-            dt.hour = apdu.data[5];
-            dt.min = apdu.data[6];
-            dt.sec = apdu.data[7];
-            if (!rtc_set_datetime(&dt)) {
-                return SW_WRONG_DATA();
-            }
+            struct tm tm;
+            tm.tm_year = get_uint16_t_be(apdu.data) - 1900;
+            tm.tm_mon = apdu.data[2];
+            tm.tm_mday = apdu.data[3];
+            tm.tm_wday = apdu.data[4];
+            tm.tm_hour = apdu.data[5];
+            tm.tm_min = apdu.data[6];
+            tm.tm_sec = apdu.data[7];
+            time_t tv_sec = mktime(&tm);
+#ifdef PICO_PLATFORM
+            struct timespec tv = {.tv_sec = tv_sec, .tv_nsec = 0};
+            aon_timer_set_time(&tv);
+#else
+            struct timeval tv = {.tv_sec = tv_sec, .tv_usec = 0};
+            settimeofday(&tv, NULL);
 #endif
         }
     }
-    else if (P1(apdu) == 0x6) {   //dynamic options
+    else if (cmd == CMD_DYNOPS) {   //dynamic options
         if (P2(apdu) != 0x0) {
             return SW_INCORRECT_P1P2();
         }
@@ -76,34 +109,26 @@ int cmd_extras() {
         }
         uint16_t opts = get_device_options();
         if (apdu.nc == 0) {
-            res_APDU[res_APDU_size++] = opts >> 8;
-            res_APDU[res_APDU_size++] = opts & 0xff;
+            res_APDU_size += put_uint16_t_be(opts, res_APDU);
         }
         else {
             uint8_t newopts[] = { apdu.data[0], (opts & 0xff) };
-            file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF);
-            flash_write_data_to_file(tf, newopts, sizeof(newopts));
+            file_t *tf = search_file(EF_DEVOPS);
+            file_put_data(tf, newopts, sizeof(newopts));
             low_flash_available();
         }
     }
-    else if (P1(apdu) == 0x3A) {   // secure lock
+    else if (cmd == CMD_SECURE_LOCK) {   // secure lock
         if (apdu.nc == 0) {
             return SW_WRONG_LENGTH();
         }
-        if (P2(apdu) == 0x01) { // Key Agreement
+        if (P2(apdu) == SECURE_LOCK_KEY_AGREEMENT) { // Key Agreement
             mbedtls_ecdh_context hkey;
             mbedtls_ecdh_init(&hkey);
             mbedtls_ecdh_setup(&hkey, MBEDTLS_ECP_DP_SECP256R1);
-            int ret = mbedtls_ecdh_gen_public(&hkey.ctx.mbed_ecdh.grp,
-                                              &hkey.ctx.mbed_ecdh.d,
-                                              &hkey.ctx.mbed_ecdh.Q,
-                                              random_gen,
-                                              NULL);
+            int ret = mbedtls_ecdh_gen_public(&hkey.ctx.mbed_ecdh.grp, &hkey.ctx.mbed_ecdh.d, &hkey.ctx.mbed_ecdh.Q, random_gen, NULL);
             mbedtls_mpi_lset(&hkey.ctx.mbed_ecdh.Qp.Z, 1);
-            ret = mbedtls_ecp_point_read_binary(&hkey.ctx.mbed_ecdh.grp,
-                                                &hkey.ctx.mbed_ecdh.Qp,
-                                                apdu.data,
-                                                apdu.nc);
+            ret = mbedtls_ecp_point_read_binary(&hkey.ctx.mbed_ecdh.grp, &hkey.ctx.mbed_ecdh.Qp, apdu.data, apdu.nc);
             if (ret != 0) {
                 mbedtls_ecdh_free(&hkey);
                 return SW_WRONG_DATA();
@@ -112,89 +137,170 @@ int cmd_extras() {
 
             uint8_t buf[MBEDTLS_ECP_MAX_BYTES];
             size_t olen = 0;
-            ret = mbedtls_ecdh_calc_secret(&hkey,
-                                           &olen,
-                                           buf,
-                                           MBEDTLS_ECP_MAX_BYTES,
-                                           random_gen,
-                                           NULL);
+            ret = mbedtls_ecdh_calc_secret(&hkey, &olen, buf, MBEDTLS_ECP_MAX_BYTES, random_gen, NULL);
             if (ret != 0) {
                 mbedtls_ecdh_free(&hkey);
                 mbedtls_platform_zeroize(buf, sizeof(buf));
                 return SW_WRONG_DATA();
             }
-            ret = mbedtls_hkdf(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256),
-                               NULL,
-                               0,
-                               buf,
-                               olen,
-                               mse.Qpt,
-                               sizeof(mse.Qpt),
-                               mse.key_enc,
-                               sizeof(mse.key_enc));
+            ret = mbedtls_hkdf(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), NULL, 0, buf, olen, mse.Qpt, sizeof(mse.Qpt), mse.key_enc, sizeof(mse.key_enc));
             mbedtls_platform_zeroize(buf, sizeof(buf));
             if (ret != 0) {
                 mbedtls_ecdh_free(&hkey);
                 return SW_EXEC_ERROR();
             }
 
-            ret = mbedtls_ecp_point_write_binary(&hkey.ctx.mbed_ecdh.grp,
-                                                 &hkey.ctx.mbed_ecdh.Q,
-                                                 MBEDTLS_ECP_PF_UNCOMPRESSED,
-                                                 &olen,
-                                                 res_APDU,
-                                                 4096);
+            ret = mbedtls_ecp_point_write_binary(&hkey.ctx.mbed_ecdh.grp, &hkey.ctx.mbed_ecdh.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &olen, res_APDU, MAX_APDU_DATA);
             mbedtls_ecdh_free(&hkey);
             if (ret != 0) {
                 return SW_EXEC_ERROR();
             }
             mse.init = true;
-            res_APDU_size = olen;
+            res_APDU_size = (uint16_t)olen;
         }
-        else if (P2(apdu) == 0x02 || P2(apdu) == 0x03 || P2(apdu) == 0x04) {
+        else if (P2(apdu) == SECURE_LOCK_ENABLE || P2(apdu) == SECURE_LOCK_MASK || P2(apdu) == SECURE_LOCK_DISABLE) {
             if (mse.init == false) {
                 return SW_COMMAND_NOT_ALLOWED();
             }
-
+            uint16_t opts = get_device_options();
             int ret = mse_decrypt_ct(apdu.data, apdu.nc);
             if (ret != 0) {
                 return SW_WRONG_DATA();
             }
-            if (P2(apdu) == 0x02 || P2(apdu) == 0x04) { // Enable
-                uint16_t opts = get_device_options();
+            if (P2(apdu) == SECURE_LOCK_ENABLE || P2(apdu) == SECURE_LOCK_DISABLE) { // Enable
                 uint8_t newopts[] = { opts >> 8, (opts & 0xff) };
-                if ((P2(apdu) == 0x02 && !(opts & HSM_OPT_SECURE_LOCK)) ||
-                    (P2(apdu) == 0x04 && (opts & HSM_OPT_SECURE_LOCK))) {
+                if ((P2(apdu) == SECURE_LOCK_ENABLE && !(opts & HSM_OPT_SECURE_LOCK)) ||
+                    (P2(apdu) == SECURE_LOCK_DISABLE && (opts & HSM_OPT_SECURE_LOCK))) {
                     uint16_t tfids[] = { EF_MKEK, EF_MKEK_SO };
                     for (int t = 0; t < sizeof(tfids) / sizeof(uint16_t); t++) {
-                        file_t *tf = search_by_fid(tfids[t], NULL, SPECIFY_EF);
+                        file_t *tf = search_file(tfids[t]);
                         if (tf) {
                             uint8_t *tmp = (uint8_t *) calloc(1, file_get_size(tf));
                             memcpy(tmp, file_get_data(tf), file_get_size(tf));
                             for (int i = 0; i < MKEK_KEY_SIZE; i++) {
                                 MKEK_KEY(tmp)[i] ^= apdu.data[i];
                             }
-                            flash_write_data_to_file(tf, tmp, file_get_size(tf));
+                            file_put_data(tf, tmp, file_get_size(tf));
                             free(tmp);
                         }
                     }
                 }
-                if (P2(apdu) == 0x02) {
+                if (P2(apdu) == SECURE_LOCK_ENABLE) {
                     newopts[0] |= HSM_OPT_SECURE_LOCK >> 8;
                 }
-                else if (P2(apdu) == 0x04) {
+                else if (P2(apdu) == SECURE_LOCK_DISABLE) {
                     newopts[0] &= ~HSM_OPT_SECURE_LOCK >> 8;
                 }
-                file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF);
-                flash_write_data_to_file(tf, newopts, sizeof(newopts));
+                file_t *tf = search_file(EF_DEVOPS);
+                file_put_data(tf, newopts, sizeof(newopts));
                 low_flash_available();
             }
-            else if (P2(apdu) == 0x03) {
-                memcpy(mkek_mask, apdu.data, apdu.nc);
+            else if (P2(apdu) == SECURE_LOCK_MASK && (opts & HSM_OPT_SECURE_LOCK)) {
+                memcpy(mkek_mask, apdu.data, MKEK_KEY_SIZE);
                 has_mkek_mask = true;
             }
         }
     }
+#ifndef ENABLE_EMULATION
+    else if (cmd == CMD_PHY) { // Set PHY
+        if (apdu.nc == 0) {
+            if (file_has_data(ef_phy)) {
+                res_APDU_size = file_get_size(ef_phy);
+                memcpy(res_APDU, file_get_data(ef_phy), res_APDU_size);
+            }
+        }
+        else {
+            if (P2(apdu) == PHY_VIDPID) { // VIDPID
+                if (apdu.nc != 4) {
+                    return SW_WRONG_LENGTH();
+                }
+                phy_data.vid = get_uint16_t_be(apdu.data);
+                phy_data.pid = get_uint16_t_be(apdu.data + 2);
+                phy_data.vidpid_present = true;
+            }
+            else if (P2(apdu) == PHY_LED_GPIO) {
+                phy_data.led_gpio = apdu.data[0];
+                phy_data.led_gpio_present = true;
+            }
+            else if (P2(apdu) == PHY_LED_BTNESS) {
+                phy_data.led_brightness = apdu.data[0];
+                phy_data.led_brightness_present = true;
+            }
+            else if (P2(apdu) == PHY_OPTS) {
+                if (apdu.nc != 2) {
+                    return SW_WRONG_LENGTH();
+                }
+                phy_data.opts = get_uint16_t_be(apdu.data);
+            }
+            else {
+                return SW_INCORRECT_P1P2();
+            }
+            if (phy_save() != PICOKEY_OK) {
+                return SW_EXEC_ERROR();
+            }
+        }
+    }
+#endif
+#if PICO_RP2350
+    else if (cmd == CMD_OTP) {
+        if (apdu.nc < 2) {
+            return SW_WRONG_LENGTH();
+        }
+        uint16_t row = get_uint16_t_be(apdu.data);
+        bool israw = P2(apdu) == 0x1;
+        if (apdu.nc == 2) {
+            if (row > 0xbf && row < 0xf48) {
+                return SW_WRONG_DATA();
+            }
+            if (israw) {
+                memcpy(res_APDU, otp_buffer_raw(row), apdu.ne);
+            }
+            else {
+                memcpy(res_APDU, otp_buffer(row), apdu.ne);
+            }
+            res_APDU_size = apdu.ne;
+        }
+        else {
+            apdu.nc -= 2;
+            apdu.data += 2;
+            if (apdu.nc > 1024) {
+                return SW_WRONG_LENGTH();
+            }
+            if (apdu.nc % (israw ? 4 : 2)) {
+                return SW_WRONG_DATA();
+            }
+            uint8_t adata[1024] __attribute__((aligned(4)));
+            memcpy(adata, apdu.data, apdu.nc);
+            int ret = 0;
+            if (israw) {
+                ret = otp_write_data_raw(row, adata, apdu.nc);
+            }
+            else {
+                ret = otp_write_data(row, adata, apdu.nc);
+            }
+            if (ret != 0) {
+                return SW_EXEC_ERROR();
+            }
+        }
+    }
+#endif
+#ifdef PICO_PLATFORM
+    else if (cmd == CMD_REBOOT) {
+        if (apdu.nc != 0) {
+            return SW_WRONG_LENGTH();
+        }
+        watchdog_reboot(0, 0, 100);
+    }
+#endif
+    else if (cmd == CMD_MEMORY) {
+        res_APDU_size = 0;
+        uint32_t free = flash_free_space(), total = flash_total_space(), used = flash_used_space(), nfiles = flash_num_files(), size = flash_size();
+        res_APDU_size += put_uint32_t_be(free, res_APDU + res_APDU_size);
+        res_APDU_size += put_uint32_t_be(used, res_APDU + res_APDU_size);
+        res_APDU_size += put_uint32_t_be(total, res_APDU + res_APDU_size);
+        res_APDU_size += put_uint32_t_be(nfiles, res_APDU + res_APDU_size);
+        res_APDU_size += put_uint32_t_be(size, res_APDU + res_APDU_size);
+    }
     else {
         return SW_INCORRECT_P1P2();
     }

src/hsm/cmd_general_authenticate.c

@@ -3,64 +3,69 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
+#include "sc_hsm.h"
 #include "mbedtls/ecdh.h"
 #include "asn1.h"
-#include "sc_hsm.h"
 #include "random.h"
 #include "oid.h"
 #include "eac.h"
 #include "files.h"
+#include "otp.h"
 
 int cmd_general_authenticate() {
     if (P1(apdu) == 0x0 && P2(apdu) == 0x0) {
         if (apdu.data[0] == 0x7C) {
             int r = 0;
-            size_t pubkey_len = 0;
+            uint16_t pubkey_len = 0;
             const uint8_t *pubkey = NULL;
             uint16_t tag = 0x0;
             uint8_t *tag_data = NULL, *p = NULL;
-            size_t tag_len = 0;
-            while (walk_tlv(apdu.data + 2, apdu.nc - 2, &p, &tag, &tag_len, &tag_data)) {
+            uint16_t tag_len = 0;
+            asn1_ctx_t ctxi;
+            asn1_ctx_init(apdu.data + 2, (uint16_t)(apdu.nc - 2), &ctxi);
+            while (walk_tlv(&ctxi, &p, &tag, &tag_len, &tag_data)) {
                 if (tag == 0x80) {
                     pubkey = tag_data - 1; //mbedtls ecdh starts reading one pos before
                     pubkey_len = tag_len + 1;
                 }
             }
-            file_t *fkey = search_by_fid(EF_KEY_DEV, NULL, SPECIFY_EF);
+            file_t *fkey = search_file(EF_KEY_DEV);
             if (!fkey) {
                 return SW_EXEC_ERROR();
             }
-            mbedtls_ecdsa_context ectx;
-            mbedtls_ecdsa_init(&ectx);
-            r = load_private_key_ecdsa(&ectx, fkey);
-            if (r != CCID_OK) {
-                mbedtls_ecdsa_free(&ectx);
+            mbedtls_ecp_keypair ectx;
+            mbedtls_ecp_keypair_init(&ectx);
+            r = load_private_key_ecdh(&ectx, fkey);
+            if (r != PICOKEY_OK) {
+                mbedtls_ecp_keypair_free(&ectx);
                 return SW_EXEC_ERROR();
             }
             mbedtls_ecdh_context ctx;
             mbedtls_ecdh_init(&ctx);
             mbedtls_ecp_group_id gid = MBEDTLS_ECP_DP_SECP256R1;
+            if (otp_key_2) {
+                gid = MBEDTLS_ECP_DP_SECP256K1;
+            }
             r = mbedtls_ecdh_setup(&ctx, gid);
             if (r != 0) {
-                mbedtls_ecdsa_free(&ectx);
+                mbedtls_ecp_keypair_free(&ectx);
                 mbedtls_ecdh_free(&ctx);
                 return SW_DATA_INVALID();
             }
             r = mbedtls_mpi_copy(&ctx.ctx.mbed_ecdh.d, &ectx.d);
-            mbedtls_ecdsa_free(&ectx);
+            mbedtls_ecp_keypair_free(&ectx);
             if (r != 0) {
                 mbedtls_ecdh_free(&ctx);
                 return SW_DATA_INVALID();
@@ -105,7 +110,7 @@ int cmd_general_authenticate() {
             r = sm_sign(t, pubkey_len + 16, res_APDU + res_APDU_size);
 
             free(t);
-            if (r != CCID_OK) {
+            if (r != PICOKEY_OK) {
                 return SW_EXEC_ERROR();
             }
             res_APDU_size += 8;

src/hsm/cmd_initialize.c

@@ -3,32 +3,33 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "crypto_utils.h"
 #include "sc_hsm.h"
+#include "crypto_utils.h"
 #include "files.h"
 #include "random.h"
 #include "kek.h"
 #include "version.h"
 #include "asn1.h"
 #include "cvc.h"
+#include "otp.h"
 
 extern void scan_all();
 
 extern char __StackLimit;
 int heapLeft() {
-#ifndef ENABLE_EMULATION
+#if !defined(ENABLE_EMULATION) && !defined(ESP_PLATFORM)
     char *p = malloc(256);   // try to avoid undue fragmentation
     int left = &__StackLimit - p;
     free(p);
@@ -42,24 +43,30 @@ extern void reset_puk_store();
 int cmd_initialize() {
     if (apdu.nc > 0) {
         uint8_t mkek[MKEK_SIZE];
+        uint16_t opts = get_device_options();
+        if (opts & HSM_OPT_SECURE_LOCK && !has_mkek_mask) {
+            return SW_SECURITY_STATUS_NOT_SATISFIED();
+        }
         int ret_mkek = load_mkek(mkek); //Try loading MKEK with previous session
         initialize_flash(true);
         scan_all();
-        has_session_pin = has_session_sopin = false;
+        has_session_pin = has_session_sopin = has_mkek_mask = false;
         uint16_t tag = 0x0;
         uint8_t *tag_data = NULL, *p = NULL, *kds = NULL, *dkeks = NULL;
-        size_t tag_len = 0;
-        while (walk_tlv(apdu.data, apdu.nc, &p, &tag, &tag_len, &tag_data)) {
+        uint16_t tag_len = 0;
+        asn1_ctx_t ctxi;
+        asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
+        while (walk_tlv(&ctxi, &p, &tag, &tag_len, &tag_data)) {
             if (tag == 0x80) { //options
-                file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF);
-                flash_write_data_to_file(tf, tag_data, tag_len);
+                file_t *tf = search_file(EF_DEVOPS);
+                file_put_data(tf, tag_data, tag_len);
             }
             else if (tag == 0x81) {   //user pin
                 if (file_pin1 && file_pin1->data) {
                     uint8_t dhash[33];
-                    dhash[0] = tag_len;
+                    dhash[0] = (uint8_t)tag_len;
                     double_hash_pin(tag_data, tag_len, dhash + 1);
-                    flash_write_data_to_file(file_pin1, dhash, sizeof(dhash));
+                    file_put_data(file_pin1, dhash, sizeof(dhash));
                     hash_multi(tag_data, tag_len, session_pin);
                     has_session_pin = true;
                 }
@@ -67,20 +74,20 @@ int cmd_initialize() {
             else if (tag == 0x82) {   //sopin pin
                 if (file_sopin && file_sopin->data) {
                     uint8_t dhash[33];
-                    dhash[0] = tag_len;
+                    dhash[0] = (uint8_t)tag_len;
                     double_hash_pin(tag_data, tag_len, dhash + 1);
-                    flash_write_data_to_file(file_sopin, dhash, sizeof(dhash));
+                    file_put_data(file_sopin, dhash, sizeof(dhash));
                     hash_multi(tag_data, tag_len, session_sopin);
                     has_session_sopin = true;
                 }
             }
             else if (tag == 0x91) {   //retries user pin
-                file_t *tf = search_by_fid(0x1082, NULL, SPECIFY_EF);
+                file_t *tf = search_file(EF_PIN1_MAX_RETRIES);
                 if (tf && tf->data) {
-                    flash_write_data_to_file(tf, tag_data, tag_len);
+                    file_put_data(tf, tag_data, tag_len);
                 }
                 if (file_retries_pin1 && file_retries_pin1->data) {
-                    flash_write_data_to_file(file_retries_pin1, tag_data, tag_len);
+                    file_put_data(file_retries_pin1, tag_data, tag_len);
                 }
             }
             else if (tag == 0x92) {
@@ -90,10 +97,10 @@ int cmd_initialize() {
                     release_mkek(mkek);
                     return SW_MEMORY_FAILURE();
                 }
-                flash_write_data_to_file(tf, NULL, 0);
+                file_put_data(tf, NULL, 0);
             }
             else if (tag == 0x93) {
-                file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF);
+                file_t *ef_puk = search_file(EF_PUKAUT);
                 if (!ef_puk) {
                     release_mkek(mkek);
                     return SW_MEMORY_FAILURE();
@@ -103,14 +110,14 @@ int cmd_initialize() {
                 pk_status[0] = puks;
                 pk_status[1] = puks;
                 pk_status[2] = tag_data[1];
-                flash_write_data_to_file(ef_puk, pk_status, sizeof(pk_status));
-                for (int i = 0; i < puks; i++) {
+                file_put_data(ef_puk, pk_status, sizeof(pk_status));
+                for (uint8_t i = 0; i < puks; i++) {
                     file_t *tf = file_new(EF_PUK + i);
                     if (!tf) {
                         release_mkek(mkek);
                         return SW_MEMORY_FAILURE();
                     }
-                    flash_write_data_to_file(tf, NULL, 0);
+                    file_put_data(tf, NULL, 0);
                 }
             }
             else if (tag == 0x97) {
@@ -120,20 +127,20 @@ int cmd_initialize() {
                     file_t *tf = file_new(EF_DKEK+i);
                     if (!tf)
                         return SW_MEMORY_FAILURE();
-                    flash_write_data_to_file(tf, NULL, 0);
+                    file_put_data(tf, NULL, 0);
                    }
                  */
             }
         }
-        file_t *tf_kd = search_by_fid(EF_KEY_DOMAIN, NULL, SPECIFY_EF);
+        file_t *tf_kd = search_file(EF_KEY_DOMAIN);
         if (!tf_kd) {
             release_mkek(mkek);
             return SW_EXEC_ERROR();
         }
-        if (ret_mkek != CCID_OK) {
+        if (ret_mkek != PICOKEY_OK) {
             ret_mkek = load_mkek(mkek); //Try again with new PIN/SO-PIN just in case some is the same
         }
-        if (store_mkek(ret_mkek == CCID_OK ? mkek : NULL) != CCID_OK) {
+        if (store_mkek(ret_mkek == PICOKEY_OK ? mkek : NULL) != PICOKEY_OK) {
             release_mkek(mkek);
             return SW_EXEC_ERROR();
         }
@@ -141,95 +148,96 @@ int cmd_initialize() {
         if (dkeks) {
             if (*dkeks > 0) {
                 uint16_t d = *dkeks;
-                if (flash_write_data_to_file(tf_kd, (const uint8_t *) &d, sizeof(d)) != CCID_OK) {
+                if (file_put_data(tf_kd, (const uint8_t *) &d, sizeof(d)) != PICOKEY_OK) {
                     return SW_EXEC_ERROR();
                 }
             }
             else {
                 int r = save_dkek_key(0, random_bytes_get(32));
-                if (r != CCID_OK) {
+                if (r != PICOKEY_OK) {
                     return SW_EXEC_ERROR();
                 }
                 uint16_t d = 0x0101;
-                if (flash_write_data_to_file(tf_kd, (const uint8_t *) &d, sizeof(d)) != CCID_OK) {
+                if (file_put_data(tf_kd, (const uint8_t *) &d, sizeof(d)) != PICOKEY_OK) {
                     return SW_EXEC_ERROR();
                 }
             }
         }
         else {
             uint16_t d = 0x0000;
-            if (flash_write_data_to_file(tf_kd, (const uint8_t *) &d, sizeof(d)) != CCID_OK) {
+            if (file_put_data(tf_kd, (const uint8_t *) &d, sizeof(d)) != PICOKEY_OK) {
                 return SW_EXEC_ERROR();
             }
         }
         if (kds) {
             uint8_t t[MAX_KEY_DOMAINS * 2], k = MIN(*kds, MAX_KEY_DOMAINS);
             memset(t, 0xff, 2 * k);
-            if (flash_write_data_to_file(tf_kd, t, 2 * k) != CCID_OK) {
+            if (file_put_data(tf_kd, t, 2 * k) != PICOKEY_OK) {
                 return SW_EXEC_ERROR();
             }
         }
         /* When initialized, it has all credentials */
         isUserAuthenticated = true;
         /* Create terminal private key */
-        file_t *fdkey = search_by_fid(EF_KEY_DEV, NULL, SPECIFY_EF);
+        file_t *fdkey = search_file(EF_KEY_DEV);
         if (!fdkey) {
             return SW_EXEC_ERROR();
         }
         int ret = 0;
-        if (ret_mkek != CCID_OK || !file_has_data(fdkey)) {
+        if (ret_mkek != PICOKEY_OK || !file_has_data(fdkey)) {
             mbedtls_ecdsa_context ecdsa;
             mbedtls_ecdsa_init(&ecdsa);
             mbedtls_ecp_group_id ec_id = MBEDTLS_ECP_DP_SECP256R1;
-            uint8_t index = 0, key_id = 0;
-            ret = mbedtls_ecdsa_genkey(&ecdsa, ec_id, random_gen, &index);
+            uint8_t key_id = 0;
+            if (otp_key_2) {
+                ret = mbedtls_ecp_read_key(MBEDTLS_ECP_DP_SECP256K1, &ecdsa, otp_key_2, 32);
+                if (ret != 0) {
+                    mbedtls_ecdsa_free(&ecdsa);
+                    return SW_EXEC_ERROR();
+                }
+                ret = mbedtls_ecp_mul(&ecdsa.grp, &ecdsa.Q, &ecdsa.d, &ecdsa.grp.G, random_gen, NULL);
+            }
+            else {
+                ret = mbedtls_ecdsa_genkey(&ecdsa, ec_id, random_gen, NULL);
+            }
             if (ret != 0) {
                 mbedtls_ecdsa_free(&ecdsa);
                 return SW_EXEC_ERROR();
             }
             ret = store_keys(&ecdsa, PICO_KEYS_KEY_EC, key_id);
-            if (ret != CCID_OK) {
+            if (ret != PICOKEY_OK) {
                 mbedtls_ecdsa_free(&ecdsa);
                 return SW_EXEC_ERROR();
             }
-            size_t cvc_len = 0;
-            if ((cvc_len = asn1_cvc_aut(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, 4096, NULL, 0)) == 0) {
+            uint16_t ee_len = 0, term_len = 0;
+            if ((ee_len = asn1_cvc_aut(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, MAX_APDU_DATA, NULL, 0)) == 0) {
                 mbedtls_ecdsa_free(&ecdsa);
                 return SW_EXEC_ERROR();
             }
 
-            file_t *fpk = search_by_fid(EF_EE_DEV, NULL, SPECIFY_EF);
-            ret = flash_write_data_to_file(fpk, res_APDU, cvc_len);
+            file_t *fpk = search_file(EF_EE_DEV);
+            ret = file_put_data(fpk, res_APDU, ee_len);
             if (ret != 0) {
                 mbedtls_ecdsa_free(&ecdsa);
                 return SW_EXEC_ERROR();
             }
 
-            if ((cvc_len = asn1_cvc_cert(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, 4096, NULL, 0, true)) == 0) {
+            if ((term_len = asn1_cvc_cert(&ecdsa, PICO_KEYS_KEY_EC, res_APDU + ee_len, MAX_APDU_DATA - ee_len, NULL, 0, true)) == 0) {
                 mbedtls_ecdsa_free(&ecdsa);
                 return SW_EXEC_ERROR();
             }
-            memcpy(res_APDU + cvc_len, res_APDU, cvc_len);
             mbedtls_ecdsa_free(&ecdsa);
-            fpk = search_by_fid(EF_TERMCA, NULL, SPECIFY_EF);
-            ret = flash_write_data_to_file(fpk, res_APDU, 2 * cvc_len);
+            fpk = search_file(EF_TERMCA);
+            ret = file_put_data(fpk, res_APDU, ee_len + term_len);
             if (ret != 0) {
                 return SW_EXEC_ERROR();
             }
 
-            const uint8_t *keyid =
-                (const uint8_t *) "\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0",
+            const uint8_t *keyid = (const uint8_t *) "\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0",
                           *label = (const uint8_t *) "ESPICOHSMTR";
-            size_t prkd_len = asn1_build_prkd_ecc(label,
-                                                  strlen((const char *) label),
-                                                  keyid,
-                                                  20,
-                                                  256,
-                                                  res_APDU,
-                                                  4096);
-            fpk = search_by_fid(EF_PRKD_DEV, NULL, SPECIFY_EF);
-            ret = flash_write_data_to_file(fpk, res_APDU, prkd_len);
-
+            uint16_t prkd_len = asn1_build_prkd_ecc(label, (uint16_t)strlen((const char *) label), keyid, 20, 256, res_APDU, MAX_APDU_DATA);
+            fpk = search_file(EF_PRKD_DEV);
+            ret = file_put_data(fpk, res_APDU, prkd_len);
         }
         if (ret != 0) {
             return SW_EXEC_ERROR();
@@ -239,10 +247,7 @@ int cmd_initialize() {
     }
     else {   //free memory bytes request
         int heap_left = heapLeft();
-        res_APDU[0] = ((heap_left >> 24) & 0xff);
-        res_APDU[1] = ((heap_left >> 16) & 0xff);
-        res_APDU[2] = ((heap_left >> 8) & 0xff);
-        res_APDU[3] = ((heap_left >> 0) & 0xff);
+        res_APDU_size += put_uint32_t_be(heap_left, res_APDU);
         res_APDU[4] = 0;
         res_APDU[5] = HSM_VERSION_MAJOR;
         res_APDU[6] = HSM_VERSION_MINOR;

src/hsm/cmd_key_domain.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "crypto_utils.h"
@@ -22,7 +22,7 @@
 #include "files.h"
 
 uint8_t get_key_domain(file_t *fkey) {
-    size_t tag_len = 0;
+    uint16_t tag_len = 0;
     if (!file_has_data(fkey)) {
         return 0xff;
     }
@@ -44,7 +44,7 @@ int cmd_key_domain() {
     if (p2 >= MAX_KEY_DOMAINS) {
         return SW_WRONG_P1P2();
     }
-    file_t *tf_kd = search_by_fid(EF_KEY_DOMAIN, NULL, SPECIFY_EF);
+    file_t *tf_kd = search_file(EF_KEY_DOMAIN);
     if (!tf_kd) {
         return SW_EXEC_ERROR();
     }
@@ -52,6 +52,9 @@ int cmd_key_domain() {
     if (tf_kd_size == 0) {
         return SW_WRONG_P1P2();
     }
+    if (2 * p2 >= tf_kd_size) {
+        return SW_INCORRECT_P1P2();
+    }
     uint8_t *kdata = file_get_data(tf_kd), dkeks = kdata ? kdata[2 * p2] : 0,
             current_dkeks = kdata ? kdata[2 * p2 + 1] : 0;
     if (p1 == 0x0) { //dkek import
@@ -69,8 +72,8 @@ int cmd_key_domain() {
             import_dkek_share(p2, apdu.data);
             if (++current_dkeks >= dkeks) {
                 int r = save_dkek_key(p2, NULL);
-                if (r != CCID_OK) {
-                    if (r == CCID_NO_LOGIN) {
+                if (r != PICOKEY_OK) {
+                    if (r == PICOKEY_NO_LOGIN) {
                         pending_save_dkek = p2;
                     }
                     else {
@@ -83,17 +86,14 @@ int cmd_key_domain() {
             uint8_t t[MAX_KEY_DOMAINS * 2];
             memcpy(t, kdata, tf_kd_size);
             t[2 * p2 + 1] = current_dkeks;
-            if (flash_write_data_to_file(tf_kd, t, tf_kd_size) != CCID_OK) {
+            if (file_put_data(tf_kd, t, tf_kd_size) != PICOKEY_OK) {
                 return SW_EXEC_ERROR();
             }
             low_flash_available();
         }
         else {
-            file_t *tf = search_dynamic_file(EF_XKEK + p2);
-            if (2 * p2 >= tf_kd_size) {
-                return SW_INCORRECT_P1P2();
-            }
-            if (current_dkeks == 0xff && !tf) { //XKEK have always 0xff
+            file_t *tf = search_file(EF_XKEK + p2);
+            if (current_dkeks == 0xff && !file_has_data(tf)) { //XKEK have always 0xff
                 return SW_REFERENCE_NOT_FOUND();
             }
         }
@@ -103,8 +103,8 @@ int cmd_key_domain() {
             return SW_WRONG_LENGTH();
         }
         if (p1 == 0x3) { //if key domain is not empty, command is denied
-            for (int i = 1; i < 256; i++) {
-                file_t *fkey = search_dynamic_file(KEY_PREFIX << 8 | i);
+            for (uint16_t i = 1; i < 256; i++) {
+                file_t *fkey = search_file(KEY_PREFIX << 8 | (uint8_t)i);
                 if (get_key_domain(fkey) == p2) {
                     return SW_FILE_EXISTS();
                 }
@@ -129,17 +129,17 @@ int cmd_key_domain() {
         else if (p1 == 0x4) {
             t[2 * p2 + 1] = current_dkeks = 0;
         }
-        if (flash_write_data_to_file(tf_kd, t, tf_kd_size) != CCID_OK) {
+        if (file_put_data(tf_kd, t, tf_kd_size) != PICOKEY_OK) {
             return SW_EXEC_ERROR();
         }
         file_t *tf = NULL;
-        if ((tf = search_dynamic_file(EF_DKEK + p2))) {
-            if (delete_file(tf) != CCID_OK) {
+        if ((tf = search_file(EF_DKEK + p2))) {
+            if (delete_file(tf) != PICOKEY_OK) {
                 return SW_EXEC_ERROR();
             }
         }
-        if (p1 == 0x3 && (tf = search_dynamic_file(EF_XKEK + p2))) {
-            if (delete_file(tf) != CCID_OK) {
+        if (p1 == 0x3 && (tf = search_file(EF_XKEK + p2))) {
+            if (delete_file(tf) != PICOKEY_OK) {
                 return SW_EXEC_ERROR();
             }
         }
@@ -150,8 +150,8 @@ int cmd_key_domain() {
     }
     else if (p1 == 0x2) {   //XKEK Key Domain creation
         if (apdu.nc > 0) {
-            size_t pub_len = 0;
-            file_t *fterm = search_by_fid(EF_TERMCA, NULL, SPECIFY_EF);
+            uint16_t pub_len = 0;
+            file_t *fterm = search_file(EF_TERMCA);
             if (!fterm) {
                 return SW_EXEC_ERROR();
             }
@@ -159,13 +159,13 @@ int cmd_key_domain() {
             if (!pub) {
                 return SW_EXEC_ERROR();
             }
-            size_t t86_len = 0;
+            uint16_t t86_len = 0;
             const uint8_t *t86 = cvc_get_field(pub, pub_len, &t86_len, 0x86);
             if (!t86 || t86[0] != 0x4) {
                 return SW_EXEC_ERROR();
             }
-            size_t t54_len = 0;
-            const uint8_t *t54 = cvc_get_field(apdu.data, apdu.nc, &t54_len, 0x54);
+            uint16_t t54_len = 0;
+            const uint8_t *t54 = cvc_get_field(apdu.data, (uint16_t)apdu.nc, &t54_len, 0x54);
             if (!t54) {
                 return SW_WRONG_DATA();
             }
@@ -174,7 +174,7 @@ int cmd_key_domain() {
             memcpy(input + 1, t86 + 1, (t86_len - 1) / 2);
             hash256(input, (t86_len - 1) / 2 + 1, hash);
             free(input);
-            int r = puk_verify(t54, t54_len, hash, 32, apdu.data, apdu.nc);
+            int r = puk_verify(t54, t54_len, hash, 32, apdu.data, (uint16_t)apdu.nc);
             if (r != 0) {
                 return SW_CONDITIONS_NOT_SATISFIED();
             }
@@ -184,12 +184,12 @@ int cmd_key_domain() {
             }
 
             //All checks done. Get Key Domain UID
-            pub = cvc_get_pub(apdu.data, apdu.nc, &pub_len);
+            pub = cvc_get_pub(apdu.data, (uint16_t)apdu.nc, &pub_len);
             if (pub) {
-                size_t t86_len = 0;
-                const uint8_t *t86 = cvc_get_field(pub, pub_len, &t86_len, 0x86);
+                t86_len = 0;
+                t86 = cvc_get_field(pub, pub_len, &t86_len, 0x86);
                 if (t86) {
-                    flash_write_data_to_file(tf, t86 + 1, t86_len - 1);
+                    file_put_data(tf, t86 + 1, (uint16_t)t86_len - 1);
                     low_flash_available();
                 }
             }
@@ -203,8 +203,8 @@ int cmd_key_domain() {
     res_APDU[1] = dkeks > current_dkeks ? dkeks - current_dkeks : 0;
     dkek_kcv(p2, res_APDU + 2);
     res_APDU_size = 2 + 8;
-    file_t *tf = search_dynamic_file(EF_XKEK + p2);
-    if (tf) {
+    file_t *tf = search_file(EF_XKEK + p2);
+    if (file_has_data(tf)) {
         memcpy(res_APDU + 10, file_get_data(tf), file_get_size(tf));
         res_APDU_size += file_get_size(tf);
     }

src/hsm/cmd_key_gen.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "crypto_utils.h"
@@ -56,10 +56,10 @@ int cmd_key_gen() {
         aes_type = PICO_KEYS_KEY_AES_512;
     }
     r = store_keys(aes_key, aes_type, key_id);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return SW_MEMORY_FAILURE();
     }
-    if (find_and_store_meta_key(key_id) != CCID_OK) {
+    if (find_and_store_meta_key(key_id) != PICOKEY_OK) {
         return SW_EXEC_ERROR();
     }
     low_flash_available();

src/hsm/cmd_key_unwrap.c

@@ -3,35 +3,46 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
-#include "crypto_utils.h"
 #include "sc_hsm.h"
+#include "crypto_utils.h"
 #include "kek.h"
 #include "cvc.h"
 
 int cmd_key_unwrap() {
-    int key_id = P1(apdu), r = 0;
+    uint8_t key_id = P1(apdu);
+    int r = 0;
     if (P2(apdu) != 0x93) {
         return SW_WRONG_P1P2();
     }
     if (!isUserAuthenticated) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
-    int key_type = dkek_type_key(apdu.data);
-    uint8_t kdom = -1, *allowed = NULL, prkd_buf[128];
-    size_t allowed_len = 0, prkd_len = 0;
+    uint8_t *data = apdu.data;
+    uint16_t data_len = apdu.nc;
+    if (data_len == 0) { // New style
+        file_t *tef = search_file(0x2F10);
+        if (!file_has_data(tef)) {
+            return SW_FILE_NOT_FOUND();
+        }
+        data = file_get_data(tef);
+        data_len = file_get_size(tef);
+    }
+    int key_type = dkek_type_key(data);
+    uint8_t *allowed = NULL;
+    int16_t kdom = -1;
+    uint16_t allowed_len = 0;
     if (key_type == 0x0) {
         return SW_DATA_INVALID();
     }
@@ -39,59 +50,55 @@ int cmd_key_unwrap() {
         mbedtls_rsa_context ctx;
         mbedtls_rsa_init(&ctx);
         do {
-            r = dkek_decode_key(++kdom, &ctx, apdu.data, apdu.nc, NULL, &allowed, &allowed_len);
-        } while ((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
-        if (r != CCID_OK) {
+            r = dkek_decode_key((uint8_t)++kdom, &ctx, data, data_len, NULL, &allowed, &allowed_len);
+        } while ((r == PICOKEY_ERR_FILE_NOT_FOUND || r == PICOKEY_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
+        if (r != PICOKEY_OK) {
             mbedtls_rsa_free(&ctx);
             return SW_EXEC_ERROR();
         }
         r = store_keys(&ctx, PICO_KEYS_KEY_RSA, key_id);
-        if ((res_APDU_size = asn1_cvc_aut(&ctx, PICO_KEYS_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) {
+        if ((res_APDU_size = (uint16_t)asn1_cvc_aut(&ctx, PICO_KEYS_KEY_RSA, res_APDU, MAX_APDU_DATA, NULL, 0)) == 0) {
             mbedtls_rsa_free(&ctx);
             return SW_EXEC_ERROR();
         }
-        int key_size = ctx.len;
         mbedtls_rsa_free(&ctx);
-        if (r != CCID_OK) {
+        if (r != PICOKEY_OK) {
             return SW_EXEC_ERROR();
         }
-        prkd_len = asn1_build_prkd_ecc(NULL, 0, NULL, 0, key_size * 8, prkd_buf, sizeof(prkd_buf));
     }
     else if (key_type & PICO_KEYS_KEY_EC) {
-        mbedtls_ecdsa_context ctx;
-        mbedtls_ecdsa_init(&ctx);
+        mbedtls_ecp_keypair ctx;
+        mbedtls_ecp_keypair_init(&ctx);
         do {
-            r = dkek_decode_key(++kdom, &ctx, apdu.data, apdu.nc, NULL, &allowed, &allowed_len);
-        } while ((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
-        if (r != CCID_OK) {
-            mbedtls_ecdsa_free(&ctx);
+            r = dkek_decode_key((uint8_t)++kdom, &ctx, data, data_len, NULL, &allowed, &allowed_len);
+        } while ((r == PICOKEY_ERR_FILE_NOT_FOUND || r == PICOKEY_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
+        if (r != PICOKEY_OK) {
+            mbedtls_ecp_keypair_free(&ctx);
             return SW_EXEC_ERROR();
         }
         r = store_keys(&ctx, PICO_KEYS_KEY_EC, key_id);
-        if ((res_APDU_size = asn1_cvc_aut(&ctx, PICO_KEYS_KEY_EC, res_APDU, 4096, NULL, 0)) == 0) {
-            mbedtls_ecdsa_free(&ctx);
+        if ((res_APDU_size = (uint16_t)asn1_cvc_aut(&ctx, PICO_KEYS_KEY_EC, res_APDU, MAX_APDU_DATA, NULL, 0)) == 0) {
+            mbedtls_ecp_keypair_free(&ctx);
             return SW_EXEC_ERROR();
         }
-        int key_size = ctx.grp.nbits;
-        mbedtls_ecdsa_free(&ctx);
-        if (r != CCID_OK) {
+        mbedtls_ecp_keypair_free(&ctx);
+        if (r != PICOKEY_OK) {
             return SW_EXEC_ERROR();
         }
-        prkd_len = asn1_build_prkd_ecc(NULL, 0, NULL, 0, key_size, prkd_buf, sizeof(prkd_buf));
     }
     else if (key_type & PICO_KEYS_KEY_AES) {
         uint8_t aes_key[64];
         int key_size = 0, aes_type = 0;
         do {
-            r = dkek_decode_key(++kdom,
+            r = dkek_decode_key((uint8_t)++kdom,
                                 aes_key,
-                                apdu.data,
-                                apdu.nc,
+                                data,
+                                data_len,
                                 &key_size,
                                 &allowed,
                                 &allowed_len);
-        } while ((r == CCID_ERR_FILE_NOT_FOUND || r == CCID_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
-        if (r != CCID_OK) {
+        } while ((r == PICOKEY_ERR_FILE_NOT_FOUND || r == PICOKEY_WRONG_DKEK) && kdom < MAX_KEY_DOMAINS);
+        if (r != PICOKEY_OK) {
             return SW_EXEC_ERROR();
         }
         if (key_size == 64) {
@@ -110,40 +117,32 @@ int cmd_key_unwrap() {
             return SW_EXEC_ERROR();
         }
         r = store_keys(aes_key, aes_type, key_id);
-        if (r != CCID_OK) {
+        if (r != PICOKEY_OK) {
             return SW_EXEC_ERROR();
         }
-        prkd_len = asn1_build_prkd_aes(NULL, 0, NULL, 0, key_size * 8, prkd_buf, sizeof(prkd_buf));
     }
     if ((allowed != NULL && allowed_len > 0) || kdom >= 0) {
-        size_t meta_len = (allowed_len > 0 ? 2 + allowed_len : 0) + (kdom >= 0 ? 3 : 0);
+        uint16_t meta_len = (allowed_len > 0 ? 2 + allowed_len : 0) + (kdom >= 0 ? 3 : 0);
         uint8_t *meta = (uint8_t *) calloc(1, meta_len), *m = meta;
         if (allowed_len > 0) {
             *m++ = 0x91;
-            *m++ = allowed_len;
+            *m++ = (uint8_t)allowed_len;
             memcpy(m, allowed, allowed_len); m += allowed_len;
         }
         if (kdom >= 0) {
             *m++ = 0x92;
             *m++ = 1;
-            *m++ = kdom;
+            *m++ = (uint8_t)kdom;
         }
         r = meta_add((KEY_PREFIX << 8) | key_id, meta, meta_len);
         free(meta);
-        if (r != CCID_OK) {
+        if (r != PICOKEY_OK) {
             return r;
         }
     }
-    if (prkd_len > 0) {
-        file_t *fpk = file_new((PRKD_PREFIX << 8) | key_id);
-        r = flash_write_data_to_file(fpk, prkd_buf, prkd_len);
-        if (r != 0) {
-            return SW_EXEC_ERROR();
-        }
-    }
     if (res_APDU_size > 0) {
         file_t *fpk = file_new((EE_CERTIFICATE_PREFIX << 8) | key_id);
-        r = flash_write_data_to_file(fpk, res_APDU, res_APDU_size);
+        r = file_put_data(fpk, res_APDU, res_APDU_size);
         if (r != 0) {
             return SW_EXEC_ERROR();
         }

src/hsm/cmd_key_wrap.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "crypto_utils.h"
@@ -24,14 +24,15 @@
 extern uint8_t get_key_domain(file_t *fkey);
 
 int cmd_key_wrap() {
-    int key_id = P1(apdu), r = 0;
+    int r = 0;
+    uint8_t key_id = P1(apdu);
     if (P2(apdu) != 0x92) {
         return SW_WRONG_P1P2();
     }
     if (!isUserAuthenticated) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
-    file_t *ef = search_dynamic_file((KEY_PREFIX << 8) | key_id);
+    file_t *ef = search_file((KEY_PREFIX << 8) | key_id);
     if (!ef) {
         return SW_FILE_NOT_FOUND();
     }
@@ -39,7 +40,7 @@ int cmd_key_wrap() {
     if (kdom == 0xff) {
         return SW_REFERENCE_NOT_FOUND();
     }
-    file_t *tf_kd = search_by_fid(EF_KEY_DOMAIN, NULL, SPECIFY_EF);
+    file_t *tf_kd = search_file(EF_KEY_DOMAIN);
     uint8_t *kdata = file_get_data(tf_kd), dkeks = kdata ? kdata[2 * kdom] : 0,
             current_dkeks = kdata ? kdata[2 * kdom + 1] : 0;
     if (dkeks != current_dkeks || dkeks == 0 || dkeks == 0xff) {
@@ -48,21 +49,20 @@ int cmd_key_wrap() {
     if (key_has_purpose(ef, ALGO_WRAP) == false) {
         return SW_CONDITIONS_NOT_SATISFIED();
     }
-    file_t *prkd = search_dynamic_file((PRKD_PREFIX << 8) | key_id);
+    file_t *prkd = search_file((PRKD_PREFIX << 8) | key_id);
     if (!prkd) {
         return SW_FILE_NOT_FOUND();
     }
     const uint8_t *dprkd = file_get_data(prkd);
-    size_t wrap_len = MAX_DKEK_ENCODE_KEY_BUFFER;
-    size_t tag_len = 0;
+    uint16_t wrap_len = MAX_DKEK_ENCODE_KEY_BUFFER, tag_len = 0;
     const uint8_t *meta_tag = get_meta_tag(ef, 0x91, &tag_len);
     if (*dprkd == P15_KEYTYPE_RSA) {
         mbedtls_rsa_context ctx;
         mbedtls_rsa_init(&ctx);
         r = load_private_key_rsa(&ctx, ef);
-        if (r != CCID_OK) {
+        if (r != PICOKEY_OK) {
             mbedtls_rsa_free(&ctx);
-            if (r == CCID_VERIFICATION_FAILED) {
+            if (r == PICOKEY_VERIFICATION_FAILED) {
                 return SW_SECURE_MESSAGE_EXEC_ERROR();
             }
             return SW_EXEC_ERROR();
@@ -71,28 +71,28 @@ int cmd_key_wrap() {
         mbedtls_rsa_free(&ctx);
     }
     else if (*dprkd == P15_KEYTYPE_ECC) {
-        mbedtls_ecdsa_context ctx;
-        mbedtls_ecdsa_init(&ctx);
-        r = load_private_key_ecdsa(&ctx, ef);
-        if (r != CCID_OK) {
-            mbedtls_ecdsa_free(&ctx);
-            if (r == CCID_VERIFICATION_FAILED) {
+        mbedtls_ecp_keypair ctx;
+        mbedtls_ecp_keypair_init(&ctx);
+        r = load_private_key_ec(&ctx, ef);
+        if (r != PICOKEY_OK) {
+            mbedtls_ecp_keypair_free(&ctx);
+            if (r == PICOKEY_VERIFICATION_FAILED) {
                 return SW_SECURE_MESSAGE_EXEC_ERROR();
             }
             return SW_EXEC_ERROR();
         }
         r = dkek_encode_key(kdom, &ctx, PICO_KEYS_KEY_EC, res_APDU, &wrap_len, meta_tag, tag_len);
-        mbedtls_ecdsa_free(&ctx);
+        mbedtls_ecp_keypair_free(&ctx);
     }
     else if (*dprkd == P15_KEYTYPE_AES) {
-        uint8_t kdata[64]; //maximum AES key size
+        uint8_t kdata_aes[64]; //maximum AES key size
         if (wait_button_pressed() == true) { //timeout
             return SW_SECURE_MESSAGE_EXEC_ERROR();
         }
 
-        int key_size = file_get_size(ef), aes_type = PICO_KEYS_KEY_AES;
-        memcpy(kdata, file_get_data(ef), key_size);
-        if (mkek_decrypt(kdata, key_size) != 0) {
+        uint16_t key_size = file_get_size(ef), aes_type = PICO_KEYS_KEY_AES;
+        memcpy(kdata_aes, file_get_data(ef), key_size);
+        if (mkek_decrypt(kdata_aes, key_size) != 0) {
             return SW_EXEC_ERROR();
         }
         if (key_size == 64) {
@@ -107,10 +107,10 @@ int cmd_key_wrap() {
         else if (key_size == 16) {
             aes_type = PICO_KEYS_KEY_AES_128;
         }
-        r = dkek_encode_key(kdom, kdata, aes_type, res_APDU, &wrap_len, meta_tag, tag_len);
-        mbedtls_platform_zeroize(kdata, sizeof(kdata));
+        r = dkek_encode_key(kdom, kdata_aes, aes_type, res_APDU, &wrap_len, meta_tag, tag_len);
+        mbedtls_platform_zeroize(kdata_aes, sizeof(kdata_aes));
     }
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return SW_EXEC_ERROR();
     }
     res_APDU_size = wrap_len;

src/hsm/cmd_keypair_gen.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "crypto_utils.h"
@@ -31,35 +31,22 @@ int cmd_keypair_gen() {
     }
     int ret = 0;
 
-    size_t tout = 0;
     //sc_asn1_print_tags(apdu.data, apdu.nc);
-    uint8_t *p = NULL;
     //DEBUG_DATA(apdu.data,apdu.nc);
-    if (asn1_find_tag(apdu.data, apdu.nc, 0x7f49, &tout, &p) && tout > 0 && p != NULL) {
-        size_t oid_len = 0;
-        uint8_t *oid = NULL;
-        if (asn1_find_tag(p, tout, 0x6, &oid_len, &oid) && oid_len > 0 && oid != NULL) {
-            if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) { //RSA
-                size_t ex_len = 3, ks_len = 2;
-                uint8_t *ex = NULL, *ks = NULL;
+    asn1_ctx_t ctxi, ctxo = { 0 };
+    asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
+    if (asn1_find_tag(&ctxi, 0x7f49, &ctxo) && asn1_len(&ctxo) > 0) {
+        asn1_ctx_t oid = { 0 };
+        if (asn1_find_tag(&ctxo, 0x6, &oid) && asn1_len(&oid) > 0) {
+            if (memcmp(oid.data, OID_ID_TA_RSA_V1_5_SHA_256, oid.len) == 0) { //RSA
+                asn1_ctx_t ex = { 0 }, ks = { 0 };
                 uint32_t exponent = 65537, key_size = 2048;
-                if (asn1_find_tag(p, tout, 0x82, &ex_len, &ex) && ex_len > 0 && ex != NULL) {
-                    uint8_t *dt = ex;
-                    exponent = 0;
-                    for (int i = 0; i < ex_len; i++) {
-                        exponent = (exponent << 8) | *dt++;
-                    }
+                if (asn1_find_tag(&ctxo, 0x82, &ex) && asn1_len(&ex) > 0) {
+                    exponent = asn1_get_uint(&ex);
                 }
-                if (asn1_find_tag(p, tout, 0x2, &ks_len, &ks) && ks_len > 0 && ks != NULL) {
-                    uint8_t *dt = ks;
-                    key_size = 0;
-                    for (int i = 0; i < ks_len; i++) {
-                        key_size = (key_size << 8) | *dt++;
-                    }
+                if (asn1_find_tag(&ctxo, 0x2, &ks) && asn1_len(&ks) > 0) {
+                    key_size = asn1_get_uint(&ks);
                 }
-                printf("KEYPAIR RSA %lu (%lx)\r\n",
-                       (unsigned long) key_size,
-                       (unsigned long) exponent);
                 mbedtls_rsa_context rsa;
                 mbedtls_rsa_init(&rsa);
                 uint8_t index = 0;
@@ -68,28 +55,39 @@ int cmd_keypair_gen() {
                     mbedtls_rsa_free(&rsa);
                     return SW_EXEC_ERROR();
                 }
-                if ((res_APDU_size =
-                         asn1_cvc_aut(&rsa, PICO_KEYS_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) {
+                if ((res_APDU_size = (uint16_t)asn1_cvc_aut(&rsa, PICO_KEYS_KEY_RSA, res_APDU, MAX_APDU_DATA, NULL, 0)) == 0) {
                     return SW_EXEC_ERROR();
                 }
                 ret = store_keys(&rsa, PICO_KEYS_KEY_RSA, key_id);
-                if (ret != CCID_OK) {
+                if (ret != PICOKEY_OK) {
                     mbedtls_rsa_free(&rsa);
                     return SW_EXEC_ERROR();
                 }
                 mbedtls_rsa_free(&rsa);
             }
-            else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, MIN(oid_len, 10)) == 0) {   //ECC
-                size_t prime_len;
-                uint8_t *prime = NULL;
-                if (asn1_find_tag(p, tout, 0x81, &prime_len, &prime) != true) {
+            else if (memcmp(oid.data, OID_ID_TA_ECDSA_SHA_256, MIN(oid.len, 10)) == 0) {   //ECC
+                asn1_ctx_t prime = { 0 };
+                if (asn1_find_tag(&ctxo, 0x81, &prime) != true) {
                     return SW_WRONG_DATA();
                 }
-                mbedtls_ecp_group_id ec_id = ec_get_curve_from_prime(prime, prime_len);
-                printf("KEYPAIR ECC %d\r\n", ec_id);
+                mbedtls_ecp_group_id ec_id = ec_get_curve_from_prime(prime.data, prime.len);
                 if (ec_id == MBEDTLS_ECP_DP_NONE) {
                     return SW_FUNC_NOT_SUPPORTED();
                 }
+                if (ec_id == MBEDTLS_ECP_DP_CURVE25519 || ec_id == MBEDTLS_ECP_DP_CURVE448) {
+                    asn1_ctx_t g = { 0 };
+                    if (asn1_find_tag(&ctxo, 0x83, &g) != true) {
+                        return SW_WRONG_DATA();
+                    }
+#ifdef MBEDTLS_EDDSA_C
+                    if (ec_id == MBEDTLS_ECP_DP_CURVE25519 && (g.data[0] != 9)) {
+                        ec_id = MBEDTLS_ECP_DP_ED25519;
+                    }
+                    else if (ec_id == MBEDTLS_ECP_DP_CURVE448 && (g.len != 56 || g.data[0] != 5)) {
+                        ec_id = MBEDTLS_ECP_DP_ED448;
+                    }
+#endif
+                }
                 mbedtls_ecdsa_context ecdsa;
                 mbedtls_ecdsa_init(&ecdsa);
                 uint8_t index = 0;
@@ -98,54 +96,50 @@ int cmd_keypair_gen() {
                     mbedtls_ecdsa_free(&ecdsa);
                     return SW_EXEC_ERROR();
                 }
-                size_t l91 = 0, ext_len = 0;
-                uint8_t *p91 = NULL, *ext = NULL;
-                if (asn1_find_tag(apdu.data, apdu.nc, 0x91, &l91, &p91) && p91 != NULL && l91 > 0) {
-                    for (int n = 0; n < l91; n++) {
-                        if (p91[n] == ALGO_EC_DH_XKEK) {
-                            size_t l92 = 0;
-                            uint8_t *p92 = NULL;
-                            if (!asn1_find_tag(apdu.data, apdu.nc, 0x92, &l92,
-                                               &p92) || p92 == NULL || l92 == 0) {
+                asn1_ctx_t a91 = { 0 }, ext = { 0 };
+                if (asn1_find_tag(&ctxi, 0x91, &a91) && asn1_len(&a91) > 0) {
+                    for (size_t n = 0; n < a91.len; n++) {
+                        if (a91.data[n] == ALGO_EC_DH_XKEK) {
+                            asn1_ctx_t a92 = {0};
+                            if (!asn1_find_tag(&ctxi, 0x92, &a92) || asn1_len(&a92) == 0) {
                                 return SW_WRONG_DATA();
                             }
-                            if (p92[0] > MAX_KEY_DOMAINS) {
+                            if (a92.data[0] > MAX_KEY_DOMAINS) {
                                 return SW_WRONG_DATA();
                             }
-                            file_t *tf_xkek = search_dynamic_file(EF_XKEK + p92[0]);
+                            file_t *tf_xkek = search_file(EF_XKEK + a92.data[0]);
                             if (!tf_xkek) {
                                 return SW_WRONG_DATA();
                             }
-                            ext_len = 2 + 2 + strlen(OID_ID_KEY_DOMAIN_UID) + 2 + file_get_size(
+                            ext.len = 2 + 2 + (uint16_t)strlen(OID_ID_KEY_DOMAIN_UID) + 2 + file_get_size(
                                 tf_xkek);
-                            ext = (uint8_t *) calloc(1, ext_len);
-                            uint8_t *pe = ext;
+                            ext.data = (uint8_t *) calloc(1, ext.len);
+                            uint8_t *pe = ext.data;
                             *pe++ = 0x73;
-                            *pe++ = ext_len - 2;
+                            *pe++ = (uint8_t)ext.len - 2;
                             *pe++ = 0x6;
-                            *pe++ = strlen(OID_ID_KEY_DOMAIN_UID);
+                            *pe++ = (uint8_t)strlen(OID_ID_KEY_DOMAIN_UID);
                             memcpy(pe, OID_ID_KEY_DOMAIN_UID, strlen(OID_ID_KEY_DOMAIN_UID));
                             pe += strlen(OID_ID_KEY_DOMAIN_UID);
                             *pe++ = 0x80;
-                            *pe++ = file_get_size(tf_xkek);
+                            *pe++ = (uint8_t)file_get_size(tf_xkek);
                             memcpy(pe, file_get_data(tf_xkek), file_get_size(tf_xkek));
                         }
                     }
                 }
-                if ((res_APDU_size =
-                         asn1_cvc_aut(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, 4096, ext, ext_len)) == 0) {
-                    if (ext) {
-                        free(ext);
+                if ((res_APDU_size = (uint16_t)asn1_cvc_aut(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, MAX_APDU_DATA, ext.data, ext.len)) == 0) {
+                    if (ext.data) {
+                        free(ext.data);
                     }
                     mbedtls_ecdsa_free(&ecdsa);
                     return SW_EXEC_ERROR();
                 }
-                if (ext) {
-                    free(ext);
+                if (ext.data) {
+                    free(ext.data);
                 }
                 ret = store_keys(&ecdsa, PICO_KEYS_KEY_EC, key_id);
                 mbedtls_ecdsa_free(&ecdsa);
-                if (ret != CCID_OK) {
+                if (ret != PICOKEY_OK) {
                     return SW_EXEC_ERROR();
                 }
             }
@@ -155,11 +149,11 @@ int cmd_keypair_gen() {
     else {
         return SW_WRONG_DATA();
     }
-    if (find_and_store_meta_key(key_id) != CCID_OK) {
+    if (find_and_store_meta_key(key_id) != PICOKEY_OK) {
         return SW_EXEC_ERROR();
     }
     file_t *fpk = file_new((EE_CERTIFICATE_PREFIX << 8) | key_id);
-    ret = flash_write_data_to_file(fpk, res_APDU, res_APDU_size);
+    ret = file_put_data(fpk, res_APDU, res_APDU_size);
     if (ret != 0) {
         return SW_EXEC_ERROR();
     }

src/hsm/cmd_list_keys.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "sc_hsm.h"
@@ -21,13 +21,11 @@
 int cmd_list_keys() {
     /* First we send DEV private key */
     /* Both below conditions should be always TRUE */
-    if (search_by_fid(EF_PRKD_DEV, NULL, SPECIFY_EF)) {
-        res_APDU[res_APDU_size++] = EF_PRKD_DEV >> 8;
-        res_APDU[res_APDU_size++] = EF_PRKD_DEV & 0xff;
+    if (search_file(EF_PRKD_DEV)) {
+        res_APDU_size += put_uint16_t_be(EF_PRKD_DEV, res_APDU + res_APDU_size);
     }
-    if (search_by_fid(EF_KEY_DEV, NULL, SPECIFY_EF)) {
-        res_APDU[res_APDU_size++] = EF_KEY_DEV >> 8;
-        res_APDU[res_APDU_size++] = EF_KEY_DEV & 0xff;
+    if (search_file(EF_KEY_DEV)) {
+        res_APDU_size += put_uint16_t_be(EF_KEY_DEV, res_APDU + res_APDU_size);
     }
     //first CC
     for (int i = 0; i < dynamic_files; i++) {
@@ -60,5 +58,11 @@ int cmd_list_keys() {
             res_APDU[res_APDU_size++] = f->fid & 0xff;
         }
     }
+#if !defined(ENABLE_EMULATION) && !defined(ESP_PLATFORM)
+    if ((apdu.rlen + 2 + 10) % 64 == 0) { // FIX for strange behaviour with PSCS and multiple of 64
+        res_APDU[res_APDU_size++] = 0;
+        res_APDU[res_APDU_size++] = 0;
+    }
+#endif
     return SW_OK();
 }

src/hsm/cmd_mse.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "sc_hsm.h"
@@ -33,8 +33,10 @@ int cmd_mse() {
     if (p1 & 0x1) { //SET
         uint16_t tag = 0x0;
         uint8_t *tag_data = NULL, *p = NULL;
-        size_t tag_len = 0;
-        while (walk_tlv(apdu.data, apdu.nc, &p, &tag, &tag_len, &tag_data)) {
+        uint16_t tag_len = 0;
+        asn1_ctx_t ctxi;
+        asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
+        while (walk_tlv(&ctxi, &p, &tag, &tag_len, &tag_data)) {
             if (tag == 0x80) {
                 if (p2 == 0xA4) {
                     if (tag_len == 10 &&
@@ -49,20 +51,20 @@ int cmd_mse() {
                 }
                 else {
                     if (p2 == 0xB6) {
-                        if (puk_store_select_chr(tag_data) == CCID_OK) {
+                        if (puk_store_select_chr(tag_data) == PICOKEY_OK) {
                             return SW_OK();
                         }
                     }
                     else if (p2 == 0xA4) {   /* Aut */
-                        for (int i = 0; i < MAX_PUK; i++) {
-                            file_t *ef = search_dynamic_file(EF_PUK + i);
+                        for (uint8_t i = 0; i < MAX_PUK; i++) {
+                            file_t *ef = search_file(EF_PUK + i);
                             if (!ef) {
                                 break;
                             }
                             if (!file_has_data(ef)) {
                                 break;
                             }
-                            size_t chr_len = 0;
+                            uint16_t chr_len = 0;
                             const uint8_t *chr = cvc_get_chr(file_get_data(ef),
                                                              file_get_size(ef),
                                                              &chr_len);

src/hsm/cmd_pso.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "sc_hsm.h"
@@ -20,7 +20,7 @@
 #include "asn1.h"
 #include "cvc.h"
 
-extern int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy);
+extern int add_cert_puk_store(const uint8_t *data, uint16_t data_len, bool copy);
 extern PUK *current_puk;
 
 int cmd_pso() {
@@ -33,44 +33,44 @@ int cmd_pso() {
             return SW_REFERENCE_NOT_FOUND();
         }
         if (apdu.data[0] != 0x7F || apdu.data[1] != 0x21) {
-            uint8_t tlv_len = 2 + format_tlv_len(apdu.nc, NULL);
+            uint8_t tlv_len = 2 + format_tlv_len((uint16_t)apdu.nc, NULL);
             memmove(apdu.data + tlv_len, apdu.data, apdu.nc);
             memcpy(apdu.data, "\x7F\x21", 2);
-            format_tlv_len(apdu.nc, apdu.data + 2);
+            format_tlv_len((uint16_t)apdu.nc, apdu.data + 2);
             apdu.nc += tlv_len;
         }
-        int r = cvc_verify(apdu.data, apdu.nc, current_puk->cvcert, current_puk->cvcert_len);
-        if (r != CCID_OK) {
-            if (r == CCID_WRONG_DATA) {
+        int r = cvc_verify(apdu.data, (uint16_t)apdu.nc, current_puk->cvcert, current_puk->cvcert_len);
+        if (r != PICOKEY_OK) {
+            if (r == PICOKEY_WRONG_DATA) {
                 return SW_DATA_INVALID();
             }
-            else if (r == CCID_WRONG_SIGNATURE) {
+            else if (r == PICOKEY_WRONG_SIGNATURE) {
                 return SW_CONDITIONS_NOT_SATISFIED();
             }
             return SW_EXEC_ERROR();
         }
-        for (int i = 0; i < 0xfe; i++) {
+        for (uint8_t i = 0; i < 0xfe; i++) {
             uint16_t fid = (CA_CERTIFICATE_PREFIX << 8) | i;
-            file_t *ca_ef = search_dynamic_file(fid);
+            file_t *ca_ef = search_file(fid);
             if (!ca_ef) {
                 ca_ef = file_new(fid);
-                flash_write_data_to_file(ca_ef, apdu.data, apdu.nc);
+                file_put_data(ca_ef, apdu.data, (uint16_t)apdu.nc);
                 if (add_cert_puk_store(file_get_data(ca_ef), file_get_size(ca_ef),
-                                       false) != CCID_OK) {
+                                       false) != PICOKEY_OK) {
                     return SW_FILE_FULL();
                 }
 
-                size_t chr_len = 0;
-                const uint8_t *chr = cvc_get_chr(apdu.data, apdu.nc, &chr_len);
+                uint16_t chr_len = 0;
+                const uint8_t *chr = cvc_get_chr(apdu.data, (uint16_t)apdu.nc, &chr_len);
                 if (chr == NULL) {
                     return SW_WRONG_DATA();
                 }
-                size_t puk_len = 0, puk_bin_len = 0;
-                const uint8_t *puk = cvc_get_pub(apdu.data, apdu.nc, &puk_len), *puk_bin = NULL;
+                uint16_t puk_len = 0, puk_bin_len = 0;
+                const uint8_t *puk = cvc_get_pub(apdu.data, (uint16_t)apdu.nc, &puk_len), *puk_bin = NULL;
                 if (puk == NULL) {
                     return SW_WRONG_DATA();
                 }
-                size_t oid_len = 0;
+                uint16_t oid_len = 0;
                 const uint8_t *oid = cvc_get_field(puk, puk_len, &oid_len, 0x6);
                 if (oid == NULL) {
                     return SW_WRONG_DATA();
@@ -82,15 +82,15 @@ int cmd_pso() {
                     }
                 }
                 else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) {   //ECC
-                    mbedtls_ecp_group_id ec_id = cvc_inherite_ec_group(apdu.data, apdu.nc);
+                    mbedtls_ecp_group_id ec_id = cvc_inherite_ec_group(apdu.data, (uint16_t)apdu.nc);
                     mbedtls_ecp_group grp;
                     mbedtls_ecp_group_init(&grp);
                     if (mbedtls_ecp_group_load(&grp, ec_id) != 0) {
                         mbedtls_ecp_group_free(&grp);
                         return SW_WRONG_DATA();
                     }
-                    size_t plen = mbedtls_mpi_size(&grp.P);
-                    size_t t86_len = 0;
+                    uint16_t plen = (uint16_t)mbedtls_mpi_size(&grp.P);
+                    uint16_t t86_len = 0;
                     const uint8_t *t86 = cvc_get_field(puk, puk_len, &t86_len, 0x86);
                     if (mbedtls_ecp_get_type(&grp) == MBEDTLS_ECP_TYPE_MONTGOMERY) {
                         if (plen != t86_len) {
@@ -126,7 +126,7 @@ int cmd_pso() {
                     }
                 }
                 file_t *cd_ef = file_new((CD_PREFIX << 8) | i);
-                size_t cd_len = asn1_build_cert_description(chr,
+                uint16_t cd_len = (uint16_t)asn1_build_cert_description(chr,
                                                             chr_len,
                                                             puk_bin,
                                                             puk_bin_len,
@@ -137,14 +137,14 @@ int cmd_pso() {
                     return SW_EXEC_ERROR();
                 }
                 uint8_t *buf = (uint8_t *) calloc(cd_len, sizeof(uint8_t));
-                int r = asn1_build_cert_description(chr,
+                r = (int)asn1_build_cert_description(chr,
                                                     chr_len,
                                                     puk_bin,
                                                     puk_bin_len,
                                                     fid,
                                                     buf,
                                                     cd_len);
-                flash_write_data_to_file(cd_ef, buf, cd_len);
+                file_put_data(cd_ef, buf, cd_len);
                 free(buf);
                 if (r == 0) {
                     return SW_EXEC_ERROR();
@@ -153,7 +153,6 @@ int cmd_pso() {
                 break;
             }
         }
-        return SW_OK();
     }
     else {
         return SW_INCORRECT_P1P2();

src/hsm/cmd_puk_auth.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "sc_hsm.h"
@@ -21,7 +21,7 @@
 
 int cmd_puk_auth() {
     uint8_t p1 = P1(apdu), p2 = P2(apdu);
-    file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF);
+    file_t *ef_puk = search_file(EF_PUKAUT);
     if (!file_has_data(ef_puk)) {
         if (apdu.nc > 0) {
             return SW_FILE_NOT_FOUND();
@@ -36,8 +36,8 @@ int cmd_puk_auth() {
                 if (p2 != 0x0) {
                     return SW_INCORRECT_P1P2();
                 }
-                for (int i = 0; i < puk_data[0]; i++) {
-                    ef = search_dynamic_file(EF_PUK + i);
+                for (uint8_t i = 0; i < puk_data[0]; i++) {
+                    ef = search_file(EF_PUK + i);
                     if (!ef) { /* Never should not happen */
                         return SW_MEMORY_FAILURE();
                     }
@@ -48,7 +48,7 @@ int cmd_puk_auth() {
                 uint8_t *tmp = (uint8_t *) calloc(file_get_size(ef_puk), sizeof(uint8_t));
                 memcpy(tmp, puk_data, file_get_size(ef_puk));
                 tmp[1] = puk_data[1] - 1;
-                flash_write_data_to_file(ef_puk, tmp, file_get_size(ef_puk));
+                file_put_data(ef_puk, tmp, file_get_size(ef_puk));
                 puk_data = file_get_data(ef_puk);
                 free(tmp);
             }
@@ -56,12 +56,12 @@ int cmd_puk_auth() {
                 if (p2 >= puk_data[0]) {
                     return SW_INCORRECT_P1P2();
                 }
-                ef = search_dynamic_file(EF_PUK + p2);
+                ef = search_file(EF_PUK + p2);
                 if (!ef) { /* Never should not happen */
                     return SW_MEMORY_FAILURE();
                 }
             }
-            flash_write_data_to_file(ef, apdu.data, apdu.nc);
+            file_put_data(ef, apdu.data, (uint16_t)apdu.nc);
             low_flash_available();
         }
         else {
@@ -72,14 +72,14 @@ int cmd_puk_auth() {
         if (p2 >= puk_data[0]) {
             return SW_INCORRECT_P1P2();
         }
-        file_t *ef = search_dynamic_file(EF_PUK + p2);
+        file_t *ef = search_file(EF_PUK + p2);
         if (!ef) {
             return SW_INCORRECT_P1P2();
         }
         if (!file_has_data(ef)) {
             return SW_REFERENCE_NOT_FOUND();
         }
-        size_t chr_len = 0;
+        uint16_t chr_len = 0;
         const uint8_t *chr = cvc_get_chr(file_get_data(ef), file_get_size(ef), &chr_len);
         if (chr) {
             memcpy(res_APDU, chr, chr_len);

src/hsm/cmd_read_binary.c

@@ -3,52 +3,49 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "sc_hsm.h"
 
 int cmd_read_binary() {
-    uint16_t fid = 0x0;
-    uint32_t offset = 0;
+    uint16_t offset = 0;
     uint8_t ins = INS(apdu), p1 = P1(apdu), p2 = P2(apdu);
     const file_t *ef = NULL;
 
     if ((ins & 0x1) == 0) {
         if ((p1 & 0x80) != 0) {
-            if (!(ef = search_by_fid(p1 & 0x1f, NULL, SPECIFY_EF))) {
+            if (!(ef = search_file(p1 & 0x1f))) {
                 return SW_FILE_NOT_FOUND();
             }
             offset = p2;
         }
         else {
-            offset = make_uint16_t(p1, p2) & 0x7fff;
+            offset = make_uint16_t_be(p1, p2) & 0x7fff;
             ef = currentEF;
         }
     }
     else {
         if (p1 == 0 && (p2 & 0xE0) == 0 && (p2 & 0x1f) != 0 && (p2 & 0x1f) != 0x1f) {
-            if (!(ef = search_by_fid(p2 & 0x1f, NULL, SPECIFY_EF))) {
+            if (!(ef = search_file(p2 & 0x1f))) {
                 return SW_FILE_NOT_FOUND();
             }
         }
         else {
-            uint16_t file_id = make_uint16_t(p1, p2); // & 0x7fff;
+            uint16_t file_id = make_uint16_t_be(p1, p2); // & 0x7fff;
             if (file_id == 0x0) {
                 ef = currentEF;
             }
-            else if (!(ef =
-                           search_by_fid(file_id, NULL,
-                                         SPECIFY_EF)) && !(ef = search_dynamic_file(file_id))) {
+            else if (!(ef = search_file(file_id))) {
                 return SW_FILE_NOT_FOUND();
             }
 
@@ -63,12 +60,12 @@ int cmd_read_binary() {
         }
     }
 
-    if ((fid >> 8) == KEY_PREFIX || !authenticate_action(ef, ACL_OP_READ_SEARCH)) {
+    if ((ef->fid >> 8) == KEY_PREFIX || !authenticate_action(ef, ACL_OP_READ_SEARCH)) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
     if (ef->data) {
         if ((ef->type & FILE_DATA_FUNC) == FILE_DATA_FUNC) {
-            uint16_t data_len = ((int (*)(const file_t *, int))(ef->data))((const file_t *) ef, 1); //already copies content to res_APDU
+            uint16_t data_len = (uint16_t)((int (*)(const file_t *, int))(ef->data))((const file_t *) ef, 1); //already copies content to res_APDU
             if (offset > data_len) {
                 return SW_WRONG_P1P2();
             }

src/hsm/cmd_reset_retry.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "crypto_utils.h"
@@ -34,17 +34,17 @@ int cmd_reset_retry() {
         return SW_COMMAND_NOT_ALLOWED();
     }
     if (P1(apdu) == 0x0 || P1(apdu) == 0x2) {
-        int newpin_len = 0;
+        uint8_t newpin_len = 0;
         if (P1(apdu) == 0x0) {
-            uint8_t so_pin_len = file_read_uint8(file_get_data(file_sopin));
-            if (apdu.nc <= so_pin_len + 1) {
+            uint8_t so_pin_len = file_read_uint8(file_sopin);
+            if ((uint16_t)apdu.nc <= so_pin_len + 1) {
                 return SW_WRONG_LENGTH();
             }
             uint16_t r = check_pin(file_sopin, apdu.data, so_pin_len);
             if (r != 0x9000) {
                 return r;
             }
-            newpin_len = apdu.nc - so_pin_len;
+            newpin_len = (uint8_t)apdu.nc - so_pin_len;
         }
         else if (P1(apdu) == 0x2) {
             if (!has_session_sopin) {
@@ -53,25 +53,25 @@ int cmd_reset_retry() {
             if (apdu.nc > 16) {
                 return SW_WRONG_LENGTH();
             }
-            newpin_len = apdu.nc;
+            newpin_len = (uint8_t)apdu.nc;
         }
         uint8_t dhash[33];
         dhash[0] = newpin_len;
         double_hash_pin(apdu.data + (apdu.nc - newpin_len), newpin_len, dhash + 1);
-        flash_write_data_to_file(file_pin1, dhash, sizeof(dhash));
-        if (pin_reset_retries(file_pin1, true) != CCID_OK) {
+        file_put_data(file_pin1, dhash, sizeof(dhash));
+        if (pin_reset_retries(file_pin1, true) != PICOKEY_OK) {
             return SW_MEMORY_FAILURE();
         }
         uint8_t mkek[MKEK_SIZE];
         int r = load_mkek(mkek); //loads the MKEK with SO pin
-        if (r != CCID_OK) {
+        if (r != PICOKEY_OK) {
             return SW_EXEC_ERROR();
         }
         hash_multi(apdu.data + (apdu.nc - newpin_len), newpin_len, session_pin);
         has_session_pin = true;
         r = store_mkek(mkek);
         release_mkek(mkek);
-        if (r != CCID_OK) {
+        if (r != PICOKEY_OK) {
             return SW_EXEC_ERROR();
         }
         low_flash_available();
@@ -82,7 +82,7 @@ int cmd_reset_retry() {
             return SW_COMMAND_NOT_ALLOWED();
         }
         if (P1(apdu) == 0x1) {
-            uint8_t so_pin_len = file_read_uint8(file_get_data(file_sopin));
+            uint8_t so_pin_len = file_read_uint8(file_sopin);
             if (apdu.nc != so_pin_len) {
                 return SW_WRONG_LENGTH();
             }
@@ -99,7 +99,7 @@ int cmd_reset_retry() {
                 return SW_WRONG_LENGTH();
             }
         }
-        if (pin_reset_retries(file_pin1, true) != CCID_OK) {
+        if (pin_reset_retries(file_pin1, true) != PICOKEY_OK) {
             return SW_MEMORY_FAILURE();
         }
         return SW_OK();

src/hsm/cmd_select.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "sc_hsm.h"
@@ -23,7 +23,7 @@ void select_file(file_t *pe) {
         currentDF = (file_t *) MF;
         currentEF = NULL;
     }
-    else if (pe->type & FILE_TYPE_INTERNAL_EF) {
+    else if (pe->type & (FILE_TYPE_INTERNAL_EF|FILE_TYPE_WORKING_EF)) {
         currentEF = pe;
         currentDF = &file_entries[pe->parent];
     }
@@ -48,7 +48,7 @@ int cmd_select() {
     //}
 
     if (apdu.nc == 2) {
-        fid = get_uint16_t(apdu.data, 0);
+        fid = get_uint16_t_be(apdu.data);
     }
 
     //if ((fid & 0xff00) == (KEY_PREFIX << 8))
@@ -63,8 +63,7 @@ int cmd_select() {
         pfx == DCOD_PREFIX ||
         pfx == DATA_PREFIX ||
         pfx == PROT_DATA_PREFIX) {*/
-    if (fid != 0x0 && !(pe = search_dynamic_file(fid)) &&
-        !(pe = search_by_fid(fid, NULL, SPECIFY_EF))) {
+    if (fid != 0x0 && !(pe = search_file(fid))) {
         return SW_FILE_NOT_FOUND();
     }
     /*}*/
@@ -96,7 +95,7 @@ int cmd_select() {
             }
         }
         else if (p1 == 0x04) {   //Select by DF name - e.g., [truncated] application identifier
-            if (!(pe = search_by_name(apdu.data, apdu.nc))) {
+            if (!(pe = search_by_name(apdu.data, (uint16_t)apdu.nc))) {
                 return SW_FILE_NOT_FOUND();
             }
             if (card_terminated) {
@@ -104,12 +103,12 @@ int cmd_select() {
             }
         }
         else if (p1 == 0x08) {   //Select from the MF - Path without the MF identifier
-            if (!(pe = search_by_path(apdu.data, apdu.nc, MF))) {
+            if (!(pe = search_by_path(apdu.data, (uint8_t)apdu.nc, MF))) {
                 return SW_FILE_NOT_FOUND();
             }
         }
         else if (p1 == 0x09) {   //Select from the current DF - Path without the current DF identifier
-            if (!(pe = search_by_path(apdu.data, apdu.nc, currentDF))) {
+            if (!(pe = search_by_path(apdu.data, (uint8_t)apdu.nc, currentDF))) {
                 return SW_FILE_NOT_FOUND();
             }
         }
@@ -120,12 +119,11 @@ int cmd_select() {
             res_APDU[res_APDU_size++] = 0x85;
             res_APDU[res_APDU_size++] = 5;
             uint16_t opts = get_device_options();
-            res_APDU[res_APDU_size++] = opts >> 8;
-            res_APDU[res_APDU_size++] = opts & 0xff;
+            res_APDU_size += put_uint16_t_be(opts, res_APDU + res_APDU_size);
             res_APDU[res_APDU_size++] = 0xFF;
             res_APDU[res_APDU_size++] = HSM_VERSION_MAJOR;
             res_APDU[res_APDU_size++] = HSM_VERSION_MINOR;
-            res_APDU[1] = res_APDU_size - 2;
+            res_APDU[1] = (uint8_t)res_APDU_size - 2;
         }
     }
     else {

src/hsm/cmd_session_pin.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "sc_hsm.h"

src/hsm/cmd_signature.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 #include "sc_hsm.h"
 #include "crypto_utils.h"
@@ -20,6 +20,9 @@
 #include "asn1.h"
 #include "mbedtls/oid.h"
 #include "random.h"
+#ifdef MBEDTLS_EDDSA_C
+#include "mbedtls/eddsa.h"
+#endif
 
 extern mbedtls_ecp_keypair hd_context;
 extern uint8_t hd_keytype;
@@ -57,8 +60,8 @@ static const uint8_t hdr_ripemd160[] = {
 static const struct digest_info_prefix {
     mbedtls_md_type_t algorithm;
     const uint8_t *hdr;
-    size_t hdr_len;
-    size_t hash_len;
+    uint16_t hdr_len;
+    uint16_t hash_len;
 } digest_info_prefix[] = {
     { MBEDTLS_MD_MD5, hdr_md5, sizeof(hdr_md5), 16 },
     { MBEDTLS_MD_SHA1, hdr_sha1, sizeof(hdr_sha1), 20 },
@@ -71,28 +74,28 @@ static const struct digest_info_prefix {
 };
 int pkcs1_strip_digest_info_prefix(mbedtls_md_type_t *algorithm,
                                    const uint8_t *in_dat,
-                                   size_t in_len,
+                                   uint16_t in_len,
                                    uint8_t *out_dat,
-                                   size_t *out_len) {
+                                   uint16_t *out_len) {
     for (int i = 0; digest_info_prefix[i].algorithm != 0; i++) {
-        size_t hdr_len = digest_info_prefix[i].hdr_len, hash_len = digest_info_prefix[i].hash_len;
+        uint16_t hdr_len = digest_info_prefix[i].hdr_len, hash_len = digest_info_prefix[i].hash_len;
         const uint8_t *hdr = digest_info_prefix[i].hdr;
         if (in_len == (hdr_len + hash_len) && !memcmp(in_dat, hdr, hdr_len)) {
             if (algorithm) {
                 *algorithm = digest_info_prefix[i].algorithm;
             }
             if (out_dat == NULL) {
-                return CCID_OK;
+                return PICOKEY_OK;
             }
             if (*out_len < hash_len) {
-                return CCID_WRONG_DATA;
+                return PICOKEY_WRONG_DATA;
             }
             memmove(out_dat, in_dat + hdr_len, hash_len);
             *out_len = hash_len;
-            return CCID_OK;
+            return PICOKEY_OK;
         }
     }
-    return CCID_EXEC_ERROR;
+    return PICOKEY_EXEC_ERROR;
 }
 //-----
 
@@ -104,10 +107,7 @@ int cmd_signature() {
     if (!isUserAuthenticated) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
-    if ((!(fkey = search_dynamic_file((KEY_PREFIX << 8) | key_id)) &&
-         !(fkey =
-               search_by_fid((KEY_PREFIX << 8) | key_id, NULL,
-                             SPECIFY_EF))) || !file_has_data(fkey)) {
+    if (!(fkey = search_file((KEY_PREFIX << 8) | key_id)) || !file_has_data(fkey)) {
         return SW_FILE_NOT_FOUND();
     }
     if (get_key_counter(fkey) == 0) {
@@ -116,7 +116,7 @@ int cmd_signature() {
     if (key_has_purpose(fkey, p2) == false) {
         return SW_CONDITIONS_NOT_SATISFIED();
     }
-    int key_size = file_get_size(fkey);
+    uint16_t key_size = file_get_size(fkey);
     if (p2 == ALGO_RSA_PKCS1_SHA1 || p2 == ALGO_RSA_PSS_SHA1 || p2 == ALGO_EC_SHA1) {
         md = MBEDTLS_MD_SHA1;
     }
@@ -145,54 +145,52 @@ int cmd_signature() {
         mbedtls_rsa_init(&ctx);
 
         int r = load_private_key_rsa(&ctx, fkey);
-        if (r != CCID_OK) {
+        if (r != PICOKEY_OK) {
             mbedtls_rsa_free(&ctx);
-            if (r == CCID_VERIFICATION_FAILED) {
+            if (r == PICOKEY_VERIFICATION_FAILED) {
                 return SW_SECURE_MESSAGE_EXEC_ERROR();
             }
             return SW_EXEC_ERROR();
         }
-        uint8_t *hash = apdu.data;
-        size_t hash_len = apdu.nc;
+        asn1_ctx_t hash = {.len = (uint16_t)apdu.nc, .data = apdu.data};
         if (p2 == ALGO_RSA_PKCS1) { //DigestInfo attached
-            size_t nc = apdu.nc;
-            if (pkcs1_strip_digest_info_prefix(&md, apdu.data, apdu.nc, apdu.data,
-                                               &nc) != CCID_OK) {                                   //gets the MD algo id and strips it off
+            uint16_t nc = (uint16_t)apdu.nc;
+            if (pkcs1_strip_digest_info_prefix(&md, apdu.data, (uint16_t)apdu.nc, apdu.data,
+                                               &nc) != PICOKEY_OK) {                                   //gets the MD algo id and strips it off
                 return SW_EXEC_ERROR();
             }
             apdu.nc = nc;
         }
         else {
             //sc_asn1_print_tags(apdu.data, apdu.nc);
-            size_t tout = 0, oid_len = 0;
-            uint8_t *p = NULL, *oid = NULL;
-            if (asn1_find_tag(apdu.data, apdu.nc, 0x30, &tout, &p) && tout > 0 && p != NULL) {
-                size_t tout30 = 0;
-                uint8_t *c30 = NULL;
-                if (asn1_find_tag(p, tout, 0x30, &tout30, &c30) && tout30 > 0 && c30 != NULL) {
-                    asn1_find_tag(c30, tout30, 0x6, &oid_len, &oid);
+            asn1_ctx_t ctxi, ctxo = { 0 }, oid = { 0 };
+            asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
+            if (asn1_find_tag(&ctxi, 0x30, &ctxo) && asn1_len(&ctxo) > 0) {
+                asn1_ctx_t a30 = { 0 };
+                if (asn1_find_tag(&ctxo, 0x30, &a30) && asn1_len(&a30) > 0) {
+                    asn1_find_tag(&a30, 0x6, &oid);
                 }
-                asn1_find_tag(p, tout, 0x4, &hash_len, &hash);
+                asn1_find_tag(&ctxo, 0x4, &hash);
             }
-            if (oid && oid_len > 0) {
-                if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA1, oid_len) == 0) {
+            if (asn1_len(&oid)) {
+                if (memcmp(oid.data, MBEDTLS_OID_DIGEST_ALG_SHA1, oid.len) == 0) {
                     md = MBEDTLS_MD_SHA1;
                 }
-                else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA224, oid_len) == 0) {
+                else if (memcmp(oid.data, MBEDTLS_OID_DIGEST_ALG_SHA224, oid.len) == 0) {
                     md = MBEDTLS_MD_SHA224;
                 }
-                else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA256, oid_len) == 0) {
+                else if (memcmp(oid.data, MBEDTLS_OID_DIGEST_ALG_SHA256, oid.len) == 0) {
                     md = MBEDTLS_MD_SHA256;
                 }
-                else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA384, oid_len) == 0) {
+                else if (memcmp(oid.data, MBEDTLS_OID_DIGEST_ALG_SHA384, oid.len) == 0) {
                     md = MBEDTLS_MD_SHA384;
                 }
-                else if (memcmp(oid, MBEDTLS_OID_DIGEST_ALG_SHA512, oid_len) == 0) {
+                else if (memcmp(oid.data, MBEDTLS_OID_DIGEST_ALG_SHA512, oid.len) == 0) {
                     md = MBEDTLS_MD_SHA512;
                 }
             }
             if (p2 >= ALGO_RSA_PSS && p2 <= ALGO_RSA_PSS_SHA512) {
-                if (p2 == ALGO_RSA_PSS && !oid) {
+                if (p2 == ALGO_RSA_PSS && asn1_len(&oid) == 0) {
                     if (apdu.nc == 20) { //default is sha1
                         md = MBEDTLS_MD_SHA1;
                     }
@@ -220,7 +218,7 @@ int cmd_signature() {
         }
         else {
             uint8_t *signature = (uint8_t *) calloc(key_size, sizeof(uint8_t));
-            r = mbedtls_rsa_pkcs1_sign(&ctx, random_gen, NULL, md, hash_len, hash, signature);
+            r = mbedtls_rsa_pkcs1_sign(&ctx, random_gen, NULL, md, hash.len, hash.data, signature);
             memcpy(res_APDU, signature, key_size);
             free(signature);
         }
@@ -233,8 +231,8 @@ int cmd_signature() {
         mbedtls_rsa_free(&ctx);
     }
     else if (p2 >= ALGO_EC_RAW && p2 <= ALGO_EC_SHA512) {
-        mbedtls_ecdsa_context ctx;
-        mbedtls_ecdsa_init(&ctx);
+        mbedtls_ecp_keypair ctx;
+        mbedtls_ecp_keypair_init(&ctx);
         md = MBEDTLS_MD_SHA256;
         if (p2 == ALGO_EC_RAW) {
             if (apdu.nc == 32) {
@@ -268,44 +266,55 @@ int cmd_signature() {
         else if (p2 == ALGO_EC_SHA512) {
             md = MBEDTLS_MD_SHA512;
         }
-        int r = load_private_key_ecdsa(&ctx, fkey);
-        if (r != CCID_OK) {
-            mbedtls_ecdsa_free(&ctx);
-            if (r == CCID_VERIFICATION_FAILED) {
+        int r = load_private_key_ec(&ctx, fkey);
+        if (r != PICOKEY_OK) {
+            mbedtls_ecp_keypair_free(&ctx);
+            if (r == PICOKEY_VERIFICATION_FAILED) {
                 return SW_SECURE_MESSAGE_EXEC_ERROR();
             }
             return SW_EXEC_ERROR();
         }
         size_t olen = 0;
         uint8_t buf[MBEDTLS_ECDSA_MAX_LEN];
-        if (mbedtls_ecdsa_write_signature(&ctx, md, apdu.data, apdu.nc, buf, MBEDTLS_ECDSA_MAX_LEN,
-                                          &olen, random_gen, NULL) != 0) {
-            mbedtls_ecdsa_free(&ctx);
+#ifdef MBEDTLS_EDDSA_C
+        if (ctx.grp.id == MBEDTLS_ECP_DP_ED25519 || ctx.grp.id == MBEDTLS_ECP_DP_ED448) {
+            r = mbedtls_eddsa_write_signature(&ctx, apdu.data, apdu.nc, buf, sizeof(buf), &olen, MBEDTLS_EDDSA_PURE, NULL, 0, random_gen, NULL);
+        }
+        else
+#endif
+        {
+            r = mbedtls_ecdsa_write_signature(&ctx, md, apdu.data, apdu.nc, buf, MBEDTLS_ECDSA_MAX_LEN,
+                                              &olen, random_gen, NULL);
+        }
+        if (r != 0) {
+            mbedtls_ecp_keypair_free(&ctx);
             return SW_EXEC_ERROR();
         }
         memcpy(res_APDU, buf, olen);
-        res_APDU_size = olen;
-        mbedtls_ecdsa_free(&ctx);
+        res_APDU_size = (uint16_t)olen;
+        mbedtls_ecp_keypair_free(&ctx);
     }
     else if (p2 == ALGO_HD) {
         size_t olen = 0;
-        uint8_t buf[MBEDTLS_ECDSA_MAX_LEN];
+        uint8_t buf[MBEDTLS_ECDSA_MAX_LEN] = {0};
         if (hd_context.grp.id == MBEDTLS_ECP_DP_NONE) {
+            mbedtls_ecp_keypair_free(&hd_context);
             return SW_CONDITIONS_NOT_SATISFIED();
         }
         if (hd_keytype != 0x1 && hd_keytype != 0x2) {
+            mbedtls_ecp_keypair_free(&hd_context);
             return SW_INCORRECT_PARAMS();
         }
         md = MBEDTLS_MD_SHA256;
         if (mbedtls_ecdsa_write_signature(&hd_context, md, apdu.data, apdu.nc, buf,
                                           MBEDTLS_ECDSA_MAX_LEN,
                                           &olen, random_gen, NULL) != 0) {
-            mbedtls_ecdsa_free(&hd_context);
+            mbedtls_ecp_keypair_free(&hd_context);
             return SW_EXEC_ERROR();
         }
         memcpy(res_APDU, buf, olen);
-        res_APDU_size = olen;
-        mbedtls_ecdsa_free(&hd_context);
+        res_APDU_size = (uint16_t)olen;
+        mbedtls_ecp_keypair_free(&hd_context);
         hd_keytype = 0;
     }
     else {

src/hsm/cmd_update_ef.c

@@ -48,15 +48,17 @@ int cmd_update_ef() {
 
     uint16_t tag = 0x0;
     uint8_t *tag_data = NULL, *p = NULL;
-    size_t tag_len = 0;
-    while (walk_tlv(apdu.data, apdu.nc, &p, &tag, &tag_len, &tag_data)) {
+    uint16_t tag_len = 0;
+    asn1_ctx_t ctxi;
+    asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
+    while (walk_tlv(&ctxi, &p, &tag, &tag_len, &tag_data)) {
         if (tag == 0x54) { //ofset tag
-            for (int i = 1; i <= tag_len; i++) {
+            for (size_t i = 1; i <= tag_len; i++) {
                 offset |= (*tag_data++ << (8 * (tag_len - i)));
             }
         }
         else if (tag == 0x53) {   //data
-            data_len = tag_len;
+            data_len = (uint16_t)tag_len;
             data = tag_data;
         }
     }
@@ -70,16 +72,13 @@ int cmd_update_ef() {
         if (fid == 0x0 && !ef) {
             return SW_FILE_NOT_FOUND();
         }
-        else if (fid != 0x0 &&
-                 !(ef =
-                       search_by_fid(fid, NULL,
-                                     SPECIFY_EF)) && !(ef = search_dynamic_file(fid))) {                           //if does not exist, create it
+        else if (fid != 0x0 && !(ef = search_file(fid))) {                           //if does not exist, create it
             //return SW_FILE_NOT_FOUND();
             ef = file_new(fid);
         }
         if (offset == 0) {
-            int r = flash_write_data_to_file(ef, data, data_len);
-            if (r != CCID_OK) {
+            int r = file_put_data(ef, data, data_len);
+            if (r != PICOKEY_OK) {
                 return SW_MEMORY_FAILURE();
             }
         }
@@ -91,9 +90,9 @@ int cmd_update_ef() {
             uint8_t *data_merge = (uint8_t *) calloc(1, offset + data_len);
             memcpy(data_merge, file_get_data(ef), offset);
             memcpy(data_merge + offset, data, data_len);
-            int r = flash_write_data_to_file(ef, data_merge, offset + data_len);
+            int r = file_put_data(ef, data_merge, offset + data_len);
             free(data_merge);
-            if (r != CCID_OK) {
+            if (r != PICOKEY_OK) {
                 return SW_MEMORY_FAILURE();
             }
         }

src/hsm/cmd_verify.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "sc_hsm.h"
@@ -37,30 +37,27 @@ int cmd_verify() {
             return SW_REFERENCE_NOT_FOUND();
         }
         if (apdu.nc > 0) {
-            return check_pin(file_pin1, apdu.data, apdu.nc);
+            return check_pin(file_pin1, apdu.data, (uint16_t)apdu.nc);
         }
-        if (file_read_uint8(file_get_data(file_retries_pin1)) == 0) {
+        if (file_read_uint8(file_retries_pin1) == 0) {
             return SW_PIN_BLOCKED();
         }
-        return set_res_sw(0x63, 0xc0 | file_read_uint8(file_get_data(file_retries_pin1)));
+        return set_res_sw(0x63, 0xc0 | file_read_uint8(file_retries_pin1));
     }
     else if (p2 == 0x88) {   //SOPin
-        if (file_read_uint8(file_get_data(file_sopin)) == 0) { //not initialized
+        if (file_read_uint8(file_sopin) == 0) { //not initialized
             return SW_REFERENCE_NOT_FOUND();
         }
         if (apdu.nc > 0) {
-            return check_pin(file_sopin, apdu.data, apdu.nc);
+            return check_pin(file_sopin, apdu.data, (uint16_t)apdu.nc);
         }
-        if (file_read_uint8(file_get_data(file_retries_sopin)) == 0) {
+        if (file_read_uint8(file_retries_sopin) == 0) {
             return SW_PIN_BLOCKED();
         }
         if (has_session_sopin) {
             return SW_OK();
         }
-        return set_res_sw(0x63, 0xc0 | file_read_uint8(file_get_data(file_retries_sopin)));
-    }
-    else if (p2 == 0x85) {
-        return SW_OK();
+        return set_res_sw(0x63, 0xc0 | file_read_uint8(file_retries_sopin));
     }
     return SW_REFERENCE_NOT_FOUND();
 }

src/hsm/cvc.c

@@ -3,21 +3,20 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
-#include "cvc.h"
 #include "sc_hsm.h"
+#include "cvc.h"
 #include "mbedtls/rsa.h"
 #include "mbedtls/ecdsa.h"
 #include <string.h>
@@ -27,16 +26,19 @@
 #include "oid.h"
 #include "mbedtls/md.h"
 #include "files.h"
+#ifdef MBEDTLS_EDDSA_C
+#include "mbedtls/eddsa.h"
+#endif
 
 extern const uint8_t *dev_name;
-extern size_t dev_name_len;
+extern uint16_t dev_name_len;
 
-size_t asn1_cvc_public_key_rsa(mbedtls_rsa_context *rsa, uint8_t *buf, size_t buf_len) {
+uint16_t asn1_cvc_public_key_rsa(mbedtls_rsa_context *rsa, uint8_t *buf, uint16_t buf_len) {
     const uint8_t oid_rsa[] = { 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x02, 0x01, 0x02 };
-    size_t n_size = mbedtls_mpi_size(&rsa->N), e_size = mbedtls_mpi_size(&rsa->E);
-    size_t ntot_size = asn1_len_tag(0x81, n_size), etot_size = asn1_len_tag(0x82, e_size);
-    size_t oid_len = asn1_len_tag(0x6, sizeof(oid_rsa));
-    size_t tot_len = asn1_len_tag(0x7f49, oid_len + ntot_size + etot_size);
+    uint16_t n_size = (uint16_t)mbedtls_mpi_size(&rsa->N), e_size = (uint16_t)mbedtls_mpi_size(&rsa->E);
+    uint16_t ntot_size = asn1_len_tag(0x81, n_size), etot_size = asn1_len_tag(0x82, e_size);
+    uint16_t oid_len = asn1_len_tag(0x6, sizeof(oid_rsa));
+    uint16_t tot_len = asn1_len_tag(0x7f49, oid_len + ntot_size + etot_size);
     if (buf == NULL || buf_len == 0) {
         return tot_len;
     }
@@ -72,7 +74,7 @@ const uint8_t *pointA[] = {
     "\x01\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC",
 };
 
-size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, size_t buf_len) {
+uint16_t asn1_cvc_public_key_ecdsa(mbedtls_ecp_keypair *ecdsa, uint8_t *buf, uint16_t buf_len) {
     uint8_t Y_buf[MBEDTLS_ECP_MAX_PT_LEN], G_buf[MBEDTLS_ECP_MAX_PT_LEN];
     const uint8_t oid_ecdsa[] = { 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x02, 0x02, 0x03 };
     const uint8_t oid_ri[]    = { 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x05, 0x02, 0x03 };
@@ -82,14 +84,18 @@ size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, siz
     size_t o_size = mbedtls_mpi_size(&ecdsa->grp.N), y_size = 0;
     mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->grp.G, MBEDTLS_ECP_PF_UNCOMPRESSED, &g_size, G_buf, sizeof(G_buf));
     mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &y_size, Y_buf, sizeof(Y_buf));
-    size_t c_size = 1;
-    size_t ptot_size = asn1_len_tag(0x81, p_size), atot_size = asn1_len_tag(0x82, a_size ? a_size : (pointA[ecdsa->grp.id] && ecdsa->grp.id < 6 ? p_size : 1));
-    size_t btot_size = asn1_len_tag(0x83, b_size), gtot_size = asn1_len_tag(0x84, g_size);
-    size_t otot_size = asn1_len_tag(0x85, o_size), ytot_size = asn1_len_tag(0x86, y_size);
-    size_t ctot_size = asn1_len_tag(0x87, c_size);
-    size_t oid_len = asn1_len_tag(0x6, sizeof(oid_ecdsa));
-    size_t tot_len = 0, tot_data_len = 0;
-    if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_MONTGOMERY) {
+    uint16_t c_size = 1;
+    uint16_t ptot_size = asn1_len_tag(0x81, (uint16_t)p_size), atot_size = asn1_len_tag(0x82, a_size ? (uint16_t)a_size : (pointA[ecdsa->grp.id] && ecdsa->grp.id < 6 ? (uint16_t)p_size : 1));
+    uint16_t btot_size = asn1_len_tag(0x83, (uint16_t)b_size), gtot_size = asn1_len_tag(0x84, (uint16_t)g_size);
+    uint16_t otot_size = asn1_len_tag(0x85, (uint16_t)o_size), ytot_size = asn1_len_tag(0x86, (uint16_t)y_size);
+    uint16_t ctot_size = asn1_len_tag(0x87, (uint16_t)c_size);
+    uint16_t oid_len = asn1_len_tag(0x6, sizeof(oid_ecdsa));
+    uint16_t tot_len = 0, tot_data_len = 0;
+    if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_MONTGOMERY
+#ifdef MBEDTLS_EDDSA_C
+     || mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_EDWARDS
+#endif
+    ) {
         tot_data_len = oid_len + ptot_size + otot_size + gtot_size + ytot_size;
         oid = oid_ri;
     }
@@ -110,29 +116,33 @@ size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, siz
     //oid
     *p++ = 0x6; p += format_tlv_len(sizeof(oid_ecdsa), p); memcpy(p, oid, sizeof(oid_ecdsa));
     p += sizeof(oid_ecdsa);
-    if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_MONTGOMERY) {
+    if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_MONTGOMERY
+#ifdef MBEDTLS_EDDSA_C
+    || mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_EDWARDS
+#endif
+    ) {
         //p
-        *p++ = 0x81; p += format_tlv_len(p_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.P, p, p_size);
+        *p++ = 0x81; p += format_tlv_len((uint16_t)p_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.P, p, p_size);
         p += p_size;
         //order
-        *p++ = 0x82; p += format_tlv_len(o_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.N, p, o_size);
+        *p++ = 0x82; p += format_tlv_len((uint16_t)o_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.N, p, o_size);
         p += o_size;
          //G
-        *p++ = 0x83; p += format_tlv_len(g_size, p); memcpy(p, G_buf, g_size); p += g_size;
+        *p++ = 0x83; p += format_tlv_len((uint16_t)g_size, p); memcpy(p, G_buf, g_size); p += g_size;
         //Y
-        *p++ = 0x84; p += format_tlv_len(y_size, p); memcpy(p, Y_buf, y_size); p += y_size;
+        *p++ = 0x84; p += format_tlv_len((uint16_t)y_size, p); memcpy(p, Y_buf, y_size); p += y_size;
     }
     else {
         //p
-        *p++ = 0x81; p += format_tlv_len(p_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.P, p, p_size);
+        *p++ = 0x81; p += format_tlv_len((uint16_t)p_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.P, p, p_size);
         p += p_size;
         //A
         if (a_size) {
-            *p++ = 0x82; p += format_tlv_len(a_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.A, p, a_size); p += a_size;
+            *p++ = 0x82; p += format_tlv_len((uint16_t)a_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.A, p, a_size); p += a_size;
         }
         else {   //mbedtls does not set point A for some curves
             if (pointA[ecdsa->grp.id] && ecdsa->grp.id < 6) {
-                *p++ = 0x82; p += format_tlv_len(p_size, p); memcpy(p, pointA[ecdsa->grp.id], p_size);
+                *p++ = 0x82; p += format_tlv_len((uint16_t)p_size, p); memcpy(p, pointA[ecdsa->grp.id], p_size);
                 p += p_size;
             }
             else {
@@ -141,15 +151,15 @@ size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, siz
             }
         }
         //B
-        *p++ = 0x83; p += format_tlv_len(b_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.B, p, b_size);
+        *p++ = 0x83; p += format_tlv_len((uint16_t)b_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.B, p, b_size);
         p += b_size;
         //G
-        *p++ = 0x84; p += format_tlv_len(g_size, p); memcpy(p, G_buf, g_size); p += g_size;
+        *p++ = 0x84; p += format_tlv_len((uint16_t)g_size, p); memcpy(p, G_buf, g_size); p += g_size;
         //order
-        *p++ = 0x85; p += format_tlv_len(o_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.N, p, o_size);
+        *p++ = 0x85; p += format_tlv_len((uint16_t)o_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.N, p, o_size);
         p += o_size;
         //Y
-        *p++ = 0x86; p += format_tlv_len(y_size, p); memcpy(p, Y_buf, y_size); p += y_size;
+        *p++ = 0x86; p += format_tlv_len((uint16_t)y_size, p); memcpy(p, Y_buf, y_size); p += y_size;
         //cofactor
         *p++ = 0x87; p += format_tlv_len(c_size, p);
         *p++ = 1;
@@ -157,55 +167,52 @@ size_t asn1_cvc_public_key_ecdsa(mbedtls_ecdsa_context *ecdsa, uint8_t *buf, siz
     return tot_len;
 }
 
-size_t asn1_cvc_cert_body(void *rsa_ecdsa,
+uint16_t asn1_cvc_cert_body(void *rsa_ecdsa,
                           uint8_t key_type,
                           uint8_t *buf,
-                          size_t buf_len,
+                          uint16_t buf_len,
                           const uint8_t *ext,
-                          size_t ext_len,
+                          uint16_t ext_len,
                           bool full) {
-    size_t pubkey_size = 0;
+    uint16_t pubkey_size = 0;
     if (key_type & PICO_KEYS_KEY_RSA) {
         pubkey_size = asn1_cvc_public_key_rsa(rsa_ecdsa, NULL, 0);
     }
     else if (key_type & PICO_KEYS_KEY_EC) {
         pubkey_size = asn1_cvc_public_key_ecdsa(rsa_ecdsa, NULL, 0);
     }
-    size_t cpi_size = 4, ext_size = 0, role_size = 0, valid_size = 0;
+    uint16_t cpi_size = 4, ext_size = 0, role_size = 0, valid_size = 0;
     if (ext && ext_len > 0) {
         ext_size = asn1_len_tag(0x65, ext_len);
     }
     const uint8_t *role = (const uint8_t *)"\x06\x09\x04\x00\x7F\x00\x07\x03\x01\x02\x02\x53\x01\x00";
-    size_t rolelen = 14;
+    uint16_t rolelen = 14;
     if (full) {
         role_size = asn1_len_tag(0x7f4c, rolelen);
         valid_size = asn1_len_tag(0x5f24, 6) + asn1_len_tag(0x5f25, 6);
     }
 
-    uint8_t *car = NULL, *chr = NULL;
-    size_t lencar = 0, lenchr = 0;
-
-    if (asn1_find_tag(apdu.data, apdu.nc, 0x42, &lencar,
-                      &car) == false || lencar == 0 || car == NULL) {
-        car = (uint8_t *) dev_name;
-        lencar = dev_name_len;
+    asn1_ctx_t ctxi, car = {0}, chr = {0};
+    asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
+    if (asn1_find_tag(&ctxi, 0x42, &car) == false || asn1_len(&car) == 0) {
+        car.data = (uint8_t *) dev_name;
+        car.len = dev_name_len;
         if (dev_name == NULL) {
-            car = (uint8_t *)"ESPICOHSMTR00001";
-            lencar = strlen((const char *)car);
+            car.data = (uint8_t *)"ESPICOHSMTR00001";
+            car.len = (uint16_t)strlen((const char *)car.data);
         }
     }
-    if (asn1_find_tag(apdu.data, apdu.nc, 0x5f20, &lenchr,
-                      &chr) == false || lenchr == 0 || chr == NULL) {
-        chr = (uint8_t *) dev_name;
-        lenchr = dev_name_len;
-        if (chr == NULL) {
-            chr = car;
-            lenchr = lencar;
+    if (asn1_find_tag(&ctxi, 0x5f20, &chr) == false || asn1_len(&chr) == 0) {
+        chr.data = (uint8_t *) dev_name;
+        chr.len = dev_name_len;
+        if (chr.data == NULL) {
+            chr.data = car.data;
+            chr.len = car.len;
         }
     }
-    size_t car_size = asn1_len_tag(0x42, lencar), chr_size = asn1_len_tag(0x5f20, lenchr);
+    uint16_t car_size = asn1_len_tag(0x42, car.len), chr_size = asn1_len_tag(0x5f20, chr.len);
 
-    size_t tot_len = asn1_len_tag(0x7f4e, cpi_size + car_size + pubkey_size + chr_size + ext_size + role_size + valid_size);
+    uint16_t tot_len = asn1_len_tag(0x7f4e, cpi_size + car_size + pubkey_size + chr_size + ext_size + role_size + valid_size);
 
     if (buf_len == 0 || buf == NULL) {
         return tot_len;
@@ -219,7 +226,7 @@ size_t asn1_cvc_cert_body(void *rsa_ecdsa,
     //cpi
     *p++ = 0x5f; *p++ = 0x29; *p++ = 1; *p++ = 0;
     //car
-    *p++ = 0x42; p += format_tlv_len(lencar, p); memcpy(p, car, lencar); p += lencar;
+    *p++ = 0x42; p += format_tlv_len(car.len, p); memcpy(p, car.data, car.len); p += car.len;
     //pubkey
     if (key_type & PICO_KEYS_KEY_RSA) {
         p += asn1_cvc_public_key_rsa(rsa_ecdsa, p, pubkey_size);
@@ -228,7 +235,7 @@ size_t asn1_cvc_cert_body(void *rsa_ecdsa,
         p += asn1_cvc_public_key_ecdsa(rsa_ecdsa, p, pubkey_size);
     }
     //chr
-    *p++ = 0x5f; *p++ = 0x20; p += format_tlv_len(lenchr, p); memcpy(p, chr, lenchr); p += lenchr;
+    *p++ = 0x5f; *p++ = 0x20; p += format_tlv_len(chr.len, p); memcpy(p, chr.data, chr.len); p += chr.len;
     if (full) {
         *p++ = 0x7f;
         *p++ = 0x4c;
@@ -257,22 +264,22 @@ size_t asn1_cvc_cert_body(void *rsa_ecdsa,
     return tot_len;
 }
 
-size_t asn1_cvc_cert(void *rsa_ecdsa,
+uint16_t asn1_cvc_cert(void *rsa_ecdsa,
                      uint8_t key_type,
                      uint8_t *buf,
-                     size_t buf_len,
+                     uint16_t buf_len,
                      const uint8_t *ext,
-                     size_t ext_len,
+                     uint16_t ext_len,
                      bool full) {
-    size_t key_size = 0;
+    uint16_t key_size = 0;
     if (key_type & PICO_KEYS_KEY_RSA) {
-        key_size = mbedtls_mpi_size(&((mbedtls_rsa_context *) rsa_ecdsa)->N);
+        key_size = (uint16_t)mbedtls_mpi_size(&((mbedtls_rsa_context *) rsa_ecdsa)->N);
     }
     else if (key_type & PICO_KEYS_KEY_EC) {
         key_size = 2 * (int)((mbedtls_ecp_curve_info_from_grp_id(((mbedtls_ecdsa_context *) rsa_ecdsa)->grp.id)->bit_size + 7) / 8);
     }
-    size_t body_size = asn1_cvc_cert_body(rsa_ecdsa, key_type, NULL, 0, ext, ext_len, full), sig_size = asn1_len_tag(0x5f37, key_size);
-    size_t tot_len = asn1_len_tag(0x7f21, body_size + sig_size);
+    uint16_t body_size = asn1_cvc_cert_body(rsa_ecdsa, key_type, NULL, 0, ext, ext_len, full), sig_size = asn1_len_tag(0x5f37, key_size);
+    uint16_t tot_len = asn1_len_tag(0x7f21, body_size + sig_size);
     if (buf_len == 0 || buf == NULL) {
         return tot_len;
     }
@@ -297,11 +304,18 @@ size_t asn1_cvc_cert(void *rsa_ecdsa,
     else if (key_type & PICO_KEYS_KEY_EC) {
         mbedtls_mpi r, s;
         int ret = 0;
-        mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) rsa_ecdsa;
+        mbedtls_ecp_keypair *ecdsa = (mbedtls_ecp_keypair *) rsa_ecdsa;
         mbedtls_mpi_init(&r);
         mbedtls_mpi_init(&s);
-        ret =
-            mbedtls_ecdsa_sign(&ecdsa->grp, &r, &s, &ecdsa->d, hsh, sizeof(hsh), random_gen, NULL);
+#ifdef MBEDTLS_EDDSA_C
+        if (ecdsa->grp.id == MBEDTLS_ECP_DP_ED25519 || ecdsa->grp.id == MBEDTLS_ECP_DP_ED448) {
+            ret = mbedtls_eddsa_sign(&ecdsa->grp, &r, &s, &ecdsa->d, body, body_size, MBEDTLS_EDDSA_PURE, NULL, 0, random_gen, NULL);
+        }
+        else
+#endif
+        {
+            ret = mbedtls_ecdsa_sign(&ecdsa->grp, &r, &s, &ecdsa->d, hsh, sizeof(hsh), random_gen, NULL);
+        }
         if (ret == 0) {
             mbedtls_mpi_write_binary(&r, p, key_size / 2); p += key_size / 2;
             mbedtls_mpi_write_binary(&s, p, key_size / 2); p += key_size / 2;
@@ -313,31 +327,32 @@ size_t asn1_cvc_cert(void *rsa_ecdsa,
         mbedtls_mpi_free(&r);
         mbedtls_mpi_free(&s);
     }
-    return p - buf;
+    return (uint16_t)(p - buf);
 }
 
-size_t asn1_cvc_aut(void *rsa_ecdsa,
+uint16_t asn1_cvc_aut(void *rsa_ecdsa,
                     uint8_t key_type,
                     uint8_t *buf,
-                    size_t buf_len,
+                    uint16_t buf_len,
                     const uint8_t *ext,
-                    size_t ext_len) {
-    size_t cvcert_size = asn1_cvc_cert(rsa_ecdsa, key_type, NULL, 0, ext, ext_len, false);
-    size_t outcar_len = dev_name_len;
+                    uint16_t ext_len) {
+    uint16_t cvcert_size = asn1_cvc_cert(rsa_ecdsa, key_type, NULL, 0, ext, ext_len, false);
+    uint16_t outcar_len = dev_name_len;
     const uint8_t *outcar = dev_name;
-    size_t outcar_size = asn1_len_tag(0x42, outcar_len);
-    file_t *fkey = search_by_fid(EF_KEY_DEV, NULL, SPECIFY_EF);
+    uint16_t outcar_size = asn1_len_tag(0x42, outcar_len);
+    file_t *fkey = search_file(EF_KEY_DEV);
     if (!fkey) {
         return 0;
     }
-    mbedtls_ecdsa_context ectx;
-    mbedtls_ecdsa_init(&ectx);
-    if (load_private_key_ecdsa(&ectx, fkey) != CCID_OK) {
-        mbedtls_ecdsa_free(&ectx);
+    mbedtls_ecp_keypair ectx;
+    mbedtls_ecp_keypair_init(&ectx);
+    if (load_private_key_ec(&ectx, fkey) != PICOKEY_OK) {
+        mbedtls_ecp_keypair_free(&ectx);
         return 0;
     }
-    int ret = 0, key_size = 2 * mbedtls_mpi_size(&ectx.d);
-    size_t outsig_size = asn1_len_tag(0x5f37, key_size), tot_len = asn1_len_tag(0x67, cvcert_size + outcar_size + outsig_size);
+    int ret = 0;
+    uint16_t key_size = 2 * (uint16_t)mbedtls_mpi_size(&ectx.d);
+    uint16_t outsig_size = asn1_len_tag(0x5f37, key_size), tot_len = asn1_len_tag(0x67, cvcert_size + outcar_size + outsig_size);
     if (buf_len == 0 || buf == NULL) {
         return tot_len;
     }
@@ -352,42 +367,50 @@ size_t asn1_cvc_aut(void *rsa_ecdsa,
     p += asn1_cvc_cert(rsa_ecdsa, key_type, p, cvcert_size, ext, ext_len, false);
     //outcar
     *p++ = 0x42; p += format_tlv_len(outcar_len, p); memcpy(p, outcar, outcar_len); p += outcar_len;
-    uint8_t hsh[32];
     memcpy(p, "\x5f\x37", 2); p += 2;
     p += format_tlv_len(key_size, p);
-    hash256(body, cvcert_size + outcar_size, hsh);
     mbedtls_mpi r, s;
     mbedtls_mpi_init(&r);
     mbedtls_mpi_init(&s);
-    ret = mbedtls_ecdsa_sign(&ectx.grp, &r, &s, &ectx.d, hsh, sizeof(hsh), random_gen, NULL);
-    mbedtls_ecdsa_free(&ectx);
+#ifdef MBEDTLS_EDDSA_C
+    if (ectx.grp.id == MBEDTLS_ECP_DP_ED25519 || ectx.grp.id == MBEDTLS_ECP_DP_ED448) {
+        ret = mbedtls_eddsa_sign(&ectx.grp, &r, &s, &ectx.d, body, cvcert_size + outcar_size, MBEDTLS_EDDSA_PURE, NULL, 0, random_gen, NULL);
+    }
+    else
+#endif
+    {
+        uint8_t hsh[32];
+        hash256(body, cvcert_size + outcar_size, hsh);
+        ret = mbedtls_ecdsa_sign(&ectx.grp, &r, &s, &ectx.d, hsh, sizeof(hsh), random_gen, NULL);
+    }
+    mbedtls_ecp_keypair_free(&ectx);
     if (ret != 0) {
         mbedtls_mpi_free(&r);
         mbedtls_mpi_free(&s);
         return 0;
     }
-    mbedtls_mpi_write_binary(&r, p, mbedtls_mpi_size(&r)); p += mbedtls_mpi_size(&r);
-    mbedtls_mpi_write_binary(&s, p, mbedtls_mpi_size(&s)); p += mbedtls_mpi_size(&s);
+    mbedtls_mpi_write_binary(&r, p, key_size / 2); p += key_size / 2;
+    mbedtls_mpi_write_binary(&s, p, key_size / 2); p += key_size / 2;
     mbedtls_mpi_free(&r);
     mbedtls_mpi_free(&s);
-    return p - buf;
+    return (uint16_t)(p - buf);
 }
 
-size_t asn1_build_cert_description(const uint8_t *label,
-                                   size_t label_len,
+uint16_t asn1_build_cert_description(const uint8_t *label,
+                                   uint16_t label_len,
                                    const uint8_t *puk,
-                                   size_t puk_len,
+                                   uint16_t puk_len,
                                    uint16_t fid,
                                    uint8_t *buf,
-                                   size_t buf_len) {
-    size_t opt_len = 2;
-    size_t seq1_size =
+                                   uint16_t buf_len) {
+    uint16_t opt_len = 2;
+    uint16_t seq1_size =
         asn1_len_tag(0x30, asn1_len_tag(0xC, label_len) + asn1_len_tag(0x3, opt_len));
-    size_t seq2_size = asn1_len_tag(0x30, asn1_len_tag(0x4, 20)); /* SHA1 is 20 bytes length */
-    size_t seq3_size =
+    uint16_t seq2_size = asn1_len_tag(0x30, asn1_len_tag(0x4, 20)); /* SHA1 is 20 bytes length */
+    uint16_t seq3_size =
         asn1_len_tag(0xA1,
                      asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, sizeof(uint16_t)))));
-    size_t tot_len = asn1_len_tag(0x30, seq1_size + seq2_size + seq3_size);
+    uint16_t tot_len = asn1_len_tag(0x30, seq1_size + seq2_size + seq3_size);
     if (buf_len == 0 || buf == NULL) {
         return tot_len;
     }
@@ -424,20 +447,19 @@ size_t asn1_build_cert_description(const uint8_t *label,
     p += format_tlv_len(asn1_len_tag(0x4, sizeof(uint16_t)), p);
     *p++ = 0x4;
     p += format_tlv_len(sizeof(uint16_t), p);
-    *p++ = fid >> 8;
-    *p++ = fid & 0xff;
-    return p - buf;
+    put_uint16_t_be(fid, p); p += sizeof(uint16_t);
+    return (uint16_t)(p - buf);
 }
 
-size_t asn1_build_prkd_generic(const uint8_t *label,
-                               size_t label_len,
+uint16_t asn1_build_prkd_generic(const uint8_t *label,
+                               uint16_t label_len,
                                const uint8_t *keyid,
-                               size_t keyid_len,
-                               size_t keysize,
+                               uint16_t keyid_len,
+                               uint16_t keysize,
                                int key_type,
                                uint8_t *buf,
-                               size_t buf_len) {
-    size_t seq_len = 0;
+                               uint16_t buf_len) {
+    uint16_t seq_len = 0;
     const uint8_t *seq = NULL;
     uint8_t first_tag = 0x0;
     if (key_type & PICO_KEYS_KEY_EC) {
@@ -455,10 +477,10 @@ size_t asn1_build_prkd_generic(const uint8_t *label,
         seq_len = 3;
         first_tag = 0xA8;
     }
-    size_t seq1_size = asn1_len_tag(0x30, asn1_len_tag(0xC, label_len));
-    size_t seq2_size =
+    uint16_t seq1_size = asn1_len_tag(0x30, asn1_len_tag(0xC, label_len));
+    uint16_t seq2_size =
         asn1_len_tag(0x30, asn1_len_tag(0x4, keyid_len) + asn1_len_tag(0x3, seq_len));
-    size_t seq3_size = 0, seq4_size = 0;
+    uint16_t seq3_size = 0, seq4_size = 0;
     if (key_type & PICO_KEYS_KEY_EC || key_type & PICO_KEYS_KEY_RSA) {
         seq4_size = asn1_len_tag(0xA1, asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, 0)) + asn1_len_tag(0x2, 2)));
     }
@@ -466,7 +488,7 @@ size_t asn1_build_prkd_generic(const uint8_t *label,
         seq3_size = asn1_len_tag(0xA0, asn1_len_tag(0x30, asn1_len_tag(0x2, 2)));
         seq4_size = asn1_len_tag(0xA1, asn1_len_tag(0x30, asn1_len_tag(0x30, asn1_len_tag(0x4, 0))));
     }
-    size_t tot_len = asn1_len_tag(first_tag, seq1_size + seq2_size + seq4_size);
+    uint16_t tot_len = asn1_len_tag(first_tag, seq1_size + seq2_size + seq4_size);
     if (buf_len == 0 || buf == NULL) {
         return tot_len;
     }
@@ -501,13 +523,12 @@ size_t asn1_build_prkd_generic(const uint8_t *label,
         p += format_tlv_len(asn1_len_tag(0x2, 2), p);
         *p++ = 0x2;
         p += format_tlv_len(2, p);
-        *p++ = (keysize >> 8) & 0xff;
-        *p++ = keysize & 0xff;
+        p += put_uint16_t_be(keysize, p);
     }
 
     //Seq 4
     *p++ = 0xA1;
-    size_t inseq4_len = asn1_len_tag(0x30, asn1_len_tag(0x4, 0));
+    uint16_t inseq4_len = asn1_len_tag(0x30, asn1_len_tag(0x4, 0));
     if (key_type & PICO_KEYS_KEY_EC || key_type & PICO_KEYS_KEY_RSA) {
         inseq4_len += asn1_len_tag(0x2, 2);
     }
@@ -521,19 +542,18 @@ size_t asn1_build_prkd_generic(const uint8_t *label,
     if (key_type & PICO_KEYS_KEY_EC || key_type & PICO_KEYS_KEY_RSA) {
         *p++ = 0x2;
         p += format_tlv_len(2, p);
-        *p++ = (keysize >> 8) & 0xff;
-        *p++ = keysize & 0xff;
+        p += put_uint16_t_be(keysize, p);
     }
-    return p - buf;
+    return (uint16_t)(p - buf);
 }
 
-size_t asn1_build_prkd_ecc(const uint8_t *label,
-                           size_t label_len,
+uint16_t asn1_build_prkd_ecc(const uint8_t *label,
+                           uint16_t label_len,
                            const uint8_t *keyid,
-                           size_t keyid_len,
-                           size_t keysize,
+                           uint16_t keyid_len,
+                           uint16_t keysize,
                            uint8_t *buf,
-                           size_t buf_len) {
+                           uint16_t buf_len) {
     return asn1_build_prkd_generic(label,
                                    label_len,
                                    keyid,
@@ -544,13 +564,13 @@ size_t asn1_build_prkd_ecc(const uint8_t *label,
                                    buf_len);
 }
 
-size_t asn1_build_prkd_rsa(const uint8_t *label,
-                           size_t label_len,
+uint16_t asn1_build_prkd_rsa(const uint8_t *label,
+                           uint16_t label_len,
                            const uint8_t *keyid,
-                           size_t keyid_len,
-                           size_t keysize,
+                           uint16_t keyid_len,
+                           uint16_t keysize,
                            uint8_t *buf,
-                           size_t buf_len) {
+                           uint16_t buf_len) {
     return asn1_build_prkd_generic(label,
                                    label_len,
                                    keyid,
@@ -561,13 +581,13 @@ size_t asn1_build_prkd_rsa(const uint8_t *label,
                                    buf_len);
 }
 
-size_t asn1_build_prkd_aes(const uint8_t *label,
-                           size_t label_len,
+uint16_t asn1_build_prkd_aes(const uint8_t *label,
+                           uint16_t label_len,
                            const uint8_t *keyid,
-                           size_t keyid_len,
-                           size_t keysize,
+                           uint16_t keyid_len,
+                           uint16_t keysize,
                            uint8_t *buf,
-                           size_t buf_len) {
+                           uint16_t buf_len) {
     return asn1_build_prkd_generic(label,
                                    label_len,
                                    keyid,
@@ -578,18 +598,20 @@ size_t asn1_build_prkd_aes(const uint8_t *label,
                                    buf_len);
 }
 
-const uint8_t *cvc_get_field(const uint8_t *data, size_t len, size_t *olen, uint16_t tag) {
-    uint8_t *rdata = NULL;
-    if (data == NULL || len == 0) {
+const uint8_t *cvc_get_field(const uint8_t *data, uint16_t len, uint16_t *olen, uint16_t tag) {
+    asn1_ctx_t ctxi, ctxo = { 0 };
+    asn1_ctx_init((uint8_t *)data, len, &ctxi);
+    if (asn1_len(&ctxi) == 0) {
         return NULL;
     }
-    if (asn1_find_tag(data, len, tag, olen, &rdata) == false) {
+    if (asn1_find_tag(&ctxi, tag, &ctxo) == false) {
         return NULL;
     }
-    return rdata;
+    *olen = ctxo.len;
+    return ctxo.data;
 }
 
-const uint8_t *cvc_get_body(const uint8_t *data, size_t len, size_t *olen) {
+const uint8_t *cvc_get_body(const uint8_t *data, uint16_t len, uint16_t *olen) {
     const uint8_t *bkdata = data;
     if ((data = cvc_get_field(data, len, olen, 0x67)) == NULL) { /* Check for CSR */
         data = bkdata;
@@ -600,7 +622,7 @@ const uint8_t *cvc_get_body(const uint8_t *data, size_t len, size_t *olen) {
     return NULL;
 }
 
-const uint8_t *cvc_get_sig(const uint8_t *data, size_t len, size_t *olen) {
+const uint8_t *cvc_get_sig(const uint8_t *data, uint16_t len, uint16_t *olen) {
     const uint8_t *bkdata = data;
     if ((data = cvc_get_field(data, len, olen, 0x67)) == NULL) { /* Check for CSR */
         data = bkdata;
@@ -611,28 +633,28 @@ const uint8_t *cvc_get_sig(const uint8_t *data, size_t len, size_t *olen) {
     return NULL;
 }
 
-const uint8_t *cvc_get_car(const uint8_t *data, size_t len, size_t *olen) {
+const uint8_t *cvc_get_car(const uint8_t *data, uint16_t len, uint16_t *olen) {
     if ((data = cvc_get_body(data, len, olen)) != NULL) {
         return cvc_get_field(data, len, olen, 0x42);
     }
     return NULL;
 }
 
-const uint8_t *cvc_get_chr(const uint8_t *data, size_t len, size_t *olen) {
+const uint8_t *cvc_get_chr(const uint8_t *data, uint16_t len, uint16_t *olen) {
     if ((data = cvc_get_body(data, len, olen)) != NULL) {
         return cvc_get_field(data, len, olen, 0x5F20);
     }
     return NULL;
 }
 
-const uint8_t *cvc_get_pub(const uint8_t *data, size_t len, size_t *olen) {
+const uint8_t *cvc_get_pub(const uint8_t *data, uint16_t len, uint16_t *olen) {
     if ((data = cvc_get_body(data, len, olen)) != NULL) {
         return cvc_get_field(data, len, olen, 0x7F49);
     }
     return NULL;
 }
 
-const uint8_t *cvc_get_ext(const uint8_t *data, size_t len, size_t *olen) {
+const uint8_t *cvc_get_ext(const uint8_t *data, uint16_t len, uint16_t *olen) {
     if ((data = cvc_get_body(data, len, olen)) != NULL) {
         return cvc_get_field(data, len, olen, 0x65);
     }
@@ -642,7 +664,7 @@ const uint8_t *cvc_get_ext(const uint8_t *data, size_t len, size_t *olen) {
 extern PUK puk_store[MAX_PUK_STORE_ENTRIES];
 extern int puk_store_entries;
 
-int puk_store_index(const uint8_t *chr, size_t chr_len) {
+int puk_store_index(const uint8_t *chr, uint16_t chr_len) {
     for (int i = 0; i < puk_store_entries; i++) {
         if (memcmp(puk_store[i].chr, chr, chr_len) == 0) {
             return i;
@@ -651,8 +673,8 @@ int puk_store_index(const uint8_t *chr, size_t chr_len) {
     return -1;
 }
 
-mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len) {
-    size_t chr_len = 0, car_len = 0;
+mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, uint16_t ca_len) {
+    uint16_t chr_len = 0, car_len = 0;
     const uint8_t *chr = NULL, *car = NULL;
     int eq = -1;
     do {
@@ -670,12 +692,12 @@ mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len) {
             }
         }
     } while (car && chr && eq != 0);
-    size_t ca_puk_len = 0;
+    uint16_t ca_puk_len = 0;
     const uint8_t *ca_puk = cvc_get_pub(ca, ca_len, &ca_puk_len);
     if (!ca_puk) {
         return MBEDTLS_ECP_DP_NONE;
     }
-    size_t t81_len = 0;
+    uint16_t t81_len = 0;
     const uint8_t *t81 = cvc_get_field(ca_puk, ca_puk_len, &t81_len, 0x81);
     if (!t81) {
         return MBEDTLS_ECP_DP_NONE;
@@ -685,29 +707,29 @@ mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len) {
 }
 
 int puk_verify(const uint8_t *sig,
-               size_t sig_len,
+               uint16_t sig_len,
                const uint8_t *hash,
-               size_t hash_len,
+               uint16_t hash_len,
                const uint8_t *ca,
-               size_t ca_len) {
-    size_t puk_len = 0;
+               uint16_t ca_len) {
+    uint16_t puk_len = 0;
     const uint8_t *puk = cvc_get_pub(ca, ca_len, &puk_len);
     if (!puk) {
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
-    size_t oid_len = 0;
+    uint16_t oid_len = 0;
     const uint8_t *oid = cvc_get_field(puk, puk_len, &oid_len, 0x6);
     if (!oid) {
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
     if (memcmp(oid, OID_ID_TA_RSA, 9) == 0) { //RSA
-        size_t t81_len = 0, t82_len = 0;
+        uint16_t t81_len = 0, t82_len = 0;
         const uint8_t *t81 = cvc_get_field(puk, puk_len, &t81_len, 0x81), *t82 = cvc_get_field(puk,
                                                                                                puk_len,
                                                                                                &t81_len,
                                                                                                0x82);
         if (!t81 || !t82) {
-            return CCID_WRONG_DATA;
+            return PICOKEY_WRONG_DATA;
         }
         mbedtls_rsa_context rsa;
         mbedtls_rsa_init(&rsa);
@@ -735,32 +757,32 @@ int puk_verify(const uint8_t *sig,
         }
         if (md == MBEDTLS_MD_NONE) {
             mbedtls_rsa_free(&rsa);
-            return CCID_WRONG_DATA;
+            return PICOKEY_WRONG_DATA;
         }
         int r = mbedtls_mpi_read_binary(&rsa.N, t81, t81_len);
         if (r != 0) {
             mbedtls_rsa_free(&rsa);
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
         r = mbedtls_mpi_read_binary(&rsa.E, t82, t82_len);
         if (r != 0) {
             mbedtls_rsa_free(&rsa);
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
         r = mbedtls_rsa_complete(&rsa);
         if (r != 0) {
             mbedtls_rsa_free(&rsa);
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
         r = mbedtls_rsa_check_pubkey(&rsa);
         if (r != 0) {
             mbedtls_rsa_free(&rsa);
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
-        r = mbedtls_rsa_pkcs1_verify(&rsa, md, hash_len, hash, sig);
+        r = mbedtls_rsa_pkcs1_verify(&rsa, md, (unsigned int)hash_len, hash, sig);
         mbedtls_rsa_free(&rsa);
         if (r != 0) {
-            return CCID_WRONG_SIGNATURE;
+            return PICOKEY_WRONG_SIGNATURE;
         }
     }
     else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) {   //ECC
@@ -781,34 +803,34 @@ int puk_verify(const uint8_t *sig,
             md = MBEDTLS_MD_SHA512;
         }
         if (md == MBEDTLS_MD_NONE) {
-            return CCID_WRONG_DATA;
+            return PICOKEY_WRONG_DATA;
         }
 
-        size_t t86_len = 0;
+        uint16_t t86_len = 0;
         const uint8_t *t86 = cvc_get_field(puk, puk_len, &t86_len, 0x86);
         if (!t86) {
-            return CCID_WRONG_DATA;
+            return PICOKEY_WRONG_DATA;
         }
         mbedtls_ecp_group_id ec_id = cvc_inherite_ec_group(ca, ca_len);
         if (ec_id == MBEDTLS_ECP_DP_NONE) {
-            return CCID_WRONG_DATA;
+            return PICOKEY_WRONG_DATA;
         }
         mbedtls_ecdsa_context ecdsa;
         mbedtls_ecdsa_init(&ecdsa);
         int ret = mbedtls_ecp_group_load(&ecdsa.grp, ec_id);
         if (ret != 0) {
             mbedtls_ecdsa_free(&ecdsa);
-            return CCID_WRONG_DATA;
+            return PICOKEY_WRONG_DATA;
         }
         ret = mbedtls_ecp_point_read_binary(&ecdsa.grp, &ecdsa.Q, t86, t86_len);
         if (ret != 0) {
             mbedtls_ecdsa_free(&ecdsa);
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
         ret = mbedtls_ecp_check_pubkey(&ecdsa.grp, &ecdsa.Q);
         if (ret != 0) {
             mbedtls_ecdsa_free(&ecdsa);
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
         mbedtls_mpi r, s;
         mbedtls_mpi_init(&r);
@@ -818,44 +840,44 @@ int puk_verify(const uint8_t *sig,
             mbedtls_mpi_free(&r);
             mbedtls_mpi_free(&s);
             mbedtls_ecdsa_free(&ecdsa);
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
         ret = mbedtls_mpi_read_binary(&s, sig + sig_len / 2, sig_len / 2);
         if (ret != 0) {
             mbedtls_mpi_free(&r);
             mbedtls_mpi_free(&s);
             mbedtls_ecdsa_free(&ecdsa);
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
         ret = mbedtls_ecdsa_verify(&ecdsa.grp, hash, hash_len, &ecdsa.Q, &r, &s);
         mbedtls_mpi_free(&r);
         mbedtls_mpi_free(&s);
         mbedtls_ecdsa_free(&ecdsa);
         if (ret != 0) {
-            return CCID_WRONG_SIGNATURE;
+            return PICOKEY_WRONG_SIGNATURE;
         }
     }
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
-int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t ca_len) {
-    size_t puk_len = 0;
+int cvc_verify(const uint8_t *cert, uint16_t cert_len, const uint8_t *ca, uint16_t ca_len) {
+    uint16_t puk_len = 0;
     const uint8_t *puk = cvc_get_pub(ca, ca_len, &puk_len);
     if (!puk) {
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
-    size_t oid_len = 0, cv_body_len = 0, sig_len = 0;
+    uint16_t oid_len = 0, cv_body_len = 0, sig_len = 0;
     const uint8_t *oid = cvc_get_field(puk, puk_len, &oid_len, 0x6);
     const uint8_t *cv_body = cvc_get_body(cert, cert_len, &cv_body_len);
     const uint8_t *sig = cvc_get_sig(cert, cert_len, &sig_len);
     if (!sig) {
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
     if (!cv_body) {
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
     if (!oid) {
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
     mbedtls_md_type_t md = MBEDTLS_MD_NONE;
     if (memcmp(oid, OID_ID_TA_RSA, 9) == 0) { //RSA
@@ -896,18 +918,18 @@ int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t c
         }
     }
     if (md == MBEDTLS_MD_NONE) {
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
     const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md);
     uint8_t hash[64], hash_len = mbedtls_md_get_size(md_info);
     uint8_t tlv_body = 2 + format_tlv_len(cv_body_len, NULL);
     int r = mbedtls_md(md_info, cv_body - tlv_body, cv_body_len + tlv_body, hash);
     if (r != 0) {
-        return CCID_EXEC_ERROR;
+        return PICOKEY_EXEC_ERROR;
     }
     r = puk_verify(sig, sig_len, hash, hash_len, ca, ca_len);
     if (r != 0) {
-        return CCID_WRONG_SIGNATURE;
+        return PICOKEY_WRONG_SIGNATURE;
     }
-    return CCID_OK;
+    return PICOKEY_OK;
 }

src/hsm/cvc.h

@@ -3,23 +3,23 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef _CVC_H_
 #define _CVC_H_
 
 #include <stdlib.h>
-#ifndef ENABLE_EMULATION
+#if !defined(ENABLE_EMULATION) && !defined(ESP_PLATFORM)
 #include "pico/stdlib.h"
 #else
 #include <stdbool.h>
@@ -28,70 +28,78 @@
 
 typedef struct PUK {
     const uint8_t *puk;
-    size_t puk_len;
+    uint16_t puk_len;
     const uint8_t *car;
-    size_t car_len;
+    uint16_t car_len;
     const uint8_t *chr;
-    size_t chr_len;
+    uint16_t chr_len;
     const uint8_t *cvcert;
-    size_t cvcert_len;
+    uint16_t cvcert_len;
     bool copied;
 } PUK;
 
 #define MAX_PUK_STORE_ENTRIES 4
 
-extern size_t asn1_cvc_cert(void *rsa_ecdsa,
+extern uint16_t asn1_cvc_cert(void *rsa_ecdsa,
                             uint8_t key_type,
                             uint8_t *buf,
-                            size_t buf_len,
+                            uint16_t buf_len,
                             const uint8_t *ext,
-                            size_t ext_len,
+                            uint16_t ext_len,
                             bool full);
-extern size_t asn1_cvc_aut(void *rsa_ecdsa,
+extern uint16_t asn1_cvc_aut(void *rsa_ecdsa,
                            uint8_t key_type,
                            uint8_t *buf,
-                           size_t buf_len,
+                           uint16_t buf_len,
                            const uint8_t *ext,
-                           size_t ext_len);
-extern size_t asn1_build_cert_description(const uint8_t *label,
-                                          size_t label_len,
+                           uint16_t ext_len);
+extern uint16_t asn1_build_cert_description(const uint8_t *label,
+                                          uint16_t label_len,
                                           const uint8_t *puk,
-                                          size_t puk_len,
+                                          uint16_t puk_len,
                                           uint16_t fid,
                                           uint8_t *buf,
-                                          size_t buf_len);
-extern const uint8_t *cvc_get_field(const uint8_t *data, size_t len, size_t *olen, uint16_t tag);
-extern const uint8_t *cvc_get_car(const uint8_t *data, size_t len, size_t *olen);
-extern const uint8_t *cvc_get_chr(const uint8_t *data, size_t len, size_t *olen);
-extern const uint8_t *cvc_get_pub(const uint8_t *data, size_t len, size_t *olen);
-extern const uint8_t *cvc_get_ext(const uint8_t *data, size_t len, size_t *olen);
-extern int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t ca_len);
-extern mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, size_t ca_len);
+                                          uint16_t buf_len);
+extern const uint8_t *cvc_get_field(const uint8_t *data, uint16_t len, uint16_t *olen, uint16_t tag);
+extern const uint8_t *cvc_get_car(const uint8_t *data, uint16_t len, uint16_t *olen);
+extern const uint8_t *cvc_get_chr(const uint8_t *data, uint16_t len, uint16_t *olen);
+extern const uint8_t *cvc_get_pub(const uint8_t *data, uint16_t len, uint16_t *olen);
+extern const uint8_t *cvc_get_ext(const uint8_t *data, uint16_t len, uint16_t *olen);
+extern int cvc_verify(const uint8_t *cert, uint16_t cert_len, const uint8_t *ca, uint16_t ca_len);
+extern mbedtls_ecp_group_id cvc_inherite_ec_group(const uint8_t *ca, uint16_t ca_len);
 extern int puk_verify(const uint8_t *sig,
-                      size_t sig_len,
+                      uint16_t sig_len,
                       const uint8_t *hash,
-                      size_t hash_len,
+                      uint16_t hash_len,
                       const uint8_t *ca,
-                      size_t ca_len);
-extern size_t asn1_build_prkd_ecc(const uint8_t *label,
-                                  size_t label_len,
+                      uint16_t ca_len);
+extern uint16_t asn1_build_prkd_ecc(const uint8_t *label,
+                                  uint16_t label_len,
                                   const uint8_t *keyid,
-                                  size_t keyid_len,
-                                  size_t keysize,
+                                  uint16_t keyid_len,
+                                  uint16_t keysize,
                                   uint8_t *buf,
-                                  size_t buf_len);
-extern size_t asn1_build_prkd_rsa(const uint8_t *label,
-                                  size_t label_len,
+                                  uint16_t buf_len);
+extern uint16_t asn1_build_prkd_rsa(const uint8_t *label,
+                                  uint16_t label_len,
                                   const uint8_t *keyid,
-                                  size_t keyid_len,
-                                  size_t keysize,
+                                  uint16_t keyid_len,
+                                  uint16_t keysize,
                                   uint8_t *buf,
-                                  size_t buf_len);
-extern size_t asn1_build_prkd_aes(const uint8_t *label,
-                                  size_t label_len,
+                                  uint16_t buf_len);
+extern uint16_t asn1_build_prkd_aes(const uint8_t *label,
+                                  uint16_t label_len,
                                   const uint8_t *keyid,
-                                  size_t keyid_len,
-                                  size_t keysize,
+                                  uint16_t keyid_len,
+                                  uint16_t keysize,
                                   uint8_t *buf,
-                                  size_t buf_len);
+                                  uint16_t buf_len);
+extern uint16_t asn1_build_prkd_generic(const uint8_t *label,
+                                  uint16_t label_len,
+                                  const uint8_t *keyid,
+                                  uint16_t keyid_len,
+                                  uint16_t keysize,
+                                  int key_tpe,
+                                  uint8_t *buf,
+                                  uint16_t buf_len);
 #endif

src/hsm/files.c

@@ -3,27 +3,28 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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_ef_dir(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,
+    /*  1 */ { .fid = 0x2f00, .parent = 0, .name = NULL, .type = FILE_TYPE_WORKING_EF | FILE_DATA_FUNC, .data = (uint8_t *) parse_ef_dir,
                .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
@@ -41,26 +42,26 @@ file_t file_entries[] = {
                .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,
+    /*  9 */ { .fid = EF_PIN1, .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,
+    /* 10 */ { .fid = EF_PIN1_MAX_RETRIES, .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,
+    /* 11 */ { .fid = EF_PIN1_RETRIES, .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,
+    /* 12 */ { .fid = EF_SOPIN, .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,
+    /* 13 */ { .fid = EF_SOPIN_MAX_RETRIES, .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,
+    /* 14 */ { .fid = EF_SOPIN_RETRIES, .parent = 5, .name = NULL,
                .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //retries PIN (SOPIN)
     /* 15 */ { .fid = EF_DEVOPS, .parent = 5, .name = NULL,
-               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //Device options
     /* 16 */ { .fid = EF_PRKDFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF,
                .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                           //EF.PrKDFs
@@ -101,7 +102,7 @@ file_t file_entries[] = {
     ///* 30 */ { .fid = 0x0000, .parent = 0, .name = openpgpcard_aid, .type = FILE_TYPE_WORKING_EF, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = {0} },
     /* 31 */ { .fid = 0x0000, .parent = 5, .name = sc_hsm_aid, .type = FILE_TYPE_WORKING_EF,
                .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },
-    /* 32 */ { .fid = 0x0000, .parent = 0xff, .name = NULL, .type = FILE_TYPE_UNKNOWN, .data = NULL,
+    /* 32 */ { .fid = 0x0000, .parent = 0xff, .name = NULL, .type = FILE_TYPE_NOT_KNOWN, .data = NULL,
                .ef_structure = 0, .acl = { 0 } }                                                                                     //end
 };
 

src/hsm/files.h

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 
@@ -24,7 +24,13 @@
 #define EF_DEVOPS       0x100E
 #define EF_MKEK         0x100A
 #define EF_MKEK_SO      0x100B
-#define EF_XKEK         0x1080
+#define EF_XKEK         0x1070
+#define EF_PIN1         0x1081
+#define EF_PIN1_MAX_RETRIES 0x1082
+#define EF_PIN1_RETRIES 0x1083
+#define EF_SOPIN        0x1088
+#define EF_SOPIN_MAX_RETRIES 0x1089
+#define EF_SOPIN_RETRIES 0x108A
 #define EF_DKEK         0x1090
 #define EF_KEY_DOMAIN   0x10A0
 #define EF_PUKAUT       0x10C0

src/hsm/kek.c

@@ -3,34 +3,33 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
-#include "common.h"
+#include "sc_hsm.h"
 #include "stdlib.h"
-#ifndef ENABLE_EMULATION
+#if !defined(ENABLE_EMULATION) && !defined(ESP_PLATFORM)
 #include "pico/stdlib.h"
 #endif
 #include "kek.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 "mbedtls/chachapoly.h"
 #include "files.h"
+#include "otp.h"
 
 extern bool has_session_pin, has_session_sopin;
 extern uint8_t session_pin[32], session_sopin[32];
@@ -38,56 +37,52 @@ uint8_t mkek_mask[MKEK_KEY_SIZE];
 bool has_mkek_mask = false;
 uint8_t pending_save_dkek = 0xff;
 
-#define POLY 0xedb88320
-
-uint32_t crc32c(const uint8_t *buf, size_t len) {
-    uint32_t crc = ~0;
-    while (len--) {
-        crc ^= *buf++;
-        for (int k = 0; k < 8; k++) {
-            crc = (crc >> 1) ^ (POLY & (0 - (crc & 1)));
+void mkek_masked(uint8_t *mkek, const uint8_t *mask) {
+    if (mask) {
+        for (int i = 0; i < MKEK_KEY_SIZE; i++) {
+            MKEK_KEY(mkek)[i] ^= mask[i];
         }
     }
-    return ~crc;
 }
 
 int load_mkek(uint8_t *mkek) {
     if (has_session_pin == false && has_session_sopin == false) {
-        return CCID_NO_LOGIN;
+        return PICOKEY_NO_LOGIN;
     }
     const uint8_t *pin = NULL;
     if (pin == NULL && has_session_pin == true) {
-        file_t *tf = search_by_fid(EF_MKEK, NULL, SPECIFY_EF);
+        file_t *tf = search_file(EF_MKEK);
         if (file_has_data(tf)) {
             memcpy(mkek, file_get_data(tf), MKEK_SIZE);
             pin = session_pin;
         }
     }
     if (pin == NULL && has_session_sopin == true) {
-        file_t *tf = search_by_fid(EF_MKEK_SO, NULL, SPECIFY_EF);
+        file_t *tf = search_file(EF_MKEK_SO);
         if (file_has_data(tf)) {
             memcpy(mkek, file_get_data(tf), MKEK_SIZE);
             pin = session_sopin;
         }
     }
     if (pin == NULL) { //Should never happen
-        return CCID_EXEC_ERROR;
+        return PICOKEY_EXEC_ERROR;
     }
 
     if (has_mkek_mask) {
-        for (int i = 0; i < MKEK_KEY_SIZE; i++) {
-            MKEK_KEY(mkek)[i] ^= mkek_mask[i];
-        }
+        mkek_masked(mkek, mkek_mask);
     }
-    int ret =
-        aes_decrypt_cfb_256(pin, MKEK_IV(mkek), MKEK_KEY(mkek), MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE);
+
+    int ret = aes_decrypt_cfb_256(pin, MKEK_IV(mkek), MKEK_KEY(mkek), MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE);
     if (ret != 0) {
-        return CCID_EXEC_ERROR;
+        return PICOKEY_EXEC_ERROR;
     }
     if (crc32c(MKEK_KEY(mkek), MKEK_KEY_SIZE) != *(uint32_t *) MKEK_CHECKSUM(mkek)) {
-        return CCID_WRONG_DKEK;
+        return PICOKEY_WRONG_DKEK;
     }
-    return CCID_OK;
+    if (otp_key_1) {
+        mkek_masked(mkek, otp_key_1);
+    }
+    return PICOKEY_OK;
 }
 
 mse_t mse = { .init = false };
@@ -96,22 +91,15 @@ int mse_decrypt_ct(uint8_t *data, size_t len) {
     mbedtls_chachapoly_context chatx;
     mbedtls_chachapoly_init(&chatx);
     mbedtls_chachapoly_setkey(&chatx, mse.key_enc + 12);
-    int ret = mbedtls_chachapoly_auth_decrypt(&chatx,
-                                              len - 16,
-                                              mse.key_enc,
-                                              mse.Qpt,
-                                              65,
-                                              data + len - 16,
-                                              data,
-                                              data);
+    int ret = mbedtls_chachapoly_auth_decrypt(&chatx, len - 16, mse.key_enc, mse.Qpt, 65, data + len - 16, data, data);
     mbedtls_chachapoly_free(&chatx);
     return ret;
 }
 
 int load_dkek(uint8_t id, uint8_t *dkek) {
-    file_t *tf = search_dynamic_file(EF_DKEK + id);
-    if (!tf) {
-        return CCID_ERR_FILE_NOT_FOUND;
+    file_t *tf = search_file(EF_DKEK + id);
+    if (!file_has_data(tf)) {
+        return PICOKEY_ERR_FILE_NOT_FOUND;
     }
     memcpy(dkek, file_get_data(tf), DKEK_KEY_SIZE);
     return mkek_decrypt(dkek, DKEK_KEY_SIZE);
@@ -123,7 +111,7 @@ void release_mkek(uint8_t *mkek) {
 
 int store_mkek(const uint8_t *mkek) {
     if (has_session_pin == false && has_session_sopin == false) {
-        return CCID_NO_LOGIN;
+        return PICOKEY_NO_LOGIN;
     }
     uint8_t tmp_mkek[MKEK_SIZE];
     if (mkek == NULL) {
@@ -133,64 +121,61 @@ int store_mkek(const uint8_t *mkek) {
     else {
         memcpy(tmp_mkek, mkek, MKEK_SIZE);
     }
+    if (otp_key_1) {
+        mkek_masked(tmp_mkek, otp_key_1);
+    }
     *(uint32_t *) MKEK_CHECKSUM(tmp_mkek) = crc32c(MKEK_KEY(tmp_mkek), MKEK_KEY_SIZE);
     if (has_session_pin) {
         uint8_t tmp_mkek_pin[MKEK_SIZE];
         memcpy(tmp_mkek_pin, tmp_mkek, MKEK_SIZE);
-        file_t *tf = search_by_fid(EF_MKEK, NULL, SPECIFY_EF);
+        file_t *tf = search_file(EF_MKEK);
         if (!tf) {
             release_mkek(tmp_mkek);
             release_mkek(tmp_mkek_pin);
-            return CCID_ERR_FILE_NOT_FOUND;
+            return PICOKEY_ERR_FILE_NOT_FOUND;
         }
-        aes_encrypt_cfb_256(session_pin,
-                            MKEK_IV(tmp_mkek_pin),
-                            MKEK_KEY(tmp_mkek_pin),
-                            MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE);
-        flash_write_data_to_file(tf, tmp_mkek_pin, MKEK_SIZE);
+        aes_encrypt_cfb_256(session_pin, MKEK_IV(tmp_mkek_pin), MKEK_KEY(tmp_mkek_pin), MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE);
+        file_put_data(tf, tmp_mkek_pin, MKEK_SIZE);
         release_mkek(tmp_mkek_pin);
     }
     if (has_session_sopin) {
         uint8_t tmp_mkek_sopin[MKEK_SIZE];
         memcpy(tmp_mkek_sopin, tmp_mkek, MKEK_SIZE);
-        file_t *tf = search_by_fid(EF_MKEK_SO, NULL, SPECIFY_EF);
+        file_t *tf = search_file(EF_MKEK_SO);
         if (!tf) {
             release_mkek(tmp_mkek);
             release_mkek(tmp_mkek_sopin);
-            return CCID_ERR_FILE_NOT_FOUND;
+            return PICOKEY_ERR_FILE_NOT_FOUND;
         }
-        aes_encrypt_cfb_256(session_sopin,
-                            MKEK_IV(tmp_mkek_sopin),
-                            MKEK_KEY(tmp_mkek_sopin),
-                            MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE);
-        flash_write_data_to_file(tf, tmp_mkek_sopin, MKEK_SIZE);
+        aes_encrypt_cfb_256(session_sopin, MKEK_IV(tmp_mkek_sopin), MKEK_KEY(tmp_mkek_sopin), MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE);
+        file_put_data(tf, tmp_mkek_sopin, MKEK_SIZE);
         release_mkek(tmp_mkek_sopin);
     }
     low_flash_available();
     release_mkek(tmp_mkek);
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int store_dkek_key(uint8_t id, uint8_t *dkek) {
-    file_t *tf = search_dynamic_file(EF_DKEK + id);
+    file_t *tf = search_file(EF_DKEK + id);
     if (!tf) {
-        return CCID_ERR_FILE_NOT_FOUND;
+        return PICOKEY_ERR_FILE_NOT_FOUND;
     }
     int r = mkek_encrypt(dkek, DKEK_KEY_SIZE);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
-    flash_write_data_to_file(tf, dkek, DKEK_KEY_SIZE);
+    file_put_data(tf, dkek, DKEK_KEY_SIZE);
     low_flash_available();
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int save_dkek_key(uint8_t id, const uint8_t *key) {
     uint8_t dkek[DKEK_KEY_SIZE];
     if (!key) {
-        file_t *tf = search_dynamic_file(EF_DKEK + id);
+        file_t *tf = search_file(EF_DKEK + id);
         if (!tf) {
-            return CCID_ERR_FILE_NOT_FOUND;
+            return PICOKEY_ERR_FILE_NOT_FOUND;
         }
         memcpy(dkek, file_get_data(tf), DKEK_KEY_SIZE);
     }
@@ -202,9 +187,9 @@ int save_dkek_key(uint8_t id, const uint8_t *key) {
 
 int import_dkek_share(uint8_t id, const uint8_t *share) {
     uint8_t tmp_dkek[DKEK_KEY_SIZE];
-    file_t *tf = search_dynamic_file(EF_DKEK + id);
+    file_t *tf = search_file(EF_DKEK + id);
     if (!tf) {
-        return CCID_ERR_FILE_NOT_FOUND;
+        return PICOKEY_ERR_FILE_NOT_FOUND;
     }
     memset(tmp_dkek, 0, sizeof(tmp_dkek));
     if (file_get_size(tf) == DKEK_KEY_SIZE) {
@@ -213,9 +198,9 @@ int import_dkek_share(uint8_t id, const uint8_t *share) {
     for (int i = 0; i < DKEK_KEY_SIZE; i++) {
         tmp_dkek[i] ^= share[i];
     }
-    flash_write_data_to_file(tf, tmp_dkek, DKEK_KEY_SIZE);
+    file_put_data(tf, tmp_dkek, DKEK_KEY_SIZE);
     low_flash_available();
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int dkek_kcv(uint8_t id, uint8_t *kcv) { //kcv 8 bytes
@@ -223,45 +208,45 @@ int dkek_kcv(uint8_t id, uint8_t *kcv) { //kcv 8 bytes
     memset(kcv, 0, 8);
     memset(hsh, 0, sizeof(hsh));
     int r = load_dkek(id, dkek);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
     hash256(dkek, DKEK_KEY_SIZE, hsh);
     mbedtls_platform_zeroize(dkek, sizeof(dkek));
     memcpy(kcv, hsh, 8);
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int dkek_kenc(uint8_t id, uint8_t *kenc) { //kenc 32 bytes
     uint8_t dkek[DKEK_KEY_SIZE + 4];
     memset(kenc, 0, 32);
     int r = load_dkek(id, dkek);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
     memcpy(dkek + DKEK_KEY_SIZE, "\x0\x0\x0\x1", 4);
     hash256(dkek, sizeof(dkek), kenc);
     mbedtls_platform_zeroize(dkek, sizeof(dkek));
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int dkek_kmac(uint8_t id, uint8_t *kmac) { //kmac 32 bytes
     uint8_t dkek[DKEK_KEY_SIZE + 4];
     memset(kmac, 0, 32);
     int r = load_dkek(id, dkek);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
     memcpy(dkek + DKEK_KEY_SIZE, "\x0\x0\x0\x2", 4);
     hash256(dkek, DKEK_KEY_SIZE + 4, kmac);
     mbedtls_platform_zeroize(dkek, sizeof(dkek));
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
-int mkek_encrypt(uint8_t *data, size_t len) {
+int mkek_encrypt(uint8_t *data, uint16_t len) {
     int r;
     uint8_t mkek[MKEK_SIZE + 4];
-    if ((r = load_mkek(mkek)) != CCID_OK) {
+    if ((r = load_mkek(mkek)) != PICOKEY_OK) {
         return r;
     }
     r = aes_encrypt_cfb_256(MKEK_KEY(mkek), MKEK_IV(mkek), data, len);
@@ -269,10 +254,10 @@ int mkek_encrypt(uint8_t *data, size_t len) {
     return r;
 }
 
-int mkek_decrypt(uint8_t *data, size_t len) {
+int mkek_decrypt(uint8_t *data, uint16_t len) {
     int r;
     uint8_t mkek[MKEK_SIZE + 4];
-    if ((r = load_mkek(mkek)) != CCID_OK) {
+    if ((r = load_mkek(mkek)) != PICOKEY_OK) {
         return r;
     }
     r = aes_decrypt_cfb_256(MKEK_KEY(mkek), MKEK_IV(mkek), data, len);
@@ -280,40 +265,35 @@ int mkek_decrypt(uint8_t *data, size_t len) {
     return r;
 }
 
-int dkek_encode_key(uint8_t id,
-                    void *key_ctx,
-                    int key_type,
-                    uint8_t *out,
-                    size_t *out_len,
-                    const uint8_t *allowed,
-                    size_t allowed_len) {
+int dkek_encode_key(uint8_t id, void *key_ctx, int key_type, uint8_t *out, uint16_t *out_len, const uint8_t *allowed, uint16_t allowed_len) {
     if (!(key_type & PICO_KEYS_KEY_RSA) && !(key_type & PICO_KEYS_KEY_EC) && !(key_type & PICO_KEYS_KEY_AES)) {
-        return CCID_WRONG_DATA;
+        return PICOKEY_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, r = 0;
+    uint16_t kb_len = 0;
+    int r = 0;
     uint8_t *algo = NULL;
     uint8_t algo_len = 0;
     uint8_t kenc[32];
     memset(kenc, 0, sizeof(kenc));
     r = dkek_kenc(id, kenc);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
 
     uint8_t kcv[8];
     memset(kcv, 0, sizeof(kcv));
     r = dkek_kcv(id, kcv);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
 
     uint8_t kmac[32];
     memset(kmac, 0, sizeof(kmac));
     r = dkek_kmac(id, kmac);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
 
@@ -332,13 +312,13 @@ int dkek_encode_key(uint8_t id,
         }
 
         if (kb_len != 16 && kb_len != 24 && kb_len != 32 && kb_len != 64) {
-            return CCID_WRONG_DATA;
+            return PICOKEY_WRONG_DATA;
         }
         if (*out_len < 8 + 1 + 10 + 6 + (2 + 64 + 14) + 16) { // 14 bytes padding
-            return CCID_WRONG_LENGTH;
+            return PICOKEY_WRONG_LENGTH;
         }
 
-        put_uint16_t(kb_len, kb + 8);
+        put_uint16_t_be(kb_len, kb + 8);
         memcpy(kb + 10, key_ctx, kb_len);
         kb_len += 2;
 
@@ -347,67 +327,57 @@ int dkek_encode_key(uint8_t id,
     }
     else if (key_type & PICO_KEYS_KEY_RSA) {
         if (*out_len < 8 + 1 + 12 + 6 + (8 + 2 * 4 + 2 * 4096 / 8 + 3 + 13) + 16) { //13 bytes pading
-            return CCID_WRONG_LENGTH;
+            return PICOKEY_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;
+        kb_len += put_uint16_t_be((uint16_t)mbedtls_rsa_get_len(rsa) * 8, kb + 8 + kb_len);
 
-        put_uint16_t(mbedtls_mpi_size(&rsa->D), kb + 8 + kb_len); kb_len += 2;
+        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&rsa->D), kb + 8 + kb_len);
         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;
+        kb_len += (uint16_t)mbedtls_mpi_size(&rsa->D);
+        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&rsa->N), kb + 8 + kb_len);
         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;
+        kb_len += (uint16_t)mbedtls_mpi_size(&rsa->N);
+        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&rsa->E), kb + 8 + kb_len);
         mbedtls_mpi_write_binary(&rsa->E, kb + 8 + kb_len, mbedtls_mpi_size(&rsa->E));
-        kb_len += mbedtls_mpi_size(&rsa->E);
+        kb_len += (uint16_t)mbedtls_mpi_size(&rsa->E);
 
         algo = (uint8_t *) "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x01\x02";
         algo_len = 12;
     }
     else if (key_type & PICO_KEYS_KEY_EC) {
         if (*out_len < 8 + 1 + 12 + 6 + (8 + 2 * 8 + 9 * 66 + 2 + 4) + 16) { //4 bytes pading
-            return CCID_WRONG_LENGTH;
+            return PICOKEY_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;
+        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&ecdsa->grp.P) * 8, kb + 8 + kb_len);
+        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&ecdsa->grp.A), kb + 8 + kb_len);
         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;
+        kb_len += (uint16_t)mbedtls_mpi_size(&ecdsa->grp.A);
+        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&ecdsa->grp.B), kb + 8 + kb_len);
         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;
+        kb_len += (uint16_t)mbedtls_mpi_size(&ecdsa->grp.B);
+        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&ecdsa->grp.P), kb + 8 + kb_len);
         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;
+        kb_len += (uint16_t)mbedtls_mpi_size(&ecdsa->grp.P);
+        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&ecdsa->grp.N), kb + 8 + kb_len);
         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);
+        kb_len += (uint16_t)mbedtls_mpi_size(&ecdsa->grp.N);
 
         size_t olen = 0;
-        mbedtls_ecp_point_write_binary(&ecdsa->grp,
-                                       &ecdsa->grp.G,
-                                       MBEDTLS_ECP_PF_UNCOMPRESSED,
-                                       &olen,
-                                       kb + 8 + kb_len + 2,
-                                       sizeof(kb) - 8 - kb_len - 2);
-        put_uint16_t(olen, kb + 8 + kb_len);
-        kb_len += 2 + olen;
+        mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->grp.G, MBEDTLS_ECP_PF_UNCOMPRESSED, &olen, kb + 8 + kb_len + 2, sizeof(kb) - 8 - kb_len - 2);
+        kb_len += put_uint16_t_be((uint16_t)olen, kb + 8 + kb_len);
+        kb_len += (uint16_t)olen;
 
-        put_uint16_t(mbedtls_mpi_size(&ecdsa->d), kb + 8 + kb_len); kb_len += 2;
+        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&ecdsa->d), kb + 8 + kb_len);
         mbedtls_mpi_write_binary(&ecdsa->d, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->d));
-        kb_len += mbedtls_mpi_size(&ecdsa->d);
+        kb_len += (uint16_t)mbedtls_mpi_size(&ecdsa->d);
 
-        mbedtls_ecp_point_write_binary(&ecdsa->grp,
-                                       &ecdsa->Q,
-                                       MBEDTLS_ECP_PF_UNCOMPRESSED,
-                                       &olen,
-                                       kb + 8 + kb_len + 2,
-                                       sizeof(kb) - 8 - kb_len - 2);
-        put_uint16_t(olen, kb + 8 + kb_len);
-        kb_len += 2 + olen;
+        mbedtls_ecp_point_write_binary(&ecdsa->grp, &ecdsa->Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &olen, kb + 8 + kb_len + 2, sizeof(kb) - 8 - kb_len - 2);
+        kb_len += put_uint16_t_be((uint16_t)olen, kb + 8 + kb_len);
+        kb_len += (uint16_t)olen;
 
         algo = (uint8_t *) "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03";
         algo_len = 12;
@@ -438,7 +408,7 @@ int dkek_encode_key(uint8_t id,
     }
 
     if (allowed && allowed_len > 0) {
-        put_uint16_t(allowed_len, out + *out_len); *out_len += 2;
+        *out_len += put_uint16_t_be(allowed_len, out + *out_len);
         memcpy(out + *out_len, allowed, allowed_len);
         *out_len += allowed_len;
     }
@@ -450,7 +420,7 @@ int dkek_encode_key(uint8_t id,
 
     memcpy(kb, random_bytes_get(8), 8);
     kb_len += 8; //8 random bytes
-    int kb_len_pad = ((int) (kb_len / 16)) * 16;
+    uint16_t kb_len_pad = ((uint16_t) (kb_len / 16)) * 16;
     if (kb_len % 16 > 0) {
         kb_len_pad = ((int) (kb_len / 16) + 1) * 16;
     }
@@ -459,25 +429,20 @@ int dkek_encode_key(uint8_t id,
         kb[kb_len] = 0x80;
     }
     r = aes_encrypt(kenc, NULL, 256, PICO_KEYS_AES_MODE_CBC, kb, kb_len_pad);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
 
     memcpy(out + *out_len, kb, kb_len_pad);
     *out_len += kb_len_pad;
 
-    r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB),
-                            kmac,
-                            256,
-                            out,
-                            *out_len,
-                            out + *out_len);
+    r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB), kmac, 256, out, *out_len, out + *out_len);
 
     *out_len += 16;
     if (r != 0) {
         return r;
     }
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int dkek_type_key(const uint8_t *in) {
@@ -493,104 +458,93 @@ int dkek_type_key(const uint8_t *in) {
     return 0x0;
 }
 
-int dkek_decode_key(uint8_t id,
-                    void *key_ctx,
-                    const uint8_t *in,
-                    size_t in_len,
-                    int *key_size_out,
-                    uint8_t **allowed,
-                    size_t *allowed_len) {
+int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, uint16_t in_len, int *key_size_out, uint8_t **allowed, uint16_t *allowed_len) {
     uint8_t kcv[8];
     int r = 0;
     memset(kcv, 0, sizeof(kcv));
     r = dkek_kcv(id, kcv);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
 
     uint8_t kmac[32];
     memset(kmac, 0, sizeof(kmac));
     r = dkek_kmac(id, kmac);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
 
     uint8_t kenc[32];
     memset(kenc, 0, sizeof(kenc));
     r = dkek_kenc(id, kenc);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
 
     if (memcmp(kcv, in, 8) != 0) {
-        return CCID_WRONG_DKEK;
+        return PICOKEY_WRONG_DKEK;
     }
 
     uint8_t signature[16];
-    r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB),
-                            kmac,
-                            256,
-                            in,
-                            in_len - 16,
-                            signature);
+    r = mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_ECB), kmac, 256, in, in_len - 16, signature);
     if (r != 0) {
-        return CCID_WRONG_SIGNATURE;
+        return PICOKEY_WRONG_SIGNATURE;
     }
     if (memcmp(signature, in + in_len - 16, 16) != 0) {
-        return CCID_WRONG_SIGNATURE;
+        return PICOKEY_WRONG_SIGNATURE;
     }
 
     int key_type = in[8];
     if (key_type != 5 && key_type != 6 && key_type != 12 && key_type != 15) {
-        return CCID_WRONG_DATA;
+        return PICOKEY_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;
+        return PICOKEY_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;
+        return PICOKEY_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;
+        return PICOKEY_WRONG_DATA;
     }
 
-    size_t ofs = 9;
+    uint16_t ofs = 9;
 
     //OID
-    size_t len = get_uint16_t(in, ofs);
+    uint16_t len = get_uint16_t_be(in + ofs);
     ofs += len + 2;
 
     //Allowed algorithms
-    len = get_uint16_t(in, ofs);
+    len = get_uint16_t_be(in + ofs);
     *allowed = (uint8_t *) (in + ofs + 2);
     *allowed_len = len;
     ofs += len + 2;
 
     //Access conditions
-    len = get_uint16_t(in, ofs);
+    len = get_uint16_t_be(in + ofs);
     ofs += len + 2;
 
     //Key OID
-    len = get_uint16_t(in, ofs);
+    len = get_uint16_t_be(in + ofs);
     ofs += len + 2;
 
     if ((in_len - 16 - ofs) % 16 != 0) {
-        return CCID_WRONG_PADDING;
+        return PICOKEY_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, PICO_KEYS_AES_MODE_CBC, kb, in_len - 16 - ofs);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
 
-    int key_size = get_uint16_t(kb, 8);
+    int key_size = get_uint16_t_be(kb + 8);
     if (key_size_out) {
         *key_size_out = key_size;
     }
@@ -599,78 +553,78 @@ int dkek_decode_key(uint8_t id,
         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;
+            len = get_uint16_t_be(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;
+                return PICOKEY_WRONG_DATA;
             }
 
-            len = get_uint16_t(kb, ofs); ofs += 2;
+            len = get_uint16_t_be(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;
+                return PICOKEY_WRONG_DATA;
             }
         }
         else if (key_type == 6) {
             //DP-1
-            len = get_uint16_t(kb, ofs); ofs += len + 2;
+            len = get_uint16_t_be(kb + ofs); ofs += len + 2;
 
             //DQ-1
-            len = get_uint16_t(kb, ofs); ofs += len + 2;
+            len = get_uint16_t_be(kb + ofs); ofs += len + 2;
 
-            len = get_uint16_t(kb, ofs); ofs += 2;
+            len = get_uint16_t_be(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;
+                return PICOKEY_WRONG_DATA;
             }
 
             //PQ
-            len = get_uint16_t(kb, ofs); ofs += len + 2;
+            len = get_uint16_t_be(kb + ofs); ofs += len + 2;
 
-            len = get_uint16_t(kb, ofs); ofs += 2;
+            len = get_uint16_t_be(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;
+                return PICOKEY_WRONG_DATA;
             }
             //N
-            len = get_uint16_t(kb, ofs); ofs += len + 2;
+            len = get_uint16_t_be(kb + ofs); ofs += len + 2;
         }
 
-        len = get_uint16_t(kb, ofs); ofs += 2;
+        len = get_uint16_t_be(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;
+            return PICOKEY_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;
+                return PICOKEY_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;
+                return PICOKEY_EXEC_ERROR;
             }
         }
 
         r = mbedtls_rsa_complete(rsa);
         if (r != 0) {
             mbedtls_rsa_free(rsa);
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
         r = mbedtls_rsa_check_privkey(rsa);
         if (r != 0) {
             mbedtls_rsa_free(rsa);
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
     }
     else if (key_type == 12) {
@@ -678,53 +632,70 @@ int dkek_decode_key(uint8_t id,
         mbedtls_ecdsa_init(ecdsa);
 
         //A
-        len = get_uint16_t(kb, ofs); ofs += len + 2;
+        len = get_uint16_t_be(kb + ofs); ofs += len + 2;
 
         //B
-        len = get_uint16_t(kb, ofs); ofs += len + 2;
+        len = get_uint16_t_be(kb + ofs); ofs += len + 2;
 
         //P
-        len = get_uint16_t(kb, ofs); ofs += 2;
+        len = get_uint16_t_be(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;
+            return PICOKEY_WRONG_DATA;
         }
         ofs += len;
 
         //N
-        len = get_uint16_t(kb, ofs); ofs += len + 2;
+        len = get_uint16_t_be(kb + ofs); ofs += len + 2;
 
         //G
-        len = get_uint16_t(kb, ofs); ofs += len + 2;
+        len = get_uint16_t_be(kb + ofs);
+#ifdef MBEDTLS_EDDSA_C
+        if (ec_id == MBEDTLS_ECP_DP_CURVE25519 && kb[ofs + 2] != 0x09) {
+            ec_id = MBEDTLS_ECP_DP_ED25519;
+        }
+        else if (ec_id == MBEDTLS_ECP_DP_CURVE448 && (len != 56 || kb[ofs + 2] != 0x05)) {
+            ec_id = MBEDTLS_ECP_DP_ED448;
+        }
+#endif
+        ofs += len + 2;
 
         //d
-        len = get_uint16_t(kb, ofs); ofs += 2;
+        len = get_uint16_t_be(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;
+            return PICOKEY_EXEC_ERROR;
         }
         ofs += len;
 
         //Q
-        len = get_uint16_t(kb, ofs); ofs += 2;
+        len = get_uint16_t_be(kb + ofs); ofs += 2;
         r = mbedtls_ecp_point_read_binary(&ecdsa->grp, &ecdsa->Q, kb + ofs, len);
         if (r != 0) {
-            r = mbedtls_ecp_mul(&ecdsa->grp, &ecdsa->Q, &ecdsa->d, &ecdsa->grp.G, random_gen, NULL);
+#ifdef MBEDTLS_EDDSA_C
+            if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_EDWARDS) {
+                r = mbedtls_ecp_point_edwards(&ecdsa->grp, &ecdsa->Q, &ecdsa->d, random_gen, NULL);
+            }
+            else
+#endif
+            {
+                r = mbedtls_ecp_mul(&ecdsa->grp, &ecdsa->Q, &ecdsa->d, &ecdsa->grp.G, random_gen, NULL);
+            }
             if (r != 0) {
                 mbedtls_ecdsa_free(ecdsa);
-                return CCID_EXEC_ERROR;
+                return PICOKEY_EXEC_ERROR;
             }
         }
         r = mbedtls_ecp_check_pub_priv(ecdsa, ecdsa, random_gen, NULL);
         if (r != 0) {
             mbedtls_ecdsa_free(ecdsa);
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
     }
     else if (key_type == 15) {
         memcpy(key_ctx, kb + ofs, key_size);
     }
-    return CCID_OK;
+    return PICOKEY_OK;
 }

src/hsm/kek.h

@@ -3,26 +3,27 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef _DKEK_H_
 #define _DKEK_H_
 
 #include "crypto_utils.h"
-#ifdef ENABLE_EMULATION
+#if defined(ENABLE_EMULATION) || defined(ESP_PLATFORM)
 #include <stdbool.h>
 #endif
 
+
 extern int load_mkek(uint8_t *);
 extern int store_mkek(const uint8_t *);
 extern int save_dkek_key(uint8_t, const uint8_t *key);
@@ -31,23 +32,23 @@ extern void init_mkek();
 extern void release_mkek(uint8_t *);
 extern int import_dkek_share(uint8_t, const uint8_t *share);
 extern int dkek_kcv(uint8_t, uint8_t *kcv);
-extern int mkek_encrypt(uint8_t *data, size_t len);
-extern int mkek_decrypt(uint8_t *data, size_t len);
+extern int mkek_encrypt(uint8_t *data, uint16_t len);
+extern int mkek_decrypt(uint8_t *data, uint16_t len);
 extern int dkek_encode_key(uint8_t,
                            void *key_ctx,
                            int key_type,
                            uint8_t *out,
-                           size_t *out_len,
+                           uint16_t *out_len,
                            const uint8_t *,
-                           size_t);
+                           uint16_t);
 extern int dkek_type_key(const uint8_t *in);
 extern int dkek_decode_key(uint8_t,
                            void *key_ctx,
                            const uint8_t *in,
-                           size_t in_len,
+                           uint16_t in_len,
                            int *key_size_out,
                            uint8_t **,
-                           size_t *);
+                           uint16_t *);
 
 #define MAX_DKEK_ENCODE_KEY_BUFFER (8 + 1 + 12 + 6 + (8 + 2 * 4 + 2 * 4096 / 8 + 3 + 13) + 16)
 

src/hsm/oid.c

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "oid.h"

src/hsm/oid.h

@@ -3,16 +3,16 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef _OID_H_

src/hsm/sc_hsm.c

@@ -3,21 +3,20 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "sc_hsm.h"
 #include "files.h"
-#include "common.h"
 #include "version.h"
 #include "crypto_utils.h"
 #include "kek.h"
@@ -27,6 +26,7 @@
 #include "pico_keys.h"
 #include "usb.h"
 #include "random.h"
+#include "version.h"
 
 const uint8_t sc_hsm_aid[] = {
     11,
@@ -42,7 +42,11 @@ const uint8_t atr_sc_hsm[] = {
 uint8_t session_pin[32], session_sopin[32];
 bool has_session_pin = false, has_session_sopin = false;
 const uint8_t *dev_name = NULL;
-size_t dev_name_len = 0;
+uint16_t dev_name_len = 0;
+
+uint8_t PICO_PRODUCT = 1;
+uint8_t PICO_VERSION_MAJOR = HSM_VERSION_MAJOR;
+uint8_t PICO_VERSION_MINOR = HSM_VERSION_MINOR;
 
 static int sc_hsm_process_apdu();
 
@@ -52,6 +56,7 @@ static int sc_hsm_unload();
 extern int cmd_select();
 extern void select_file(file_t *pe);
 extern int cmd_list_keys();
+
 extern int cmd_read_binary();
 extern int cmd_verify();
 extern int cmd_reset_retry();
@@ -80,86 +85,88 @@ extern int cmd_bip_slip();
 
 extern const uint8_t *ccid_atr;
 
-int sc_hsm_select_aid(app_t *a) {
+int sc_hsm_select_aid(app_t *a, uint8_t force) {
+    (void) force;
     a->process_apdu = sc_hsm_process_apdu;
     a->unload = sc_hsm_unload;
     init_sc_hsm();
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
-void __attribute__((constructor)) sc_hsm_ctor() {
+INITIALIZER( sc_hsm_ctor ) {
+    printf("INITIALIZER\n");
     ccid_atr = atr_sc_hsm;
     register_app(sc_hsm_select_aid, sc_hsm_aid);
 }
 
 void scan_files() {
-    file_pin1 = search_by_fid(0x1081, NULL, SPECIFY_EF);
+    file_pin1 = search_file(EF_PIN1);
     if (file_pin1) {
         if (!file_pin1->data) {
-            printf("PIN1 is empty. Initializing with default password\r\n");
+            printf("PIN1 is empty. Initializing with default password\n");
             const uint8_t empty[33] = { 0 };
-            flash_write_data_to_file(file_pin1, empty, sizeof(empty));
+            file_put_data(file_pin1, empty, sizeof(empty));
         }
     }
     else {
-        printf("FATAL ERROR: PIN1 not found in memory!\r\n");
+        printf("FATAL ERROR: PIN1 not found in memory!\n");
     }
-    file_sopin = search_by_fid(0x1088, NULL, SPECIFY_EF);
+    file_sopin = search_file(EF_SOPIN);
     if (file_sopin) {
         if (!file_sopin->data) {
-            printf("SOPIN is empty. Initializing with default password\r\n");
+            printf("SOPIN is empty. Initializing with default password\n");
             const uint8_t empty[33] = { 0 };
-            flash_write_data_to_file(file_sopin, empty, sizeof(empty));
+            file_put_data(file_sopin, empty, sizeof(empty));
         }
     }
     else {
-        printf("FATAL ERROR: SOPIN not found in memory!\r\n");
+        printf("FATAL ERROR: SOPIN not found in memory!\n");
     }
-    file_retries_pin1 = search_by_fid(0x1083, NULL, SPECIFY_EF);
+    file_retries_pin1 = search_file(EF_PIN1_RETRIES);
     if (file_retries_pin1) {
         if (!file_retries_pin1->data) {
             printf("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));
+            file_put_data(file_retries_pin1, &retries, sizeof(uint8_t));
         }
     }
     else {
-        printf("FATAL ERROR: Retries PIN1 not found in memory!\r\n");
+        printf("FATAL ERROR: Retries PIN1 not found in memory!\n");
     }
-    file_retries_sopin = search_by_fid(0x108A, NULL, SPECIFY_EF);
+    file_retries_sopin = search_file(EF_SOPIN_RETRIES);
     if (file_retries_sopin) {
         if (!file_retries_sopin->data) {
-            printf("Retries SOPIN is empty. Initializing with default retries\r\n");
+            printf("Retries SOPIN is empty. Initializing with default retries\n");
             const uint8_t retries = 15;
-            flash_write_data_to_file(file_retries_sopin, &retries, sizeof(uint8_t));
+            file_put_data(file_retries_sopin, &retries, sizeof(uint8_t));
         }
     }
     else {
-        printf("FATAL ERROR: Retries SOPIN not found in memory!\r\n");
+        printf("FATAL ERROR: Retries SOPIN not found in memory!\n");
     }
     file_t *tf = NULL;
 
-    tf = search_by_fid(0x1082, NULL, SPECIFY_EF);
+    tf = search_file(EF_PIN1_MAX_RETRIES);
     if (tf) {
         if (!tf->data) {
             printf("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));
+            file_put_data(tf, &retries, sizeof(uint8_t));
         }
     }
     else {
-        printf("FATAL ERROR: Max Retries PIN1 not found in memory!\r\n");
+        printf("FATAL ERROR: Max Retries PIN1 not found in memory!\n");
     }
-    tf = search_by_fid(0x1089, NULL, SPECIFY_EF);
+    tf = search_file(EF_SOPIN_MAX_RETRIES);
     if (tf) {
         if (!tf->data) {
-            printf("Max Retries SOPIN is empty. Initializing with default max retries\r\n");
+            printf("Max Retries SOPIN is empty. Initializing with default max retries\n");
             const uint8_t retries = 15;
-            flash_write_data_to_file(tf, &retries, sizeof(uint8_t));
+            file_put_data(tf, &retries, sizeof(uint8_t));
         }
     }
     else {
-        printf("FATAL ERROR: Retries SOPIN not found in memory!\r\n");
+        printf("FATAL ERROR: Retries SOPIN not found in memory!\n");
     }
     low_flash_available();
 }
@@ -174,12 +181,12 @@ int puk_store_entries = 0;
 PUK *current_puk = NULL;
 uint8_t puk_status[MAX_PUK];
 
-int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy) {
+int add_cert_puk_store(const uint8_t *data, uint16_t data_len, bool copy) {
     if (data == NULL || data_len == 0) {
-        return CCID_ERR_NULL_PARAM;
+        return PICOKEY_ERR_NULL_PARAM;
     }
     if (puk_store_entries == MAX_PUK_STORE_ENTRIES) {
-        return CCID_ERR_MEMORY_FATAL;
+        return PICOKEY_ERR_MEMORY_FATAL;
     }
 
     puk_store[puk_store_entries].copied = copy;
@@ -203,17 +210,17 @@ int add_cert_puk_store(const uint8_t *data, size_t data_len, bool copy) {
                                                    &puk_store[puk_store_entries].puk_len);
 
     puk_store_entries++;
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int puk_store_select_chr(const uint8_t *chr) {
     for (int i = 0; i < puk_store_entries; i++) {
         if (memcmp(puk_store[i].chr, chr, puk_store[i].chr_len) == 0) {
             current_puk = &puk_store[i];
-            return CCID_OK;
+            return PICOKEY_OK;
         }
     }
-    return CCID_ERR_FILE_NOT_FOUND;
+    return PICOKEY_ERR_FILE_NOT_FOUND;
 }
 
 void reset_puk_store() {
@@ -226,17 +233,19 @@ void reset_puk_store() {
     }
     memset(puk_store, 0, sizeof(puk_store));
     puk_store_entries = 0;
-    file_t *fterm = search_by_fid(EF_TERMCA, NULL, SPECIFY_EF);
+    file_t *fterm = search_file(EF_TERMCA);
     if (fterm) {
         uint8_t *p = NULL, *fterm_data = file_get_data(fterm), *pq = fterm_data;
-        size_t fterm_data_len = file_get_size(fterm);
-        while (walk_tlv(fterm_data, fterm_data_len, &p, NULL, NULL, NULL)) {
-            add_cert_puk_store(pq, p - pq, false);
+        uint16_t fterm_data_len = file_get_size(fterm);
+        asn1_ctx_t ctxi;
+        asn1_ctx_init(fterm_data, fterm_data_len, &ctxi);
+        while (walk_tlv(&ctxi, &p, NULL, NULL, NULL)) {
+            add_cert_puk_store(pq, (uint16_t)(p - pq), false);
             pq = p;
         }
     }
     for (int i = 0; i < 0xfe; i++) {
-        file_t *ef = search_dynamic_file((CA_CERTIFICATE_PREFIX << 8) | i);
+        file_t *ef = search_file((CA_CERTIFICATE_PREFIX << 8) | (uint8_t)i);
         if (ef && file_get_size(ef) > 0) {
             add_cert_puk_store(file_get_data(ef), file_get_size(ef), false);
         }
@@ -257,19 +266,17 @@ int sc_hsm_unload() {
     has_session_pin = has_session_sopin = false;
     isUserAuthenticated = false;
     sm_session_pin_len = 0;
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 uint16_t get_device_options() {
-    file_t *ef = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF);
+    file_t *ef = search_file(EF_DEVOPS);
     if (file_has_data(ef)) {
-        return (file_read_uint8(file_get_data(ef)) << 8) | file_read_uint8(file_get_data(ef) + 1);
+        return get_uint16_t_be(file_get_data(ef));
     }
     return 0x0;
 }
 
-extern uint32_t board_button_read(void);
-
 bool wait_button_pressed() {
     uint32_t val = EV_PRESS_BUTTON;
 #ifndef ENABLE_EMULATION
@@ -285,6 +292,7 @@ bool wait_button_pressed() {
 }
 
 int parse_token_info(const file_t *f, int mode) {
+    (void)f;
 #ifdef __FOR_CI
     char *label = "SmartCard-HSM";
 #else
@@ -297,68 +305,87 @@ int parse_token_info(const file_t *f, int mode) {
         *p++ = 0; //set later
         *p++ = 0x2; *p++ = 1; *p++ = HSM_VERSION_MAJOR;
 #ifndef ENABLE_EMULATION
-        *p++ = 0x4; *p++ = 8; pico_get_unique_board_id((pico_unique_board_id_t *) p); p += 8;
+        *p++ = 0x4; *p++ = 8; memcpy(p, pico_serial.id, 8); p += 8;
 #else
         *p++ = 0x4; *p++ = 8; memset(p, 0, 8); p += 8;
 #endif
-        *p++ = 0xC; *p++ = strlen(manu); strcpy((char *) p, manu); p += strlen(manu);
-        *p++ = 0x80; *p++ = strlen(label); strcpy((char *) p, label); p += strlen(label);
+        *p++ = 0xC; *p++ = (uint8_t)strlen(manu); strcpy((char *) p, manu); p += strlen(manu);
+        *p++ = 0x80; *p++ = (uint8_t)strlen(label); strcpy((char *) p, label); p += strlen(label);
         *p++ = 0x3; *p++ = 2; *p++ = 4; *p++ = 0x30;
-        res_APDU_size = p - res_APDU;
-        res_APDU[1] = res_APDU_size - 2;
+        res_APDU_size = (uint16_t)(p - res_APDU);
+        res_APDU[1] = (uint8_t)res_APDU_size - 2;
     }
-    return 2 + (2 + 1) + (2 + 8) + (2 + strlen(manu)) + (2 + strlen(label)) + (2 + 2);
+    return (int)(2 + (2 + 1) + (2 + 8) + (2 + strlen(manu)) + (2 + strlen(label)) + (2 + 2));
+}
+
+int parse_ef_dir(const file_t *f, int mode) {
+    (void)f;
+#ifdef __FOR_CI
+    char *label = "SmartCard-HSM";
+#else
+    char *label = "Pico-HSM";
+#endif
+    if (mode == 1) {
+        uint8_t *p = res_APDU;
+        *p++ = 0x61;
+        *p++ = 0; //set later
+        *p++ = 0x4F; *p++ = sc_hsm_aid[0]; memcpy(p, sc_hsm_aid + 1, sc_hsm_aid[0]); p += sc_hsm_aid[0];
+        *p++ = 0x50; *p++ = (uint8_t)strlen(label); strcpy((char *) p, label); p += strlen(label);
+        res_APDU_size = (uint16_t)(p - res_APDU);
+        res_APDU[1] = (uint8_t)res_APDU_size - 2;
+    }
+    return (int)(2 + (2 + sc_hsm_aid[0]) + (2 + strlen(label)));
 }
 
 int pin_reset_retries(const file_t *pin, bool force) {
     if (!pin) {
-        return CCID_ERR_NULL_PARAM;
+        return PICOKEY_ERR_NULL_PARAM;
     }
-    const file_t *max = search_by_fid(pin->fid + 1, NULL, SPECIFY_EF);
-    const file_t *act = search_by_fid(pin->fid + 2, NULL, SPECIFY_EF);
+    const file_t *max = search_file(pin->fid + 1);
+    const file_t *act = search_file(pin->fid + 2);
     if (!max || !act) {
-        return CCID_ERR_FILE_NOT_FOUND;
+        return PICOKEY_ERR_FILE_NOT_FOUND;
     }
-    uint8_t retries = file_read_uint8(file_get_data(act));
+    uint8_t retries = file_read_uint8(act);
     if (retries == 0 && force == false) { // blocked
-        return CCID_ERR_BLOCKED;
+        return PICOKEY_ERR_BLOCKED;
     }
-    retries = file_read_uint8(file_get_data(max));
-    int r = flash_write_data_to_file((file_t *) act, &retries, sizeof(retries));
+    retries = file_read_uint8(max);
+    int r = file_put_data((file_t *) act, &retries, sizeof(retries));
     low_flash_available();
     return r;
 }
 
 int pin_wrong_retry(const file_t *pin) {
     if (!pin) {
-        return CCID_ERR_NULL_PARAM;
+        return PICOKEY_ERR_NULL_PARAM;
     }
-    const file_t *act = search_by_fid(pin->fid + 2, NULL, SPECIFY_EF);
+    const file_t *act = search_file(pin->fid + 2);
     if (!act) {
-        return CCID_ERR_FILE_NOT_FOUND;
+        return PICOKEY_ERR_FILE_NOT_FOUND;
     }
-    uint8_t retries = file_read_uint8(file_get_data(act));
+    uint8_t retries = file_read_uint8(act);
     if (retries > 0) {
         retries -= 1;
-        int r = flash_write_data_to_file((file_t *) act, &retries, sizeof(retries));
-        if (r != CCID_OK) {
+        int r = file_put_data((file_t *) act, &retries, sizeof(retries));
+        if (r != PICOKEY_OK) {
             return r;
         }
         low_flash_available();
         if (retries == 0) {
-            return CCID_ERR_BLOCKED;
+            return PICOKEY_ERR_BLOCKED;
         }
         return retries;
     }
-    return CCID_ERR_BLOCKED;
+    return PICOKEY_ERR_BLOCKED;
 }
 
 bool pka_enabled() {
-    file_t *ef_puk = search_by_fid(EF_PUKAUT, NULL, SPECIFY_EF);
-    return file_has_data(ef_puk) && file_read_uint8(file_get_data(ef_puk)) > 0;
+    file_t *ef_puk = search_file(EF_PUKAUT);
+    return file_has_data(ef_puk) && file_read_uint8(ef_puk) > 0;
 }
 
-int check_pin(const file_t *pin, const uint8_t *data, size_t len) {
+uint16_t check_pin(const file_t *pin, const uint8_t *data, uint16_t len) {
     if (!file_has_data((file_t *) pin)) {
         return SW_REFERENCE_NOT_FOUND();
     }
@@ -369,10 +396,10 @@ int check_pin(const file_t *pin, const uint8_t *data, size_t len) {
     if (is_secured_apdu() && sm_session_pin_len > 0 && pin == file_pin1) {
         if (len == sm_session_pin_len && memcmp(data, sm_session_pin, len) != 0) {
             int retries;
-            if ((retries = pin_wrong_retry(pin)) < CCID_OK) {
+            if ((retries = pin_wrong_retry(pin)) < PICOKEY_OK) {
                 return SW_PIN_BLOCKED();
             }
-            return set_res_sw(0x63, 0xc0 | retries);
+            return set_res_sw(0x63, 0xc0 | (uint8_t)retries);
         }
     }
     else {
@@ -383,17 +410,17 @@ int check_pin(const file_t *pin, const uint8_t *data, size_t len) {
         }
         if (memcmp(file_get_data(pin) + 1, dhash, sizeof(dhash)) != 0) {
             int retries;
-            if ((retries = pin_wrong_retry(pin)) < CCID_OK) {
+            if ((retries = pin_wrong_retry(pin)) < PICOKEY_OK) {
                 return SW_PIN_BLOCKED();
             }
-            return set_res_sw(0x63, 0xc0 | retries);
+            return set_res_sw(0x63, 0xc0 | (uint8_t)retries);
         }
     }
     int r = pin_reset_retries(pin, false);
-    if (r == CCID_ERR_BLOCKED) {
+    if (r == PICOKEY_ERR_BLOCKED) {
         return SW_PIN_BLOCKED();
     }
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return SW_MEMORY_FAILURE();
     }
     if (pka_enabled() == false) {
@@ -414,16 +441,18 @@ int check_pin(const file_t *pin, const uint8_t *data, size_t len) {
     return SW_OK();
 }
 
-const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len) {
+const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, uint16_t *tag_len) {
     if (ef == NULL) {
         return NULL;
     }
     uint8_t *meta_data = NULL;
-    uint8_t meta_size = meta_find(ef->fid, &meta_data);
+    uint16_t meta_size = meta_find(ef->fid, &meta_data);
     if (meta_size > 0 && meta_data != NULL) {
         uint16_t tag = 0x0;
         uint8_t *tag_data = NULL, *p = NULL;
-        while (walk_tlv(meta_data, meta_size, &p, &tag, tag_len, &tag_data)) {
+        asn1_ctx_t ctxi;
+        asn1_ctx_init(meta_data, meta_size, &ctxi);
+        while (walk_tlv(&ctxi, &p, &tag, tag_len, &tag_data)) {
             if (tag == meta_tag) {
                 return tag_data;
             }
@@ -433,19 +462,19 @@ const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len) {
 }
 
 uint32_t get_key_counter(file_t *fkey) {
-    size_t tag_len = 0;
+    uint16_t tag_len = 0;
     const uint8_t *meta_tag = get_meta_tag(fkey, 0x90, &tag_len);
     if (meta_tag) {
-        return (meta_tag[0] << 24) | (meta_tag[1] << 16) | (meta_tag[2] << 8) | meta_tag[3];
+        return get_uint32_t_be(meta_tag);
     }
     return 0xffffffff;
 }
 
 bool key_has_purpose(file_t *ef, uint8_t purpose) {
-    size_t tag_len = 0;
+    uint16_t tag_len = 0;
     const uint8_t *meta_tag = get_meta_tag(ef, 0x91, &tag_len);
     if (meta_tag) {
-        for (int i = 0; i < tag_len; i++) {
+        for (unsigned i = 0; i < tag_len; i++) {
             if (meta_tag[i] == purpose) {
                 return true;
             }
@@ -460,25 +489,22 @@ uint32_t decrement_key_counter(file_t *fkey) {
         return 0xffffff;
     }
     uint8_t *meta_data = NULL;
-    uint8_t meta_size = meta_find(fkey->fid, &meta_data);
+    uint16_t meta_size = meta_find(fkey->fid, &meta_data);
     if (meta_size > 0 && meta_data != NULL) {
         uint16_t tag = 0x0;
         uint8_t *tag_data = NULL, *p = NULL;
-        size_t tag_len = 0;
+        uint16_t tag_len = 0;
         uint8_t *cmeta = (uint8_t *) calloc(1, meta_size);
         /* We cannot modify meta_data, as it comes from flash memory. It must be cpied to an aux buffer */
         memcpy(cmeta, meta_data, meta_size);
-        while (walk_tlv(cmeta, meta_size, &p, &tag, &tag_len, &tag_data)) {
+        asn1_ctx_t ctxi;
+        asn1_ctx_init(meta_data, meta_size, &ctxi);
+        while (walk_tlv(&ctxi, &p, &tag, &tag_len, &tag_data)) {
             if (tag == 0x90) { // ofset tag
-                uint32_t val =
-                    (tag_data[0] << 24) | (tag_data[1] << 16) | (tag_data[2] << 8) | tag_data[3];
+                uint32_t val = get_uint32_t_be(tag_data);
                 val--;
-                tag_data[0] = (val >> 24) & 0xff;
-                tag_data[1] = (val >> 16) & 0xff;
-                tag_data[2] = (val >> 8) & 0xff;
-                tag_data[3] = val & 0xff;
-
-                int r = meta_add(fkey->fid, cmeta, meta_size);
+                put_uint32_t_be(val, tag_data);
+                int r = meta_add(fkey->fid, cmeta, (uint16_t)meta_size);
                 free(cmeta);
                 if (r != 0) {
                     return 0xffffffff;
@@ -494,20 +520,21 @@ uint32_t decrement_key_counter(file_t *fkey) {
 
 // Stores the private and public keys in flash
 int store_keys(void *key_ctx, int type, uint8_t key_id) {
-    int r, key_size = 0;
+    int r = 0;
+    uint16_t key_size = 0;
     uint8_t kdata[4096 / 8]; // worst case
     if (type & PICO_KEYS_KEY_RSA) {
         mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) key_ctx;
-        key_size = mbedtls_mpi_size(&rsa->P) + mbedtls_mpi_size(&rsa->Q);
+        key_size = (uint16_t)mbedtls_mpi_size(&rsa->P) + (uint16_t)mbedtls_mpi_size(&rsa->Q);
         mbedtls_mpi_write_binary(&rsa->P, kdata, key_size / 2);
         mbedtls_mpi_write_binary(&rsa->Q, kdata + key_size / 2, key_size / 2);
     }
     else if (type & PICO_KEYS_KEY_EC) {
         mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx;
-        key_size = mbedtls_mpi_size(&ecdsa->d);
+        size_t olen = 0;
         kdata[0] = ecdsa->grp.id & 0xff;
-        mbedtls_ecp_write_key(ecdsa, kdata + 1, key_size);
-        key_size++;
+        mbedtls_ecp_write_key_ext(ecdsa, &olen, kdata + 1, sizeof(kdata) - 1);
+        key_size = olen + 1;
     }
     else if (type & PICO_KEYS_KEY_AES) {
         if (type == PICO_KEYS_KEY_AES_128) {
@@ -525,133 +552,154 @@ int store_keys(void *key_ctx, int type, uint8_t key_id) {
         memcpy(kdata, key_ctx, key_size);
     }
     else {
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
     file_t *fpk = file_new((KEY_PREFIX << 8) | key_id);
     if (!fpk) {
-        return CCID_ERR_MEMORY_FATAL;
+        return PICOKEY_ERR_MEMORY_FATAL;
     }
     r = mkek_encrypt(kdata, key_size);
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return r;
     }
-    r = flash_write_data_to_file(fpk, kdata, key_size);
-    if (r != CCID_OK) {
+    r = file_put_data(fpk, kdata, (uint16_t)key_size);
+    if (r != PICOKEY_OK) {
         return r;
     }
+    char key_id_str[4] = {0};
+    sprintf(key_id_str, "%u", key_id);
+    if (type & PICO_KEYS_KEY_EC) {
+        key_size--;
+    }
+    uint16_t prkd_len = asn1_build_prkd_generic(NULL, 0, (uint8_t *)key_id_str, (uint16_t)strlen(key_id_str), key_size * 8, type, kdata, sizeof(kdata));
+    if (prkd_len > 0) {
+        fpk = file_new((PRKD_PREFIX << 8) | key_id);
+        r = file_put_data(fpk, kdata, prkd_len);
+        if (r != 0) {
+            return SW_EXEC_ERROR();
+        }
+    }
     low_flash_available();
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int find_and_store_meta_key(uint8_t key_id) {
-    size_t lt[4] = { 0, 0, 0, 0 }, meta_size = 0;
-    uint8_t *pt[4] = { NULL, NULL, NULL, NULL };
+    uint16_t meta_size = 0;
     uint8_t t90[4] = { 0xFF, 0xFF, 0xFF, 0xFE };
-    for (int t = 0; t < 4; t++) {
-        uint8_t *ptt = NULL;
-        size_t ltt = 0;
-        if (asn1_find_tag(apdu.data, apdu.nc, 0x90 + t, &ltt, &ptt) && ptt != NULL && ltt > 0) {
-            lt[t] = ltt;
-            pt[t] = ptt;
-            meta_size += asn1_len_tag(0x90 + t, lt[t]);
+    asn1_ctx_t ctxi, ctxo[4] = { 0 };
+    asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
+    for (uint16_t t = 0; t < 4; t++) {
+        if (asn1_find_tag(&ctxi, 0x90 + t, &ctxo[t]) && asn1_len(&ctxo[t]) > 0) {
+            meta_size += asn1_len_tag(0x90 + t, ctxo[t].len);
         }
     }
-    if (lt[0] == 0 && pt[0] == NULL) {
+    if (asn1_len(&ctxo[0]) == 0) {
         uint16_t opts = get_device_options();
         if (opts & HSM_OPT_KEY_COUNTER_ALL) {
-            lt[0] = 4;
-            pt[0] = t90;
+            ctxo[0].len = 4;
+            ctxo[0].data = t90;
             meta_size += 6;
         }
     }
     if (meta_size) {
         uint8_t *meta = (uint8_t *) calloc(1, meta_size), *m = meta;
-        for (int t = 0; t < 4; t++) {
-            if (lt[t] > 0 && pt[t] != NULL) {
+        for (uint8_t t = 0; t < 4; t++) {
+            if (asn1_len(&ctxo[t]) > 0) {
                 *m++ = 0x90 + t;
-                m += format_tlv_len(lt[t], m);
-                memcpy(m, pt[t], lt[t]);
-                m += lt[t];
+                m += format_tlv_len(ctxo[t].len, m);
+                memcpy(m, ctxo[t].data, ctxo[t].len);
+                m += ctxo[t].len;
             }
         }
-        int r = meta_add((KEY_PREFIX << 8) | key_id, meta, meta_size);
+        int r = meta_add((KEY_PREFIX << 8) | key_id, meta, (uint16_t)meta_size);
         free(meta);
         if (r != 0) {
-            return CCID_EXEC_ERROR;
+            return PICOKEY_EXEC_ERROR;
         }
     }
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
 int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey) {
     if (wait_button_pressed() == true) { // timeout
-        return CCID_VERIFICATION_FAILED;
+        return PICOKEY_VERIFICATION_FAILED;
     }
 
-    int key_size = file_get_size(fkey);
+    uint16_t key_size = file_get_size(fkey);
     uint8_t kdata[4096 / 8];
     memcpy(kdata, file_get_data(fkey), key_size);
     if (mkek_decrypt(kdata, key_size) != 0) {
-        return CCID_EXEC_ERROR;
+        return PICOKEY_EXEC_ERROR;
     }
     if (mbedtls_mpi_read_binary(&ctx->P, kdata, key_size / 2) != 0) {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));
         mbedtls_rsa_free(ctx);
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
     if (mbedtls_mpi_read_binary(&ctx->Q, kdata + key_size / 2, key_size / 2) != 0) {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));
         mbedtls_rsa_free(ctx);
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
     if (mbedtls_mpi_lset(&ctx->E, 0x10001) != 0) {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));
         mbedtls_rsa_free(ctx);
-        return CCID_EXEC_ERROR;
+        return PICOKEY_EXEC_ERROR;
     }
     if (mbedtls_rsa_import(ctx, NULL, &ctx->P, &ctx->Q, NULL, &ctx->E) != 0) {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));
         mbedtls_rsa_free(ctx);
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
     if (mbedtls_rsa_complete(ctx) != 0) {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));
         mbedtls_rsa_free(ctx);
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
     if (mbedtls_rsa_check_privkey(ctx) != 0) {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));
         mbedtls_rsa_free(ctx);
-        return CCID_WRONG_DATA;
+        return PICOKEY_WRONG_DATA;
     }
-    return CCID_OK;
+    return PICOKEY_OK;
 }
 
-int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey) {
+int load_private_key_ec(mbedtls_ecp_keypair *ctx, file_t *fkey) {
     if (wait_button_pressed() == true) { // timeout
-        return CCID_VERIFICATION_FAILED;
+        return PICOKEY_VERIFICATION_FAILED;
     }
 
-    int key_size = file_get_size(fkey);
+    uint16_t key_size = file_get_size(fkey);
     uint8_t kdata[67]; // Worst case, 521 bit + 1byte
     memcpy(kdata, file_get_data(fkey), key_size);
     if (mkek_decrypt(kdata, key_size) != 0) {
-        return CCID_EXEC_ERROR;
+        return PICOKEY_EXEC_ERROR;
     }
     mbedtls_ecp_group_id gid = kdata[0];
     int r = mbedtls_ecp_read_key(gid, ctx, kdata + 1, key_size - 1);
     if (r != 0) {
         mbedtls_platform_zeroize(kdata, sizeof(kdata));
-        mbedtls_ecdsa_free(ctx);
-        return CCID_EXEC_ERROR;
+        mbedtls_ecp_keypair_free(ctx);
+        return PICOKEY_EXEC_ERROR;
     }
     mbedtls_platform_zeroize(kdata, sizeof(kdata));
-    r = mbedtls_ecp_mul(&ctx->grp, &ctx->Q, &ctx->d, &ctx->grp.G, random_gen, NULL);
-    if (r != 0) {
-        mbedtls_ecdsa_free(ctx);
-        return CCID_EXEC_ERROR;
+#ifdef MBEDTLS_EDDSA_C
+    if (gid == MBEDTLS_ECP_DP_ED25519 || gid == MBEDTLS_ECP_DP_ED448) {
+        r = mbedtls_ecp_point_edwards(&ctx->grp, &ctx->Q, &ctx->d, random_gen, NULL);
     }
-    return CCID_OK;
+    else
+#endif
+    {
+        r = mbedtls_ecp_mul(&ctx->grp, &ctx->Q, &ctx->d, &ctx->grp.G, random_gen, NULL);
+    }
+    if (r != 0) {
+        mbedtls_ecp_keypair_free(ctx);
+        return PICOKEY_EXEC_ERROR;
+    }
+    return PICOKEY_OK;
+}
+int load_private_key_ecdh(mbedtls_ecp_keypair *ctx, file_t *fkey) {
+    return load_private_key_ec(ctx, fkey);
 }
 
 #define INS_VERIFY                  0x20
@@ -716,15 +764,19 @@ static const cmd_t cmds[] = {
 };
 
 int sc_hsm_process_apdu() {
+    uint32_t ne = apdu.ne;
     int r = sm_unwrap();
-    if (r != CCID_OK) {
+    if (r != PICOKEY_OK) {
         return SW_DATA_INVALID();
     }
     for (const cmd_t *cmd = cmds; cmd->ins != 0x00; cmd++) {
         if (cmd->ins == INS(apdu)) {
-            int r = cmd->cmd_handler();
+            int res = cmd->cmd_handler();
             sm_wrap();
-            return r;
+            if ((CLA(apdu) >> 2) & 0x3) {
+                apdu.ne = ne;
+            }
+            return res;
         }
     }
     return SW_INS_NOT_SUPPORTED();

src/hsm/sc_hsm.h

@@ -3,31 +3,38 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef _SC_HSM_H_
 #define _SC_HSM_H_
 
 #include <stdlib.h>
+#ifndef ESP_PLATFORM
 #include "common.h"
+#else
+#define MBEDTLS_ALLOW_PRIVATE_ACCESS
+#endif
 #include "mbedtls/rsa.h"
 #include "mbedtls/ecdsa.h"
-#ifndef ENABLE_EMULATION
+#if !defined(ENABLE_EMULATION) && !defined(ESP_PLATFORM)
 #include "pico/stdlib.h"
 #endif
 #include "file.h"
 #include "apdu.h"
 #include "pico_keys.h"
+#include "usb.h"
+
+#define MAX_APDU_DATA (USB_BUFFER_SIZE - 20)
 
 extern const uint8_t sc_hsm_aid[];
 
@@ -102,23 +109,22 @@ extern const uint8_t sc_hsm_aid[];
 extern int pin_reset_retries(const file_t *pin, bool);
 extern int pin_wrong_retry(const file_t *pin);
 
-extern void hash(const uint8_t *input, size_t len, uint8_t output[32]);
-extern void hash_multi(const uint8_t *input, size_t len, uint8_t output[32]);
-extern void double_hash_pin(const uint8_t *pin, size_t len, uint8_t output[32]);
+extern void hash(const uint8_t *input, uint16_t len, uint8_t output[32]);
 extern uint16_t get_device_options();
 extern bool has_session_pin, has_session_sopin;
 extern uint8_t session_pin[32], session_sopin[32];
-extern int check_pin(const file_t *pin, const uint8_t *data, size_t len);
+extern uint16_t check_pin(const file_t *pin, const uint8_t *data, uint16_t len);
 extern bool pka_enabled();
 extern const uint8_t *dev_name;
-extern size_t dev_name_len;
+extern uint16_t dev_name_len;
 extern uint8_t puk_status[MAX_PUK];
 extern int puk_store_select_chr(const uint8_t *chr);
 extern int delete_file(file_t *ef);
-extern const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, size_t *tag_len);
+extern const uint8_t *get_meta_tag(file_t *ef, uint16_t meta_tag, uint16_t *tag_len);
 extern bool key_has_purpose(file_t *ef, uint8_t purpose);
 extern int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey);
-extern int load_private_key_ecdsa(mbedtls_ecdsa_context *ctx, file_t *fkey);
+extern int load_private_key_ec(mbedtls_ecp_keypair *ctx, file_t *fkey);
+extern int load_private_key_ecdh(mbedtls_ecp_keypair *ctx, file_t *fkey);
 extern bool wait_button_pressed();
 extern int store_keys(void *key_ctx, int type, uint8_t key_id);
 extern int find_and_store_meta_key(uint8_t key_id);

src/hsm/version.h

@@ -3,22 +3,22 @@
  * 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
+ * it under the terms of the GNU Affero 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.
+ * Affero 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/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef __VERSION_H_
 #define __VERSION_H_
 
-#define HSM_VERSION 0x0306
+#define HSM_VERSION 0x0604
 
 #define HSM_VERSION_MAJOR ((HSM_VERSION >> 8) & 0xff)
 #define HSM_VERSION_MINOR (HSM_VERSION & 0xff)

tests/build-in-docker.sh

@@ -4,7 +4,7 @@ source tests/docker_env.sh
 build_image
 #run_in_docker rm -rf CMakeFiles
 run_in_docker mkdir -p build_in_docker
-run_in_docker -w "$PWD/build_in_docker" cmake -DENABLE_EMULATION=1 -D__FOR_CI=1 ..
+run_in_docker -w "$PWD/build_in_docker" cmake -DENABLE_EMULATION=1 -D__FOR_CI=1 -DENABLE_EDDSA=1 ..
 run_in_docker -w "$PWD/build_in_docker" make -j ${NUM_PROC}
 docker create --name temp_container pico-hsm-test:bullseye
 docker cp $PWD/build_in_docker/pico_hsm temp_container:/pico_hsm

tests/const.py

@@ -21,5 +21,5 @@ from binascii import unhexlify
 
 DEFAULT_DKEK = [0x1] * 32
 
-TERM_CERT = unhexlify('7F2181E57F4E819E5F290100421045535049434F48534D445630303030317F494F060A04007F00070202020203864104F571E53AA8E75C929D925081CF0F893CB5991D48BD546C1A3F22199F037E4B12D601ACD91C67C88D3C5B3D04C08EC0A372485F7A248E080EE0C6237C1B075E1C5F201045535049434F48534D54525A474E50327F4C0E060904007F0007030102025301005F25060203000300055F24060204000300045F374041BF5E970739135770DBCC5DDA81FFD8B13419A9257D44CAF8404267C644E8F435B43F5E57EB2A8CF4B198045ACD094E0CB34E6217D9C8922CFB9BBEFD4088AD')
-DICA_CERT = unhexlify('7F2181E97F4E81A25F290100421045535049434F48534D434130303030317F494F060A04007F0007020202020386410421EE4A21C16A10F737F12E78E5091B266612038CDABEBB722B15BF6D41B877FBF64D9AB69C39B9831B1AE00BEF2A4E81976F7688D45189BB232A24703D8A96A55F201045535049434F48534D445630303030317F4C12060904007F000703010202530580000000005F25060202000801085F24060203000601045F37403F75C08FFFC9186B56E6147199E82BFC327CEEF72495BC567961CD54D702F13E3C2766FCD1D11BD6A9D1F4A229B76B248CEB9AF88D59A74D0AB149448705159B')
+TERM_CERT = unhexlify('7f2181e57f4e819e5f290100421045535049434f48534d445630303030327f494f060a04007f000702020202038641043400e4f42ea8b78b2ab58d24c8297a4b1c13a73a631b531e58d0efb60d70dd6666c8fce4130e9b15ffa4ad29708d32764ac4b0cc0e5301898522f4c735f5a90d5f201045535049434f48534d54524c524134437f4c0e060904007f0007030102025301005f25060205010102085f24060206010102085f3740569f6fe91796f95fa77ecdb680468417eed7b4e00ccc2e091a6b56389213f913c4cf91da96fbcb12d363fead30a5598f737975d58b5170b7f45e9e87ec546883')
+DICA_CERT = unhexlify('7f2181e97f4e81a25f290100421045535049434f48534d434130303030327f494f060a04007f00070202020203864104e66b473ec328caf39eaed840f9c7a4ba237e1dd19004861fa3f4f134bd2d5ea5f71c6c2e6321add4c8a7793ba41119c5783f48a5d9dfc0898d9ae9e7b14da8d65f201045535049434f48534d445630303030327f4c12060904007f000703010202530580000000045f25060205000400065f24060206000400065f3740a645594c6c338cd6bda6cad039cee54fd822b1011c0af1e4e3a2a6d03d43bdbb8be68a66a8757e7b1f963589bdd80d8e65de5055b722609041ec63f0498ddc8b')

tests/docker/bullseye/Dockerfile

@@ -24,11 +24,11 @@ RUN apt install -y libccid \
     cmake \
     vsmartcard-vpcd \
     && rm -rf /var/lib/apt/lists/*
-RUN pip3 install pytest pycvc cryptography pyscard base58
+RUN pip3 install pytest pycvc cryptography base58
 WORKDIR /
 RUN git clone https://github.com/OpenSC/OpenSC
 WORKDIR /OpenSC
-RUN git checkout tags/0.23.0
+RUN git checkout tags/0.26.1
 RUN ./bootstrap
 RUN ./configure --enable-openssl
 RUN make -j `nproc`
@@ -36,8 +36,6 @@ RUN make install
 RUN make clean
 RUN ldconfig
 WORKDIR /
-RUN git clone https://github.com/polhenarejos/pypicohsm.git
-RUN pip3 install -e pypicohsm
 RUN git clone https://github.com/CardContact/sc-hsm-embedded
 WORKDIR /sc-hsm-embedded
 RUN autoreconf -fi

tests/pico-hsm/test_000_info.py

@@ -23,7 +23,7 @@ def test_select(device):
     device.select_applet()
 
 def test_initialization(device):
-    device.initialize()
+    device.initialize(no_dev_cert=True)
 
 def test_termca(device):
     data = device.get_termca()

tests/pico-hsm/test_004_key_domains.py

@@ -20,14 +20,14 @@
 import pytest
 import hashlib
 from const import DEFAULT_DKEK
-from picohsm import APDUResponse, SWCodes
+from picokey import APDUResponse, SWCodes
 from picohsm.const import DEFAULT_DKEK_SHARES
 
 KEY_DOMAINS = 3
 TEST_KEY_DOMAIN = 1
 
 def test_key_domains(device):
-    device.initialize(key_domains=KEY_DOMAINS)
+    device.initialize(key_domains=KEY_DOMAINS, no_dev_cert=True)
     for k in range(KEY_DOMAINS):
         kd = device.get_key_domain(key_domain=k)
         assert('error' in kd)
@@ -69,14 +69,19 @@ def test_set_key_domain_ok(device):
 
 def test_import_dkek_ok(device):
     resp = device.import_dkek(DEFAULT_DKEK, key_domain=TEST_KEY_DOMAIN)
-    assert(resp[0] == DEFAULT_DKEK_SHARES)
-    assert(resp[1] == DEFAULT_DKEK_SHARES-1)
+    assert('dkek' in resp)
+    assert('kcv' in resp)
+    assert(resp['dkek']['total'] == DEFAULT_DKEK_SHARES)
+    assert(resp['dkek']['missing'] == DEFAULT_DKEK_SHARES-1)
 
     resp = device.import_dkek(DEFAULT_DKEK, key_domain=TEST_KEY_DOMAIN)
-    assert(resp[1] == DEFAULT_DKEK_SHARES-2)
+    assert('dkek' in resp)
+    assert('kcv' in resp)
+    assert(resp['dkek']['total'] == DEFAULT_DKEK_SHARES)
+    assert(resp['dkek']['missing'] == DEFAULT_DKEK_SHARES-2)
 
     kcv = hashlib.sha256(b'\x00'*32).digest()[:8]
-    assert(resp[2:] == kcv)
+    assert(resp['kcv'] == kcv)
 
 def test_clear_key_domain(device):
     kd = device.get_key_domain(key_domain=0)

tests/pico-hsm/test_005_dkek.py

@@ -23,15 +23,20 @@ from picohsm.const import DEFAULT_DKEK_SHARES, DEFAULT_PIN, DEFAULT_RETRIES
 from const import  DEFAULT_DKEK
 
 def test_dkek(device):
-    device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES)
+    device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
     device.login(DEFAULT_PIN)
     resp = device.import_dkek(DEFAULT_DKEK)
-    assert(resp[0] == DEFAULT_DKEK_SHARES)
-    assert(resp[1] == DEFAULT_DKEK_SHARES-1)
+    assert('dkek' in resp)
+    assert('kcv' in resp)
+    assert(resp['dkek']['total'] == DEFAULT_DKEK_SHARES)
+    assert(resp['dkek']['missing'] == DEFAULT_DKEK_SHARES-1)
 
     resp = device.import_dkek(DEFAULT_DKEK)
-    assert(resp[1] == DEFAULT_DKEK_SHARES-2)
+    assert('dkek' in resp)
+    assert('kcv' in resp)
+    assert(resp['dkek']['total'] == DEFAULT_DKEK_SHARES)
+    assert(resp['dkek']['missing'] == DEFAULT_DKEK_SHARES-2)
 
     kcv = hashlib.sha256(b'\x00'*32).digest()[:8]
-    assert(resp[2:] == kcv)
+    assert(resp['kcv'] == kcv)
 

tests/pico-hsm/test_010_pin.py

@@ -18,22 +18,22 @@
 """
 
 import pytest
-from picohsm import APDUResponse, SWCodes
+from picokey import APDUResponse, SWCodes
 from picohsm.const import DEFAULT_PIN, DEFAULT_RETRIES
 
 WRONG_PIN = '112233'
 
 def test_pin_init_retries(device):
-    device.initialize(retries=DEFAULT_RETRIES)
+    device.initialize(retries=DEFAULT_RETRIES, no_dev_cert=True)
     retries = device.get_login_retries()
     assert(retries == DEFAULT_RETRIES)
 
 def test_pin_login(device):
-    device.initialize(retries=DEFAULT_RETRIES)
+    device.initialize(retries=DEFAULT_RETRIES, no_dev_cert=True)
     device.login(DEFAULT_PIN)
 
 def test_pin_retries(device):
-    device.initialize(retries=DEFAULT_RETRIES)
+    device.initialize(retries=DEFAULT_RETRIES, no_dev_cert=True)
     device.login(DEFAULT_PIN)
 
     for ret in range(DEFAULT_RETRIES-1):
@@ -45,7 +45,7 @@ def test_pin_retries(device):
         device.login(WRONG_PIN)
     assert(e.value.sw == SWCodes.SW_PIN_BLOCKED)
 
-    device.initialize(retries=DEFAULT_RETRIES)
+    device.initialize(retries=DEFAULT_RETRIES, no_dev_cert=True)
     retries = device.get_login_retries()
     assert(retries == DEFAULT_RETRIES)
 

tests/pico-hsm/test_020_keypair_gen.py

@@ -21,10 +21,10 @@ import pytest
 from picohsm import KeyType, DOPrefixes
 
 def test_gen_initialize(device):
-    device.initialize()
+    device.initialize(no_dev_cert=True)
 
 @pytest.mark.parametrize(
-    "curve", ['secp192r1', 'secp256r1', 'secp384r1', 'secp521r1', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1', 'secp192k1', 'secp256k1', 'curve25519', 'curve448']
+    "curve", ['secp192r1', 'secp256r1', 'secp384r1', 'secp521r1', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1', 'secp192k1', 'secp256k1', 'curve25519', 'curve448', 'ed25519', 'ed448']
 )
 def test_gen_ecc(device, curve):
     keyid = device.key_generation(KeyType.ECC, curve)

tests/pico-hsm/test_021_key_import.py

@@ -21,17 +21,17 @@ import pytest
 import hashlib
 import os
 from picohsm import DOPrefixes
-from cryptography.hazmat.primitives.asymmetric import rsa, ec, x25519, x448
+from cryptography.hazmat.primitives.asymmetric import rsa, ec, x25519, x448, ed25519, ed448
 from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
 from picohsm.const import DEFAULT_RETRIES, DEFAULT_DKEK_SHARES
 from const import DEFAULT_DKEK
 
 def test_prepare_dkek(device):
-    device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES)
+    device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
     resp = device.import_dkek(DEFAULT_DKEK)
     resp = device.import_dkek(DEFAULT_DKEK)
     kcv = hashlib.sha256(b'\x00'*32).digest()[:8]
-    assert(resp[2:] == kcv)
+    assert(resp['kcv'] == kcv)
 
 @pytest.mark.parametrize(
     "modulus", [1024, 2048, 4096]
@@ -70,6 +70,17 @@ def test_import_montgomery(device, curve):
     device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
     device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, keyid)
 
+@pytest.mark.parametrize(
+    "curve", [ed25519.Ed25519PrivateKey, ed448.Ed448PrivateKey]
+)
+def test_import_edwards(device, curve):
+    pkey = curve.generate()
+    keyid = device.import_key(pkey)
+    pubkey = device.public_key(keyid, param=curve)
+    assert(pubkey.public_bytes(Encoding.Raw, PublicFormat.Raw) == pkey.public_key().public_bytes(Encoding.Raw, PublicFormat.Raw))
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    device.delete_file(DOPrefixes.EE_CERTIFICATE_PREFIX, keyid)
+
 @pytest.mark.parametrize(
     "size", [128, 192, 256]
 )

tests/pico-hsm/test_022_key_exchange.py

@@ -25,11 +25,11 @@ from picohsm.const import DEFAULT_RETRIES, DEFAULT_DKEK_SHARES
 from const import DEFAULT_DKEK
 
 def test_prepare_dkek(device):
-    device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES)
+    device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
     resp = device.import_dkek(DEFAULT_DKEK)
     resp = device.import_dkek(DEFAULT_DKEK)
     kcv = hashlib.sha256(b'\x00'*32).digest()[:8]
-    assert(resp[2:] == kcv)
+    assert(resp['kcv'] == kcv)
 
 @pytest.mark.parametrize(
     "curve", [ec.SECP192R1, ec.SECP256R1, ec.SECP384R1, ec.SECP521R1, ec.SECP256K1, ec.BrainpoolP256R1, ec.BrainpoolP384R1, ec.BrainpoolP512R1]

tests/pico-hsm/test_025_key_export.py

@@ -18,7 +18,8 @@
 """
 
 import pytest
-from picohsm import KeyType, DOPrefixes, APDUResponse, SWCodes
+from picohsm import KeyType, DOPrefixes
+from picokey import APDUResponse, SWCodes
 from binascii import hexlify
 import hashlib
 from const import DEFAULT_DKEK
@@ -28,7 +29,7 @@ from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import serialization
 
 def test_initialize(device):
-    device.initialize(key_domains=1)
+    device.initialize(key_domains=1, no_dev_cert=True)
     assert(device.get_key_domains() == 1)
 
     device.set_key_domain(key_domain=0, total=2)

tests/pico-hsm/test_030_signature.py

@@ -55,3 +55,12 @@ def test_signature_rsa(device, modulus, scheme):
     device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
     device.verify(pubkey, data, signature, scheme)
 
+@pytest.mark.parametrize(
+    "curve", ['ed25519', 'ed448']
+)
+def test_signature_edwards(device, curve):
+    keyid = device.key_generation(KeyType.ECC, curve)
+    pubkey = device.public_key(keyid=keyid)
+    signature = device.sign(keyid=keyid, scheme=Algorithm.ALGO_EC_RAW, data=data)
+    device.delete_file(DOPrefixes.KEY_PREFIX, keyid)
+    device.verify(pubkey, data, signature)

tests/pico-hsm/test_050_cipher.py

@@ -27,7 +27,7 @@ from const import DEFAULT_DKEK
 MESSAGE = b'a secret message'
 
 def test_prepare_aes(device):
-    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
     resp = device.import_dkek(DEFAULT_DKEK)
     resp = device.import_dkek(DEFAULT_DKEK)
 

tests/pico-hsm/test_051_chachapoly.py

@@ -21,7 +21,8 @@ import pytest
 import os
 from cryptography.hazmat.primitives.ciphers import aead
 import cryptography.exceptions
-from picohsm import APDUResponse, DOPrefixes, EncryptionMode, SWCodes
+from picohsm import DOPrefixes, EncryptionMode
+from picokey import APDUResponse, SWCodes
 from picohsm.const import DEFAULT_DKEK_SHARES
 from const import DEFAULT_DKEK
 from binascii import hexlify
@@ -30,7 +31,7 @@ MESSAGE = b'a secret message'
 AAD = b'this is a tag for AAD'
 
 def test_prepare_chachapoly(device):
-    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
     resp = device.import_dkek(DEFAULT_DKEK)
     resp = device.import_dkek(DEFAULT_DKEK)
 

tests/pico-hsm/test_052_aes_ext.py

@@ -20,8 +20,7 @@
 import pytest
 import os
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes, aead
-import cryptography.exceptions
-from picohsm import APDUResponse, DOPrefixes, EncryptionMode, SWCodes, AES
+from picohsm import EncryptionMode, AES
 from picohsm.const import DEFAULT_DKEK_SHARES
 from const import DEFAULT_DKEK
 from binascii import hexlify
@@ -30,7 +29,7 @@ MESSAGE = b'a secret message'
 AAD = b'this is a tag for AAD'
 
 def test_prepare_aes(device):
-    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
     resp = device.import_dkek(DEFAULT_DKEK)
     resp = device.import_dkek(DEFAULT_DKEK)
 

tests/pico-hsm/test_060_mac.py

@@ -28,7 +28,7 @@ from const import DEFAULT_DKEK
 MESSAGE = b'a secret message'
 
 def test_prepare_aes(device):
-    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
     resp = device.import_dkek(DEFAULT_DKEK)
     resp = device.import_dkek(DEFAULT_DKEK)
 

tests/pico-hsm/test_070_hkdf.py

@@ -29,7 +29,7 @@ from picohsm import DOPrefixes
 INFO = b'info message'
 
 def test_prepare_kd(device):
-    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
     resp = device.import_dkek(DEFAULT_DKEK)
     resp = device.import_dkek(DEFAULT_DKEK)
 

tests/pico-hsm/test_071_pbkdf2.py

@@ -29,7 +29,7 @@ from picohsm import DOPrefixes
 INFO = b'info message'
 
 def test_prepare_kd(device):
-    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
     resp = device.import_dkek(DEFAULT_DKEK)
     resp = device.import_dkek(DEFAULT_DKEK)
 

tests/pico-hsm/test_072_x963.py

@@ -29,7 +29,7 @@ from picohsm import DOPrefixes
 INFO = b'shared message'
 
 def test_prepare_kd(device):
-    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
     resp = device.import_dkek(DEFAULT_DKEK)
     resp = device.import_dkek(DEFAULT_DKEK)
 

tests/pico-hsm/test_080_pka.py

@@ -21,20 +21,20 @@ import pytest
 from binascii import unhexlify, hexlify
 from cvc.certificates import CVC
 from picohsm.utils import int_to_bytes
-from picohsm import APDUResponse, SWCodes
+from picokey import APDUResponse, SWCodes
 from const import TERM_CERT, DICA_CERT
 from cryptography.hazmat.primitives.asymmetric import ec, utils
 from cryptography.hazmat.primitives import hashes
 
-AUT_KEY = unhexlify('0A40E11E672C28C558B72C25D93BCF28C08D39AFDD5A1A2FD3BAF7A6B27F0C2E')
+AUT_KEY = unhexlify('579A995BD7BA35AD3D3968940FA4CDA34116E121A8AC01396234DAFB132B3FD7')
 aut_pk = ec.derive_private_key(int.from_bytes(AUT_KEY, 'big'), ec.BrainpoolP256R1())
-AUT_PUK = unhexlify('678201ed7f218201937f4e82014b5f290100421045535049434f48534d54525a474e50327f4982011d060a04007f000702020202038120a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e537782207d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9832026dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b68441048bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f0469978520a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a78641040cc18ce246da678239af0913a1579dda58c07be404da4a65327794fac93f57a333267979905b5d046da7020226cc4e5fc477e8fc651a0cf87095259aafa88e648701015f201045535049434f48534d54525a474e50325f37401fc90bdab2a58c3cd25f18a90baa2c21d3d087002ba240fb274ff066759297f79e130053d902d637a448c8cdcd0670fe8ebcc06d8a3ee82079f08d1ff8660393421045535049434f48534d54525a474e50325f3740e24e7e23eae3c78f9fa88391004369a293c43ef99e2279170983e1dbe707fbf0382d09de3e60ef1addd2f055947c3efcef17926065ddb7a031f4905da474ed1d')
+AUT_PUK = unhexlify('678201ed7f218201937f4e82014b5f290100421045535049434f48534d54524c524134437f4982011d060a04007f000702020202038120a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e537782207d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9832026dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b68441048bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f0469978520a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a7864104a8217de2cec275cdf9dcda68128aff6061199291532545ab394e2554015962e16d568012a9d01b3da60d062aeed11356467fa3af9ebf9aad3d2933ebb9d86e0f8701015f201045535049434f48534d54524c524134435f374022d9f4480995e8370f8377e8bd4a63547be7740f7836456de5196839c6689540889acd573338d68bdea3db2e31c8dd00e670a4bcccdef497a156c39170d3c837421045535049434f48534d54524c524134435f374014445d219facb3bb745867d945e46526a2a6d03441dba52911d8f9483abbe4272a0beee7cecc69c661f3459c9b5431719ebf7e11f93d903a2cf705899eb4b631')
 
 
 term_chr = CVC().decode(TERM_CERT).chr()
 
 def test_initialize(device):
-    device.initialize(puk_auts=1, puk_min_auts=1)
+    device.initialize(puk_auts=1, puk_min_auts=1, no_dev_cert=False)
     device.logout()
 
 def test_register_puk(device):
@@ -102,7 +102,7 @@ def test_enumerate_puk_1(device):
     assert(puks[0]['status'] == 0)
 
 def test_enumerate_puk_2(device):
-    device.initialize(puk_auts=2, puk_min_auts=1)
+    device.initialize(puk_auts=2, puk_min_auts=1, no_dev_cert=True)
     puks = device.enumerate_puk()
     assert(len(puks) == 2)
     assert(puks[0]['status'] == -1)
@@ -115,7 +115,7 @@ def test_enumerate_puk_2(device):
     assert(puks[1]['status'] == -1)
 
 def test_register_more_puks(device):
-    device.initialize(puk_auts=2, puk_min_auts=1)
+    device.initialize(puk_auts=2, puk_min_auts=1, no_dev_cert=True)
     status = device.get_puk_status()
     assert(status == bytes([2,2,1,0]))
 
@@ -123,14 +123,14 @@ def test_register_more_puks(device):
     assert(status == bytes([2,1,1,0]))
 
 def test_is_pku(device):
-    device.initialize(puk_auts=1, puk_min_auts=1)
+    device.initialize(puk_auts=1, puk_min_auts=1, no_dev_cert=True)
     assert(device.is_puk() == True)
 
-    device.initialize()
+    device.initialize(no_dev_cert=True)
     assert(device.is_puk() == False)
 
 def test_check_puk_key(device):
-    device.initialize(puk_auts=1, puk_min_auts=1)
+    device.initialize(puk_auts=1, puk_min_auts=1, no_dev_cert=True)
     status = device.check_puk_key(term_chr)
     assert(status == -1)
 
@@ -140,7 +140,7 @@ def test_check_puk_key(device):
 
 
 def test_register_puk_with_no_puk(device):
-    device.initialize()
+    device.initialize(no_dev_cert=True)
     with pytest.raises(APDUResponse) as e:
         device.register_puk(AUT_PUK, TERM_CERT, DICA_CERT)
     assert(e.value.sw == SWCodes.SW_FILE_NOT_FOUND)

tests/pico-hsm/test_090_xkek.py

@@ -25,12 +25,13 @@ from cvc.asn1 import ASN1
 from cvc.certificates import CVC
 from cvc import oid
 from cryptography.hazmat.primitives.asymmetric import ec
-from picohsm import DOPrefixes, APDUResponse, SWCodes
+from picohsm import DOPrefixes
+from picokey import APDUResponse, SWCodes
 
-KDM = unhexlify(b'30820420060b2b0601040181c31f0402016181ed7f2181e97f4e81a25f290100421045535049434f48534d434130303030317f494f060a04007f0007020202020386410421ee4a21c16a10f737f12e78e5091b266612038cdabebb722b15bf6d41b877fbf64d9ab69c39b9831b1ae00bef2a4e81976f7688d45189bb232a24703d8a96a55f201045535049434f48534d445630303030317f4c12060904007f000703010202530580000000005f25060202000801085f24060203000601045f37403f75c08fffc9186b56e6147199e82bfc327ceef72495bc567961cd54d702f13e3c2766fcd1d11bd6a9d1f4a229b76b248ceb9af88d59a74d0ab149448705159b6281e97f2181e57f4e819e5f290100421045535049434f48534d445630303030317f494f060a04007f00070202020203864104c8561b41e54fea81bb80dd4a6d537e7c3904344e8ca90bc5f668111811e02c8d5d51ca93ca89558f2a8a9cbb147434e3441ec174505ff980fd7a7106286196915f201045535049434f48534d54524a444736387f4c0e060904007f0007030102025301005f25060203000300065f24060204000300055f3740983de63d0975b715ebd8a93cb38fa9638882c8b7064d51a6facabed693b92edc098e458b713203413ef6de0958c44772cbdbc264205c7b1bdb8b4fcb2516437f638201f1678201ed7f218201937f4e82014b5f290100421045535049434f48534d54524a444736387f4982011d060a04007f000702020202038120a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e537782207d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9832026dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b68441048bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f0469978520a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a78641048b1f450912a2e4d428b7eefc5fa05618a9ef295e90009a61cbb0970181b333474ea94f94cde5a11aba0589e85d4225002789ff1cdcf25756f059647b49fc2a158701015f201045535049434f48534d54524a444736385f3740372407c20de7257c89dae1e6606c8a046ca65efaa010c0a22b75c402ee243de51f5f1507457193679ed9db4fbbfe8efb9d695b684492b665ad8ba98c1f84ea38421045535049434f48534d54524a444736385f374098718e2e14a44386b689b71a101530316b65ab49a91bab0dd56099c5161ecb8aadff6cf27449f94034e58b7306f01e6ffa2766a2f5bb1281e12e5f1f9174733454400cf8926ca5bec9a91bcd47bf391c15d94ef6e3243d5fd1fffeaafd586766bc3221eafd808f17f8450f238cc1fe7ab1854443db31d622f53a2b3fdb3ad750d5ce')
+KDM = unhexlify(b'30820420060b2b0601040181c31f0402016181ed7f2181e97f4e81a25f290100421045535049434f48534d434130303030327f494f060a04007f00070202020203864104e66b473ec328caf39eaed840f9c7a4ba237e1dd19004861fa3f4f134bd2d5ea5f71c6c2e6321add4c8a7793ba41119c5783f48a5d9dfc0898d9ae9e7b14da8d65f201045535049434f48534d445630303030327f4c12060904007f000703010202530580000000045f25060205000400065f24060206000400065f3740a645594c6c338cd6bda6cad039cee54fd822b1011c0af1e4e3a2a6d03d43bdbb8be68a66a8757e7b1f963589bdd80d8e65de5055b722609041ec63f0498ddc8b6281e97f2181e57f4e819e5f290100421045535049434f48534d445630303030327f494f060a04007f000702020202038641043359f5234ce62e0eb80460046d8fd1aae018cc8b9e687b40aa2c047e352409b45153d1ad888e4e7e780a3b1fa8c69ca8998bd271c8849137149142e96816a5a45f201045535049434f48534d54524a5a58314a7f4c0e060904007f0007030102025301005f25060205010102085f24060206010102085f37409add1c1c8a05e7bc56a8bd846c9122d9214cc43c86b6952a961dce525d830a58130cbb275e9408af38dc16160f958d2b9ac6ac4f0f1b9b863284f00121d447ce638201f1678201ed7f218201937f4e82014b5f290100421045535049434f48534d54524a5a58314a7f4982011d060a04007f000702020202038120a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e537782207d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9832026dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b68441048bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f0469978520a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a78641049de55b50b921de72bbf740d3518905ff893e8208cfe8d144de34d79da3645d1c0cb551a19d6e6a5fee050e479a65d36fdf638af741e52dad4df9960b8ed443d18701015f201045535049434f48534d54524a5a58314a5f374099dede270b9a2def89a4d12dc0314e6289bd565808683f362e9f9ac9554ec5113bf7e412ecc386af12d2a9b43f27e54e10dfc6d8f2d6b618b1776459c13c0bec421045535049434f48534d54524a5a58314a5f3740459f6385f28a84f1c57f421a7f6cb4f1177084497321be94c87998c2e01af0202bab6984411cde1aab34e4e59cc27961b85855bae6340305281ff838253b0f3554404b6a2fe6947faa91f6ffa0d707cd4cbb43192935f561be137f4b3680304fc28b41210b671b8b033e06b4ad720010bcd36b92282844616261f944f3c4f67bfda5')
 
 def test_initialize(device):
-    device.initialize(key_domains=1)
+    device.initialize(key_domains=1, no_dev_cert=True)
     device.logout()
 
 def test_create_xkek(device):

tests/pico-hsm/test_095_bip_slip.py

@@ -27,7 +27,8 @@ from cvc.certificates import CVC
 from cvc import oid
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import hashes
-from picohsm import EncryptionMode, APDUResponse, SWCodes, PicoHSM
+from picohsm import EncryptionMode, PicoHSM
+from picokey import APDUResponse, SWCodes
 import hashlib
 
 TEST_STRING = b'Pico Keys are awesome!'
@@ -36,7 +37,7 @@ def sha256_sha256(data):
     return hashlib.sha256(hashlib.sha256(data).digest()).digest()
 
 def test_initialize(device):
-    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
     resp = device.import_dkek(DEFAULT_DKEK)
     resp = device.import_dkek(DEFAULT_DKEK)
 

tests/scripts/asym_cipher.sh

@@ -7,9 +7,9 @@ test $? -eq 0 || exit $?
 rsa_encrypt_decrypt() {
     openssl pkeyutl -encrypt -pubin -inkey 1.pub $2 -in $1 -out data.crypt
     test $? -eq 0 && echo -n "." || exit $?
-    TDATA=$(tr -d '\0' < <(pkcs11-tool --id 1 --pin 648219 --decrypt $3 -i data.crypt 2>/dev/null))
+    TDATA=$(pkcs11-tool --id 1 --pin 648219 --decrypt $3 -i data.crypt 2>/dev/null | sed '/^OAEP parameters:/d' | tr -d '\0')
     test $? -eq 0 && echo -n "." || exit $?
-    if [[ ${TEST_STRING} != "$TDATA" ]]; then
+    if [[ "$TEST_STRING" != "$TDATA" ]]; then
         exit 1
     fi
     test $? -eq 0 && echo -n "." || exit $?
@@ -36,7 +36,7 @@ rsa_encrypt_decrypt data_pad "-pkeyopt rsa_padding_mode:none" "--mechanism RSA-X
 test $? -eq 0 && echo -e ".\t${OK}" || exit $?
 
 echo -n "  Test RSA-PKCS-OAEP ciphering..."
-rsa_encrypt_decrypt data "-pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 -pkeyopt rsa_mgf1_md:sha256" "--mechanism RSA-PKCS-OAEP"
+rsa_encrypt_decrypt data "-pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 -pkeyopt rsa_mgf1_md:sha256" "--mechanism RSA-PKCS-OAEP --hash-algorithm SHA256 --mgf MGF1-SHA256"
 test $? -eq 0 && echo -e ".\t${OK}" || exit $?
 
 rm -rf data* 1.*

tests/scripts/func.sh

@@ -37,7 +37,9 @@ gen_and_delete() {
     test $? -eq 0 && echo -n "." || exit $?
 }
 reset() {
-    python3 tools/pico-hsm-tool.py --pin 648219 initialize --so-pin 57621880 --silent > /dev/null 2>&1
+    #python3 tools/pico-hsm-tool.py --pin 648219 initialize --so-pin 57621880 --silent --no-dev-cert > /dev/null 2>&1
+    rm -f memory.flash
+    tar -xf tests/memory.tar.gz
     test $? -eq 0 || exit $?
 }
 

tests/scripts/sc_hsm_test.sh

@@ -14,7 +14,7 @@ test $? -eq 0 && echo -n "." || {
     echo -e "\t${FAIL}"
     exit 1
 }
-grep -q "338 tests performed" <<< $e && echo -n "." || {
+grep -q "334 tests performed" <<< $e && echo -n "." || {
     echo -e "\t${FAIL}"
     exit 1
 }

tests/scripts/sign_and_verify.sh

@@ -12,7 +12,7 @@ create_dgst() {
     test $? -eq 0 && echo -n "." || exit $?
 }
 
-dgsts=("sha1" "sha224" "sha256" "sha384" "sha512")
+dgsts=("sha256" "sha384" "sha512")
 for dgst in ${dgsts[*]}; do
     echo -n "  Create digest ${dgst}..."
     create_dgst ${dgst}
@@ -104,7 +104,7 @@ dd if=/dev/zero bs=1 count=$((256-$tlen)) >> data_pad > /dev/null 2>&1
 test $? -eq 0 && echo -n "." || exit $?
 pkcs11-tool --id 1 --sign --pin 648219 --mechanism RSA-X-509 -i data_pad -o data.sig > /dev/null 2>&1
 test $? -eq 0 && echo -n "." || exit $?
-TDATA=$(tr -d '\0' < <(openssl rsautl -verify -inkey 1.pub -in data.sig -pubin -raw))
+TDATA=$(tr -d '\0' < <(openssl rsautl -verify -inkey 1.pub -in data.sig -pubin -raw 2>/dev/null))
 if [[ ${TEST_DATA} != "$TDATA" ]]; then
     exit 1
 fi

tests/start-up-and-test.sh

@@ -2,4 +2,4 @@
 
 source ./tests/startup.sh
 
-pytest tests -W ignore::DeprecationWarning
+# pytest tests -W ignore::DeprecationWarning

tools/pico-hsm-patch-vidpid.sh

@@ -1,94 +0,0 @@
-#!/bin/bash
-
-#
-# 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/>.
-#
-
-VERSION_MAJOR="4" #Version of Pico CCID Core
-VERSION_MINOR="0"
-
-echo "----------------------------"
-echo "VID/PID patcher for Pico HSM"
-echo "----------------------------"
-echo ""
-
-if [ "$#" -le 0 ]; then
-    echo "Usage: $0 VID:PID [input_uf2_file] [output_uf2_file]"
-    exit 1
-fi
-
-IFS=':' read -r -a ARR <<< "$1"
-
-if [ ${#ARR[@]} -ne 2 ]; then
-    echo "ERROR: Specify vendor and product ids as VID:PID (e.g., $0 CAFE:1234)"
-    exit 1
-fi
-
-VID=${ARR[0]}
-PID=${ARR[1]}
-
-if [ ${#VID} -ne 4 ]; then
-    echo "ERROR: VID length must be 4 hexadecimal characters"
-    exit 1
-fi
-
-if [ ${#PID} -ne 4 ]; then
-    echo "ERROR: PID length must be 4 hexadecimal characters"
-    exit 1
-fi
-
-if ! [[ $VID =~ ^[0-9A-Fa-f]{1,}$ ]] ; then
-    echo "ERROR: VID must contain hexadecimal characters"
-    exit 1
-fi
-
-if ! [[ $PID =~ ^[0-9A-Fa-f]{1,}$ ]] ; then
-    echo "ERROR: PID must contain hexadecimal characters"
-    exit 1
-fi
-
-UF2_FILE_IF="hsm2040.uf2"
-UF2_FILE_OF="$UF2_FILE_IF"
-
-if [ "$#" -ge 2 ]; then
-    UF2_FILE_IF="$2"
-    UF2_FILE_OF="$UF2_FILE_IF"
-fi
-
-if [ "$#" -ge 3 ]; then
-    UF2_FILE_OF="$3"
-fi
-
-
-echo -n "Patching ${UF2_FILE_IF}... "
-
-if [[ ! -f "$UF2_FILE_IF" ]]; then
-    echo "ERROR: UF2 file ${UF2_FILE_IF} does not exist"
-    exit 1
-fi
-
-if [ "$UF2_FILE_IF" != "$UF2_FILE_OF" ]; then
-    cp -R $UF2_FILE_IF $UF2_FILE_OF
-fi
-
-LITTLE_VID="\x${VID:2:2}\x${VID:0:2}"
-LITTLE_PID="\x${PID:2:2}\x${PID:0:2}"
-
-perl -pi -e "s/\xff\xfe\xfd\xfc\x$VERSION_MINOR\x$VERSION_MAJOR\x01\x02\x03\x01/$LITTLE_VID$LITTLE_PID\x$VERSION_MINOR\x$VERSION_MAJOR\x01\x02\x03\x01/" $UF2_FILE_OF
-
-echo "Done!"
-echo ""
-echo "Patched file was saved in ${UF2_FILE_OF}"

tools/pico-hsm-tool.py

@@ -39,13 +39,13 @@ except ModuleNotFoundError:
     sys.exit(-1)
 
 try:
-    from picohsm import PicoHSM, PinType, DOPrefixes, KeyType, EncryptionMode, utils, APDUResponse, SWCodes
+    from picohsm import PicoHSM, PinType, DOPrefixes, KeyType, EncryptionMode, AES
+    from picohsm.utils import get_pki_data
+    from picokey import APDUResponse, Platform
 except ModuleNotFoundError:
     print('ERROR: picohsm module not found! Install picohsm package.\nTry with `pip install pypicohsm`')
     sys.exit(-1)
 
-import json
-import urllib.request
 import base64
 from binascii import hexlify, unhexlify
 import sys
@@ -57,22 +57,26 @@ from argparse import RawTextHelpFormatter
 
 pin = None
 
+BOOTKEY = [225, 209, 107, 167, 100, 171, 215, 18, 212, 239, 110, 62, 221, 116, 78, 213, 99, 140, 38, 11, 119, 28, 249, 129, 81, 17, 11, 175, 172, 155, 200, 113]
+
 def hexy(a):
     return [hex(i) for i in a]
 
 def parse_args():
     parser = argparse.ArgumentParser()
-    subparser = parser.add_subparsers(title="commands", dest="command")
+    subparser = parser.add_subparsers(title="commands", dest="command", required=True)
     parser_init = subparser.add_parser('initialize', help='Performs the first initialization of the Pico HSM.')
     parser.add_argument('--pin', help='PIN number')
+    parser.add_argument('--slot', help='Select specific slot', type=int, default=-1)
     parser_init.add_argument('--so-pin', help='SO-PIN number')
     parser_init.add_argument('--silent', help='Confirms initialization silently.', action='store_true')
+    parser_init.add_argument('--no-dev-cert', help='Do not request a device certificate (it will use a self-signed certificate). Do not use if attestation is needed.', action='store_true', default=False)
 
     parser_attestate = subparser.add_parser('attestate', help='Generates an attestation report for a private key and verifies the private key was generated in the devices or outside.')
     parser_attestate.add_argument('-k', '--key', help='The private key index', metavar='KEY_ID')
 
     parser_pki = subparser.add_parser('pki', help='Performs PKI operations.')
-    subparser_pki = parser_pki.add_subparsers(title='commands', dest='subcommand')
+    subparser_pki = parser_pki.add_subparsers(title='commands', dest='subcommand', required=True)
     parser_pki_init = subparser_pki.add_parser('initialize', help='Initializes the Public Key Infrastructure (PKI)')
 
     parser_pki_init.add_argument('--certs-dir', help='Store the PKI certificates into this directory.', default='certs')
@@ -80,36 +84,46 @@ def parse_args():
     parser_pki_init.add_argument('--force', help='Forces the download of certificates.', action='store_true')
 
     parser_rtc = subparser.add_parser('datetime', help='Datetime operations with the integrated Real Time Clock (RTC).')
-    subparser_rtc = parser_rtc.add_subparsers(title='commands', dest='subcommand')
+    subparser_rtc = parser_rtc.add_subparsers(title='commands', dest='subcommand', required=True)
     parser_rtc_set = subparser_rtc.add_parser('set', help='Sets the current datetime.')
     parser_rtc_get = subparser_rtc.add_parser('get', help='Gets the current datetime.')
 
     parser_opts = subparser.add_parser('options', help='Manage extra options.', formatter_class=RawTextHelpFormatter)
-    subparser_opts = parser_opts.add_subparsers(title='commands', dest='subcommand')
+    subparser_opts = parser_opts.add_subparsers(title='commands', dest='subcommand', required=True)
     parser_opts_set = subparser_opts.add_parser('set', help='Sets option OPT.')
-    parser_opts_get = subparser_opts.add_parser('get', help='Gets optiont OPT.')
+    parser_opts_get = subparser_opts.add_parser('get', help='Gets option OPT.')
     parser_opts.add_argument('opt', choices=['button', 'counter'], help='button: press-to-confirm button.\ncounter: every generated key has an internal counter.', metavar='OPT')
     parser_opts_set.add_argument('onoff', choices=['on', 'off'], help='Toggles state ON or OFF', metavar='ON/OFF', nargs='?')
 
+    parser_phy = subparser.add_parser('phy', help='Set PHY options.')
+    subparser_phy = parser_phy.add_subparsers(title='commands', dest='subcommand', required=True)
+    parser_phy_vp = subparser_phy.add_parser('vidpid', help='Sets VID/PID. Use VID:PID format (e.g. 1234:5678)')
+    parser_phy_ledn = subparser_phy.add_parser('led_gpio', help='Sets LED GPIO number.')
+    parser_phy_optwcid = subparser_phy.add_parser('wcid', help='Enable/Disable Web CCID interface.')
+    parser_phy_vp.add_argument('value', help='Value of the PHY option.', metavar='VAL', nargs='?')
+    parser_phy_ledn.add_argument('value', help='Value of the PHY option.', metavar='VAL', nargs='?')
+    parser_phy_optwcid.add_argument('value', choices=['enable', 'disable'], help='Enable/Disable Web CCID interface.', nargs='?')
+    parser_phy_ledbtness = subparser_phy.add_parser('led_brightness', help='Sets LED max. brightness.')
+    parser_phy_ledbtness.add_argument('value', help='Value of the max. brightness.', metavar='VAL', nargs='?')
+    parser_phy_optdimm = subparser_phy.add_parser('led_dimmable', help='Enable/Disable LED dimming.')
+    parser_phy_optdimm.add_argument('value', choices=['enable', 'disable'], help='Enable/Disable LED dimming.', nargs='?')
+
     parser_secure = subparser.add_parser('secure', help='Manages security of Pico HSM.')
-    subparser_secure = parser_secure.add_subparsers(title='commands', dest='subcommand')
+    subparser_secure = parser_secure.add_subparsers(title='commands', dest='subcommand', required=True)
     parser_opts_enable = subparser_secure.add_parser('enable', help='Enables secure lock.')
     parser_opts_unlock = subparser_secure.add_parser('unlock', help='Unlocks the secure lock.')
     parser_opts_disable = subparser_secure.add_parser('disable', help='Disables secure lock.')
 
-    parser_cipher = subparser.add_parser('cipher', help='Implements extended symmetric ciphering with new algorithms and options.\n\tIf no file input/output is specified, stdin/stoud will be used.')
-    subparser_cipher = parser_cipher.add_subparsers(title='commands', dest='subcommand')
+    parser_cipher = subparser.add_parser('cipher', help='Implements extended symmetric ciphering with new algorithms and options.\n\tIf no file input/output is specified, stdin/stdout will be used.')
+    subparser_cipher = parser_cipher.add_subparsers(title='commands', dest='subcommand', required=True)
     parser_cipher_encrypt = subparser_cipher.add_parser('encrypt', help='Performs encryption.')
     parser_cipher_decrypt = subparser_cipher.add_parser('decrypt', help='Performs decryption.')
-    parser_cipher_keygen = subparser_cipher.add_parser('keygen', help='Generates new AES key.')
-    parser_cipher_hmac = subparser_cipher.add_parser('hmac', help='Computes HMAC.')
+    parser_cipher_hmac = subparser_cipher.add_parser('mac', help='Computes MAC (HMAC or CMAC).')
     parser_cipher_kdf = subparser_cipher.add_parser('kdf', help='Performs key derivation function on a secret key.')
-    parser_cipher_encrypt.add_argument('--alg', choices=['CHACHAPOLY'], required=True)
-    parser_cipher_encrypt.add_argument('--iteration', help='Iteration count.', required=any(['PBKDF2' in s for s in sys.argv]))
-    parser_cipher_decrypt.add_argument('--alg', choices=['CHACHAPOLY'], required=True)
-    parser_cipher_decrypt.add_argument('--iteration', help='Iteration count.', required=any(['PBKDF2' in s for s in sys.argv]))
+    parser_cipher_encrypt.add_argument('--alg', choices=['CHACHAPOLY','AES-ECB','AES-CBC','AES-OFB','AES-CFB','AES-GCM','AES-CCM','AES-CTR','AES-XTS'], required=True)
+    parser_cipher_decrypt.add_argument('--alg', choices=['CHACHAPOLY','AES-ECB','AES-CBC','AES-OFB','AES-CFB','AES-GCM','AES-CCM','AES-CTR','AES-XTS'], required=True)
 
-    parser_cipher_hmac.add_argument('--alg', choices=['HMAC-SHA1', 'HMAC-SHA224', 'HMAC-SHA256', 'HMAC-SHA384', 'HMAC-SHA512'], help='Selects the algorithm.', required=True)
+    parser_cipher_hmac.add_argument('--alg', choices=['CMAC', 'HMAC-SHA1', 'HMAC-SHA224', 'HMAC-SHA256', 'HMAC-SHA384', 'HMAC-SHA512'], help='Selects the algorithm.', required=True)
     parser_cipher_kdf.add_argument('--alg', choices=['HKDF-SHA256', 'HKDF-SHA384', 'HKDF-SHA512', 'PBKDF2-SHA1', 'PBKDF2-SHA224', 'PBKDF2-SHA256', 'PBKDF2-SHA384', 'PBKDF2-SHA512', 'X963-SHA1', 'X963-SHA224', 'X963-SHA256', 'X963-SHA384', 'X963-SHA512'], help='Selects the algorithm.', required=True)
     parser_cipher_kdf.add_argument('--output-len', help='Specifies the output length of derived material.')
     parser_cipher_kdf.add_argument('--iteration', help='Iteration count.', required=any(['PBKDF2' in s for s in sys.argv]))
@@ -119,42 +133,48 @@ def parse_args():
     parser_cipher.add_argument('--file-out', help='File to write the result.')
     parser_cipher.add_argument('--aad', help='Specifies the authentication data (it can be a string or hex string. Combine with --hex if necesary).')
     parser_cipher.add_argument('--hex', help='Parses the AAD parameter as a hex string (for binary data).', action='store_true')
-    parser_cipher.add_argument('-k', '--key', help='The private key index', metavar='KEY_ID', required=True)
+    parser_cipher.add_argument('-k', '--key', help='The private key index', metavar='KEY_ID', required=all(['keygen' not in s for s in sys.argv]))
     parser_cipher.add_argument('-s', '--key-size', default=32, help='Size of the key in bytes.')
 
-    parser_x25519 = argparse.ArgumentParser(add_help=False)
-    subparser_x25519 = parser_x25519.add_subparsers(title='commands', dest='subcommand')
-    parser_x25519_keygen = subparser_x25519.add_parser('keygen', help='Generates a keypair for X25519 or X448.')
-    parser_x25519.add_argument('-k', '--key', help='The private key index', metavar='KEY_ID', required=True)
+    parser_keygen = subparser.add_parser('keygen', help='Generates private keypair or secret key.')
+    subparser_keygen = parser_keygen.add_subparsers(title='commands', dest='subcommand', required=True)
+    parser_keygen_aes = subparser_keygen.add_parser('aes', help='Generates an AES key.')
+    parser_keygen_aes.add_argument('--size', help='Specifies the size of AES key [128, 192 or 256]', choices=[128, 192, 256], default=128, type=int)
+    parser_keygen_x25519 = subparser_keygen.add_parser('x25519', help='Generates a private X25519 keypair.')
+    parser_keygen_x448 = subparser_keygen.add_parser('x448', help='Generates a private X448 keypair.')
+    parser_keygen_x25519 = subparser_keygen.add_parser('ed25519', help='Generates a private Ed25519 keypair.')
+    parser_keygen_x448 = subparser_keygen.add_parser('ed448', help='Generates a private Ed448 keypair.')
 
-    # Subparsers based on parent
+    parser_otp = subparser.add_parser('otp', help='Read/write OTP values.')
+    parser_otp.add_argument('subcommand', choices=['read', 'write', 'secure_boot'], help='Read, write or enable Secure Boot', nargs='?')
+    parser_otp.add_argument('--row', help='OTP row (in HEX)', required='write' in sys.argv or 'read' in sys.argv)
+    parser_otp.add_argument('-d', '--data', help='Data to write (in HEX) [e.g. 0011223344556677889900AABBCCDDEEFF]', required='write' in sys.argv)
+    parser_otp.add_argument('--lock', help='Lock & protect (no other firmwares can be loaded)', action='store_true')
+    parser_otp.add_argument('--index', help='Bootkey index [0-3]', type=int, default=0, choices=[0, 1, 2, 3])
 
-    parser_create = subparser.add_parser("x25519", parents=[parser_x25519],
-                                        help='X25519 key management.')
-    # Add some arguments exclusively for parser_create
+    parser_reboot = subparser.add_parser('reboot', help='Reboots the Pico HSM.')
 
-    parser_update = subparser.add_parser("x448", parents=[parser_x25519],
-                                        help='X448 key management.')
-    # Add some arguments exclusively for parser_update
+    parser_memory = subparser.add_parser('memory', help='Get memory usage.')
+
+    parser_bip32 = subparser.add_parser('bip32', help='Performs bip32 operations.')
+    parser_bip32.add_argument('--id', help='Master key id (0-255)', required=True)
+    subparser_bip32 = parser_bip32.add_subparsers(title='commands', dest='subcommand', required=True)
+    parser_bip32_init = subparser_bip32.add_parser('initialize', help='Initializes a master key.')
+    parser_bip32_derive = subparser_bip32.add_parser('derive', help='Derives a extended public key (xpub).')
+    parser_bip32_sign = subparser_bip32.add_parser('sign', help='Sign message.\n\tIf no file input/output is specified, stdin/stdout will be used.')
+
+    parser_bip32_init.add_argument('--curve', choices=['secp256k1', 'secp256r1', 'symmetric'], required=True)
+    parser_bip32_init.add_argument('--seed-file', help='File with the master seed. Specify "-" for stdin.')
+
+    parser_bip32_derive.add_argument('--path', help='Derivation path (e.g. m/0h/1/2)', required=True)
+
+    parser_bip32_sign.add_argument('--path', help='Derivation path (e.g. m/0h/1/2)', required=True)
+    parser_bip32_sign.add_argument('--file-in', help='File to sign.')
+    parser_bip32_sign.add_argument('--file-out', help='File to write the signature.')
 
     args = parser.parse_args()
     return args
 
-def get_pki_data(url, data=None, method='GET'):
-    user_agent = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; '
-    'rv:1.9.0.7) Gecko/2009021910 Firefox/3.0.7'
-    method = 'GET'
-    if (data is not None):
-        method = 'POST'
-    req = urllib.request.Request(f"https://www.picokeys.com/pico/pico-hsm/{url}/",
-                                method=method,
-                                data=data,
-                                headers={'User-Agent': user_agent, })
-    response = urllib.request.urlopen(req)
-    resp = response.read().decode('utf-8')
-    j = json.loads(resp)
-    return j
-
 def get_pki_certs(certs_dir='certs', force=False):
     certs = get_pki_data('certs')
     if (os.path.exists(certs_dir) is False):
@@ -187,43 +207,11 @@ def initialize(picohsm, args):
         print('Are you sure?')
         _ = input('[Press enter to confirm]')
 
-    if (args.pin):
-        try:
-            picohsm.login(args.pin)
-        except APDUResponse:
-            pass
-        pin = args.pin
-    else:
-        pin = '648219'
+    picohsm.initialize(pin=args.pin, sopin=args.so_pin, no_dev_cert=args.no_dev_cert)
 
-    if (args.so_pin):
-        try:
-            picohsm.login(args.so_pin, who=PinType.SO_PIN)
-        except APDUResponse:
-            pass
-        so_pin = args.so_pin
-    else:
-        so_pin = '57621880'
-
-    picohsm.initialize(pin=pin, sopin=so_pin)
-    response = picohsm.get_contents(DOPrefixes.EE_CERTIFICATE_PREFIX, 0x00)
-
-    cert = bytearray(response)
-    Y = CVC().decode(cert).pubkey().find(0x86).data()
-    print(f'Public Point: {hexlify(Y).decode()}')
-
-    pbk = base64.urlsafe_b64encode(Y)
-    data = urllib.parse.urlencode({'pubkey': pbk}).encode()
-    j = get_pki_data('cvc', data=data)
-    print('Device name: '+j['devname'])
-    dataef = base64.urlsafe_b64decode(
-        j['cvcert']) + base64.urlsafe_b64decode(j['dvcert']) + base64.urlsafe_b64decode(j['cacert'])
-
-    picohsm.select_file(0x2f02)
-    response = picohsm.put_contents(0x0000, data=dataef)
-
-    print('Certificate uploaded successfully!')
-    print('')
+    if (not args.no_dev_cert):
+        print('Certificate uploaded successfully!')
+        print('')
     print('Note that the device is initialized with a default PIN and '
         'configuration.')
     print('Now you can initialize the device as usual with your chosen PIN '
@@ -351,7 +339,7 @@ class SecureLock:
 
     def disable_device_aut(self):
         ct = self.get_skey()
-        self.picohsm.send(cla=0x80, command=0x64, p1=0x3A, p2=0x04, p3=list(ct))
+        self.picohsm.send(cla=0x80, command=0x64, p1=0x3A, p2=0x04, data=list(ct))
 
 def secure(picohsm, args):
     slck = SecureLock(picohsm)
@@ -363,106 +351,209 @@ def secure(picohsm, args):
         slck.disable_device_aut()
 
 def cipher(picohsm, args):
-    if (args.subcommand == 'keygen'):
-        ret = picohsm.key_generation(KeyType.AES, param=args.key_size * 8)
+    if (args.file_in):
+        fin = open(args.file_in, 'rb')
     else:
+        fin = sys.stdin.buffer
+    enc = fin.read()
+    fin.close()
+    iv = args.iv
+    if (args.iv and args.hex):
+        iv = unhexlify(iv)
+    aad = args.aad
+    if (args.aad and args.hex):
+            aad = unhexlify(aad)
+    kid = int(args.key)
+
+    mode = EncryptionMode.ENCRYPT if args.subcommand[0] == 'e' else EncryptionMode.DECRYPT
+    if (args.alg == 'CHACHAPOLY'):
+        ret = picohsm.chachapoly(kid, mode, data=enc, iv=iv, aad=aad)
+    elif (args.alg == 'AES-ECB'):
+        ret = picohsm.aes(keyid=kid, mode=mode, algorithm=AES.ECB, data=enc, iv=iv, aad=aad)
+    elif (args.alg == 'AES-CBC'):
+        ret = picohsm.aes(keyid=kid, mode=mode, algorithm=AES.CBC, data=enc, iv=iv, aad=aad)
+    elif (args.alg == 'AES-OFB'):
+        ret = picohsm.aes(keyid=kid, mode=mode, algorithm=AES.OFB, data=enc, iv=iv, aad=aad)
+    elif (args.alg == 'AES-CFB'):
+        ret = picohsm.aes(keyid=kid, mode=mode, algorithm=AES.CFB, data=enc, iv=iv, aad=aad)
+    elif (args.alg == 'AES-GCM'):
+        ret = picohsm.aes(keyid=kid, mode=mode, algorithm=AES.GCM, data=enc, iv=iv, aad=aad)
+    elif (args.alg == 'AES-CCM'):
+        ret = picohsm.aes(keyid=kid, mode=mode, algorithm=AES.CCM, data=enc, iv=iv, aad=aad)
+    elif (args.alg == 'AES-CTR'):
+        ret = picohsm.aes(keyid=kid, mode=mode, algorithm=AES.CTR, data=enc, iv=iv, aad=aad)
+    elif (args.alg == 'AES-XTS'):
+        ret = picohsm.aes(keyid=kid, mode=mode, algorithm=AES.XTS, data=enc, iv=iv, aad=aad)
+    elif (args.alg == 'CMAC'):
+        ret = picohsm.cmac(keyid=kid, data=enc)
+    elif (args.alg == 'HMAC-SHA1'):
+        ret = picohsm.hmac(hashes.SHA1, kid, data=enc)
+    elif (args.alg == 'HMAC-SHA224'):
+        ret = picohsm.hmac(hashes.SHA224, kid, data=enc)
+    elif (args.alg == 'HMAC-SHA256'):
+        ret = picohsm.hmac(hashes.SHA256, kid, data=enc)
+    elif (args.alg == 'HMAC-SHA384'):
+        ret = picohsm.hmac(hashes.SHA384, kid, data=enc)
+    elif (args.alg == 'HMAC-SHA512'):
+        ret = picohsm.hmac(hashes.SHA512, kid, data=enc)
+    elif (args.alg == 'HKDF-SHA256'):
+        ret = picohsm.hkdf(hashes.SHA256, kid, data=enc, salt=iv, out_len=args.output_len)
+    elif (args.alg == 'HKDF-SHA384'):
+        ret = picohsm.hkdf(hashes.SHA384, kid, data=enc, salt=iv, out_len=args.output_len)
+    elif (args.alg == 'HKDF-SHA512'):
+        ret = picohsm.hkdf(hashes.SHA512, kid, data=enc, salt=iv, out_len=args.output_len)
+    elif (args.alg == 'PBKDF2-SHA1'):
+        ret = picohsm.pbkdf2(hashes.SHA1, kid, salt=iv, iterations=args.iteration, out_len=args.output_len)
+    elif (args.alg == 'PBKDF2-SHA224'):
+        ret = picohsm.pbkdf2(hashes.SHA224, kid, salt=iv, iterations=args.iteration, out_len=args.output_len)
+    elif (args.alg == 'PBKDF2-SHA256'):
+        ret = picohsm.pbkdf2(hashes.SHA256, kid, salt=iv, iterations=args.iteration, out_len=args.output_len)
+    elif (args.alg == 'PBKDF2-SHA384'):
+        ret = picohsm.pbkdf2(hashes.SHA384, kid, salt=iv, iterations=args.iteration, out_len=args.output_len)
+    elif (args.alg == 'PBKDF2-SHA512'):
+        ret = picohsm.pbkdf2(hashes.SHA512, kid, salt=iv, iterations=args.iteration, out_len=args.output_len)
+    elif (args.alg == 'X963-SHA1'):
+        ret = picohsm.x963(hashes.SHA1, kid, data=enc, out_len=args.output_len)
+    elif (args.alg == 'X963-SHA224'):
+        ret = picohsm.x963(hashes.SHA224, kid, data=enc, out_len=args.output_len)
+    elif (args.alg == 'X963-SHA256'):
+        ret = picohsm.x963(hashes.SHA256, kid, data=enc, out_len=args.output_len)
+    elif (args.alg == 'X963-SHA384'):
+        ret = picohsm.x963(hashes.SHA384, kid, data=enc, out_len=args.output_len)
+    elif (args.alg == 'X963-SHA512'):
+        ret = picohsm.x963(hashes.SHA512, kid, data=enc, out_len=args.output_len)
+
+    if (args.file_out):
+        fout = open(args.file_out, 'wb')
+    else:
+        fout = sys.stdout.buffer
+    if (args.hex):
+        fout.write(hexlify(bytes(ret)))
+    else:
+        fout.write(bytes(ret))
+    if (args.file_out):
+        fout.close()
+
+def keygen(picohsm, args):
+    if (args.subcommand == 'aes'):
+        ret = picohsm.key_generation(KeyType.AES, param=args.size)
+    elif (args.subcommand in ['x25519', 'x448', 'ed25519', 'ed448']):
+        curve = args.subcommand
+        if (args.subcommand in ['x25519', 'x448']):
+            curve = 'curve' + args.subcommand[1:]
+        ret = picohsm.key_generation(KeyType.ECC, curve)
+    print('Key generated successfully.')
+    print(f'Key ID: {ret}')
+
+def phy(picohsm, args):
+    val = args.value if 'value' in args else None
+    if (val):
+        if (args.subcommand == 'vidpid'):
+            sp = val.split(':')
+            if (len(sp) != 2):
+                print('ERROR: VID/PID have wrong format. Use VID:PID format (e.g. 1234:5678)')
+                return
+            val = int(sp[0],16).to_bytes(2, 'big') + int(sp[1],16).to_bytes(2, 'big')
+        elif (args.subcommand in ['led_gpio', 'led_brightness']):
+            if (args.subcommand == 'led_brightness'):
+                if (int(val) > 15 or int(val) < 0):
+                    print('ERROR: LED brightness must be between 0 and 15.')
+                    return
+            val = [int(val)]
+        elif (args.subcommand in ['wcid', 'led_dimmable']):
+            val = val == 'enable'
+    ret = picohsm.phy(args.subcommand, val)
+    if (ret):
+        print(f'Current value: {hexlify(ret)}')
+    else:
+        print('Command executed successfully. Please, restart your Pico Key.')
+
+def otp(picohsm, args):
+    if (args.subcommand == 'read'):
+        row = int(args.row, 16)
+        ret = picohsm.otp(row=row)
+        print(f'OTP row {args.row}: {hexlify(ret).decode()}')
+    elif (args.subcommand == 'write'):
+        row = int(args.row, 16)
+        data = unhexlify(args.data)
+        picohsm.otp(row=row, data=data)
+        print(f'OTP row {args.row} written successfully.')
+    elif (args.subcommand == 'secure_boot'):
+        picohsm.secure_boot(BOOTKEY, bootkey_index=args.index, lock=args.lock)
+
+def reboot(picohsm, args):
+    picohsm.reboot()
+
+def memory(picohsm, args):
+    mem = picohsm.memory()
+    print(f'Memory usage:')
+    print(f'\tFree: {mem["free"]/1024:.2f} kilobytes ({mem["free"]*100/mem["total"]:.2f}%)')
+    print(f'\tUsed: {mem["used"]/1024:.2f} kilobytes ({mem["used"]*100/mem["total"]:.2f}%)')
+    print(f'\tTotal: {mem["total"]/1024:.2f} kilobytes')
+    print(f'\tFlash size: {mem["size"]/1024:.2f} kilobytes')
+    print(f'\tFiles: {mem["files"]}')
+
+def bip32(picohsm, args):
+    id = 0
+    if args.id != "":
+        id = int(args.id)
+    if (args.subcommand == 'initialize'):
+        seed = None
+        if args.seed_file:
+            if args.seed_file != '-':
+                fin = open(args.seed_file, 'rb')
+                seed = fin.read()
+                fin.close()
+            else:
+                seed = sys.stdin.buffer.read()
+        picohsm.hd_generate_master_node(curve=args.curve, id=id, seed=seed)
+    elif (args.subcommand == 'derive'):
+        path = parse_derivation_path(args.path)
+        ret = picohsm.hd_derive_node([id] + path)
+        sys.stdout.buffer.write(bytes(ret))
+    elif (args.subcommand == 'sign'):
         if (args.file_in):
             fin = open(args.file_in, 'rb')
         else:
             fin = sys.stdin.buffer
-        enc = fin.read()
+        data = fin.read()
         fin.close()
-        iv = args.iv
-        if (args.iv and args.hex):
-            iv = unhexlify(iv)
-        aad = args.aad
-        if (args.aad and args.hex):
-                aad = unhexlify(aad)
-
-        mode = EncryptionMode.ENCRYPT if args.subcommand[0] == 'e' else EncryptionMode.DECRYPT
-        if (args.alg == 'CHACHAPOLY'):
-            ret = picohsm.chachapoly(args.key, mode, data=enc, iv=iv, aad=aad)
-        elif (args.alg == 'HMAC-SHA1'):
-            ret = picohsm.hmac(hashes.SHA1, args.key, data=enc)
-        elif (args.alg == 'HMAC-SHA224'):
-            ret = picohsm.hmac(hashes.SHA224, args.key, data=enc)
-        elif (args.alg == 'HMAC-SHA256'):
-            ret = picohsm.hmac(hashes.SHA256, args.key, data=enc)
-        elif (args.alg == 'HMAC-SHA384'):
-            ret = picohsm.hmac(hashes.SHA384, args.key, data=enc)
-        elif (args.alg == 'HMAC-SHA512'):
-            ret = picohsm.hmac(hashes.SHA512, args.key, data=enc)
-        elif (args.alg == 'HKDF-SHA256'):
-            ret = picohsm.hkdf(hashes.SHA256, args.key, data=enc, salt=iv, out_len=args.output_len)
-        elif (args.alg == 'HKDF-SHA384'):
-            ret = picohsm.hkdf(hashes.SHA384, args.key, data=enc, salt=iv, out_len=args.output_len)
-        elif (args.alg == 'HKDF-SHA512'):
-            ret = picohsm.hkdf(hashes.SHA512, args.key, data=enc, salt=iv, out_len=args.output_len)
-        elif (args.alg == 'PBKDF2-SHA1'):
-            ret = picohsm.pbkdf2(hashes.SHA1, args.key, salt=iv, iterations=args.iteration, out_len=args.output_len)
-        elif (args.alg == 'PBKDF2-SHA224'):
-            ret = picohsm.pbkdf2(hashes.SHA224, args.key, salt=iv, iterations=args.iteration, out_len=args.output_len)
-        elif (args.alg == 'PBKDF2-SHA256'):
-            ret = picohsm.pbkdf2(hashes.SHA256, args.key, salt=iv, iterations=args.iteration, out_len=args.output_len)
-        elif (args.alg == 'PBKDF2-SHA384'):
-            ret = picohsm.pbkdf2(hashes.SHA384, args.key, salt=iv, iterations=args.iteration, out_len=args.output_len)
-        elif (args.alg == 'PBKDF2-SHA512'):
-            ret = picohsm.pbkdf2(hashes.SHA512, args.key, salt=iv, iterations=args.iteration, out_len=args.output_len)
-        elif (args.alg == 'X963-SHA1'):
-            ret = picohsm.x963(hashes.SHA1, args.key, data=enc, out_len=args.output_len)
-        elif (args.alg == 'X963-SHA224'):
-            ret = picohsm.x963(hashes.SHA224, args.key, data=enc, out_len=args.output_len)
-        elif (args.alg == 'X963-SHA256'):
-            ret = picohsm.x963(hashes.SHA256, args.key, data=enc, out_len=args.output_len)
-        elif (args.alg == 'X963-SHA384'):
-            ret = picohsm.x963(hashes.SHA384, args.key, data=enc, out_len=args.output_len)
-        elif (args.alg == 'X963-SHA512'):
-            ret = picohsm.x963(hashes.SHA512, args.key, data=enc, out_len=args.output_len)
-
+        path = parse_derivation_path(args.path)
+        ret = picohsm.hd_signature([id] + path, data)
         if (args.file_out):
             fout = open(args.file_out, 'wb')
-        else:
-            fout = sys.stdout.buffer
-        if (args.hex):
-            fout.write(hexlify(bytes(ret)))
-        else:
             fout.write(bytes(ret))
-        if (args.file_out):
             fout.close()
+        else:
+            sys.stdout.buffer.write(bytes(ret))
 
-def x25519(picohsm, args):
-    if (args.command == 'x25519'):
-        P = b'\x7f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xed'
-        A = utils.int_to_bytes(0x01DB42)
-        N = b'\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x14\xDE\xF9\xDE\xA2\xF7\x9C\xD6\x58\x12\x63\x1A\x5C\xF5\xD3\xED'
-        G = b'\x04\x09\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xd9\xd3\xce\x7e\xa2\xc5\xe9\x29\xb2\x61\x7c\x6d\x7e\x4d\x3d\x92\x4c\xd1\x48\x77\x2c\xdd\x1e\xe0\xb4\x86\xa0\xb8\xa1\x19\xae\x20'
-        h = b'\x08'
-    elif (args.command == 'x448'):
-        P = b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'
-        A = utils.int_to_bytes(0x98AA)
-        N = b'\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7c\xca\x23\xe9\xc4\x4e\xdb\x49\xae\xd6\x36\x90\x21\x6c\xc2\x72\x8d\xc5\x8f\x55\x23\x78\xc2\x92\xab\x58\x44\xf3'
-        G = b'\x04\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x5b\x7b\x45\x3d\x22\xd7\x6f\xf7\x7a\x67\x50\xb1\xc4\x12\x13\x21\x0d\x43\x46\x23\x7e\x02\xb8\xed\xf6\xf3\x8d\xc2\x5d\xf7\x60\xd0\x45\x55\xf5\x34\x5d\xae\xcb\xce\x6f\x32\x58\x6e\xab\x98\x6c\xf6\xb1\xf5\x95\x12\x5d\x23\x7d'
-        h = b'\x04'
-    oid = b'\x06\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03'
-    p_data = b'\x81' + bytes([len(P)]) + P
-    a_data = b'\x82' + bytes([len(A)]) + A
-    g_data = b'\x84' + bytes([len(G)]) + G
-    n_data = b'\x85' + bytes([len(N)]) + N
-    h_data = b'\x87' + bytes([len(h)]) + h
-
-    cdata =  b'\x5F\x29\x01\x00'
-    cdata += b'\x42\x0C\x55\x54\x44\x55\x4D\x4D\x59\x30\x30\x30\x30\x31'
-    cdata += b'\x7f\x49\x81' + bytes([len(oid)+len(p_data)+len(a_data)+len(g_data)+len(n_data)+len(h_data)]) + oid + p_data + a_data + g_data + n_data + h_data
-    cdata += b'\x5F\x20\x0C\x55\x54\x44\x55\x4D\x4D\x59\x30\x30\x30\x30\x31'
-    ret = picohsm.send(command=0x46, p1=args.key, data=list(cdata))
+def parse_derivation_path(path):
+    if path == "m":
+        return []
+    if len(path) < 3:
+        raise ValueError(f"derivation path too short: {path}")
+    elems = path.split("/")
+    if elems[0] != 'm':
+        raise ValueError(f"derivation path {path} does not begin with 'm/'")
+    indices = []
+    for e in elems[1:]:
+        if len(e) == 0:
+            raise ValueError(f"derivation path contains empty index: {path}")
+        off = 0
+        if e[-1:] in ["'", "h"]:
+            off = 0x80000000
+            e = e[:-1]
+        indices.append(int(e) + off)
+    return indices
 
 def main(args):
-    sys.stderr.buffer.write(b'Pico HSM Tool v1.10\n')
+    sys.stderr.buffer.write(b'Pico HSM Tool v2.4\n')
     sys.stderr.buffer.write(b'Author: Pol Henarejos\n')
     sys.stderr.buffer.write(b'Report bugs to https://github.com/polhenarejos/pico-hsm/issues\n')
     sys.stderr.buffer.write(b'\n\n')
+    sys.stderr.flush()
 
-    picohsm = PicoHSM(args.pin)
+    picohsm = PicoHSM(args.pin, slot=args.slot)
 
     # Following commands may raise APDU exception on error
     if (args.command == 'initialize'):
@@ -479,9 +570,18 @@ def main(args):
         secure(picohsm, args)
     elif (args.command == 'cipher'):
         cipher(picohsm, args)
-    elif (args.command == 'x25519' or args.command == 'x448'):
-        x25519(picohsm, args)
-
+    elif (args.command == 'keygen'):
+        keygen(picohsm, args)
+    elif (args.command == 'phy'):
+        phy(picohsm, args)
+    elif (args.command == 'otp'):
+        otp(picohsm, args)
+    elif (args.command == 'reboot'):
+        reboot(picohsm, args)
+    elif (args.command == 'memory'):
+        memory(picohsm, args)
+    elif (args.command == 'bip32'):
+        bip32(picohsm, args)
 
 def run():
     args = parse_args()

tools/secure_key/windows.py

@@ -8,7 +8,7 @@ USERNAME = "Pico-HSM"
 try:
     import keyring
 except:
-    print('ERROR: keyring module not found! Install keyring package.\nTry with `pip install keyrings.osx-keychain-keys`')
+    print('ERROR: keyring module not found! Install keyring package.\nTry with `pip install keyring`')
     sys.exit(-1)
 
 try:

workflows/autobuild.sh

@@ -2,12 +2,55 @@
 
 git submodule update --init --recursive
 sudo apt update
+
+if [[ $1 == "pico" ]]; then
 sudo apt install -y cmake gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
 git clone https://github.com/raspberrypi/pico-sdk
 cd pico-sdk
+git checkout tags/2.1.1
 git submodule update --init
 cd ..
+git clone https://github.com/raspberrypi/picotool
+cd picotool
+git submodule update --init
 mkdir build
 cd build
+cmake -DPICO_SDK_PATH=../../pico-sdk ..
+make -j`nproc`
+sudo make install
+cd ../..
+mkdir build_pico
+cd build_pico
 cmake -DPICO_SDK_PATH=../pico-sdk ..
 make
+cd ..
+elif [[ $1 == "esp32" ]]; then
+sudo apt install -y git wget flex bison gperf python3 python3-pip python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0
+git clone --recursive https://github.com/espressif/esp-idf.git
+cd esp-idf
+git checkout tags/v5.5
+./install.sh esp32s3
+. ./export.sh
+cd ..
+idf.py set-target esp32s3
+idf.py all
+mkdir -p release
+cd build
+esptool.py --chip ESP32-S3 merge_bin -o ../release/pico_hsm_esp32-s3.bin @flash_args
+cd ..
+cd esp-idf
+./install.sh esp32s2
+. ./export.sh
+cd ..
+idf.py set-target esp32s2
+idf.py all
+mkdir -p release
+cd build
+esptool.py --chip ESP32-S2 merge_bin -o ../release/pico_hsm_esp32-s2.bin @flash_args
+cd ..
+else
+mkdir build
+cd build
+cmake -DENABLE_EMULATION=1 ..
+make
+fi