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

Submodules update #398

Merged
merged 4 commits into from
Dec 27, 2023
Merged

Submodules update #398

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
206116a
Updated submodules
danielinux Dec 27, 2023
f8ab11e
[tpmtools] Added missing include to policy_sign
danielinux Dec 27, 2023
1baf4d7
Updated binary sizes limit for wolfSSL 5.6.6
danielinux Dec 27, 2023
b1ff7b0
Fix return code to avoid TLS/SSL header use. Fixed in https://github.…
dgarske Dec 27, 2023
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
2 changes: 1 addition & 1 deletion lib/wolfTPM
Open in desktop
Submodule wolfTPM updated 55 files
+22 −1 .github/workflows/make-test-swtpm.yml
+61 −0 .github/workflows/win-test.yml
+6 −0 .gitignore
+2 −2 CMakeLists.txt
+46 −0 ChangeLog.md
+4 −4 IDE/STM32CUBE/include.am
+4 −1 IDE/STM32CUBE/wolftpm_test.c
+1 −3 IDE/STM32CUBE/wolftpm_test.h
+7 −0 IDE/VisualStudio/README.md
+12 −0 IDE/VisualStudio/include.am
+306 −0 IDE/VisualStudio/tls_server.vcxproj
+172 −0 IDE/VisualStudio/user_settings.h
+284 −0 IDE/VisualStudio/wolfcrypt_test.vcxproj
+368 −0 IDE/VisualStudio/wolfssl.vcxproj
+115 −0 IDE/VisualStudio/wolftpm.sln
+337 −0 IDE/VisualStudio/wolftpm.vcxproj
+306 −0 IDE/VisualStudio/wrap_test.vcxproj
+1 −0 IDE/include.am
+1 −0 Makefile.am
+4 −6 README.md
+1 −0 certs/certreq.sh
+7 −3 configure.ac
+2 −0 docs/WindowTBS.md
+5 −5 examples/boot/secret_seal.c
+23 −11 examples/csr/csr.c
+0 −2 examples/keygen/external_import.c
+13 −4 examples/nvram/store.c
+14 −7 examples/pcr/policy_sign.c
+51 −34 examples/run_examples.sh
+7 −3 examples/seal/seal.c
+48 −14 examples/seal/unseal.c
+0 −5 examples/timestamp/signed_timestamp.c
+70 −25 examples/tls/tls_client.c
+12 −3 examples/tls/tls_common.h
+165 −96 examples/tls/tls_server.c
+12 −5 examples/tpm_test_keys.c
+2 −0 examples/wrap/wrap_test.c
+4 −4 hal/tpm_io.c
+4 −4 hal/tpm_io.h
+1 −1 hal/tpm_io_linux.c
+79 −27 hal/tpm_io_st.c
+3 −2 src/include.am
+195 −260 src/tpm2.c
+1,193 −0 src/tpm2_cryptocb.c
+80 −14 src/tpm2_packet.c
+19 −26 src/tpm2_param_enc.c
+5 −6 src/tpm2_swtpm.c
+180 −670 src/tpm2_wrap.c
+106 −7 tests/unit_tests.c
+2 −2 wolftpm/tpm2.h
+28 −1 wolftpm/tpm2_packet.h
+13 −5 wolftpm/tpm2_types.h
+78 −14 wolftpm/tpm2_wrap.h
+2 −2 wolftpm/version.h
+10 −5 wolftpm/visibility.h
2 changes: 1 addition & 1 deletion lib/wolfssl
Open in desktop
Submodule wolfssl updated 489 files
10 changes: 5 additions & 5 deletions tools/test.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,25 +972,25 @@ test-size-all:
make keysclean
make test-size SIGN=ED25519 LIMIT=11380
make keysclean
make test-size SIGN=ECC256 LIMIT=17620
make test-size SIGN=ECC256 LIMIT=17696
make keysclean
make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13572
make keysclean
make test-size SIGN=RSA2048 LIMIT=10584
make keysclean
make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=10376
make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=10460
make keysclean
make test-size SIGN=RSA4096 LIMIT=11884
make keysclean
make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=10660
make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=10780
make keysclean
make test-size SIGN=ECC384 LIMIT=17280
make test-size SIGN=ECC384 LIMIT=17370
make keysclean
make test-size SIGN=ECC384 NO_ASM=1 LIMIT=15024
make keysclean
make test-size SIGN=ED448 LIMIT=13464
make keysclean
make test-size SIGN=RSA3072 LIMIT=11236
make keysclean
make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=10472
make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=10570
make keysclean
1 change: 1 addition & 0 deletions tools/tpm/policy_sign.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <wolfssl/wolfcrypt/ecc.h>
#include <wolfssl/wolfcrypt/hash.h>
#include <wolftpm/tpm2_wrap.h>
#include <wolfssl/error-ssl.h>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want to include any TLS/SSL headers.
Instead of adding this header please replace INPUT_SIZE_E with BUFFER_E.
See http://github.com/wolfSSL/wolftpm/pull/308

#include "tpm.h"

/* Default PCR (test) */
Expand Down
Loading