Release v3.2.3 (20200912)

MicrochipTech · Sep 14, 2020 · 70d082c · 70d082c
1 parent 1cb00de
commit 70d082c
Show file tree

Hide file tree

Showing 34 changed files with 747 additions and 2,455 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.6.4)
 project (cryptoauthlib)
 
 # Set the current release version
-set(VERSION "3.2.2")
+set(VERSION "3.2.3")
 set(VERSION_MAJOR 3)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 2)
+set(VERSION_PATCH 3)
 
 # Build Options
 option(BUILD_TESTS "Create Test Application with library" OFF)

diff --git a/app/pkcs11/example_pkcs11_config.c b/app/pkcs11/example_pkcs11_config.c
@@ -21,7 +21,7 @@
 #define pkcs11configLABEL_DEVICE_PUBLIC_KEY_FOR_TLS         pkcs11configLABEL_DEVICE_CERTIFICATE_FOR_TLS
 #endif
 
-/** Standard Configuration Structure for ATECC608A devices */
+/** Standard Configuration Structure for ATECC608 devices */
 const uint8_t atecc608_config[] = {
     0x01, 0x23, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x00, 0x00, 0x00, 0x00, 0xEE, 0x01, 0x01, 0x00,
     0xC0, 0x00, 0x00, 0x01, 0x8F, 0x20, 0xC4, 0x44, 0x87, 0x20, 0x87, 0x20, 0x8F, 0x0F, 0xC4, 0x36,

diff --git a/cryptoauthlib-manual.pdf b/cryptoauthlib-manual.pdf
diff --git a/harmony/config/hal_common.py b/harmony/config/hal_common.py
diff --git a/harmony/config/hal_instance.py b/harmony/config/hal_instance.py
diff --git a/harmony/templates/atca_main.c.ftl b/harmony/templates/atca_main.c.ftl
diff --git a/harmony/templates/device_instance.c.ftl b/harmony/templates/device_instance.c.ftl
@@ -8,6 +8,8 @@
 
 #include "cryptoauthlib.h"
 
+<#assign PLIB_NAME  = core.PORT_API_PREFIX?string>
+
 ATCAIfaceCfg ${NAME?lower_case}_${INDEX?string}_init_data = {
     .iface_type            = ${INTERFACE},
     .devtype               = ${NAME?upper_case},
@@ -19,8 +21,12 @@ ATCAIfaceCfg ${NAME?lower_case}_${INDEX?string}_init_data = {
 <#elseif INTERFACE == "ATCA_SPI_IFACE">
 <#assign plib_type = "spi">
     .atcaspi.bus           = 0,
-    .atcaspi.select_pin    = PORT_PIN_${SPI_CS_PIN?upper_case},
+        .atcaspi.select_pin    = ${PLIB_NAME}_PIN_${SPI_CS_PIN?upper_case},
+<#if HAL_INTERFACE?contains("FLEXCOM")>
+        .atcaspi.baud          = ${.vars["${HAL_INTERFACE?lower_case}"].FLEXCOM_SPI_BAUD_RATE},
+<#else>
     .atcaspi.baud          = ${.vars["${HAL_INTERFACE?lower_case}"].SPI_BAUD_RATE},
+</#if>
 </#if>
     .wake_delay            = ${WAKEUP_DELAY},
     .rx_retries            = ${RECEIVE_RETRY},

diff --git a/harmony/templates/hal_harmony_init.c.ftl b/harmony/templates/hal_harmony_init.c.ftl
@@ -33,6 +33,7 @@
 #include "cryptoauthlib.h"
 
 <#assign pliblist = CAL_PLIB_LIST?word_list>
+<#assign PLIB_NAME  = core.PORT_API_PREFIX?string>
 <#if pliblist?size != 0>
 <#list pliblist as plib_id>
 <#assign plib_info = plib_id?split("_")>
@@ -46,7 +47,7 @@ atca_plib_i2c_api_t ${plib_info[0]}_plib_i2c_api = {
 <#elseif plib_info[1] == "spi">
 static void ${plib_info[0]}_select_pin(uint32_t pin, bool value)
 {
-    PORT_PinWrite(pin, value);
+    ${PLIB_NAME}_PinWrite(pin, value);
 }
 
 atca_plib_spi_api_t ${plib_info[0]}_plib_spi_api = {

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -77,6 +77,7 @@ source_group("App/Tng" FILES ${TNG_SRC})
 endif()
 
 if (ATCA_MBEDTLS)
+if (NOT TARGET mbedtls)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../third_party/CMakeLists-mbedtls.txt.in ${CMAKE_BINARY_DIR}/${DEPENDENCY_DIR}/mbedtls_downloader/CMakeLists.txt)
 execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/${DEPENDENCY_DIR}/mbedtls_downloader/)
@@ -88,7 +89,7 @@ add_library(mbedtls STATIC ${MBEDTLS_LIB_SRC})
 target_compile_definitions(mbedtls PUBLIC -DMBEDTLS_CMAC_C)
 include_directories(mbedtls PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
                                     ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/mbedtls/include)
-
+endif()
 
 file(GLOB MBEDTLS_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "mbedtls/*.c")
 if(${CMAKE_VERSION} VERSION_GREATER "3.8.0")

diff --git a/lib/atca_version.h b/lib/atca_version.h
@@ -30,9 +30,9 @@
 #define _ATCA_VERSION_H
 
 // Version format yyyymmdd
-#define ATCA_LIBRARY_VERSION_DATE   "20200728"
+#define ATCA_LIBRARY_VERSION_DATE   "20200912"
 #define ATCA_LIBRARY_VERSION_MAJOR  3
 #define ATCA_LIBRARY_VERSION_MINOR  2
-#define ATCA_LIBRARY_VERSION_BUILD  2
+#define ATCA_LIBRARY_VERSION_BUILD  3
 
 #endif /* _ATCA_VERSION_H */