Peer review feedback. Cleanups for code comments, logging and white-s…

…pace.
wolfSSL · Sep 11, 2024 · 7abe543 · 7abe543
1 parent 03070da
commit 7abe543
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/examples/tls/tls_client.c b/examples/tls/tls_client.c
@@ -247,7 +247,10 @@ int TPM2_TLS_ClientArgs(void* userCtx, int argc, char *argv[])
         bindKey = &storageKey;
     }
     else {
+        /* error printed in getPrimaryStoragekey */
     #ifndef WOLFTPM_MFG_IDENTITY /* not fatal if using mfg identity */
+        printf("Allowing primary creation failure, since not required "
+               "when using a pre-prvisioned IDevID key\n");
         goto exit;
     #endif
     }
@@ -291,7 +294,9 @@ int TPM2_TLS_ClientArgs(void* userCtx, int argc, char *argv[])
         /* Attempt to use pre-provisioned identity key */
         rc = wolfTPM2_ReadPublicKey(&dev, &eccKey, TPM2_IDEVID_KEY_HANDLE);
         if (rc == 0) {
-            /* TODO: Supply master password (if not TEST_SAMPLE) */
+            /* Custom should supply their own custom master password used during
+             * device provisioning. If using a sample TPM supply NULL to use the
+             * default password. */
             wolfTPM2_SetIdentityAuth(&dev, &eccKey.handle, NULL, 0);
         }
         else
@@ -487,7 +492,7 @@ int TPM2_TLS_ClientArgs(void* userCtx, int argc, char *argv[])
 
         }
     #elif defined(NO_FILESYSTEM)
-        /* Load "cert" buffer with ASN.1/DER certificate */
+        /* Example for loading cert using an ASN.1/DER certificate */
         #if 0
         rc = wolfSSL_CTX_use_certificate_buffer(ctx, cert.buffer, (long)cert.size,
                                                 WOLFSSL_FILETYPE_ASN1);

diff --git a/examples/tls/tls_server.c b/examples/tls/tls_server.c
@@ -263,7 +263,10 @@ int TPM2_TLS_ServerArgs(void* userCtx, int argc, char *argv[])
         bindKey = &storageKey;
     }
     else {
+        /* error printed in getPrimaryStoragekey */
     #ifndef WOLFTPM_MFG_IDENTITY /* not fatal if using mfg identity */
+        printf("Allowing primary creation failure, since not required "
+               "when using a pre-prvisioned IDevID key\n");
         goto exit;
     #endif
     }
@@ -307,7 +310,9 @@ int TPM2_TLS_ServerArgs(void* userCtx, int argc, char *argv[])
         /* Attempt to use pre-provisioned identity key */
         rc = wolfTPM2_ReadPublicKey(&dev, &eccKey, TPM2_IDEVID_KEY_HANDLE);
         if (rc == 0) {
-            /* TODO: Supply master password (if not TEST_SAMPLE) */
+            /* Custom should supply their own custom master password used during
+             * device provisioning. If using a sample TPM supply NULL to use the
+             * default password. */
             wolfTPM2_SetIdentityAuth(&dev, &eccKey.handle, NULL, 0);
         }
         else
@@ -454,7 +459,7 @@ int TPM2_TLS_ServerArgs(void* userCtx, int argc, char *argv[])
                                                 WOLFSSL_FILETYPE_ASN1);
         #endif
         #else
-		const char* useCert = "./certs/server-rsa-cert.pem";
+        const char* useCert = "./certs/server-rsa-cert.pem";
         if (useSelfSign) {
             useCert = "./certs/tpm-rsa-cert.pem";
         }
@@ -481,16 +486,15 @@ int TPM2_TLS_ServerArgs(void* userCtx, int argc, char *argv[])
             /* Load "cert" buffer with ASN.1/DER certificate */
             rc = wolfSSL_CTX_use_certificate_buffer(ctx, cert, (long)certSz,
                 WOLFSSL_FILETYPE_ASN1);
-
         }
     #elif defined(NO_FILESYSTEM)
-        /* Load "cert" buffer with ASN.1/DER certificate */
+        /* Example for loading cert using an ASN.1/DER certificate */
         #if 0
         rc = wolfSSL_CTX_use_certificate_buffer(ctx, cert.buffer, (long)cert.size,
                                                 WOLFSSL_FILETYPE_ASN1);
         #endif
     #else
-		const char* useCert = "./certs/server-ecc-cert.pem";
+        const char* useCert = "./certs/server-ecc-cert.pem";
         if (useSelfSign) {
             useCert = "./certs/tpm-ecc-cert.pem";
         }