Adding support for ChaCha20 with Poly1305.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-09-14 17:26:45 +02:00
parent 607f7c50d4
commit 493a88538a
2 changed files with 9 additions and 7 deletions

View File

@@ -2112,7 +2112,7 @@
* *
* Module: library/chacha20.c * Module: library/chacha20.c
*/ */
//#define MBEDTLS_CHACHA20_C #define MBEDTLS_CHACHA20_C
/** /**
* \def MBEDTLS_CHACHAPOLY_C * \def MBEDTLS_CHACHAPOLY_C
@@ -2123,7 +2123,7 @@
* *
* This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C * This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
*/ */
//#define MBEDTLS_CHACHAPOLY_C #define MBEDTLS_CHACHAPOLY_C
/** /**
* \def MBEDTLS_CIPHER_C * \def MBEDTLS_CIPHER_C

View File

@@ -76,11 +76,6 @@ if (NOT TARGET pico_hsm_sdk)
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha1.c ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha1.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha256.c ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha256.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha512.c ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha512.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/x509write_crt.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/x509_create.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pk.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pk_wrap.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pkwrite.c
) )
if (${HSM_DRIVER} STREQUAL "ccid") if (${HSM_DRIVER} STREQUAL "ccid")
@@ -99,6 +94,13 @@ if (NOT TARGET pico_hsm_sdk)
${CMAKE_CURRENT_LIST_DIR}/tinycbor/src/cborencoder.c ${CMAKE_CURRENT_LIST_DIR}/tinycbor/src/cborencoder.c
${CMAKE_CURRENT_LIST_DIR}/tinycbor/src/cborparser.c ${CMAKE_CURRENT_LIST_DIR}/tinycbor/src/cborparser.c
${CMAKE_CURRENT_LIST_DIR}/tinycbor/src/cborparser_dup_string.c ${CMAKE_CURRENT_LIST_DIR}/tinycbor/src/cborparser_dup_string.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/x509write_crt.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/x509_create.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pk.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pk_wrap.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pkwrite.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pkwrite.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/chachapoly.c
) )
target_include_directories(pico_hsm_sdk INTERFACE target_include_directories(pico_hsm_sdk INTERFACE
${CMAKE_CURRENT_LIST_DIR}/src/usb/hid ${CMAKE_CURRENT_LIST_DIR}/src/usb/hid