Merge branch 'main' into eddsa

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

CMakeLists.txt

@@ -1,43 +1,43 @@
- #
+#
- # This file is part of the Pico OpenPGP distribution (https://github.com/polhenarejos/pico-openpgp).
+# This file is part of the Pico OpenPGP distribution (https://github.com/polhenarejos/pico-openpgp).
- # Copyright (c) 2022 Pol Henarejos.
+# Copyright (c) 2022 Pol Henarejos.
- #
+#
- # This program is free software: you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU General Public License as published by
- # the Free Software Foundation, version 3.
+# the Free Software Foundation, version 3.
- #
+#
- # This program is distributed in the hope that it will be useful, but
+# This program is distributed in the hope that it will be useful, but
- # WITHOUT ANY WARRANTY; without even the implied warranty of
+# WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- # General Public License for more details.
+# General Public License for more details.
- #
+#
- # You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
- #
+#
 
 cmake_minimum_required(VERSION 3.13)
 
 if(ESP_PLATFORM)
-set(EXTRA_COMPONENT_DIRS src pico-keys-sdk/src)
+        set(EXTRA_COMPONENT_DIRS src pico-keys-sdk/src)
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+        include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 else()
 
-if(ENABLE_EMULATION)
+        if(ENABLE_EMULATION)
-else()
+        else()
-include(pico_sdk_import.cmake)
+                include(pico_sdk_import.cmake)
-endif()
+        endif()
 
-project(pico_openpgp C CXX ASM)
+        project(pico_openpgp C CXX ASM)
 
-set(CMAKE_C_STANDARD 11)
+        set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 17)
+        set(CMAKE_CXX_STANDARD 17)
 
-if(ENABLE_EMULATION)
+        if(ENABLE_EMULATION)
-else()
+        else()
-pico_sdk_init()
+                pico_sdk_init()
-endif()
+        endif()
 
-add_executable(pico_openpgp)
+        add_executable(pico_openpgp)
 endif()
 
 set(SOURCES ${SOURCES}
@@ -45,49 +45,54 @@ set(SOURCES ${SOURCES}
         ${CMAKE_CURRENT_LIST_DIR}/src/openpgp/files.c
         ${CMAKE_CURRENT_LIST_DIR}/src/openpgp/piv.c
         ${CMAKE_CURRENT_LIST_DIR}/src/openpgp/management.c
-        )
+)
+
+set(USB_ITF_CCID 1)
+set(USB_ITF_WCID 1)
+include(pico-keys-sdk/pico_keys_sdk_import.cmake)
+if(ESP_PLATFORM)
+        project(pico_openpgp)
+endif()
 
 set(INCLUDES ${INCLUDES}
         ${CMAKE_CURRENT_LIST_DIR}/src/openpgp
-        )
-
-set(USB_ITF_CCID 1)
-include(pico-keys-sdk/pico_keys_sdk_import.cmake)
-if(ESP_PLATFORM)
-    project(pico_fido)
-endif()
-
-if(NOT ESP_PLATFORM)
-target_sources(pico_openpgp PUBLIC ${SOURCES})
-target_include_directories(pico_openpgp PUBLIC ${INCLUDES})
-
-target_compile_options(pico_openpgp PUBLIC
-    -Wall
-    -Werror
 )
+if(NOT ESP_PLATFORM)
+        target_sources(pico_openpgp PUBLIC ${SOURCES})
+        target_include_directories(pico_openpgp PUBLIC ${INCLUDES})
 
