Skip to content

wolfCrypt 3 subset - Don't merge #6

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
tmael wants to merge 7 commits into
base: master
Choose a base branch
from
Open

wolfCrypt 3 subset - Don't merge #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
61b0904
Fix build err
tmael Mar 11, 2021
a86a1e8
Rebase to slimmed DO-178
tmael Mar 11, 2021
9589ad4
Revert AES
tmael Mar 11, 2021
4d70748
Doc update and cleanup
tmael Mar 30, 2021
f40e4c4
Add ecc key export and cert verify
tmael Jun 18, 2021
623bb2e
Remove malloc and fix various issues
tmael Jul 1, 2021
360cca3
Address review feedback and remove unneeded functionality
tmael Jul 2, 2021
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
20 changes: 4 additions & 16 deletions src/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@ endif

endif !BUILD_FIPS_RAND

src_libwolfssl_la_SOURCES += \
wolfcrypt/src/hash.c \
wolfcrypt/src/cpuid.c
#DO178 - uncomment to test on x86_64 with gcc
#src_libwolfssl_la_SOURCES += wolfcrypt/src/cpuid.c
#src_libwolfssl_la_SOURCES += wolfcrypt/src/logging.c

if !BUILD_FIPS_RAND

Expand Down Expand Up @@ -314,20 +314,8 @@ endif

endif !BUILD_FIPS_RAND

src_libwolfssl_la_SOURCES += \
wolfcrypt/src/logging.c \
wolfcrypt/src/wc_port.c \
wolfcrypt/src/error.c

if !BUILD_FIPS_RAND
src_libwolfssl_la_SOURCES += \
wolfcrypt/src/wc_encrypt.c \
wolfcrypt/src/signature.c \
wolfcrypt/src/wolfmath.c
endif !BUILD_FIPS_RAND

if BUILD_MEMORY
src_libwolfssl_la_SOURCES += wolfcrypt/src/memory.c
#src_libwolfssl_la_SOURCES += wolfcrypt/src/memory.c
endif

if !BUILD_FIPS_RAND
Expand Down
3 changes: 3 additions & 0 deletions src/ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4784,8 +4784,11 @@ int AddCA(WOLFSSL_CERT_MANAGER* cm, DerBuffer** pDer, int type, int verify)
signer->keyUsage = cert->extKeyUsageSet ? cert->extKeyUsage
: 0xFFFF;
signer->next = NULL; /* If Key Usage not set, all uses valid. */

#ifndef WOLFSSL_NO_MALLOC
cert->publicKey = 0; /* in case lock fails don't free here. */
cert->subjectCN = 0;
#endif
#ifndef IGNORE_NAME_CONSTRAINTS
cert->permittedNames = NULL;
cert->excludedNames = NULL;
Expand Down
11 changes: 0 additions & 11 deletions wolfcrypt/benchmark/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
# vim:ft=automake
# All paths should be given relative to the root

if BUILD_WOLFCRYPT_TESTS
if !BUILD_LINUXKM

noinst_PROGRAMS += wolfcrypt/benchmark/benchmark
wolfcrypt_benchmark_benchmark_SOURCES = wolfcrypt/benchmark/benchmark.c
wolfcrypt_benchmark_benchmark_LDADD = src/libwolfssl.la $(LIB_STATIC_ADD)
wolfcrypt_benchmark_benchmark_DEPENDENCIES = src/libwolfssl.la
noinst_HEADERS += wolfcrypt/benchmark/benchmark.h

endif
endif

EXTRA_DIST += wolfcrypt/benchmark/benchmark.sln
EXTRA_DIST += wolfcrypt/benchmark/benchmark.vcproj
Expand Down
Loading