More CI fixes.

.github/workflows/make-test-swtpm.yml

@@ -57,15 +57,15 @@ jobs:
     - name: make no wolfCrypt
       run: make
     - name: make check no wolfCrypt
-      run: WOLFSSL_PATH=./wolfssl make check -j1
+      run: WOLFSSL_PATH=./wolfssl WOLFCRYPT_ENABLE=0 make check -j1
 
 #test no wrapper
     - name: configure no wrapper
       run: ./configure --enable-swtpm --disable-wrapper
     - name: make no wrapper
       run: make
     - name: make check no wrapper
-      run: WOLFSSL_PATH=./wolfssl make check -j1
+      run: ./examples/native/native_test
 
 # test small stack
     - name: configure smallstack

configure.ac

@@ -350,7 +350,8 @@ then
     AM_CFLAGS="$AM_CFLAGS -DWOLFTPM_SMALL_STACK"
 
     # Reduces max packet and buffer sizes to 1024 bytes
-    AM_CFLAGS="$AM_CFLAGS -DMAX_COMMAND_SIZE=1024 -DMAX_RESPONSE_SIZE=1024 -DWOLFTPM2_MAX_BUFFER=1500 -DMAX_DIGEST_BUFFER=973"
+    # RSA KeyGen response is 1289 MAX_RESPONSE_SIZE
+    AM_CFLAGS="$AM_CFLAGS -DMAX_COMMAND_SIZE=1024 -DMAX_RESPONSE_SIZE=1300 -DWOLFTPM2_MAX_BUFFER=1500 -DMAX_DIGEST_BUFFER=973"
 
     # If parameter encryption is not used then maximum session count is one
     if test "x$ENABLED_WOLFCRYPT" = "xno"

examples/attestation/activate_credential.c

@@ -57,7 +57,7 @@ int TPM2_ActivateCredential_Example(void* userCtx, int argc, char *argv[])
     WOLFTPM2_KEY *primary = NULL;
     WOLFTPM2_KEYBLOB akKey;
     WOLFTPM2_SESSION tpmSession;
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     FILE *fp;
     int dataSize = 0;
 #endif
