Fixes for building with --disable-wolfcrypt.

Author: dgarske

examples/attestation/make_credential.c

@@ -141,13 +141,15 @@ 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)
     /* Load AK Name digest */
     fp = XFOPEN("ak.name", "rb");
     if (fp != XBADFILE) {
         XFREAD((BYTE*)&name, 1, sizeof(name), fp);
         printf("Read AK Name digest\n");
         XFCLOSE(fp);
     }
+#endif
 
     /* Create secret for the attestation server */
     cmdIn.makeCred.credential.size = CRED_SECRET_SIZE;

examples/keygen/keygen.c

@@ -129,14 +129,16 @@ int TPM2_Keygen_Example(void* userCtx, int argc, char *argv[])
     int bAIK = 1;
     int keyBits = 256;
     const char *outputFile = "keyblob.bin";
-    const char *nameFile = "ak.name"; /* Name Digest for attestation purposes */
     const char *ekPubFile = "ek.pub";
     const char *srkPubFile = "srk.pub";
     const char *pubFilename = NULL;
+#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
+    const char *nameFile = "ak.name"; /* Name Digest for attestation purposes */
     const char *pemFilename = NULL;
+    FILE *fp;
+#endif
     size_t len = 0;
     char symMode[] = "aesctr";
-    FILE *fp;
 
     if (argc >= 2) {
         if (XSTRNCMP(argv[1], "-?", 2) == 0 ||

examples/tpm_test_keys.c

@@ -39,13 +39,13 @@ int writeKeyPubPem(const char* filename, byte *buf, int bufSz)
 {
     int rc = TPM_RC_FAILURE;
 
+    if (filename == NULL || buf == NULL)
+        return BAD_FUNC_ARG;
+
 #if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_FILESYSTEM)
     XFILE fp = NULL;
     size_t fileSz = 0;
 
-    if (filename == NULL || buf == NULL)
-        return BAD_FUNC_ARG;
-
     fp = XFOPEN(filename, "wt");
     if (fp != XBADFILE) {
         fileSz = XFWRITE(buf, 1, bufSz, fp);
@@ -59,6 +59,8 @@ int writeKeyPubPem(const char* filename, byte *buf, int bufSz)
 #endif
         XFCLOSE(fp);
     }
+#else
+    (void)bufSz;
 #endif
     return rc;
 }