2026-01-18 09:48:06 +00:00
77 changed files with 611 additions and 936 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -1,50 +0,0 @@
-## 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.
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@ -19,22 +19,14 @@ jobs:
        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
+           ./build_pico_hsm.sh
      - name: Update nightly release
-        uses: pyTooling/Actions/releaser@v6.7.0
+        uses: pyTooling/Actions/releaser@main
        with:
          tag: nightly-${{ matrix.refs }}
          rm: true
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -22,7 +22,6 @@ if(ESP_PLATFORM)
    include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 else()
    if(NOT ENABLE_EMULATION)
-        set(PICO_USE_FASTEST_SUPPORTED_CLOCK 1)
        include(pico_sdk_import.cmake)
    endif()

@ -31,6 +30,10 @@ else()
    set(CMAKE_C_STANDARD 11)
    set(CMAKE_CXX_STANDARD 17)

+    if(NOT ENABLE_EMULATION)
+        pico_sdk_init()
+    endif()
+
    if(NOT DEFINED __FOR_CI)
        set(__FOR_CI 0)
    endif()
@ -40,12 +43,6 @@ else()

    add_executable(pico_hsm)
 endif()
-set(USB_ITF_CCID 1)
-set(USB_ITF_WCID 1)
-include(pico-keys-sdk/pico_keys_sdk_import.cmake)
-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
@ -79,8 +76,11 @@ set(SOURCES ${SOURCES}
    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/files.c
    ${CMAKE_CURRENT_LIST_DIR}/src/hsm/kek.c
 )
+set(USB_ITF_CCID 1)
+set(USB_ITF_WCID 1)
+include(pico-keys-sdk/pico_keys_sdk_import.cmake)

-SET_VERSION(ver_major ver_minor "${CMAKE_CURRENT_LIST_DIR}/src/hsm/version.h" 2)
+SET_VERSION(ver_major ver_minor "${CMAKE_CURRENT_LIST_DIR}/src/hsm/version.h")

 if(ESP_PLATFORM)
    project(pico_hsm)
@ -125,7 +125,5 @@ if(NOT ESP_PLATFORM)
            )
        endif(APPLE)
        target_link_libraries(pico_hsm PRIVATE pthread m)
-    else()
-        pico_add_extra_outputs(${CMAKE_PROJECT_NAME})
    endif()
 endif()
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,105 +0,0 @@
-# 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.
--- a/ENTERPRISE.md
+++ b/ENTERPRISE.md
@ -1,116 +0,0 @@
-# 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.
--- a/143
+++ b/143
@ -1,5 +1,5 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007

 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
@ -7,15 +7,17 @@

                            Preamble

-  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 GNU General Public License is a free, copyleft license for
+software and other kinds of works.

  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
+the GNU General Public License is 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.
+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.

  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@ -24,34 +26,44 @@ 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.

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

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

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

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

  The precise terms and conditions for copying, distribution and
 modification follow.
@ -60,7 +72,7 @@ modification follow.

  0. Definitions.

-  "This License" refers to version 3 of the GNU Affero General Public License.
+  "This License" refers to version 3 of the GNU General Public License.

  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@ -537,45 +549,35 @@ 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. 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.
+  13. Use with the GNU Affero General Public License.

  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 General Public License into a single
+under version 3 of the GNU Affero 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 work with which it is combined will remain governed by version
-3 of the GNU General Public License.
+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.

  14. Revised Versions of this License.

  The Free Software Foundation may publish revised and/or new versions of
-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
+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
 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 Affero General
+Program specifies that a certain numbered version of the GNU 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 Affero General Public License, you may choose any version ever published
+GNU 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 Affero General Public License can be used, that proxy's
+versions of the GNU 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.

@ -633,29 +635,40 @@ 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 Affero General Public License as published by
+    it under the terms of the GNU 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 Affero General Public License for more details.
+    GNU General Public License for more details.

-    You should have received a copy of the GNU Affero General Public License
+    You should have received a copy of the GNU 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 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.
+  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".

  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 AGPL, see
-<https://www.gnu.org/licenses/>.
+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>.
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# Pico HSM
+# Raspberry 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
@ -162,10 +162,10 @@ Secure Lock restricts the device to the manufacturer’s firmware only, locking
 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
