Skip to content
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

Jump to bottom

Refactoring of pkcs11_store.c module #481

Merged
merged 4 commits into from
Sep 6, 2024
Merged

Refactoring of pkcs11_store.c module #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6737d7e
Refactoring of PKCS11 store module + unit tests
danielinux Aug 12, 2024
a1a7601
Unit tests: cleanup warnings
danielinux Sep 6, 2024
2972998
Removed deprecate libcheck API
danielinux Sep 6, 2024
865e3ee
Fixed wrong check due to fail_if refactoring
danielinux Sep 6, 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
9 changes: 9 additions & 0 deletions options.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,3 +843,12 @@ endif
ifeq ($(SIGN_ALG),ext_LMS)
SIGN_ALG=LMS
endif

ifneq ($(KEYVAULT_OBJ_SIZE),)
CFLAGS+=-DKEYVAULT_OBJ_SIZE=$(KEYVAULT_OBJ_SIZE)
endif

ifneq ($(KEYVAULT_MAX_ITEMS),)
CFLAGS+=-DKEYVAULT_MAX_ITEMS=$(KEYVAULT_MAX_ITEMS)
endif

3 changes: 3 additions & 0 deletions src/image.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
#ifndef IMAGE_H_
#define IMAGE_H_

#ifdef UNIT_TEST
#include <stdio.h>
#endif
#include <wolfssl/wolfcrypt/settings.h> /* for wolfCrypt hash/sign routines */

#include <stddef.h>
Expand Down
6 changes: 3 additions & 3 deletions src/libwolfboot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,13 +1504,13 @@ ChaCha chacha;
int RAMFUNCTION chacha_init(void)
{
#if defined(MMU) || defined(UNIT_TEST)
uint8_t *key = ENCRYPT_KEY;
const uint8_t *key = ENCRYPT_KEY;
#else
uint8_t *key = (uint8_t *)(WOLFBOOT_PARTITION_BOOT_ADDRESS +
const uint8_t *key = (uint8_t *)(WOLFBOOT_PARTITION_BOOT_ADDRESS +
ENCRYPT_TMP_SECRET_OFFSET);
#endif
uint8_t ff[ENCRYPT_KEY_SIZE];
uint8_t* stored_nonce;
const uint8_t* stored_nonce;

#ifdef NVM_FLASH_WRITEONCE
key -= WOLFBOOT_SECTOR_SIZE * nvm_select_fresh_sector(PART_BOOT);
Expand Down
Loading
Loading