-if(ENABLE_EMULATION)
+        target_compile_options(pico_openpgp PUBLIC
-
+                -Wall
-target_compile_options(pico_openpgp PUBLIC
-        -fdata-sections
-        -ffunction-sections
         )
-if(APPLE)
+        if(NOT MSVC)
-target_link_options(pico_openpgp PUBLIC
+                target_compile_options(pico_openpgp PUBLIC
-        -Wl,-dead_strip
+                        -Werror
-        )
+                )
-else()
+        endif()
-target_link_options(pico_openpgp PUBLIC
-        -Wl,--gc-sections
-        )
-endif (APPLE)
-target_link_libraries(pico_openpgp PRIVATE pthread m)
-else()
 
-pico_add_extra_outputs(pico_openpgp)
+        if(ENABLE_EMULATION)
+                if(NOT MSVC)
+                        target_compile_options(pico_openpgp PUBLIC
+                                -fdata-sections
+                                -ffunction-sections
+                        )
+                endif()
+                if(APPLE)
+                        target_link_options(pico_openpgp PUBLIC
+                                -Wl,-dead_strip
+                        )
+                elseif(MSVC)
+                        target_compile_options(pico_openpgp PUBLIC
+                                -WX
+                        )
 
-#target_compile_definitions(pico_openpgp PRIVATE MBEDTLS_ECDSA_DETERMINISTIC=1)
+                        target_link_libraries(pico_openpgp PUBLIC wsock32 ws2_32 Bcrypt)
-
+                else()
-target_link_libraries(pico_openpgp PRIVATE pico_keys_sdk pico_stdlib tinyusb_device tinyusb_board pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id pico_aon_timer)
+                        target_link_options(pico_openpgp PUBLIC
-endif()
+                                -Wl,--gc-sections
+                        )
+                endif(APPLE)
+                target_link_libraries(pico_openpgp PRIVATE pthread m)
+        endif()
 endif()
+

sdkconfig.defaults

@@ -0,0 +1,54 @@
+# This file was generated using idf.py save-defconfig. It can be edited manually.
+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
+#
+IGNORE_UNKNOWN_FILES_FOR_MANAGED_COMPONENTS=1
+
+CONFIG_TINYUSB=y
+
+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_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_MODE_PERF=y
+
+CONFIG_MBEDTLS_CMAC_C=y
+CONFIG_MBEDTLS_CHACHA20_C=y
+CONFIG_MBEDTLS_POLY1305_C=y
+CONFIG_MBEDTLS_CHACHAPOLY_C=y
+CONFIG_MBEDTLS_HKDF_C=y
+CONFIG_MBEDTLS_HARDWARE_ECC=y
+CONFIG_MBEDTLS_HARDWARE_GCM=y
+CONFIG_MBEDTLS_DES_C=y
+# CONFIG_MBEDTLS_HARDWARE_MPI is not set
+CONFIG_MBEDTLS_HARDWARE_SHA=y
+CONFIG_MBEDTLS_HARDWARE_AES=y
+# CONFIG_MBEDTLS_ROM_MD5 is not set
+CONFIG_MBEDTLS_SHA512_C=y
+CONFIG_MBEDTLS_TLS_DISABLED=y
+# CONFIG_MBEDTLS_TLS_ENABLED is not set
+# CONFIG_ESP_TLS_USE_DS_PERIPHERAL is not set
+# CONFIG_ESP_WIFI_ENABLED is not set
+# CONFIG_ESP_WIFI_MBEDTLS_CRYPTO is not set
+# CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT is not set
+# CONFIG_WPA_MBEDTLS_CRYPTO is not set
+# CONFIG_MBEDTLS_PSK_MODES is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_RSA is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA is not set
+# CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA is not set
+# CONFIG_MBEDTLS_SSL_RENEGOTIATION is not set
+# CONFIG_MBEDTLS_SSL_PROTO_TLS1_2 is not set
+# CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set
+# CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set
+# CONFIG_MBEDTLS_SSL_ALPN is not set
+# CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS is not set
+# CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS is not set
+# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set
+# CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA is not set
+# CONFIG_ESP_WIFI_ENABLE_WPA3_SAE is not set
+# CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA is not set
+
+CONFIG_ESP_COREDUMP_ENABLE_TO_UART=y