+Supports setting VID & PID on-the-fly. Use `pico-hsm-tool.py` or [Pico Commissioner](https://www.picokeys.com/pico-commissioner/ "Pico Commissioner") for specify VID/PID values and reboot the device.

-### > 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.
+### > Rescue Pico HSM Tool and Commissioner
+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. It can be accessed through `pico-hsm-tool.py` or [Pico Commissioner](https://www.picokeys.com/pico-commissioner/ "Pico Commissioner").

 ## Security considerations
 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.
@ -179,16 +179,26 @@ In the event that the Pico is stolen, the private and secret key contents cannot
 ### 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.

+### Secure Boot
+Secure Boot is a security feature that ensures that only trusted firmware, verified through digital signatures, can be loaded onto the device during the boot process. Once enabled, Secure Boot checks every piece of firmware against a cryptographic signature before execution, rejecting any unauthorized or modified code. This prevents malicious firmware from compromising the device’s operation and integrity. With Secure Boot activated, only firmware versions signed by a trusted authority, such as the device manufacturer, will be accepted, ensuring the device remains protected from unauthorized software modifications. **This is irreversible. Once enabled, it CANNOT be disabled.**
+
+**IMPORTANT:** For users wishing to develop and compile custom firmware, a private-public key pair is essential. Activating Secure Boot requires users to generate and manage their own unique private-public key pair. The public key from this pair must be embedded into the device to validate all firmware. Firmware will not boot without a proper digital signature from this key pair. This means that users must sign all future firmware versions with their private key and embed the public key in the device to ensure compatibility.
+
+### Secure Lock
+Secure Lock builds on Secure Boot by imposing an even stricter security model. Once activated, Secure Lock prevents any further installation of new boot keys, effectively locking the device to only run firmware that is authorized by the device's primary vendor—in this case, Pico Keys. In addition to preventing additional keys, Secure Lock disables debugging interfaces and puts additional safeguards in place to resist tampering and intrusion attempts. This ensures that the device operates exclusively with the original vendor’s firmware and resists unauthorized access, making it highly secure against external threats. **This is irreversible. Once enabled, it CANNOT be disabled.**
+
+**IMPORTANT:** Activating Secure Lock not only enables Secure Boot but also invalidates all keys except the official Pico Key. This means that only firmware signed by Pico Key will be recognized, and custom code will no longer be allowed. Once enabled, the Pico Key device will run solely on the official firmware available on the website, with no option for generating or compiling new code for the device.
+
 ## Download
 **If you own an ESP32-S3 board, go to [ESP32 Flasher](https://www.picokeys.com/esp32-flasher/) for flashing your Pico HSM.**

-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.
+If you own a Raspberry Pico (RP2040 or RP2350), go to [Download page](https://www.picokeys.com/getting-started/), select your vendor and model and download the proper firmware; or go to [Release page](https://www.github.com/polhenarejos/pico-hsm/releases/) and download the UF2 file for your board.

-Note that UF2 files are shiped with a dummy VID/PID to avoid license issues (FEFF:FCFD). If you 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").
+Note that UF2 files are shiped with a dummy VID/PID to avoid license issues (FEFF:FCFD). 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 [Pico Commissioner](https://www.picokeys.com/pico-commissioner/ "Pico Commissioner").

 You can use whatever VID/PID (i.e., 234b:0000 from FISJ), but remember that you are not authorized to distribute the binary with a VID/PID that you do not own.

-Note that the [PicoKey App](https://www.picokeys.com/picokeyapp/ "PicoKey App") is the most recommended.
+Note that the pure-browser option [Pico Commissioner](https://www.picokeys.com/pico-commissioner/ "Pico Commissioner") is the most recommended.

 ## 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.
@ -335,52 +345,11 @@ Communication with the Pico HSM follows the same protocols and methods used with

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

-## License and Commercial Use
-
-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.
+### 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 have several options:
+- Use `pico-hsm-tool.py` to modify VID/PID on-the-fly.
+- Use the pure-browser online [Pico Commissioner](https://www.picokeys.com/pico-commissioner/ "Pico Commissioner") that commissions the Pico Key on-the-fly without external tools.
+- Build and 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.

 ## Credits
 Pico HSM uses the following libraries or portion of code:
--- a/build_pico_hsm.sh
+++ b/build_pico_hsm.sh
@ -1,25 +1,108 @@
 #!/bin/bash

-VERSION_MAJOR="6"
-VERSION_MINOR="2"
+VERSION_MAJOR="5"
+VERSION_MINOR="0-eddsa1"
 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

-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[@]}"
+for board in 0xcb_helios \
+    adafruit_feather_rp2040_usb_host \
+    adafruit_feather_rp2040 \
+    adafruit_itsybitsy_rp2040 \
+    adafruit_kb2040 \
+    adafruit_macropad_rp2040 \
+    adafruit_qtpy_rp2040 \
+    adafruit_trinkey_qt2040 \
+    amethyst_fpga \
+    archi \
+    arduino_nano_rp2040_connect \
+    cytron_maker_pi_rp2040 \
+    datanoisetv_rp2040_dsp \
+    eetree_gamekit_rp2040 \
+    garatronic_pybstick26_rp2040 \
+    gen4_rp2350_24 \
+    gen4_rp2350_24ct \
+    gen4_rp2350_24t \
+    gen4_rp2350_28 \
+    gen4_rp2350_28ct \
+    gen4_rp2350_28t \
+    gen4_rp2350_32 \
+    gen4_rp2350_32ct \
+    gen4_rp2350_32t \
+    gen4_rp2350_35 \
+    gen4_rp2350_35ct \
+    gen4_rp2350_35t \
+    hellbender_2350A_devboard \
+    ilabs_challenger_rp2350_bconnect \
+    ilabs_challenger_rp2350_wifi_ble \
+    ilabs_opendec02 \
+    melopero_perpetuo_rp2350_lora \
+    melopero_shake_rp2040 \
+    metrotech_xerxes_rp2040 \
+    net8086_usb_interposer \
+    nullbits_bit_c_pro \
+    phyx_rick_tny_rp2350 \
+    pi-plates_micropi \
+    pico \
+    pico_w \
+    pico2 \
+    pimoroni_badger2040 \
+    pimoroni_interstate75 \
+    pimoroni_keybow2040 \
+    pimoroni_motor2040 \
+    pimoroni_pga2040 \
+    pimoroni_pga2350 \
+    pimoroni_pico_plus2_rp2350 \
+    pimoroni_picolipo_4mb \
+    pimoroni_picolipo_16mb \
+    pimoroni_picosystem \
+    pimoroni_plasma2040 \
+    pimoroni_plasma2350 \
+    pimoroni_servo2040 \
+    pimoroni_tiny2040 \
+    pimoroni_tiny2040_2mb \
+    pimoroni_tiny2350 \
+    pololu_3pi_2040_robot \
+    pololu_zumo_2040_robot \
+    seeed_xiao_rp2040 \
+    seeed_xiao_rp2350 \
+    solderparty_rp2040_stamp \
+    solderparty_rp2040_stamp_carrier \
+    solderparty_rp2040_stamp_round_carrier \
+    solderparty_rp2350_stamp_xl \
+    solderparty_rp2350_stamp \
+    sparkfun_micromod \
+    sparkfun_promicro \
+    sparkfun_promicro_rp2350 \
+    sparkfun_thingplus \
+    switchscience_picossci2_conta_base \
+    switchscience_picossci2_dev_board \
+    switchscience_picossci2_micro \
+    switchscience_picossci2_rp2350_breakout \
+    switchscience_picossci2_tiny \
+    tinycircuits_thumby_color_rp2350 \
+    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 \
+    weact_studio_rp2040_2mb \
+    weact_studio_rp2040_4mb \
+    weact_studio_rp2040_8mb \
+    weact_studio_rp2040_16mb \
+    wiznet_w5100s_evb_pico
 do
-    rm -rf -- ./*
-    PICO_SDK_PATH="${PICO_SDK_PATH}" cmake .. -DPICO_BOARD=$board_name -DSECURE_BOOT_PKEY=${SECURE_BOOT_PKEY}
+    rm -rf *
+    PICO_SDK_PATH="${PICO_SDK_PATH:-../../pico-sdk}" cmake .. -DPICO_BOARD=$board
    make -j`nproc`
-    mv pico_hsm.uf2 ../release/pico_hsm_$board_name-$SUFFIX.uf2
+    mv pico_hsm.uf2 ../release/pico_hsm_$board-$SUFFIX.uf2
 done
--- a/doc/scs3.md
+++ b/doc/scs3.md
@ -13,8 +13,7 @@ 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)),
-ESPICOHSMCA00002: new CVC(new ByteString("7F218201BA7F4E8201725F290100421045535049434F48534D434130303030327F4982011D060A04007F000702020202038120FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F822000000000000000000000000000000000000000000000000000000000000000008320000000000000000000000000000000000000000000000000000000000000000784410479BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B88520FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141864104FD4DDCD165DD64494F5F1DB76CDAE4E6BD10DA59BF6D48B684E9D50BCC4C2114D2A8BC7C9C1ACAA24C982B1383D4D02E0F32323F657E146E8A051DEB7F6CD40C8701015F201045535049434F48534D434130303030327F4C12060904007F0007030102025305C0000000045F25060205000400065F24060308000302065F3740472AA7A7945F6352F8A65388C2810AEFB657356FFD31CBB2FCC516BC4ECC953D0BACA935B22D73F49802DD9E9DE6439FD8AEA18BD71E1439ABF458C085BD70C8", HEX))
+ESPICOHSMCA00001: new CVC(new ByteString("7F218201BA7F4E8201725F290100421045535049434F48534D434130303030317F4982011D060A04007F000702020202038120FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF8220FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC83205AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B8441046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F58520FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC6325518641046A82C0A4FEAF41D6A1336AE7E992D81AD4F827929145DD0D777E1AB63D7E3325C8F7DAC0F74B6EAE13A72F6366777EC133AC5C28F456868E5F2C315044EB54EF8701015F201045535049434F48534D434130303030317F4C12060904007F0007030102025305C0000000005F25060202000801085F24060203000801085F3740601E974F57DDE060875FE6121AEF5BC02E10FC655311C7A32CA822FD18E53A80298EDC56E0D5EBF38FB470DC12987B1600AE91A0ADB5B22C4D80080782E278AD", HEX))
 ```

 Therefore, the whole variable becomes:
@ -23,8 +22,7 @@ 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)),
-	ESPICOHSMCA00002: new CVC(new ByteString("7F218201BA7F4E8201725F290100421045535049434F48534D434130303030327F4982011D060A04007F000702020202038120FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F822000000000000000000000000000000000000000000000000000000000000000008320000000000000000000000000000000000000000000000000000000000000000784410479BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B88520FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141864104FD4DDCD165DD64494F5F1DB76CDAE4E6BD10DA59BF6D48B684E9D50BCC4C2114D2A8BC7C9C1ACAA24C982B1383D4D02E0F32323F657E146E8A051DEB7F6CD40C8701015F201045535049434F48534D434130303030327F4C12060904007F0007030102025305C0000000045F25060205000400065F24060308000302065F3740472AA7A7945F6352F8A65388C2810AEFB657356FFD31CBB2FCC516BC4ECC953D0BACA935B22D73F49802DD9E9DE6439FD8AEA18BD71E1439ABF458C085BD70C8", HEX))
+	ESPICOHSMCA00001: new CVC(new ByteString("7F218201BA7F4E8201725F290100421045535049434F48534D434130303030317F4982011D060A04007F000702020202038120FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF8220FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC83205AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B8441046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F58520FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC6325518641046A82C0A4FEAF41D6A1336AE7E992D81AD4F827929145DD0D777E1AB63D7E3325C8F7DAC0F74B6EAE13A72F6366777EC133AC5C28F456868E5F2C315044EB54EF8701015F201045535049434F48534D434130303030317F4C12060904007F0007030102025305C0000000005F25060202000801085F24060203000801085F3740601E974F57DDE060875FE6121AEF5BC02E10FC655311C7A32CA822FD18E53A80298EDC56E0D5EBF38FB470DC12987B1600AE91A0ADB5B22C4D80080782E278AD", HEX))
 }
 ```

@ -35,15 +33,15 @@ Similarly, replace the line `1531` in file `scs3/keymanager/keymanager.js` with:
 ```


-Alternatively, this patch [scs3.patch.txt](https://github.com/user-attachments/files/20274013/scs3.patch.txt) can be applied.
+Alternatively, this patch [scs3.patch.txt](https://github.com/polhenarejos/pico-hsm/files/9415877/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.
--- a/doc/usage.md
+++ b/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 first step is to initialize the HSM. To do so, use the `pico-hsm-tool.py` in `tools` folder:
 ```
-$ sc-hsm-tool --initialize --so-pin 3537363231383830 --pin 648219
+$ python3 tools/pico-hsm-tool.py --pin 648219 initialize --so-pin 57621880
 ```
 The PIN number is used to manage all private keys in the device. It supports three attemps. After the third PIN failure, it gets blocked.
 The PIN accepts from 6 to 16 characters.
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 263e554cc6c59a5f168f8589c4bdabe6e1e64c25
+Subproject commit 1d86efa33bf1b3c118947eac14280f9953a49bc9
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@ -3,15 +3,10 @@
 #
 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"
--- a/src/hsm/CMakeLists.txt
+++ b/src/hsm/CMakeLists.txt
@ -1,6 +1,6 @@
 idf_component_register(
    SRCS ${SOURCES}
    INCLUDE_DIRS . ../../pico-keys-sdk/src ../../pico-keys-sdk/src/fs ../../pico-keys-sdk/src/rng ../../pico-keys-sdk/src/usb
-    REQUIRES mbedtls efuse
+    REQUIRES bootloader_support esp_partition esp_tinyusb zorxx__neopixel mbedtls efuse
 )
 idf_component_set_property(${COMPONENT_NAME} WHOLE_ARCHIVE ON)
--- a/src/hsm/cmd_bip_slip.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
--- a/src/hsm/cmd_challenge.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "random.h"
--- a/src/hsm/cmd_change_pin.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "crypto_utils.h"
--- a/src/hsm/cmd_cipher_sym.c
+++ b/src/hsm/cmd_cipher_sym.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -143,7 +143,10 @@ 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
-        put_uint32_t_be(counter, counter_buf);
+        counter_buf[0] = (uint8_t) ((counter >> 24) & 0xff);
+        counter_buf[1] = (uint8_t) ((counter >> 16) & 0xff);
+        counter_buf[2] = (uint8_t) ((counter >> 8) & 0xff);
+        counter_buf[3] = (uint8_t) ((counter >> 0) & 0xff);

        mbedtls_md_update(&md_ctx, counter_buf, 4);

@ -410,7 +413,13 @@ int cmd_cipher_sym() {
            size_t olen = 0;
            mbedtls_asn1_buf params =
                {.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);
+            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, 4096, &olen);
            mbedtls_platform_zeroize(kdata, sizeof(kdata));
            if (r != 0) {
                return SW_WRONG_DATA();
@ -655,7 +664,7 @@ int cmd_cipher_sym() {
                    secret[64] = { 0 };
            mbedtls_aes_init(&ctx);
            if (hd_keytype != 0x3) {
-                mbedtls_ecp_keypair_free(&hd_context);
+                mbedtls_ecdsa_free(&hd_context);
                return SW_INCORRECT_PARAMS();
            }
            key_size = 32;
@ -689,7 +698,7 @@ int cmd_cipher_sym() {
                return SW_EXEC_ERROR();
            }
            res_APDU_size = enc.len;
-            mbedtls_ecp_keypair_free(&hd_context);
+            mbedtls_ecdsa_free(&hd_context);
            hd_keytype = 0;
        }
        else {
--- a/src/hsm/cmd_decrypt_asym.c
+++ b/src/hsm/cmd_decrypt_asym.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
--- a/src/hsm/cmd_delete_file.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -30,7 +30,7 @@ int cmd_delete_file() {
        }
    }
    else {
-        uint16_t fid = get_uint16_t_be(apdu.data);
+        uint16_t fid = (apdu.data[0] << 8) | apdu.data[1];
        if (!(ef = search_file(fid))) {
            return SW_FILE_NOT_FOUND();
        }
--- a/src/hsm/cmd_derive_asym.c
+++ b/src/hsm/cmd_derive_asym.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
--- a/src/hsm/cmd_external_authenticate.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "crypto_utils.h"
--- a/src/hsm/cmd_extras.c
+++ b/src/hsm/cmd_extras.c
@ -3,23 +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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
 #include "mbedtls/ecdh.h"
 #ifdef PICO_PLATFORM
 #include "pico/aon_timer.h"
-#include "hardware/watchdog.h"
 #else
 #include <sys/time.h>
 #include <time.h>
@ -36,20 +35,17 @@
 #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() {
-    int cmd = P1(apdu);
 #ifndef ENABLE_EMULATION
    // Only allow change PHY without PIN
-    if (!isUserAuthenticated && cmd != CMD_PHY && cmd != CMD_MEMORY) {
+    if (!isUserAuthenticated && P1(apdu) != 0x1B) {
        return SW_SECURITY_STATUS_NOT_SATISFIED();
    }
 #endif
@ -57,7 +53,7 @@ int cmd_extras() {
    if (wait_button_pressed() == true) {
        return SW_SECURE_MESSAGE_EXEC_ERROR();
    }
-    if (cmd == CMD_DATETIME) { //datetime operations
+    if (P1(apdu) == CMD_DATETIME) { //datetime operations
        if (P2(apdu) != 0x0) {
            return SW_INCORRECT_P1P2();
        }
@ -70,7 +66,8 @@ int cmd_extras() {
            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_year + 1900) >> 8;
+            res_APDU[res_APDU_size++] = (tm->tm_year + 1900) & 0xff;
            res_APDU[res_APDU_size++] = tm->tm_mon;
            res_APDU[res_APDU_size++] = tm->tm_mday;
            res_APDU[res_APDU_size++] = tm->tm_wday;
@ -83,7 +80,7 @@ int cmd_extras() {
                return SW_WRONG_LENGTH();
            }
            struct tm tm;
-            tm.tm_year = get_uint16_t_be(apdu.data) - 1900;
+            tm.tm_year = ((apdu.data[0] << 8) | (apdu.data[1])) - 1900;
            tm.tm_mon = apdu.data[2];
            tm.tm_mday = apdu.data[3];
            tm.tm_wday = apdu.data[4];
@ -100,7 +97,7 @@ int cmd_extras() {
 #endif
        }
    }
-    else if (cmd == CMD_DYNOPS) {   //dynamic options
+    else if (P1(apdu) == CMD_DYNOPS) {   //dynamic options
        if (P2(apdu) != 0x0) {
            return SW_INCORRECT_P1P2();
        }
@ -109,7 +106,8 @@ int cmd_extras() {
        }
        uint16_t opts = get_device_options();
        if (apdu.nc == 0) {
-            res_APDU_size += put_uint16_t_be(opts, res_APDU);
+            res_APDU[res_APDU_size++] = opts >> 8;
+            res_APDU[res_APDU_size++] = opts & 0xff;
        }
        else {
            uint8_t newopts[] = { apdu.data[0], (opts & 0xff) };
@ -118,7 +116,7 @@ int cmd_extras() {
            low_flash_available();
        }
    }
-    else if (cmd == CMD_SECURE_LOCK) {   // secure lock
+    else if (P1(apdu) == CMD_SECURE_LOCK) {   // secure lock
        if (apdu.nc == 0) {
            return SW_WRONG_LENGTH();
        }
@ -150,7 +148,7 @@ int cmd_extras() {
                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, MAX_APDU_DATA);
+            ret = mbedtls_ecp_point_write_binary(&hkey.ctx.mbed_ecdh.grp, &hkey.ctx.mbed_ecdh.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &olen, res_APDU, 4096);
            mbedtls_ecdh_free(&hkey);
            if (ret != 0) {
                return SW_EXEC_ERROR();
@ -162,12 +160,13 @@ int cmd_extras() {
            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) == SECURE_LOCK_ENABLE || P2(apdu) == SECURE_LOCK_DISABLE) { // Enable
+                uint16_t opts = get_device_options();
                uint8_t newopts[] = { opts >> 8, (opts & 0xff) };
                if ((P2(apdu) == SECURE_LOCK_ENABLE && !(opts & HSM_OPT_SECURE_LOCK)) ||
                    (P2(apdu) == SECURE_LOCK_DISABLE && (opts & HSM_OPT_SECURE_LOCK))) {
@ -195,14 +194,14 @@ int cmd_extras() {
                file_put_data(tf, newopts, sizeof(newopts));
                low_flash_available();
            }
-            else if (P2(apdu) == SECURE_LOCK_MASK && (opts & HSM_OPT_SECURE_LOCK)) {
-                memcpy(mkek_mask, apdu.data, MKEK_KEY_SIZE);
+            else if (P2(apdu) == SECURE_LOCK_MASK) {
+                memcpy(mkek_mask, apdu.data, apdu.nc);
                has_mkek_mask = true;
            }
        }
    }
 #ifndef ENABLE_EMULATION
-    else if (cmd == CMD_PHY) { // Set PHY
+    else if (P1(apdu) == CMD_PHY) { // Set PHY
        if (apdu.nc == 0) {
            if (file_has_data(ef_phy)) {
                res_APDU_size = file_get_size(ef_phy);
@ -214,8 +213,8 @@ int cmd_extras() {
                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.vid = (apdu.data[0] << 8) | apdu.data[1];
+                phy_data.pid = (apdu.data[2] << 8) | apdu.data[3];
                phy_data.vidpid_present = true;
            }
            else if (P2(apdu) == PHY_LED_GPIO) {
@ -230,23 +229,28 @@ int cmd_extras() {
                if (apdu.nc != 2) {
                    return SW_WRONG_LENGTH();
                }
-                phy_data.opts = get_uint16_t_be(apdu.data);
+                phy_data.opts = (apdu.data[0] << 8) | apdu.data[1];
            }
            else {
                return SW_INCORRECT_P1P2();
            }
-            if (phy_save() != PICOKEY_OK) {
+            uint8_t tmp[PHY_MAX_SIZE];
+            uint16_t tmp_len = 0;
+            memset(tmp, 0, sizeof(tmp));
+            if (phy_serialize_data(&phy_data, tmp, &tmp_len) != PICOKEY_OK) {
                return SW_EXEC_ERROR();
            }
+            file_put_data(ef_phy, tmp, tmp_len);
+            low_flash_available();
        }
    }
 #endif
 #if PICO_RP2350
-    else if (cmd == CMD_OTP) {
+    else if (P1(apdu) == CMD_OTP) {
        if (apdu.nc < 2) {
            return SW_WRONG_LENGTH();
        }
-        uint16_t row = get_uint16_t_be(apdu.data);
+        uint16_t row = (apdu.data[0] << 8) | apdu.data[1];
        bool israw = P2(apdu) == 0x1;
        if (apdu.nc == 2) {
            if (row > 0xbf && row < 0xf48) {
@ -284,23 +288,6 @@ int cmd_extras() {
        }
    }
 #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();
    }
--- a/src/hsm/cmd_general_authenticate.c
+++ b/src/hsm/cmd_general_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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -22,7 +22,6 @@
 #include "oid.h"
 #include "eac.h"
 #include "files.h"
-#include "otp.h"

 int cmd_general_authenticate() {
    if (P1(apdu) == 0x0 && P2(apdu) == 0x0) {
@ -55,9 +54,6 @@ int cmd_general_authenticate() {
            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_ecp_keypair_free(&ectx);
--- a/src/hsm/cmd_initialize.c
+++ b/src/hsm/cmd_initialize.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -43,14 +43,10 @@ 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 = has_mkek_mask = false;
+        has_session_pin = has_session_sopin = false;
        uint16_t tag = 0x0;
        uint8_t *tag_data = NULL, *p = NULL, *kds = NULL, *dkeks = NULL;
        uint16_t tag_len = 0;
@ -210,7 +206,7 @@ int cmd_initialize() {
                return SW_EXEC_ERROR();
            }
            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) {
+            if ((ee_len = asn1_cvc_aut(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, 4096, NULL, 0)) == 0) {
                mbedtls_ecdsa_free(&ecdsa);
                return SW_EXEC_ERROR();
            }
@ -222,7 +218,7 @@ int cmd_initialize() {
                return SW_EXEC_ERROR();
            }

-            if ((term_len = asn1_cvc_cert(&ecdsa, PICO_KEYS_KEY_EC, res_APDU + ee_len, MAX_APDU_DATA - ee_len, NULL, 0, true)) == 0) {
+            if ((term_len = asn1_cvc_cert(&ecdsa, PICO_KEYS_KEY_EC, res_APDU + ee_len, 4096 - ee_len, NULL, 0, true)) == 0) {
                mbedtls_ecdsa_free(&ecdsa);
                return SW_EXEC_ERROR();
            }
@ -235,7 +231,7 @@ int cmd_initialize() {

            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";
-            uint16_t prkd_len = asn1_build_prkd_ecc(label, (uint16_t)strlen((const char *) label), keyid, 20, 256, res_APDU, MAX_APDU_DATA);
+            uint16_t prkd_len = asn1_build_prkd_ecc(label, (uint16_t)strlen((const char *) label), keyid, 20, 256, res_APDU, 4096);
            fpk = search_file(EF_PRKD_DEV);
            ret = file_put_data(fpk, res_APDU, prkd_len);
        }
@ -247,7 +243,10 @@ int cmd_initialize() {
    }
    else {   //free memory bytes request
        int heap_left = heapLeft();
-        res_APDU_size += put_uint32_t_be(heap_left, res_APDU);
+        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[4] = 0;
        res_APDU[5] = HSM_VERSION_MAJOR;
        res_APDU[6] = HSM_VERSION_MINOR;
--- a/src/hsm/cmd_key_domain.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "crypto_utils.h"
--- a/src/hsm/cmd_key_gen.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "crypto_utils.h"
--- a/src/hsm/cmd_key_unwrap.c
+++ b/src/hsm/cmd_key_unwrap.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -57,7 +57,7 @@ int cmd_key_unwrap() {
            return SW_EXEC_ERROR();
        }
        r = store_keys(&ctx, PICO_KEYS_KEY_RSA, key_id);
-        if ((res_APDU_size = (uint16_t)asn1_cvc_aut(&ctx, PICO_KEYS_KEY_RSA, res_APDU, MAX_APDU_DATA, NULL, 0)) == 0) {
+        if ((res_APDU_size = (uint16_t)asn1_cvc_aut(&ctx, PICO_KEYS_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) {
            mbedtls_rsa_free(&ctx);
            return SW_EXEC_ERROR();
        }
@ -77,7 +77,7 @@ int cmd_key_unwrap() {
            return SW_EXEC_ERROR();
        }
        r = store_keys(&ctx, PICO_KEYS_KEY_EC, key_id);
-        if ((res_APDU_size = (uint16_t)asn1_cvc_aut(&ctx, PICO_KEYS_KEY_EC, res_APDU, MAX_APDU_DATA, NULL, 0)) == 0) {
+        if ((res_APDU_size = (uint16_t)asn1_cvc_aut(&ctx, PICO_KEYS_KEY_EC, res_APDU, 4096, NULL, 0)) == 0) {
            mbedtls_ecp_keypair_free(&ctx);
            return SW_EXEC_ERROR();
        }
--- a/src/hsm/cmd_key_wrap.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "crypto_utils.h"
--- a/src/hsm/cmd_keypair_gen.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "crypto_utils.h"
@ -47,6 +47,9 @@ int cmd_keypair_gen() {
                if (asn1_find_tag(&ctxo, 0x2, &ks) && asn1_len(&ks) > 0) {
                    key_size = asn1_get_uint(&ks);
                }
+                printf("KEYPAIR RSA %lu (%lx)\n",
+                       (unsigned long) key_size,
+                       (unsigned long) exponent);
                mbedtls_rsa_context rsa;
                mbedtls_rsa_init(&rsa);
                uint8_t index = 0;
@ -55,7 +58,8 @@ int cmd_keypair_gen() {
                    mbedtls_rsa_free(&rsa);
                    return SW_EXEC_ERROR();
                }
-                if ((res_APDU_size = (uint16_t)asn1_cvc_aut(&rsa, PICO_KEYS_KEY_RSA, res_APDU, MAX_APDU_DATA, NULL, 0)) == 0) {
+                if ((res_APDU_size =
+                         (uint16_t)asn1_cvc_aut(&rsa, PICO_KEYS_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) {
                    return SW_EXEC_ERROR();
                }
                ret = store_keys(&rsa, PICO_KEYS_KEY_RSA, key_id);
@ -71,6 +75,7 @@ int cmd_keypair_gen() {
                    return SW_WRONG_DATA();
                }
                mbedtls_ecp_group_id ec_id = ec_get_curve_from_prime(prime.data, prime.len);
+                printf("KEYPAIR ECC %d\n", ec_id);
                if (ec_id == MBEDTLS_ECP_DP_NONE) {
                    return SW_FUNC_NOT_SUPPORTED();
                }
@ -79,15 +84,14 @@ int cmd_keypair_gen() {
                    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
                }
+                printf("KEYPAIR ECC %d\r\n", ec_id);
                mbedtls_ecdsa_context ecdsa;
                mbedtls_ecdsa_init(&ecdsa);
                uint8_t index = 0;
@ -127,7 +131,8 @@ int cmd_keypair_gen() {
                        }
                    }
                }
-                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 ((res_APDU_size =
+                         (uint16_t)asn1_cvc_aut(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, 4096, ext.data, ext.len)) == 0) {
                    if (ext.data) {
                        free(ext.data);
                    }
--- a/src/hsm/cmd_list_keys.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -22,10 +22,12 @@ int cmd_list_keys() {
    /* First we send DEV private key */
    /* Both below conditions should be always TRUE */
    if (search_file(EF_PRKD_DEV)) {
-        res_APDU_size += put_uint16_t_be(EF_PRKD_DEV, res_APDU + res_APDU_size);
+        res_APDU[res_APDU_size++] = EF_PRKD_DEV >> 8;
+        res_APDU[res_APDU_size++] = EF_PRKD_DEV & 0xff;
    }
    if (search_file(EF_KEY_DEV)) {
-        res_APDU_size += put_uint16_t_be(EF_KEY_DEV, res_APDU + res_APDU_size);
+        res_APDU[res_APDU_size++] = EF_KEY_DEV >> 8;
+        res_APDU[res_APDU_size++] = EF_KEY_DEV & 0xff;
    }
    //first CC
    for (int i = 0; i < dynamic_files; i++) {
--- a/src/hsm/cmd_mse.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
--- a/src/hsm/cmd_pso.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
--- a/src/hsm/cmd_puk_auth.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
--- a/src/hsm/cmd_read_binary.c
+++ b/src/hsm/cmd_read_binary.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -30,7 +30,7 @@ int cmd_read_binary() {
            offset = p2;
        }
        else {
-            offset = make_uint16_t_be(p1, p2) & 0x7fff;
+            offset = make_uint16_t(p1, p2) & 0x7fff;
            ef = currentEF;
        }
    }
@ -41,7 +41,7 @@ int cmd_read_binary() {
            }
        }
        else {
-            uint16_t file_id = make_uint16_t_be(p1, p2); // & 0x7fff;
+            uint16_t file_id = make_uint16_t(p1, p2); // & 0x7fff;
            if (file_id == 0x0) {
                ef = currentEF;
            }
--- a/src/hsm/cmd_reset_retry.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "crypto_utils.h"
--- a/src/hsm/cmd_select.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -48,7 +48,7 @@ int cmd_select() {
    //}

    if (apdu.nc == 2) {
-        fid = get_uint16_t_be(apdu.data);
+        fid = get_uint16_t(apdu.data, 0);
    }

    //if ((fid & 0xff00) == (KEY_PREFIX << 8))
@ -119,7 +119,8 @@ int cmd_select() {
            res_APDU[res_APDU_size++] = 0x85;
            res_APDU[res_APDU_size++] = 5;
            uint16_t opts = get_device_options();
-            res_APDU_size += put_uint16_t_be(opts, res_APDU + res_APDU_size);
+            res_APDU[res_APDU_size++] = opts >> 8;
+            res_APDU[res_APDU_size++] = opts & 0xff;
            res_APDU[res_APDU_size++] = 0xFF;
            res_APDU[res_APDU_size++] = HSM_VERSION_MAJOR;
            res_APDU[res_APDU_size++] = HSM_VERSION_MINOR;
--- a/src/hsm/cmd_session_pin.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
--- a/src/hsm/cmd_signature.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "sc_hsm.h"
 #include "crypto_utils.h"
@ -20,9 +20,7 @@
 #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;
@ -276,13 +274,10 @@ int cmd_signature() {
        }
        size_t olen = 0;
        uint8_t buf[MBEDTLS_ECDSA_MAX_LEN];
-#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
-        {
+        else {
            r = mbedtls_ecdsa_write_signature(&ctx, md, apdu.data, apdu.nc, buf, MBEDTLS_ECDSA_MAX_LEN,
                                              &olen, random_gen, NULL);
        }
@ -298,23 +293,23 @@ int cmd_signature() {
        size_t olen = 0;
        uint8_t buf[MBEDTLS_ECDSA_MAX_LEN] = {0};
        if (hd_context.grp.id == MBEDTLS_ECP_DP_NONE) {
-            mbedtls_ecp_keypair_free(&hd_context);
+            mbedtls_ecdsa_free(&hd_context);
            return SW_CONDITIONS_NOT_SATISFIED();
        }
        if (hd_keytype != 0x1 && hd_keytype != 0x2) {
-            mbedtls_ecp_keypair_free(&hd_context);
+            mbedtls_ecdsa_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_ecp_keypair_free(&hd_context);
+            mbedtls_ecdsa_free(&hd_context);
            return SW_EXEC_ERROR();
        }
        memcpy(res_APDU, buf, olen);
        res_APDU_size = (uint16_t)olen;
-        mbedtls_ecp_keypair_free(&hd_context);
+        mbedtls_ecdsa_free(&hd_context);
        hd_keytype = 0;
    }
    else {
--- a/src/hsm/cmd_verify.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -59,5 +59,8 @@ int cmd_verify() {
        }
        return set_res_sw(0x63, 0xc0 | file_read_uint8(file_retries_sopin));
    }
+    else if (p2 == 0x85) {
+        return SW_OK();
+    }
    return SW_REFERENCE_NOT_FOUND();
 }
--- a/src/hsm/cvc.c
+++ b/src/hsm/cvc.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -26,9 +26,7 @@
 #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 uint16_t dev_name_len;
@ -91,11 +89,7 @@ uint16_t asn1_cvc_public_key_ecdsa(mbedtls_ecp_keypair *ecdsa, uint8_t *buf, uin
    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
-    ) {
+    if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_MONTGOMERY || mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_EDWARDS) {
        tot_data_len = oid_len + ptot_size + otot_size + gtot_size + ytot_size;
        oid = oid_ri;
    }
@ -116,11 +110,7 @@ uint16_t asn1_cvc_public_key_ecdsa(mbedtls_ecp_keypair *ecdsa, uint8_t *buf, uin
    //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
-#ifdef MBEDTLS_EDDSA_C
-    || mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_EDWARDS
-#endif
-    ) {
+    if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_MONTGOMERY || mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_EDWARDS) {
        //p
        *p++ = 0x81; p += format_tlv_len((uint16_t)p_size, p); mbedtls_mpi_write_binary(&ecdsa->grp.P, p, p_size);
        p += p_size;
@ -307,13 +297,10 @@ uint16_t asn1_cvc_cert(void *rsa_ecdsa,
        mbedtls_ecp_keypair *ecdsa = (mbedtls_ecp_keypair *) rsa_ecdsa;
        mbedtls_mpi_init(&r);
        mbedtls_mpi_init(&s);
-#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
-        {
+        else {
            ret = mbedtls_ecdsa_sign(&ecdsa->grp, &r, &s, &ecdsa->d, hsh, sizeof(hsh), random_gen, NULL);
        }
        if (ret == 0) {
@ -372,13 +359,10 @@ uint16_t asn1_cvc_aut(void *rsa_ecdsa,
    mbedtls_mpi r, s;
    mbedtls_mpi_init(&r);
    mbedtls_mpi_init(&s);
-#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
-    {
+    else {
        uint8_t hsh[32];
        hash256(body, cvcert_size + outcar_size, hsh);
        ret = mbedtls_ecdsa_sign(&ectx.grp, &r, &s, &ectx.d, hsh, sizeof(hsh), random_gen, NULL);
@ -447,7 +431,8 @@ uint16_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);
-    put_uint16_t_be(fid, p); p += sizeof(uint16_t);
+    *p++ = fid >> 8;
+    *p++ = fid & 0xff;
    return (uint16_t)(p - buf);
 }

@ -523,7 +508,8 @@ uint16_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 += put_uint16_t_be(keysize, p);
+        *p++ = (keysize >> 8) & 0xff;
+        *p++ = keysize & 0xff;
    }

    //Seq 4
@ -542,7 +528,8 @@ uint16_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 += put_uint16_t_be(keysize, p);
+        *p++ = (keysize >> 8) & 0xff;
+        *p++ = keysize & 0xff;
    }
    return (uint16_t)(p - buf);
 }
--- a/src/hsm/cvc.h
+++ b/src/hsm/cvc.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #ifndef _CVC_H_
--- a/src/hsm/files.c
+++ b/src/hsm/files.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "files.h"
@ -61,7 +61,7 @@ file_t file_entries[] = {
               .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 | FILE_PERSISTENT, .data = NULL,
+               .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
               .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },                                                                                                            //Device options
    /* 16 */ { .fid = EF_PRKDFS, .parent = 5, .name = NULL, .type = FILE_TYPE_WORKING_EF,
               .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                           //EF.PrKDFs
--- a/src/hsm/files.h
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */


--- a/src/hsm/kek.c
+++ b/src/hsm/kek.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -50,14 +50,6 @@ uint32_t crc32c(const uint8_t *buf, size_t len) {
    return ~crc;
 }

-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];
-        }
-    }
-}
-
 int load_mkek(uint8_t *mkek) {
    if (has_session_pin == false && has_session_sopin == false) {
        return PICOKEY_NO_LOGIN;
@ -81,10 +73,6 @@ int load_mkek(uint8_t *mkek) {
        return PICOKEY_EXEC_ERROR;
    }

-    if (has_mkek_mask) {
-        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);
    if (ret != 0) {
        return PICOKEY_EXEC_ERROR;
@ -92,8 +80,11 @@ int load_mkek(uint8_t *mkek) {
    if (crc32c(MKEK_KEY(mkek), MKEK_KEY_SIZE) != *(uint32_t *) MKEK_CHECKSUM(mkek)) {
        return PICOKEY_WRONG_DKEK;
    }
-    if (otp_key_1) {
-        mkek_masked(mkek, otp_key_1);
+    if (has_mkek_mask || otp_key_1) {
+        const uint8_t *mask = otp_key_1 ? otp_key_1 : mkek_mask;
+        for (int i = 0; i < MKEK_KEY_SIZE; i++) {
+            MKEK_KEY(mkek)[i] ^= mask[i];
+        }
    }
    return PICOKEY_OK;
 }
@ -134,9 +125,6 @@ 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];
@ -331,7 +319,7 @@ int dkek_encode_key(uint8_t id, void *key_ctx, int key_type, uint8_t *out, uint1
            return PICOKEY_WRONG_LENGTH;
        }

-        put_uint16_t_be(kb_len, kb + 8);
+        put_uint16_t(kb_len, kb + 8);
        memcpy(kb + 10, key_ctx, kb_len);
        kb_len += 2;

@ -344,15 +332,15 @@ int dkek_encode_key(uint8_t id, void *key_ctx, int key_type, uint8_t *out, uint1
        }
        mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) key_ctx;
        kb_len = 0;
-        kb_len += put_uint16_t_be((uint16_t)mbedtls_rsa_get_len(rsa) * 8, kb + 8 + kb_len);
+        put_uint16_t((uint16_t)mbedtls_rsa_get_len(rsa) * 8, kb + 8 + kb_len); kb_len += 2;

-        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&rsa->D), kb + 8 + kb_len);
+        put_uint16_t((uint16_t)mbedtls_mpi_size(&rsa->D), kb + 8 + kb_len); kb_len += 2;
        mbedtls_mpi_write_binary(&rsa->D, kb + 8 + kb_len, mbedtls_mpi_size(&rsa->D));
        kb_len += (uint16_t)mbedtls_mpi_size(&rsa->D);
-        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&rsa->N), kb + 8 + kb_len);
+        put_uint16_t((uint16_t)mbedtls_mpi_size(&rsa->N), kb + 8 + kb_len); kb_len += 2;
        mbedtls_mpi_write_binary(&rsa->N, kb + 8 + kb_len, mbedtls_mpi_size(&rsa->N));
        kb_len += (uint16_t)mbedtls_mpi_size(&rsa->N);
-        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&rsa->E), kb + 8 + kb_len);
+        put_uint16_t((uint16_t)mbedtls_mpi_size(&rsa->E), kb + 8 + kb_len); kb_len += 2;
        mbedtls_mpi_write_binary(&rsa->E, kb + 8 + kb_len, mbedtls_mpi_size(&rsa->E));
        kb_len += (uint16_t)mbedtls_mpi_size(&rsa->E);

@ -365,32 +353,32 @@ int dkek_encode_key(uint8_t id, void *key_ctx, int key_type, uint8_t *out, uint1
        }
        mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx;
        kb_len = 0;
-        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);
+        put_uint16_t((uint16_t)mbedtls_mpi_size(&ecdsa->grp.P) * 8, kb + 8 + kb_len); kb_len += 2;
+        put_uint16_t((uint16_t)mbedtls_mpi_size(&ecdsa->grp.A), kb + 8 + kb_len); kb_len += 2;
        mbedtls_mpi_write_binary(&ecdsa->grp.A, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->grp.A));
        kb_len += (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);
+        put_uint16_t((uint16_t)mbedtls_mpi_size(&ecdsa->grp.B), kb + 8 + kb_len); kb_len += 2;
        mbedtls_mpi_write_binary(&ecdsa->grp.B, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->grp.B));
        kb_len += (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);
+        put_uint16_t((uint16_t)mbedtls_mpi_size(&ecdsa->grp.P), kb + 8 + kb_len); kb_len += 2;
        mbedtls_mpi_write_binary(&ecdsa->grp.P, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->grp.P));
        kb_len += (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);
