Skip to content

Make writing to a zone possiblr #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Make writing to a zone possiblr #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6b82b4a
Make writing to a zone possiblr
Cybnon Sep 17, 2024
c6e8dbf
Remove generated content
Cybnon Sep 18, 2024
6601c6a
Adapt Writing and Reading
Cybnon Sep 18, 2024
e10fb94
Remove unneeded code
Cybnon Sep 18, 2024
f785d15
Revert "Remove unneeded code"
Cybnon Sep 18, 2024
0f8b451
Remove false config check
Cybnon Sep 19, 2024
92bf392
Adapt read function
Cybnon Sep 19, 2024
e0ba3c4
Adapt config to create big enough data zone on slot 8
Cybnon Sep 19, 2024
031f541
Improve config
Cybnon Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions include/atecc608_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <bitset>



// Exemple of configuration for ATECC608A. Look at page 8 on the datasheet for ATECC608A-TFLXTLS
const uint8_t ECCX08_DEFAULT_CONFIGURATION_VALS[112] = {
// Read only - end
Expand All @@ -16,21 +15,21 @@ const uint8_t ECCX08_DEFAULT_CONFIGURATION_VALS[112] = {
// ChipMode
0x00,
// SlotConfig
0x83, 0x60,
0x87, 0x60,
0x8F, 0x60,
0x83, 0x60,
0x83, 0x60,
0x87, 0x60,
0x8F, 0x60,
0x83, 0x60,
0x83, 0x60,
0x8F, 0x8F,
0x9F, 0x8F,
0x9F, 0x8F,
0xAF, 0x8F,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
0xAF, 0x8F,
// Counter[0]
0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
Expand All @@ -43,7 +42,7 @@ const uint8_t ECCX08_DEFAULT_CONFIGURATION_VALS[112] = {
0xFF, 0xFF, 0xFF, 0xFF,
// Write via commands only - start
// UserExtra
0x00,
0x00,
// Selector
0x00,
// LockValue
Expand All @@ -66,8 +65,8 @@ const uint8_t ECCX08_DEFAULT_CONFIGURATION_VALS[112] = {
0x1C, 0x00,
0x1C, 0x00,
0x1C, 0x00,
0x3C, 0x00,
0x3C, 0x00,
0x00, 0x00,
0x00, 0x00,
0x3C, 0x00,
0x3C, 0x00,
0x3C, 0x00,
Expand Down
109 changes: 68 additions & 41 deletions src/atecc608_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,92 +208,119 @@ int atecc_handler_inject_priv_key(int slot, uint8_t* priv_key){
return status;
}

/** save data in slot
/** save data in slot
* \param[in] slot slot number to which data is to be written
* \param[in] data data byte array to write
* \param[in] data_len length of the data byte array
* \param[in] data_len length of the data byte array (must be a multiple of 32)
* \return ATCA_SUCCESS on success, otherwise an error code.
*/
int atecc_handler_write_data(int slot, uint8_t* data, size_t data_len) {
ATCA_STATUS status = ATCA_GEN_FAIL;
uint8_t config_data[128];
if (!data || data_len == 0 || data_len % 4 != 0) {
return ATCA_BAD_PARAM;
}

// Wake up the device
status = atcab_wakeup();
size_t slot_size;
ATCA_STATUS status = atcab_get_zone_size(ATCA_ZONE_DATA, slot, &slot_size);
if (status != ATCA_SUCCESS) {
return status;
}

// Read the configuration zone
status = atecc_handler_read_configuration(config_data);
if (data_len > slot_size) {
return slot_size;
}

status = atcab_wakeup();
if (status != ATCA_SUCCESS) {
return status;
}

/* Check if writing is allowed for the given slot */
std::bitset<8> slotConfig_H = config_data[21 + (slot * 2)];
if (!slotConfig_H[6]) { // Example condition; adapt as necessary
return ATCA_EXECUTION_ERROR;
}
size_t bytes_written = 0;
size_t remaining_bytes = data_len;

/* Config Zone should be locked for this process */
status = check_lock_zone(LOCK_ZONE_CONFIG);
if (status == ATCA_NOT_LOCKED) {
return status;
// Write full 32-byte blocks
while (remaining_bytes >= 32) {
size_t block = bytes_written / 32;
status = atcab_write_zone(ATCA_ZONE_DATA, slot, block, 0, &data[bytes_written], 32);
if (status != ATCA_SUCCESS) {
return status;
}
bytes_written += 32;
remaining_bytes -= 32;
}

// Write data to the specified slot
status = atcab_write_bytes_zone(ATCA_ZONE_DATA, slot, 0, data, data_len);
if (status != ATCA_SUCCESS) {
return status;
// Write remaining 4-byte words
while (remaining_bytes >= 4) {
size_t block = bytes_written / 32;
size_t offset = (bytes_written % 32) / 4;
status = atcab_write_zone(ATCA_ZONE_DATA, slot, block, offset, &data[bytes_written], 4);
if (status != ATCA_SUCCESS) {
return status;
}
bytes_written += 4;
remaining_bytes -= 4;
}

return ATCA_SUCCESS;
}



/* read data from slot
* \param[in] slot slot number from which data is to be read
* \param[out] data buffer to store the read data
* \param[in] data_len length of the data byte array
* \param[in] data_len length of the data byte array (must be a multiple of 32)
* \return ATCA_SUCCESS on success, otherwise an error code.
*/
int atecc_handler_read_data(int slot, uint8_t* data, size_t data_len) {
ATCA_STATUS status = ATCA_GEN_FAIL;
uint8_t config_data[128];
if (!data || data_len == 0 || data_len % 4 != 0) {
return ATCA_BAD_PARAM;
}

// Wake up the device
status = atcab_wakeup();
size_t slot_size;
ATCA_STATUS status = atcab_get_zone_size(ATCA_ZONE_DATA, slot, &slot_size);
if (status != ATCA_SUCCESS) {
return status;
}

// Read the configuration zone
status = atecc_handler_read_configuration(config_data);
if (data_len > slot_size) {
return ATCA_BAD_PARAM; // Data length exceeds slot size
}

status = atcab_wakeup();
if (status != ATCA_SUCCESS) {
return status;
}

/* Check if reading is allowed for the given slot */
std::bitset<8> slotConfig_H = config_data[21 + (slot * 2)];
if (!slotConfig_H[6]) { // Example condition; adapt as necessary
return ATCA_EXECUTION_ERROR;
}
size_t num_blocks = data_len / 32;
size_t remaining_bytes = data_len % 32;
size_t bytes_read = 0;

/* Config Zone should be locked for this process */
status = check_lock_zone(LOCK_ZONE_CONFIG);
if (status == ATCA_NOT_LOCKED) {
return status;
// Read full 32-byte blocks
for (size_t i = 0; i < num_blocks; i++) {
status = atcab_read_zone(ATCA_ZONE_DATA, slot, i, 0, &data[bytes_read], 32);
if (status != ATCA_SUCCESS) {
return status;
}
bytes_read += 32;
}

// Read data from the specified slot
status = atcab_read_bytes_zone(ATCA_ZONE_DATA, slot, 0, data, data_len);
if (status != ATCA_SUCCESS) {
return status;
// Read remaining 4-byte words
size_t num_words = remaining_bytes / 4;
for (size_t w = 0; w < num_words; w++) {
size_t block = num_blocks;
size_t offset = w;
status = atcab_read_zone(ATCA_ZONE_DATA, slot, block, offset, &data[bytes_read], 4);
if (status != ATCA_SUCCESS) {
return status;
}
bytes_read += 4;
}

return ATCA_SUCCESS;
}



/** \brief Initialize atecc object and bus
* \param[in] slot slot number of key to be written
* \param[in] pub_key public key will be written here
Expand Down