@@ -174,7 +174,7 @@ int TPM2_ActivateCredential_Example(void* userCtx, int argc, char *argv[])
     cmdIn.activCred.activateHandle = akKey.handle.hndl;
     cmdIn.activCred.keyHandle = primary->handle.hndl;
     /* Read credential from the user file */
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     fp = XFOPEN(input, "rb");
     if (fp != XBADFILE) {
         dataSize = (int)XFREAD((BYTE*)&cmdIn.activCred.credentialBlob, 1,

examples/attestation/make_credential.c

@@ -59,7 +59,7 @@ int TPM2_MakeCredential_Example(void* userCtx, int argc, char *argv[])
     WOLFTPM2_KEYBLOB primary;
     WOLFTPM2_HANDLE handle;
     TPM2B_NAME name;
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     FILE *fp;
     int dataSize = 0;
 #endif
@@ -141,7 +141,7 @@ int TPM2_MakeCredential_Example(void* userCtx, int argc, char *argv[])
     printf("Public key for encryption loaded\n");
     handle.hndl = cmdOut.loadExtOut.objectHandle;
 
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     /* Load AK Name digest */
     fp = XFOPEN("ak.name", "rb");
     if (fp != XBADFILE) {
@@ -170,7 +170,7 @@ int TPM2_MakeCredential_Example(void* userCtx, int argc, char *argv[])
     }
     printf("TPM2_MakeCredential success\n");
 
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     fp = XFOPEN(output, "wb");
     if (fp != XBADFILE) {
         dataSize = (int)XFWRITE((BYTE*)&cmdOut.makeCred.credentialBlob, 1,

examples/keygen/external_import.c

@@ -89,7 +89,7 @@ int TPM2_ExternalImport_Example(void* userCtx, int argc, char *argv[])
     TPMT_PUBLIC publicTemplate3;
     TPMA_OBJECT attributes;
     TPMI_ALG_PUBLIC alg = TPM_ALG_RSA;
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     const char* keyblobFile = "keyblob.bin";
 #endif
     int loadKeyBlob = 0;
@@ -206,7 +206,7 @@ int TPM2_ExternalImport_Example(void* userCtx, int argc, char *argv[])
         TPM2_PrintBin(rsaKey3->priv.buffer, rsaKey3->priv.size);
 
         /* Save key as encrypted blob to the disk */
-    #if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+    #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
         rc = writeKeyBlob(keyblobFile, rsaKey3);
         if (rc != TPM_RC_SUCCESS) {
             printf("Error saving keyblob.bin: %d\n", rc);

examples/keygen/keygen.c

@@ -136,9 +136,9 @@ int TPM2_Keygen_Example(void* userCtx, int argc, char *argv[])
     const char *ekPubFile = "ek.pub";
     const char *srkPubFile = "srk.pub";
     const char *pubFilename = NULL;
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     const char *nameFile = "ak.name"; /* Name Digest for attestation purposes */
-    #if !defined(NO_RSA)
+    #if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_RSA)
     const char *pemFilename = NULL;
     #endif
     FILE *fp;
@@ -350,7 +350,7 @@ int TPM2_Keygen_Example(void* userCtx, int argc, char *argv[])
         newKeyBlob.pub.size, newKeyBlob.priv.size);
 
     /* Save key as encrypted blob to the disk */
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     rc = writeKeyBlob(outputFile, &newKeyBlob);
     /* Generate key artifacts needed for remote attestation */
     if (bAIK) {
@@ -376,8 +376,8 @@ int TPM2_Keygen_Example(void* userCtx, int argc, char *argv[])
 #endif
 
     /* Save EK public key as PEM format file to the disk */
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM) && \
-    !defined(NO_RSA)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES) && \
+    !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_RSA)
     if (pemFiles) {
         byte pem[MAX_RSA_KEY_BYTES];
         word32 pemSz;

examples/keygen/keyimport.c

@@ -187,7 +187,7 @@ int TPM2_Keyimport_Example(void* userCtx, int argc, char *argv[])
              TPMA_OBJECT_userWithAuth |
              TPMA_OBJECT_noDA);
 
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     if (impFile != NULL) {
         printf("Loading %s%s key file: %s\n",
             encType == ENCODING_TYPE_PEM ? "PEM" : "DER",
@@ -244,7 +244,7 @@ int TPM2_Keyimport_Example(void* userCtx, int argc, char *argv[])
         TPM2_GetAlgName(alg), impKey.pub.size, impKey.priv.size);
 
     /* Save key as encrypted blob to the disk */
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM) && \
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES) && \
     !defined(NO_WRITE_TEMP_FILES)
     rc = writeKeyBlob(outputFile, &impKey);
 #else

examples/keygen/keyload.c

@@ -154,7 +154,7 @@ int TPM2_Keyload_Example(void* userCtx, int argc, char *argv[])
     }
 
     /* Load encrypted key from the disk */
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     rc = readKeyBlob(inputFile, &newKey);
     if (rc != 0) goto exit;
 #else

examples/pcr/extend.c

@@ -59,7 +59,8 @@ int TPM2_PCR_Extend_Test(void* userCtx, int argc, char *argv[])
     WOLFTPM2_DEV dev;
     /* Arbitrary user data provided through a file */
     const char *filename = "input.data";
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES) && \
+    !defined(WOLFTPM2_NO_WOLFCRYPT)
     XFILE fp = NULL;
     size_t len;
     BYTE hash[TPM_SHA256_DIGEST_SIZE];
@@ -120,7 +121,8 @@ int TPM2_PCR_Extend_Test(void* userCtx, int argc, char *argv[])
     cmdIn.pcrExtend.digests.digests[0].hashAlg = TPM_ALG_SHA256;
 
     /* Prepare the hash from user file or predefined value */
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES) && \
+    !defined(WOLFTPM2_NO_WOLFCRYPT)
     if (filename) {
         fp = XFOPEN(filename, "rb");
     }

examples/pcr/quote.c

@@ -71,7 +71,7 @@ int TPM2_PCR_Quote_Test(void* userCtx, int argc, char *argv[])
     } cmdOut;
     TPM_ALG_ID paramEncAlg = TPM_ALG_NULL;
     WOLFTPM2_SESSION tpmSession;
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     XFILE f;
 #endif
 
@@ -190,7 +190,7 @@ int TPM2_PCR_Quote_Test(void* userCtx, int argc, char *argv[])
     data = (UINT8*)&cmdOut.quoteResult.quoted;
     data += sizeof(UINT16); /* skip the size field of TPMS_ATTEST */
     dataSz = (int)sizeof(TPMS_ATTEST) - sizeof(UINT16);
-#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
     f = XFOPEN(outputFile, "wb");
     if (f != XBADFILE) {
         dataSz = (int)XFWRITE(data, 1, dataSz, f);