+        put_uint16_t((uint16_t)mbedtls_mpi_size(&ecdsa->grp.N), kb + 8 + kb_len); kb_len += 2;
        mbedtls_mpi_write_binary(&ecdsa->grp.N, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->grp.N));
        kb_len += (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);
-        kb_len += put_uint16_t_be((uint16_t)olen, kb + 8 + kb_len);
-        kb_len += (uint16_t)olen;
+        put_uint16_t((uint16_t)olen, kb + 8 + kb_len);
+        kb_len += 2 + (uint16_t)olen;

-        kb_len += put_uint16_t_be((uint16_t)mbedtls_mpi_size(&ecdsa->d), kb + 8 + kb_len);
+        put_uint16_t((uint16_t)mbedtls_mpi_size(&ecdsa->d), kb + 8 + kb_len); kb_len += 2;
        mbedtls_mpi_write_binary(&ecdsa->d, kb + 8 + kb_len, mbedtls_mpi_size(&ecdsa->d));
        kb_len += (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);
-        kb_len += put_uint16_t_be((uint16_t)olen, kb + 8 + kb_len);
-        kb_len += (uint16_t)olen;
+        put_uint16_t((uint16_t)olen, kb + 8 + kb_len);
+        kb_len += 2 + (uint16_t)olen;

        algo = (uint8_t *) "\x00\x0A\x04\x00\x7F\x00\x07\x02\x02\x02\x02\x03";
        algo_len = 12;
