Merge pull request wolfSSL#86 from danielinux/RSA4096_fix

Fixed build with RSA4096 (tfm.o was missing)
kojo1 · Nov 5, 2020 · 14b8dc2 · 14b8dc2
2 parents 4e823af + 5562107
commit 14b8dc2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/wolfssl b/lib/wolfssl
diff --git a/options.mk b/options.mk
@@ -75,6 +75,7 @@ ifeq ($(SIGN),RSA4096)
     ./lib/wolfssl/wolfcrypt/src/hash.o \
     ./lib/wolfssl/wolfcrypt/src/wolfmath.o \
     ./lib/wolfssl/wolfcrypt/src/wc_port.o \
+    ./lib/wolfssl/wolfcrypt/src/tfm.o \
     ./src/xmalloc_rsa.o
   PUBLIC_KEY_OBJS=./src/rsa4096_pub_key.o
   CFLAGS+=-DWOLFBOOT_SIGN_RSA4096 -DXMALLOC_USER $(RSA_EXTRA_CFLAGS) \
+0 −1		CMakeLists.txt
+13 −1		configure.ac
+42 −2		examples/client/client.c
+42 −2		examples/server/server.c
+39 −11		scripts/ocsp-stapling.test
+22 −4		scripts/ocsp-stapling2.test
+1 −1		scripts/openssl.test
+0 −5		src/include.am
+1 −1		src/sniffer.c
+16 −4		sslSniffer/sslSnifferTest/snifftest.c
+1 −1		tests/api.c
+5 −0		testsuite/testsuite.c
+4 −3		wolfcrypt/benchmark/benchmark.c
+134 −17		wolfcrypt/src/asn.c
+2 −1		wolfcrypt/src/chacha.c
+2 −1		wolfcrypt/src/chacha20_poly1305.c
+2 −1		wolfcrypt/src/cpuid.c
+0 −37		wolfcrypt/src/debug.c
+30 −121		wolfcrypt/src/ecc.c
+32 −0		wolfcrypt/src/logging.c
+25 −13		wolfcrypt/src/rsa.c
+144 −140		wolfcrypt/src/sha512_asm.S
+31 −19		wolfcrypt/test/test.c
+4 −0		wolfssl/wolfcrypt/asn.h
+1 −1		wolfssl/wolfcrypt/cpuid.h
+3 −0		wolfssl/wolfcrypt/ecc.h
+4 −0		wolfssl/wolfcrypt/logging.h
+0 −1		wolfssl/wolfcrypt/settings.h