Merge pull request #357 from dgarske/doc_fix

Fix issue with Doxygen generation in tpm2.h due to unnamed enum
wolfSSL · Jun 5, 2024 · 16ba07a · 16ba07a
2 parents d01a46f + b33e6b3
commit 16ba07a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/tpm2_wrap.c b/src/tpm2_wrap.c
@@ -2976,6 +2976,7 @@ int wolfTPM2_ExportPublicKeyBuffer(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* tpmKey,
             }
         }
     #else
+        (void)out;
         rc = NOT_COMPILED_IN;
     #endif
     }
@@ -3008,6 +3009,7 @@ int wolfTPM2_ExportPublicKeyBuffer(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* tpmKey,
             }
         }
     #else
+        (void)out;
         rc = NOT_COMPILED_IN;
     #endif
     }

diff --git a/wolftpm/tpm2.h b/wolftpm/tpm2.h
@@ -2802,7 +2802,8 @@ WOLFTPM_API TPM_RC TPM2_NV_Certify(NV_Certify_In* in, NV_Certify_Out* out);
     } SetCommandSet_In;
     WOLFTPM_API int TPM2_SetCommandSet(SetCommandSet_In* in);
 
-    enum {
+    /* Mode bit-masks for STMicro ST33 */
+    enum TPM_MODE_Vendor_Mask{
         TPMLib_2 = 0x01,
         TPMFips = 0x02,
         TPMLowPowerOff = 0x00,
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
         #else
+            (void)out;
             rc = NOT_COMPILED_IN;
         #endif
         }
@@ Expand Down Expand Up @@
                 }
             }
         #else
+            (void)out;
             rc = NOT_COMPILED_IN;
         #endif
         }
@@ Expand Down @@