@ -421,7 +409,7 @@ int dkek_encode_key(uint8_t id, void *key_ctx, int key_type, uint8_t *out, uint1
    }

    if (allowed && allowed_len > 0) {
-        *out_len += put_uint16_t_be(allowed_len, out + *out_len);
+        put_uint16_t(allowed_len, out + *out_len); *out_len += 2;
        memcpy(out + *out_len, allowed, allowed_len);
        *out_len += allowed_len;
    }
@ -529,21 +517,21 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, uint16_t in_le
    uint16_t ofs = 9;

    //OID
-    uint16_t len = get_uint16_t_be(in + ofs);
+    uint16_t len = get_uint16_t(in, ofs);
    ofs += len + 2;

    //Allowed algorithms
-    len = get_uint16_t_be(in + ofs);
+    len = get_uint16_t(in, ofs);
    *allowed = (uint8_t *) (in + ofs + 2);
    *allowed_len = len;
    ofs += len + 2;

    //Access conditions
-    len = get_uint16_t_be(in + ofs);
+    len = get_uint16_t(in, ofs);
    ofs += len + 2;

    //Key OID
-    len = get_uint16_t_be(in + ofs);
+    len = get_uint16_t(in, ofs);
    ofs += len + 2;

    if ((in_len - 16 - ofs) % 16 != 0) {
@ -557,7 +545,7 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, uint16_t in_le
        return r;
    }

