Skip to content

Commit

Permalink
Merge pull request #231 from danielinux/prepare-v1.12
Browse files Browse the repository at this point in the history
Preparing release v1.12
  • Loading branch information
dgarske committed Jul 26, 2022
2 parents 3c2c26b + 829fd1c commit e1d986a
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 18 deletions.
10 changes: 10 additions & 0 deletions README.md
Expand Up @@ -288,3 +288,13 @@ USE_LOCAL_WOLFSSL=/usr/local pip3 install .
* Fix risc-V 32bit port (missing include)
* Fix STM32L4 (VTOR alignments; clock setting clash in libwolfboot)
* STM32H7: improve HAL and documentation

### V1.12 (2022-07-26)
* Encrypted delta updates
* Support RSA3072 signature verification
* Partition ID support to include custom additional images
* New format to store multiple public keys, using keystore
* Several fixes to keytools and IDE support
* Added new test cases
* Hardware support
* New HAL: Simulated target for rapid tests
4 changes: 2 additions & 2 deletions include/wolfboot/version.h
Expand Up @@ -29,8 +29,8 @@ extern "C" {
#endif


#define LIBWOLFBOOT_VERSION_STRING "1.11.0"
#define LIBWOLFBOOT_VERSION_HEX 0x010b0000
#define LIBWOLFBOOT_VERSION_STRING "1.12.0"
#define LIBWOLFBOOT_VERSION_HEX 0x010C0000

#ifndef WOLFBOOT_VERSION
#define WOLFBOOT_VERSION LIBWOLFBOOT_VERSION_HEX
Expand Down
2 changes: 1 addition & 1 deletion lib/wolfTPM
Submodule wolfTPM updated 88 files
+1 −1 CMakeLists.txt
+35 −0 ChangeLog.md
+2 −2 IDE/OPENSTM32/Inc/wolftpm_example.h
+3 −2 IDE/OPENSTM32/Src/main.c
+2 −2 IDE/OPENSTM32/Src/wolftpm_example.c
+10 −5 configure.ac
+2 −2 examples/attestation/activate_credential.c
+2 −2 examples/attestation/credential.h
+2 −2 examples/attestation/make_credential.c
+2 −2 examples/bench/bench.c
+2 −2 examples/bench/bench.h
+131 −151 examples/csr/csr.c
+2 −2 examples/csr/csr.h
+2 −2 examples/gpio/gpio.h
+2 −2 examples/gpio/gpio_config.c
+2 −2 examples/gpio/gpio_read.c
+2 −2 examples/gpio/gpio_set.c
+1 −1 examples/keygen/create_primary.c
+2 −2 examples/keygen/keygen.c
+2 −2 examples/keygen/keygen.h
+2 −2 examples/keygen/keyimport.c
+2 −2 examples/keygen/keyload.c
+2 −2 examples/management/flush.c
+2 −2 examples/management/flush.h
+2 −2 examples/native/native_test.c
+2 −2 examples/native/native_test.h
+2 −2 examples/nvram/nvram.h
+2 −2 examples/nvram/read.c
+2 −2 examples/nvram/store.c
+2 −2 examples/pcr/extend.c
+2 −2 examples/pcr/pcr.h
+2 −2 examples/pcr/quote.c
+2 −2 examples/pcr/quote.h
+2 −2 examples/pcr/read_pcr.c
+2 −2 examples/pcr/reset.c
+7 −9 examples/pkcs7/pkcs7.c
+2 −2 examples/pkcs7/pkcs7.h
+2 −2 examples/seal/seal.c
+2 −2 examples/seal/seal.h
+2 −2 examples/seal/unseal.c
+2 −2 examples/timestamp/clock_set.c
+2 −2 examples/timestamp/clock_set.h
+2 −2 examples/timestamp/signed_timestamp.c
+2 −2 examples/timestamp/signed_timestamp.h
+7 −9 examples/tls/tls_client.c
+2 −2 examples/tls/tls_client.h
+2 −2 examples/tls/tls_client_notpm.c
+2 −2 examples/tls/tls_common.h
+7 −9 examples/tls/tls_server.c
+2 −2 examples/tls/tls_server.h
+2 −2 examples/tpm_io.c
+2 −2 examples/tpm_io.h
+2 −2 examples/tpm_io_atmel.c
+2 −2 examples/tpm_io_barebox.c
+2 −2 examples/tpm_io_linux.c
+2 −2 examples/tpm_io_qnx.c
+2 −2 examples/tpm_io_st.c
+2 −2 examples/tpm_io_xilinx.c
+2 −2 examples/tpm_test.h
+2 −2 examples/tpm_test_keys.c
+2 −2 examples/tpm_test_keys.h
+4 −4 examples/wrap/wrap_test.c
+2 −2 examples/wrap/wrap_test.h
+5 −4 src/tpm2.c
+1 −1 src/tpm2_linux.c
+1 −1 src/tpm2_packet.c
+1 −1 src/tpm2_param_enc.c
+1 −1 src/tpm2_swtpm.c
+1 −1 src/tpm2_tis.c
+1 −1 src/tpm2_winapi.c
+458 −74 src/tpm2_wrap.c
+39 −2 tests/unit_tests.c
+1 −1 wolftpm/options.h.in
+1 −1 wolftpm/tpm2.h
+2 −2 wolftpm/tpm2_linux.h
+1 −1 wolftpm/tpm2_packet.h
+2 −2 wolftpm/tpm2_param_enc.h
+2 −2 wolftpm/tpm2_socket.h
+2 −2 wolftpm/tpm2_swtpm.h
+1 −1 wolftpm/tpm2_tis.h
+46 −17 wolftpm/tpm2_types.h
+2 −2 wolftpm/tpm2_winapi.h
+225 −6 wolftpm/tpm2_wrap.h
+3 −3 wolftpm/version.h
+1 −1 wolftpm/version.h.in
+1 −1 wolftpm/visibility.h
+380 −76 wrapper/CSharp/wolfTPM-tests.cs
+758 −118 wrapper/CSharp/wolfTPM.cs
4 changes: 2 additions & 2 deletions src/xmalloc.c
Expand Up @@ -62,7 +62,7 @@ struct xmalloc_slot {
#ifndef USE_FAST_MATH
/* SP MATH */
#ifdef WOLFBOOT_SIGN_ECC256
#define MP_CURVE_SPECS_SIZE (152)
#define MP_CURVE_SPECS_SIZE (80)
#ifdef WOLFSSL_SP_ARM_CORTEX_M_ASM
#define MP_POINT_SIZE (196)
#define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 18 * 8)
Expand All @@ -76,7 +76,7 @@ struct xmalloc_slot {
#endif
#endif /* WOLFBOOT_SIGN_ECC256 */
#ifdef WOLFBOOT_SIGN_ECC384
#define MP_CURVE_SPECS_SIZE (152)
#define MP_CURVE_SPECS_SIZE (112)
#ifdef WOLFSSL_SP_ARM_CORTEX_M_ASM
#define MP_POINT_SIZE (292)
#define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 18 * 12)
Expand Down
25 changes: 13 additions & 12 deletions tools/test.mk
Expand Up @@ -879,30 +879,31 @@ test-all: clean
make test-fastmath-smallstack
make test-delta-update


test-size-all:
make test-size SIGN=NONE LIMIT=4646
make keysclean
make test-size SIGN=ED25519 LIMIT=11366
make test-size SIGN=ED25519 LIMIT=11262
make keysclean
make test-size SIGN=ECC256 LIMIT=22118
make test-size SIGN=ECC256 LIMIT=22134
make keysclean
make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13878
make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13586
make keysclean
make test-size SIGN=RSA2048 LIMIT=13110
make test-size SIGN=RSA2048 LIMIT=11038
make keysclean
make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=13274
make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=11058
make keysclean
make test-size SIGN=RSA4096 LIMIT=13446
make test-size SIGN=RSA4096 LIMIT=11386
make keysclean
make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=13526
make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=11314
make keysclean
make test-size SIGN=ECC384 LIMIT=17722
make test-size SIGN=ECC384 LIMIT=17470
make keysclean
make test-size SIGN=ECC384 NO_ASM=1 LIMIT=15486
make test-size SIGN=ECC384 NO_ASM=1 LIMIT=15022
make keysclean
make test-size SIGN=ED448 LIMIT=13718
make test-size SIGN=ED448 LIMIT=13278
make keysclean
make test-size SIGN=RSA3072 LIMIT=13302
make test-size SIGN=RSA3072 LIMIT=11234
make keysclean
make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=13382
make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=11154
make keysclean

0 comments on commit e1d986a

Please sign in to comment.