diff --git a/lib/wolfTPM b/lib/wolfTPM
index 549783056..7c079dd3f 160000
--- a/lib/wolfTPM
+++ b/lib/wolfTPM
@@ -1 +1 @@
-Subproject commit 5497830567222e9a278e5a69aaeef32d5f3fc890
+Subproject commit 7c079dd3f0e40539519101cffd0c27c5d6c1777c
diff --git a/lib/wolfssl b/lib/wolfssl
index dc7e04415..66596ad9e 160000
--- a/lib/wolfssl
+++ b/lib/wolfssl
@@ -1 +1 @@
-Subproject commit dc7e044157dc05906e7993087b3d99cfed88b0d7
+Subproject commit 66596ad9e1d7efa8479656872cf09c9c1870a02e
diff --git a/tools/test.mk b/tools/test.mk
index 5bcd5d711..42dffaba5 100644
--- a/tools/test.mk
+++ b/tools/test.mk
@@ -972,19 +972,19 @@ 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
@@ -992,5 +992,5 @@ test-size-all:
 	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
diff --git a/tools/tpm/policy_sign.c b/tools/tpm/policy_sign.c
index 9cda2c4ff..ffd4ce37e 100644
--- a/tools/tpm/policy_sign.c
+++ b/tools/tpm/policy_sign.c
@@ -82,7 +82,7 @@ static int loadFile(const char* fname, byte** buf, size_t* bufLen)
                 ret = MEMORY_E;
         }
         else if (*buf != NULL && fileSz > (ssize_t)*bufLen) {
-            ret = INPUT_SIZE_E;
+            ret = BUFFER_E;
         }
         *bufLen = (size_t)fileSz;
         if (ret == 0) {