-    int key_size = get_uint16_t_be(kb + 8);
+    int key_size = get_uint16_t(kb, 8);
    if (key_size_out) {
        *key_size_out = key_size;
    }
@ -566,14 +554,14 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, uint16_t in_le
        mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) key_ctx;
        mbedtls_rsa_init(rsa);
        if (key_type == 5) {
-            len = get_uint16_t_be(kb + ofs); ofs += 2;
+            len = get_uint16_t(kb, ofs); ofs += 2;
            r = mbedtls_mpi_read_binary(&rsa->D, kb + ofs, len); ofs += len;
            if (r != 0) {
                mbedtls_rsa_free(rsa);
                return PICOKEY_WRONG_DATA;
            }

-            len = get_uint16_t_be(kb + ofs); ofs += 2;
+            len = get_uint16_t(kb, ofs); ofs += 2;
            r = mbedtls_mpi_read_binary(&rsa->N, kb + ofs, len); ofs += len;
            if (r != 0) {
                mbedtls_rsa_free(rsa);
@ -582,12 +570,12 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, uint16_t in_le
        }
        else if (key_type == 6) {
            //DP-1
-            len = get_uint16_t_be(kb + ofs); ofs += len + 2;
+            len = get_uint16_t(kb, ofs); ofs += len + 2;

            //DQ-1
-            len = get_uint16_t_be(kb + ofs); ofs += len + 2;
+            len = get_uint16_t(kb, ofs); ofs += len + 2;

-            len = get_uint16_t_be(kb + ofs); ofs += 2;
+            len = get_uint16_t(kb, ofs); ofs += 2;
            r = mbedtls_mpi_read_binary(&rsa->P, kb + ofs, len); ofs += len;
            if (r != 0) {
                mbedtls_rsa_free(rsa);
@ -595,19 +583,19 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, uint16_t in_le
            }

            //PQ
-            len = get_uint16_t_be(kb + ofs); ofs += len + 2;
+            len = get_uint16_t(kb, ofs); ofs += len + 2;

-            len = get_uint16_t_be(kb + ofs); ofs += 2;
+            len = get_uint16_t(kb, ofs); ofs += 2;
            r = mbedtls_mpi_read_binary(&rsa->Q, kb + ofs, len); ofs += len;
            if (r != 0) {
                mbedtls_rsa_free(rsa);
                return PICOKEY_WRONG_DATA;
            }
            //N
-            len = get_uint16_t_be(kb + ofs); ofs += len + 2;
+            len = get_uint16_t(kb, ofs); ofs += len + 2;
        }

-        len = get_uint16_t_be(kb + ofs); ofs += 2;
+        len = get_uint16_t(kb, ofs); ofs += 2;
        r = mbedtls_mpi_read_binary(&rsa->E, kb + ofs, len); ofs += len;
        if (r != 0) {
            mbedtls_rsa_free(rsa);
@ -645,13 +633,13 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, uint16_t in_le
        mbedtls_ecdsa_init(ecdsa);

        //A
-        len = get_uint16_t_be(kb + ofs); ofs += len + 2;
+        len = get_uint16_t(kb, ofs); ofs += len + 2;

        //B
-        len = get_uint16_t_be(kb + ofs); ofs += len + 2;
+        len = get_uint16_t(kb, ofs); ofs += len + 2;

        //P
-        len = get_uint16_t_be(kb + ofs); ofs += 2;
+        len = get_uint16_t(kb, ofs); ofs += 2;
        mbedtls_ecp_group_id ec_id = ec_get_curve_from_prime(kb + ofs, len);
        if (ec_id == MBEDTLS_ECP_DP_NONE) {
            mbedtls_ecdsa_free(ecdsa);
@ -660,22 +648,20 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, uint16_t in_le
        ofs += len;

        //N
-        len = get_uint16_t_be(kb + ofs); ofs += len + 2;
+        len = get_uint16_t(kb, ofs); ofs += len + 2;

        //G
-        len = get_uint16_t_be(kb + ofs);
-#ifdef MBEDTLS_EDDSA_C
+        len = get_uint16_t(kb, ofs);
        if (ec_id == MBEDTLS_ECP_DP_CURVE25519 && kb[ofs + 2] != 0x09) {
            ec_id = MBEDTLS_ECP_DP_ED25519;
        }
        else if (ec_id == MBEDTLS_ECP_DP_CURVE448 && (len != 56 || kb[ofs + 2] != 0x05)) {
            ec_id = MBEDTLS_ECP_DP_ED448;
        }
-#endif
        ofs += len + 2;

        //d
-        len = get_uint16_t_be(kb + ofs); ofs += 2;
+        len = get_uint16_t(kb, ofs); ofs += 2;
        r = mbedtls_ecp_read_key(ec_id, ecdsa, kb + ofs, len);
        if (r != 0) {
            mbedtls_ecdsa_free(ecdsa);
@ -684,16 +670,13 @@ int dkek_decode_key(uint8_t id, void *key_ctx, const uint8_t *in, uint16_t in_le
        ofs += len;

        //Q
-        len = get_uint16_t_be(kb + ofs); ofs += 2;
+        len = get_uint16_t(kb, ofs); ofs += 2;
        r = mbedtls_ecp_point_read_binary(&ecdsa->grp, &ecdsa->Q, kb + ofs, len);
        if (r != 0) {
-#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
-            {
+            else {
                r = mbedtls_ecp_mul(&ecdsa->grp, &ecdsa->Q, &ecdsa->d, &ecdsa->grp.G, random_gen, NULL);
            }
            if (r != 0) {
--- a/src/hsm/kek.h
+++ b/src/hsm/kek.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #ifndef _DKEK_H_
--- a/src/hsm/oid.c
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "oid.h"
--- a/src/hsm/oid.h
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #ifndef _OID_H_
--- a/src/hsm/sc_hsm.c
+++ b/src/hsm/sc_hsm.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include "sc_hsm.h"
@ -26,7 +26,6 @@
 #include "pico_keys.h"
 #include "usb.h"
 #include "random.h"
-#include "version.h"

 const uint8_t sc_hsm_aid[] = {
    11,
@ -45,8 +44,6 @@ const uint8_t *dev_name = NULL;
 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();

@ -272,7 +269,7 @@ int sc_hsm_unload() {
 uint16_t get_device_options() {
    file_t *ef = search_file(EF_DEVOPS);
    if (file_has_data(ef)) {
-        return get_uint16_t_be(file_get_data(ef));
+        return (file_read_uint8(ef) << 8) | file_read_uint8_offset(ef, 1);
    }
    return 0x0;
 }
@ -465,7 +462,7 @@ uint32_t get_key_counter(file_t *fkey) {
    uint16_t tag_len = 0;
    const uint8_t *meta_tag = get_meta_tag(fkey, 0x90, &tag_len);
    if (meta_tag) {
-        return get_uint32_t_be(meta_tag);
+        return (meta_tag[0] << 24) | (meta_tag[1] << 16) | (meta_tag[2] << 8) | meta_tag[3];
    }
    return 0xffffffff;
 }
@ -501,9 +498,14 @@ uint32_t decrement_key_counter(file_t *fkey) {
        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 = get_uint32_t_be(tag_data);
+                uint32_t val =
+                    (tag_data[0] << 24) | (tag_data[1] << 16) | (tag_data[2] << 8) | tag_data[3];
                val--;
-                put_uint32_t_be(val, tag_data);
+                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, (uint16_t)meta_size);
                free(cmeta);
                if (r != 0) {
@ -683,13 +685,10 @@ int load_private_key_ec(mbedtls_ecp_keypair *ctx, file_t *fkey) {
        return PICOKEY_EXEC_ERROR;
    }
    mbedtls_platform_zeroize(kdata, sizeof(kdata));
-#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);
    }
-    else
-#endif
-    {
+    else {
        r = mbedtls_ecp_mul(&ctx->grp, &ctx->Q, &ctx->d, &ctx->grp.G, random_gen, NULL);
    }
    if (r != 0) {
@ -764,7 +763,6 @@ static const cmd_t cmds[] = {
 };

 int sc_hsm_process_apdu() {
-    uint32_t ne = apdu.ne;
    int r = sm_unwrap();
    if (r != PICOKEY_OK) {
        return SW_DATA_INVALID();
@ -773,9 +771,6 @@ int sc_hsm_process_apdu() {
        if (cmd->ins == INS(apdu)) {
            int res = cmd->cmd_handler();
            sm_wrap();
-            if ((CLA(apdu) >> 2) & 0x3) {
-                apdu.ne = ne;
-            }
            return res;
        }
    }
--- a/src/hsm/sc_hsm.h
+++ b/src/hsm/sc_hsm.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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #ifndef _SC_HSM_H_
@ -32,9 +32,6 @@
 #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[];

--- a/src/hsm/version.h
+++ b/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 Affero General Public License as published by
+ * 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
- * Affero General Public License for more details.
+ * General Public License for more details.
 *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #ifndef __VERSION_H_
 #define __VERSION_H_

-#define HSM_VERSION 0x0602
+#define HSM_VERSION 0x0500

 #define HSM_VERSION_MAJOR ((HSM_VERSION >> 8) & 0xff)
 #define HSM_VERSION_MINOR (HSM_VERSION & 0xff)
--- a/tests/build-in-docker.sh
+++ b/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 -DENABLE_EDDSA=1 ..
+run_in_docker -w "$PWD/build_in_docker" cmake -DENABLE_EMULATION=1 -D__FOR_CI=1 ..
 run_in_docker -w "$PWD/build_in_docker" make -j ${NUM_PROC}
 docker create --name temp_container pico-hsm-test:bullseye
 docker cp $PWD/build_in_docker/pico_hsm temp_container:/pico_hsm
--- a/tests/const.py
+++ b/tests/const.py
@ -21,5 +21,5 @@ from binascii import unhexlify

 DEFAULT_DKEK = [0x1] * 32

-TERM_CERT = unhexlify('7f2181e57f4e819e5f290100421045535049434f48534d445630303030327f494f060a04007f000702020202038641043400e4f42ea8b78b2ab58d24c8297a4b1c13a73a631b531e58d0efb60d70dd6666c8fce4130e9b15ffa4ad29708d32764ac4b0cc0e5301898522f4c735f5a90d5f201045535049434f48534d54524c524134437f4c0e060904007f0007030102025301005f25060205010102085f24060206010102085f3740569f6fe91796f95fa77ecdb680468417eed7b4e00ccc2e091a6b56389213f913c4cf91da96fbcb12d363fead30a5598f737975d58b5170b7f45e9e87ec546883')
-DICA_CERT = unhexlify('7f2181e97f4e81a25f290100421045535049434f48534d434130303030327f494f060a04007f00070202020203864104e66b473ec328caf39eaed840f9c7a4ba237e1dd19004861fa3f4f134bd2d5ea5f71c6c2e6321add4c8a7793ba41119c5783f48a5d9dfc0898d9ae9e7b14da8d65f201045535049434f48534d445630303030327f4c12060904007f000703010202530580000000045f25060205000400065f24060206000400065f3740a645594c6c338cd6bda6cad039cee54fd822b1011c0af1e4e3a2a6d03d43bdbb8be68a66a8757e7b1f963589bdd80d8e65de5055b722609041ec63f0498ddc8b')
+TERM_CERT = unhexlify('7F2181E57F4E819E5F290100421045535049434F48534D445630303030317F494F060A04007F00070202020203864104F571E53AA8E75C929D925081CF0F893CB5991D48BD546C1A3F22199F037E4B12D601ACD91C67C88D3C5B3D04C08EC0A372485F7A248E080EE0C6237C1B075E1C5F201045535049434F48534D54525A474E50327F4C0E060904007F0007030102025301005F25060203000300055F24060204000300045F374041BF5E970739135770DBCC5DDA81FFD8B13419A9257D44CAF8404267C644E8F435B43F5E57EB2A8CF4B198045ACD094E0CB34E6217D9C8922CFB9BBEFD4088AD')
+DICA_CERT = unhexlify('7F2181E97F4E81A25F290100421045535049434F48534D434130303030317F494F060A04007F0007020202020386410421EE4A21C16A10F737F12E78E5091B266612038CDABEBB722B15BF6D41B877FBF64D9AB69C39B9831B1AE00BEF2A4E81976F7688D45189BB232A24703D8A96A55F201045535049434F48534D445630303030317F4C12060904007F000703010202530580000000005F25060202000801085F24060203000601045F37403F75C08FFFC9186B56E6147199E82BFC327CEEF72495BC567961CD54D702F13E3C2766FCD1D11BD6A9D1F4A229B76B248CEB9AF88D59A74D0AB149448705159B')
--- a/tests/docker/bullseye/Dockerfile
+++ b/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 base58
+RUN pip3 install pytest pycvc cryptography pyscard base58
 WORKDIR /
 RUN git clone https://github.com/OpenSC/OpenSC
 WORKDIR /OpenSC
-RUN git checkout tags/0.26.1
+RUN git checkout tags/0.25.1
 RUN ./bootstrap
 RUN ./configure --enable-openssl
 RUN make -j `nproc`
@ -36,6 +36,8 @@ 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
--- a/tests/memory.tar.gz
+++ b/tests/memory.tar.gz
--- a/tests/pico-hsm/test_000_info.py
+++ b/tests/pico-hsm/test_000_info.py
@ -23,7 +23,7 @@ def test_select(device):
    device.select_applet()

 def test_initialization(device):
-    device.initialize(no_dev_cert=True)
+    device.initialize()

 def test_termca(device):
    data = device.get_termca()
--- a/tests/pico-hsm/test_004_key_domains.py
+++ b/tests/pico-hsm/test_004_key_domains.py
@ -20,14 +20,14 @@
 import pytest
 import hashlib
 from const import DEFAULT_DKEK
-from picokey import APDUResponse, SWCodes
+from picohsm import APDUResponse, SWCodes
 from picohsm.const import DEFAULT_DKEK_SHARES

 KEY_DOMAINS = 3
 TEST_KEY_DOMAIN = 1

 def test_key_domains(device):
-    device.initialize(key_domains=KEY_DOMAINS, no_dev_cert=True)
+    device.initialize(key_domains=KEY_DOMAINS)
    for k in range(KEY_DOMAINS):
        kd = device.get_key_domain(key_domain=k)
        assert('error' in kd)
--- a/tests/pico-hsm/test_005_dkek.py
+++ b/tests/pico-hsm/test_005_dkek.py
@ -23,7 +23,7 @@ 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, no_dev_cert=True)
+    device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES)
    device.login(DEFAULT_PIN)
    resp = device.import_dkek(DEFAULT_DKEK)
    assert('dkek' in resp)
--- a/tests/pico-hsm/test_010_pin.py
+++ b/tests/pico-hsm/test_010_pin.py
@ -18,22 +18,22 @@
 """

 import pytest
-from picokey import APDUResponse, SWCodes
+from picohsm import APDUResponse, SWCodes
 from picohsm.const import DEFAULT_PIN, DEFAULT_RETRIES

 WRONG_PIN = '112233'

 def test_pin_init_retries(device):
-    device.initialize(retries=DEFAULT_RETRIES, no_dev_cert=True)
+    device.initialize(retries=DEFAULT_RETRIES)
    retries = device.get_login_retries()
    assert(retries == DEFAULT_RETRIES)

 def test_pin_login(device):
-    device.initialize(retries=DEFAULT_RETRIES, no_dev_cert=True)
+    device.initialize(retries=DEFAULT_RETRIES)
    device.login(DEFAULT_PIN)

 def test_pin_retries(device):
-    device.initialize(retries=DEFAULT_RETRIES, no_dev_cert=True)
+    device.initialize(retries=DEFAULT_RETRIES)
    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, no_dev_cert=True)
+    device.initialize(retries=DEFAULT_RETRIES)
    retries = device.get_login_retries()
    assert(retries == DEFAULT_RETRIES)

--- a/tests/pico-hsm/test_020_keypair_gen.py
+++ b/tests/pico-hsm/test_020_keypair_gen.py
@ -21,7 +21,7 @@ import pytest
 from picohsm import KeyType, DOPrefixes

 def test_gen_initialize(device):
-    device.initialize(no_dev_cert=True)
+    device.initialize()

@pytest.mark.parametrize(
    "curve", ['secp192r1', 'secp256r1', 'secp384r1', 'secp521r1', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1', 'secp192k1', 'secp256k1', 'curve25519', 'curve448', 'ed25519', 'ed448']
--- a/tests/pico-hsm/test_021_key_import.py
+++ b/tests/pico-hsm/test_021_key_import.py
@ -27,7 +27,7 @@ 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, no_dev_cert=True)
+    device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES)
    resp = device.import_dkek(DEFAULT_DKEK)
    resp = device.import_dkek(DEFAULT_DKEK)
    kcv = hashlib.sha256(b'\x00'*32).digest()[:8]
--- a/tests/pico-hsm/test_022_key_exchange.py
+++ b/tests/pico-hsm/test_022_key_exchange.py
@ -25,7 +25,7 @@ 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, no_dev_cert=True)
+    device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES)
    resp = device.import_dkek(DEFAULT_DKEK)
    resp = device.import_dkek(DEFAULT_DKEK)
    kcv = hashlib.sha256(b'\x00'*32).digest()[:8]
--- a/tests/pico-hsm/test_025_key_export.py
+++ b/tests/pico-hsm/test_025_key_export.py
@ -18,8 +18,7 @@
 """

 import pytest
-from picohsm import KeyType, DOPrefixes
-from picokey import APDUResponse, SWCodes
+from picohsm import KeyType, DOPrefixes, APDUResponse, SWCodes
 from binascii import hexlify
 import hashlib
 from const import DEFAULT_DKEK
@ -29,7 +28,7 @@ from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import serialization

 def test_initialize(device):
-    device.initialize(key_domains=1, no_dev_cert=True)
+    device.initialize(key_domains=1)
    assert(device.get_key_domains() == 1)

    device.set_key_domain(key_domain=0, total=2)
--- a/tests/pico-hsm/test_050_cipher.py
+++ b/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, no_dev_cert=True)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
    resp = device.import_dkek(DEFAULT_DKEK)
    resp = device.import_dkek(DEFAULT_DKEK)

--- a/tests/pico-hsm/test_051_chachapoly.py
+++ b/tests/pico-hsm/test_051_chachapoly.py
@ -21,8 +21,7 @@ import pytest
 import os
 from cryptography.hazmat.primitives.ciphers import aead
 import cryptography.exceptions
-from picohsm import DOPrefixes, EncryptionMode
-from picokey import APDUResponse, SWCodes
+from picohsm import APDUResponse, DOPrefixes, EncryptionMode, SWCodes
 from picohsm.const import DEFAULT_DKEK_SHARES
 from const import DEFAULT_DKEK
 from binascii import hexlify
@ -31,7 +30,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, no_dev_cert=True)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
    resp = device.import_dkek(DEFAULT_DKEK)
    resp = device.import_dkek(DEFAULT_DKEK)

--- a/tests/pico-hsm/test_052_aes_ext.py
+++ b/tests/pico-hsm/test_052_aes_ext.py
@ -20,7 +20,8 @@
 import pytest
 import os
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes, aead
-from picohsm import EncryptionMode, AES
+import cryptography.exceptions
+from picohsm import APDUResponse, DOPrefixes, EncryptionMode, SWCodes, AES
 from picohsm.const import DEFAULT_DKEK_SHARES
 from const import DEFAULT_DKEK
 from binascii import hexlify
@ -29,7 +30,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, no_dev_cert=True)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
    resp = device.import_dkek(DEFAULT_DKEK)
    resp = device.import_dkek(DEFAULT_DKEK)

--- a/tests/pico-hsm/test_060_mac.py
+++ b/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, no_dev_cert=True)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
    resp = device.import_dkek(DEFAULT_DKEK)
    resp = device.import_dkek(DEFAULT_DKEK)

--- a/tests/pico-hsm/test_070_hkdf.py
+++ b/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, no_dev_cert=True)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
    resp = device.import_dkek(DEFAULT_DKEK)
    resp = device.import_dkek(DEFAULT_DKEK)

--- a/tests/pico-hsm/test_071_pbkdf2.py
+++ b/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, no_dev_cert=True)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
    resp = device.import_dkek(DEFAULT_DKEK)
    resp = device.import_dkek(DEFAULT_DKEK)

--- a/tests/pico-hsm/test_072_x963.py
+++ b/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, no_dev_cert=True)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
    resp = device.import_dkek(DEFAULT_DKEK)
    resp = device.import_dkek(DEFAULT_DKEK)

--- a/tests/pico-hsm/test_080_pka.py
+++ b/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 picokey import APDUResponse, SWCodes
+from picohsm import APDUResponse, SWCodes
 from const import TERM_CERT, DICA_CERT
 from cryptography.hazmat.primitives.asymmetric import ec, utils
 from cryptography.hazmat.primitives import hashes

-AUT_KEY = unhexlify('579A995BD7BA35AD3D3968940FA4CDA34116E121A8AC01396234DAFB132B3FD7')
+AUT_KEY = unhexlify('0A40E11E672C28C558B72C25D93BCF28C08D39AFDD5A1A2FD3BAF7A6B27F0C2E')
 aut_pk = ec.derive_private_key(int.from_bytes(AUT_KEY, 'big'), ec.BrainpoolP256R1())
-AUT_PUK = unhexlify('678201ed7f218201937f4e82014b5f290100421045535049434f48534d54524c524134437f4982011d060a04007f000702020202038120a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e537782207d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9832026dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b68441048bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f0469978520a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a7864104a8217de2cec275cdf9dcda68128aff6061199291532545ab394e2554015962e16d568012a9d01b3da60d062aeed11356467fa3af9ebf9aad3d2933ebb9d86e0f8701015f201045535049434f48534d54524c524134435f374022d9f4480995e8370f8377e8bd4a63547be7740f7836456de5196839c6689540889acd573338d68bdea3db2e31c8dd00e670a4bcccdef497a156c39170d3c837421045535049434f48534d54524c524134435f374014445d219facb3bb745867d945e46526a2a6d03441dba52911d8f9483abbe4272a0beee7cecc69c661f3459c9b5431719ebf7e11f93d903a2cf705899eb4b631')
+AUT_PUK = unhexlify('678201ed7f218201937f4e82014b5f290100421045535049434f48534d54525a474e50327f4982011d060a04007f000702020202038120a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e537782207d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9832026dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b68441048bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f0469978520a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a78641040cc18ce246da678239af0913a1579dda58c07be404da4a65327794fac93f57a333267979905b5d046da7020226cc4e5fc477e8fc651a0cf87095259aafa88e648701015f201045535049434f48534d54525a474e50325f37401fc90bdab2a58c3cd25f18a90baa2c21d3d087002ba240fb274ff066759297f79e130053d902d637a448c8cdcd0670fe8ebcc06d8a3ee82079f08d1ff8660393421045535049434f48534d54525a474e50325f3740e24e7e23eae3c78f9fa88391004369a293c43ef99e2279170983e1dbe707fbf0382d09de3e60ef1addd2f055947c3efcef17926065ddb7a031f4905da474ed1d')


 term_chr = CVC().decode(TERM_CERT).chr()

 def test_initialize(device):
-    device.initialize(puk_auts=1, puk_min_auts=1, no_dev_cert=False)
+    device.initialize(puk_auts=1, puk_min_auts=1)
    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, no_dev_cert=True)
+    device.initialize(puk_auts=2, puk_min_auts=1)
    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, no_dev_cert=True)
+    device.initialize(puk_auts=2, puk_min_auts=1)
    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, no_dev_cert=True)
+    device.initialize(puk_auts=1, puk_min_auts=1)
    assert(device.is_puk() == True)

-    device.initialize(no_dev_cert=True)
+    device.initialize()
    assert(device.is_puk() == False)

 def test_check_puk_key(device):
-    device.initialize(puk_auts=1, puk_min_auts=1, no_dev_cert=True)
+    device.initialize(puk_auts=1, puk_min_auts=1)
    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(no_dev_cert=True)
+    device.initialize()
    with pytest.raises(APDUResponse) as e:
        device.register_puk(AUT_PUK, TERM_CERT, DICA_CERT)
    assert(e.value.sw == SWCodes.SW_FILE_NOT_FOUND)
--- a/tests/pico-hsm/test_090_xkek.py
+++ b/tests/pico-hsm/test_090_xkek.py
@ -25,13 +25,12 @@ 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
-from picokey import APDUResponse, SWCodes
+from picohsm import DOPrefixes, APDUResponse, SWCodes

-KDM = unhexlify(b'30820420060b2b0601040181c31f0402016181ed7f2181e97f4e81a25f290100421045535049434f48534d434130303030327f494f060a04007f00070202020203864104e66b473ec328caf39eaed840f9c7a4ba237e1dd19004861fa3f4f134bd2d5ea5f71c6c2e6321add4c8a7793ba41119c5783f48a5d9dfc0898d9ae9e7b14da8d65f201045535049434f48534d445630303030327f4c12060904007f000703010202530580000000045f25060205000400065f24060206000400065f3740a645594c6c338cd6bda6cad039cee54fd822b1011c0af1e4e3a2a6d03d43bdbb8be68a66a8757e7b1f963589bdd80d8e65de5055b722609041ec63f0498ddc8b6281e97f2181e57f4e819e5f290100421045535049434f48534d445630303030327f494f060a04007f000702020202038641043359f5234ce62e0eb80460046d8fd1aae018cc8b9e687b40aa2c047e352409b45153d1ad888e4e7e780a3b1fa8c69ca8998bd271c8849137149142e96816a5a45f201045535049434f48534d54524a5a58314a7f4c0e060904007f0007030102025301005f25060205010102085f24060206010102085f37409add1c1c8a05e7bc56a8bd846c9122d9214cc43c86b6952a961dce525d830a58130cbb275e9408af38dc16160f958d2b9ac6ac4f0f1b9b863284f00121d447ce638201f1678201ed7f218201937f4e82014b5f290100421045535049434f48534d54524a5a58314a7f4982011d060a04007f000702020202038120a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e537782207d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9832026dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b68441048bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f0469978520a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a78641049de55b50b921de72bbf740d3518905ff893e8208cfe8d144de34d79da3645d1c0cb551a19d6e6a5fee050e479a65d36fdf638af741e52dad4df9960b8ed443d18701015f201045535049434f48534d54524a5a58314a5f374099dede270b9a2def89a4d12dc0314e6289bd565808683f362e9f9ac9554ec5113bf7e412ecc386af12d2a9b43f27e54e10dfc6d8f2d6b618b1776459c13c0bec421045535049434f48534d54524a5a58314a5f3740459f6385f28a84f1c57f421a7f6cb4f1177084497321be94c87998c2e01af0202bab6984411cde1aab34e4e59cc27961b85855bae6340305281ff838253b0f3554404b6a2fe6947faa91f6ffa0d707cd4cbb43192935f561be137f4b3680304fc28b41210b671b8b033e06b4ad720010bcd36b92282844616261f944f3c4f67bfda5')
+KDM = unhexlify(b'30820420060b2b0601040181c31f0402016181ed7f2181e97f4e81a25f290100421045535049434f48534d434130303030317f494f060a04007f0007020202020386410421ee4a21c16a10f737f12e78e5091b266612038cdabebb722b15bf6d41b877fbf64d9ab69c39b9831b1ae00bef2a4e81976f7688d45189bb232a24703d8a96a55f201045535049434f48534d445630303030317f4c12060904007f000703010202530580000000005f25060202000801085f24060203000601045f37403f75c08fffc9186b56e6147199e82bfc327ceef72495bc567961cd54d702f13e3c2766fcd1d11bd6a9d1f4a229b76b248ceb9af88d59a74d0ab149448705159b6281e97f2181e57f4e819e5f290100421045535049434f48534d445630303030317f494f060a04007f00070202020203864104c8561b41e54fea81bb80dd4a6d537e7c3904344e8ca90bc5f668111811e02c8d5d51ca93ca89558f2a8a9cbb147434e3441ec174505ff980fd7a7106286196915f201045535049434f48534d54524a444736387f4c0e060904007f0007030102025301005f25060203000300065f24060204000300055f3740983de63d0975b715ebd8a93cb38fa9638882c8b7064d51a6facabed693b92edc098e458b713203413ef6de0958c44772cbdbc264205c7b1bdb8b4fcb2516437f638201f1678201ed7f218201937f4e82014b5f290100421045535049434f48534d54524a444736387f4982011d060a04007f000702020202038120a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e537782207d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9832026dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b68441048bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f0469978520a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a78641048b1f450912a2e4d428b7eefc5fa05618a9ef295e90009a61cbb0970181b333474ea94f94cde5a11aba0589e85d4225002789ff1cdcf25756f059647b49fc2a158701015f201045535049434f48534d54524a444736385f3740372407c20de7257c89dae1e6606c8a046ca65efaa010c0a22b75c402ee243de51f5f1507457193679ed9db4fbbfe8efb9d695b684492b665ad8ba98c1f84ea38421045535049434f48534d54524a444736385f374098718e2e14a44386b689b71a101530316b65ab49a91bab0dd56099c5161ecb8aadff6cf27449f94034e58b7306f01e6ffa2766a2f5bb1281e12e5f1f9174733454400cf8926ca5bec9a91bcd47bf391c15d94ef6e3243d5fd1fffeaafd586766bc3221eafd808f17f8450f238cc1fe7ab1854443db31d622f53a2b3fdb3ad750d5ce')

 def test_initialize(device):
-    device.initialize(key_domains=1, no_dev_cert=True)
+    device.initialize(key_domains=1)
    device.logout()

 def test_create_xkek(device):
--- a/tests/pico-hsm/test_095_bip_slip.py
+++ b/tests/pico-hsm/test_095_bip_slip.py
@ -27,8 +27,7 @@ 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, PicoHSM
-from picokey import APDUResponse, SWCodes
+from picohsm import EncryptionMode, APDUResponse, SWCodes, PicoHSM
 import hashlib

 TEST_STRING = b'Pico Keys are awesome!'
@ -37,7 +36,7 @@ def sha256_sha256(data):
    return hashlib.sha256(hashlib.sha256(data).digest()).digest()

 def test_initialize(device):
-    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES, no_dev_cert=True)
+    device.initialize(dkek_shares=DEFAULT_DKEK_SHARES)
    resp = device.import_dkek(DEFAULT_DKEK)
    resp = device.import_dkek(DEFAULT_DKEK)

--- a/tests/scripts/asym_cipher.sh
+++ b/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=$(pkcs11-tool --id 1 --pin 648219 --decrypt $3 -i data.crypt 2>/dev/null | sed '/^OAEP parameters:/d' | tr -d '\0')
+    TDATA=$(tr -d '\0' < <(pkcs11-tool --id 1 --pin 648219 --decrypt $3 -i data.crypt 2>/dev/null))
    test $? -eq 0 && echo -n "." || exit $?
-    if [[ "$TEST_STRING" != "$TDATA" ]]; then
+    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 --hash-algorithm SHA256 --mgf MGF1-SHA256"
+rsa_encrypt_decrypt data "-pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 -pkeyopt rsa_mgf1_md:sha256" "--mechanism RSA-PKCS-OAEP"
 test $? -eq 0 && echo -e ".\t${OK}" || exit $?

 rm -rf data* 1.*
--- a/tests/scripts/func.sh
+++ b/tests/scripts/func.sh
@ -37,9 +37,7 @@ gen_and_delete() {
    test $? -eq 0 && echo -n "." || exit $?
 }
 reset() {
-    #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
+    python3 tools/pico-hsm-tool.py --pin 648219 initialize --so-pin 57621880 --silent --no-dev-cert > /dev/null 2>&1
    test $? -eq 0 || exit $?
 }

--- a/tests/start-up-and-test.sh
+++ b/tests/start-up-and-test.sh
@ -2,4 +2,4 @@

 source ./tests/startup.sh

-# pytest tests -W ignore::DeprecationWarning
+pytest tests -W ignore::DeprecationWarning
--- a/tools/pico-hsm-tool.py
+++ b/tools/pico-hsm-tool.py
@ -39,13 +39,13 @@ except ModuleNotFoundError:
    sys.exit(-1)

 try:
-    from picohsm import PicoHSM, PinType, DOPrefixes, KeyType, EncryptionMode, AES
-    from picohsm.utils import get_pki_data
-    from picokey import APDUResponse, Platform
+    from picohsm import PicoHSM, PinType, DOPrefixes, KeyType, EncryptionMode, utils, APDUResponse, SWCodes, AES, 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
@ -67,7 +67,6 @@ def parse_args():
    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)
