Skip to content

Commit

Permalink
Release v3.2.5 (20201130)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bryan-hunt
bryan-hunt committed Dec 2, 2020
1 parent af1ca6b commit 5f69624
Show file tree
Hide file tree
Showing 64 changed files with 3,421 additions and 4,831 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.6.4)
project (cryptoauthlib)

# Set the current release version
set(VERSION "3.2.4")
set(VERSION "3.2.5")
set(VERSION_MAJOR 3)
set(VERSION_MINOR 2)
set(VERSION_PATCH 4)
set(VERSION_PATCH 5)

# Build Options
option(BUILD_TESTS "Create Test Application with library" OFF)
Expand Down
10 changes: 10 additions & 0 deletions lib/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ execute_process(COMMAND ${CMAKE_COMMAND} --build .
file(GLOB MBEDTLS_LIB_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "../third_party/mbedtls/library/*.c")
add_library(mbedtls STATIC ${MBEDTLS_LIB_SRC})
target_compile_definitions(mbedtls PUBLIC -DMBEDTLS_CMAC_C)
if(NOT WIN32)
target_compile_options(mbedtls PRIVATE -fPIC)
endif()
include_directories(mbedtls PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../third_party/mbedtls/include)
endif()
Expand Down Expand Up @@ -326,11 +329,18 @@ target_link_libraries(cryptoauth rt)
endif(LINUX)

if(DEFAULT_LIB_PATH)
if(${CMAKE_VERSION} VERSION_GREATER "3.12.0")
install(TARGETS ${PROJECT_NAME}
LIBRARY
DESTINATION ${DEFAULT_LIB_PATH}
COMPONENT Libraries
NAMELINK_COMPONENT Development)
else()
install(TARGETS ${PROJECT_NAME}
LIBRARY
DESTINATION ${DEFAULT_LIB_PATH}
COMPONENT Libraries)
endif()
endif(DEFAULT_LIB_PATH)

if(DEFAULT_INC_PATH)
Expand Down
113 changes: 99 additions & 14 deletions lib/atca_basic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1260,21 +1260,21 @@ ATCA_STATUS atcab_genkey(uint16_t key_id, uint8_t* public_key)
*
* \return ATCA_SUCCESS on success, otherwise an error code.
*/
ATCA_STATUS atcab_get_pubkey(uint16_t key_id, uint8_t* public_key)
ATCA_STATUS atcab_get_pubkey_ext(ATCADevice device, uint16_t key_id, uint8_t* public_key)
{
ATCA_STATUS status = ATCA_UNIMPLEMENTED;
ATCADeviceType dev_type = atcab_get_device_type();
ATCADeviceType dev_type = atcab_get_device_type_ext(device);

if (atcab_is_ca_device(dev_type))
{
#if ATCA_CA_SUPPORT
status = calib_get_pubkey(_gDevice, key_id, public_key);
status = calib_get_pubkey(device, key_id, public_key);
#endif
}
else if (atcab_is_ta_device(dev_type))
{
#if ATCA_TA_SUPPORT
status = talib_get_pubkey_compat(_gDevice, key_id, public_key);
status = talib_get_pubkey_compat(device, key_id, public_key);
#endif
}
else
Expand All @@ -1284,6 +1284,22 @@ ATCA_STATUS atcab_get_pubkey(uint16_t key_id, uint8_t* public_key)
return status;
}

/** \brief Uses GenKey command to calculate the public key from an existing
* private key in a slot.
*
* \param[in] key_id Slot number of the private key.
* \param[out] public_key Public key will be returned here. Format will be
* the X and Y integers in big-endian format.
* 64 bytes for P256 curve. Set to NULL if public key
* isn't required.
*
* \return ATCA_SUCCESS on success, otherwise an error code.
*/
ATCA_STATUS atcab_get_pubkey(uint16_t key_id, uint8_t* public_key)
{
return atcab_get_pubkey_ext(_gDevice, key_id, public_key);
}

// HMAC command functions

/** \brief Issues a HMAC command, which computes an HMAC/SHA-256 digest of a
Expand Down Expand Up @@ -3097,6 +3113,7 @@ ATCA_STATUS atcab_sign_base(uint8_t mode, uint16_t key_id, uint8_t* signature)
* will be loaded into the Message Digest Buffer to the
* ATECC608 device or TempKey for other devices.
*
* \param[in] device Device context pointer
* \param[in] key_id Slot of the private key to be used to sign the
* message.
* \param[in] msg 32-byte message to be signed. Typically the SHA256
Expand All @@ -3107,10 +3124,10 @@ ATCA_STATUS atcab_sign_base(uint8_t mode, uint16_t key_id, uint8_t* signature)
*
* \return ATCA_SUCCESS on success, otherwise an error code.
*/
ATCA_STATUS atcab_sign(uint16_t key_id, const uint8_t* msg, uint8_t* signature)
ATCA_STATUS atcab_sign_ext(ATCADevice device, uint16_t key_id, const uint8_t* msg, uint8_t* signature)
{
ATCA_STATUS status = ATCA_UNIMPLEMENTED;
ATCADeviceType dev_type = atcab_get_device_type();
ATCADeviceType dev_type = atcab_get_device_type_ext(device);

if (atcab_is_ca_device(dev_type))
{
Expand All @@ -3131,6 +3148,26 @@ ATCA_STATUS atcab_sign(uint16_t key_id, const uint8_t* msg, uint8_t* signature)
return status;
}

/** \brief Executes Sign command, to sign a 32-byte external message using the
* private key in the specified slot. The message to be signed
* will be loaded into the Message Digest Buffer to the
* ATECC608 device or TempKey for other devices.
*
* \param[in] key_id Slot of the private key to be used to sign the
* message.
* \param[in] msg 32-byte message to be signed. Typically the SHA256
* hash of the full message.
* \param[out] signature Signature will be returned here. Format is R and S
* integers in big-endian format. 64 bytes for P256
* curve.
*
* \return ATCA_SUCCESS on success, otherwise an error code.
*/
ATCA_STATUS atcab_sign(uint16_t key_id, const uint8_t* msg, uint8_t* signature)
{
return atcab_sign_ext(_gDevice, key_id, msg, signature);
}

/** \brief Executes Sign command to sign an internally generated message.
*
* \param[in] key_id Slot of the private key to be used to sign the
Expand Down Expand Up @@ -3264,6 +3301,7 @@ ATCA_STATUS atcab_verify(uint8_t mode, uint16_t key_id, const uint8_t* signature
* the Message Digest Buffer to the ATECC608 device or TempKey for
* other devices.
*
* \param[in] device Device context pointer
* \param[in] message 32 byte message to be verified. Typically
* the SHA256 hash of the full message.
* \param[in] signature Signature to be verified. R and S integers in
Expand All @@ -3277,21 +3315,21 @@ ATCA_STATUS atcab_verify(uint8_t mode, uint16_t key_id, const uint8_t* signature
* \return ATCA_SUCCESS on verification success or failure, because the
* command still completed successfully.
*/
ATCA_STATUS atcab_verify_extern(const uint8_t* message, const uint8_t* signature, const uint8_t* public_key, bool* is_verified)
ATCA_STATUS atcab_verify_extern_ext(ATCADevice device, const uint8_t* message, const uint8_t* signature, const uint8_t* public_key, bool* is_verified)
{
ATCA_STATUS status = ATCA_UNIMPLEMENTED;
ATCADeviceType dev_type = atcab_get_device_type();
ATCADeviceType dev_type = atcab_get_device_type_ext(device);

if (atcab_is_ca_device(dev_type))
{
#ifdef ATCA_ECC_SUPPORT
status = calib_verify_extern(_gDevice, message, signature, public_key, is_verified);
status = calib_verify_extern(device, message, signature, public_key, is_verified);
#endif
}
else if (atcab_is_ta_device(dev_type))
{
#if ATCA_TA_SUPPORT
status = talib_verify_extern_compat(_gDevice, message, signature, public_key, is_verified);
status = talib_verify_extern_compat(device, message, signature, public_key, is_verified);
#endif
}
else
Expand All @@ -3301,6 +3339,30 @@ ATCA_STATUS atcab_verify_extern(const uint8_t* message, const uint8_t* signature
return status;
}

/** \brief Executes the Verify command, which verifies a signature (ECDSA
* verify operation) with all components (message, signature, and
* public key) supplied. The message to be signed will be loaded into
* the Message Digest Buffer to the ATECC608 device or TempKey for
* other devices.
*
* \param[in] message 32 byte message to be verified. Typically
* the SHA256 hash of the full message.
* \param[in] signature Signature to be verified. R and S integers in
* big-endian format. 64 bytes for P256 curve.
* \param[in] public_key The public key to be used for verification. X and
* Y integers in big-endian format. 64 bytes for
* P256 curve.
* \param[out] is_verified Boolean whether or not the message, signature,
* public key verified.
*
* \return ATCA_SUCCESS on verification success or failure, because the
* command still completed successfully.
*/
ATCA_STATUS atcab_verify_extern(const uint8_t* message, const uint8_t* signature, const uint8_t* public_key, bool* is_verified)
{
return atcab_verify_extern_ext(_gDevice, message, signature, public_key, is_verified);
}

/** \brief Executes the Verify command with verification MAC, which verifies a
* signature (ECDSA verify operation) with all components (message,
* signature, and public key) supplied. This function is only available
Expand Down Expand Up @@ -3349,6 +3411,7 @@ ATCA_STATUS atcab_verify_extern_mac(const uint8_t* message, const uint8_t* signa
* message to be signed will be loaded into the Message Digest Buffer
* to the ATECC608 device or TempKey for other devices.
*
* \param[in] device Device context pointer
* \param[in] message 32 byte message to be verified. Typically
* the SHA256 hash of the full message.
* \param[in] signature Signature to be verified. R and S integers in
Expand All @@ -3361,21 +3424,21 @@ ATCA_STATUS atcab_verify_extern_mac(const uint8_t* message, const uint8_t* signa
* \return ATCA_SUCCESS on verification success or failure, because the
* command still completed successfully.
*/
ATCA_STATUS atcab_verify_stored(const uint8_t* message, const uint8_t* signature, uint16_t key_id, bool* is_verified)
ATCA_STATUS atcab_verify_stored_ext(ATCADevice device, const uint8_t* message, const uint8_t* signature, uint16_t key_id, bool* is_verified)
{
ATCA_STATUS status = ATCA_UNIMPLEMENTED;
ATCADeviceType dev_type = atcab_get_device_type();
ATCADeviceType dev_type = atcab_get_device_type_ext(device);

if (atcab_is_ca_device(dev_type))
{
#ifdef ATCA_ECC_SUPPORT
status = calib_verify_stored(_gDevice, message, signature, key_id, is_verified);
status = calib_verify_stored(device, message, signature, key_id, is_verified);
#endif
}
else if (atcab_is_ta_device(dev_type))
{
#if ATCA_TA_SUPPORT
status = talib_verify_stored_compat(_gDevice, message, signature, key_id, is_verified);
status = talib_verify_stored_compat(device, message, signature, key_id, is_verified);
#endif
}
else
Expand All @@ -3385,6 +3448,28 @@ ATCA_STATUS atcab_verify_stored(const uint8_t* message, const uint8_t* signature
return status;
}

/** \brief Executes the Verify command, which verifies a signature (ECDSA
* verify operation) with a public key stored in the device. The
* message to be signed will be loaded into the Message Digest Buffer
* to the ATECC608 device or TempKey for other devices.
*
* \param[in] message 32 byte message to be verified. Typically
* the SHA256 hash of the full message.
* \param[in] signature Signature to be verified. R and S integers in
* big-endian format. 64 bytes for P256 curve.
* \param[in] key_id Slot containing the public key to be used in the
* verification.
* \param[out] is_verified Boolean whether or not the message, signature,
* public key verified.
*
* \return ATCA_SUCCESS on verification success or failure, because the
* command still completed successfully.
*/
ATCA_STATUS atcab_verify_stored(const uint8_t* message, const uint8_t* signature, uint16_t key_id, bool* is_verified)
{
return atcab_verify_stored_ext(_gDevice, message, signature, key_id, is_verified);
}

/** \brief Executes the Verify command with verification MAC, which verifies a
* signature (ECDSA verify operation) with a public key stored in the
* device. This function is only available on the ATECC608.
Expand Down
Loading

0 comments on commit 5f69624

Please sign in to comment.