Fixes for using/including in c++ code

Author: Elms

src/tpm2_wrap.c

@@ -224,22 +224,22 @@ int wolfTPM2_FreeKeyBlob(WOLFTPM2_KEYBLOB* blob)
 
 TPMT_PUBLIC* wolfTPM2_NewPublicTemplate(void)
 {
-    TPMT_PUBLIC* template = NULL;
+    TPMT_PUBLIC* PublicTemplate = NULL;
 
-    template = (TPMT_PUBLIC *) XMALLOC(sizeof(TPMT_PUBLIC), NULL,
+    PublicTemplate = (TPMT_PUBLIC *) XMALLOC(sizeof(TPMT_PUBLIC), NULL,
                                        DYNAMIC_TYPE_TMP_BUFFER);
-    if (template == NULL) {
+    if (PublicTemplate == NULL) {
         return NULL;
     }
 
-    XMEMSET(template, 0, sizeof(TPMT_PUBLIC));
-    return template;
+    XMEMSET(PublicTemplate, 0, sizeof(TPMT_PUBLIC));
+    return PublicTemplate;
 }
 
-int wolfTPM2_FreePublicTemplate(TPMT_PUBLIC* template)
+int wolfTPM2_FreePublicTemplate(TPMT_PUBLIC* PublicTemplate)
 {
-    if (template != NULL) {
-        XFREE(template, NULL, DYNAMIC_TYPE_TMP_BUFFER);
+    if (PublicTemplate != NULL) {
+        XFREE(PublicTemplate, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     }
     return TPM_RC_SUCCESS;
 }

wolftpm/tpm2_wrap.h

@@ -2354,7 +2354,7 @@ WOLFTPM_API int wolfTPM2_Free(WOLFTPM2_DEV *dev);
 WOLFTPM_API WOLFTPM2_KEYBLOB* wolfTPM2_NewKeyBlob(void);
 WOLFTPM_API int wolfTPM2_FreeKeyBlob(WOLFTPM2_KEYBLOB* blob);
 WOLFTPM_API TPMT_PUBLIC* wolfTPM2_NewPublicTemplate(void);
-WOLFTPM_API int wolfTPM2_FreePublicTemplate(TPMT_PUBLIC* template);
+WOLFTPM_API int wolfTPM2_FreePublicTemplate(TPMT_PUBLIC* PublicTemplate);
 WOLFTPM_API WOLFTPM2_KEY* wolfTPM2_NewKey(void);
 WOLFTPM_API int wolfTPM2_FreeKey(WOLFTPM2_KEY* key);
 WOLFTPM_API WOLFTPM2_SESSION* wolfTPM2_NewSession(void);