Skip to content

Commit

Permalink
Update wolfPKCS11 to v1.3.0. Fixed doc
Browse files Browse the repository at this point in the history
  • Loading branch information
danielinux committed Apr 16, 2024
1 parent 1db4189 commit da5b738
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions docs/STM32-TZ.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ are accessible from any software staged in non-secure domain.

### Compiling wolfBoot with wolfCrypt in TrustZone-M secure domain

When wolfBoot is compiled with the options `TZEN=1` and `WOLFCRYPT_TZ_ENGINE=1`,
When wolfBoot is compiled with the options `TZEN=1` and `WOLFCRYPT_TZ=1`,
a more complete set of components of the wolfCrypt crypto library are built-in
the bootloader, and they can be accessed by applications or OSs running in
non-secure domain through non-secure callable APIs.
Expand All @@ -19,7 +19,7 @@ This feature is used to isolate the core crypto operations from the applications

### PKCS11 API in non-secure world

The `WOLFCRYPT_TZ_PKCS11` provides a standard PKCS11 interface,
The `WOLFCRYPT_TZ_PKCS11` option provides a standard PKCS11 interface,
including a storage for PKCS11 objects in a dedicated flash area in secure mode.

This means that applications, TLS libraries and operating systems running in
Expand Down
21 changes: 11 additions & 10 deletions include/user_settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -255,19 +255,20 @@ extern int tolower(int c);

#if defined(SECURE_PKCS11)
# define HAVE_PWDBASED
# define HAVE_PBKDF2
# define WOLFPKCS11_CUSTOM_STORE
# define WOLFBOOT_SECURE_PKCS11
# define WOLFPKCS11_USER_SETTINGS
# define WOLFPKCS11_NO_TIME
# define WOLFSSL_AES_COUNTER
# define HAVE_PBKDF2
# define WOLFPKCS11_CUSTOM_STORE
# define WOLFBOOT_SECURE_PKCS11
# define WOLFPKCS11_USER_SETTINGS
# define WOLFPKCS11_NO_TIME
# define WOLFSSL_AES_COUNTER
# define WOLFSSL_AES_DIRECT
# define WOLFSSL_AES_GCM
# define ENCRYPT_WITH_AES128
# define ENCRYPT_WITH_AES128
# define WOLFSSL_AES_128
# define HAVE_SCRYPT
# define HAVE_AESGCM
typedef unsigned long time_t;
# define HAVE_SCRYPT
# define HAVE_AESGCM
# define HAVE_PKCS8
typedef unsigned long time_t;
#endif

#ifndef HAVE_PWDBASED
Expand Down

0 comments on commit da5b738

Please sign in to comment.