@ -152,29 +151,24 @@ def parse_args():
    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_reboot = subparser.add_parser('reboot', help='Reboots the Pico HSM.')
-
-    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):
@ -207,9 +201,45 @@ def initialize(picohsm, args):
        print('Are you sure?')
        _ = input('[Press enter to confirm]')

-    picohsm.initialize(pin=args.pin, sopin=args.so_pin, no_dev_cert=args.no_dev_cert)
+    if (args.pin):
+        try:
+            picohsm.login(args.pin)
+        except APDUResponse:
+            pass
+        pin = args.pin
+    else:
+        pin = '648219'

+    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)
    if (not args.no_dev_cert):
+        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)
+        params = {'pubkey': pbk}
+        if (picohsm.platform in (Platform.RP2350, Platform.ESP32)):
+            params['curve'] = 'secp256k1'
+        data = urllib.parse.urlencode(params).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('')
    print('Note that the device is initialized with a default PIN and '
@ -339,7 +369,7 @@ class SecureLock:

    def disable_device_aut(self):
        ct = self.get_skey()
-        self.picohsm.send(cla=0x80, command=0x64, p1=0x3A, p2=0x04, data=list(ct))
+        self.picohsm.send(cla=0x80, command=0x64, p1=0x3A, p2=0x04, p3=list(ct))

 def secure(picohsm, args):
    slck = SecureLock(picohsm)
@ -481,79 +511,14 @@ def otp(picohsm, args):
    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
-        data = fin.read()
-        fin.close()
-        path = parse_derivation_path(args.path)
-        ret = picohsm.hd_signature([id] + path, data)
-        if (args.file_out):
-            fout = open(args.file_out, 'wb')
-            fout.write(bytes(ret))
-            fout.close()
-        else:
-            sys.stdout.buffer.write(bytes(ret))
-
-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 v2.4\n')
+    sys.stderr.buffer.write(b'Pico HSM Tool v2.0\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, slot=args.slot)
+    picohsm = PicoHSM(args.pin)

    # Following commands may raise APDU exception on error
    if (args.command == 'initialize'):
@ -576,12 +541,6 @@ def main(args):
        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()
--- a/workflows/autobuild.sh
+++ b/workflows/autobuild.sh
@ -7,7 +7,6 @@ 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
@ -23,31 +22,15 @@ 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