Fix build issues and handle leak.

Author: dgarske

src/internal.c

@@ -8283,6 +8283,7 @@ int WP11_Object_MatchAttr(WP11_Object* object, CK_ATTRIBUTE_TYPE type,
     return ret;
 }
 
+#ifdef WOLFPKCS11_TPM
 #if !defined(NO_RSA) || defined(HAVE_ECC)
 
 static int WP11_Object_LoadTpmKey(WP11_Object* object)
@@ -8333,8 +8334,8 @@ static int WP11_Object_LoadTpmKey(WP11_Object* object)
     return ret;
 }
 
-#endif
-
+#endif /* !NO_RSA || HAVE_ECC */
+#endif /* WOLFPKCS11_TPM */
 
 #ifndef NO_RSA
 
@@ -8446,6 +8447,12 @@ int WP11_Rsa_GenerateKeyPair(WP11_Object* pub, WP11_Object* priv,
 
                 /* Generate into the private key. */
                 ret = wc_MakeRsaKey(&priv->data.rsaKey, pub->size, e, &rng);
+            #ifdef WOLFPKCS11_TPM
+                if (ret == 0) {
+                    /* unload handle and reload when used */
+                    wolfTPM2_UnloadHandle(&priv->slot->tpmDev, &priv->tpmKey.handle);
+                }
+            #endif
                 if (ret != 0) {
                     wc_FreeRsaKey(&priv->data.rsaKey);
                 }
@@ -9182,6 +9189,12 @@ int WP11_Ec_GenerateKeyPair(WP11_Object* pub, WP11_Object* priv,
         if (ret == 0) {
             ret = wc_ecc_make_key_ex(&rng, priv->data.ecKey.dp->size,
                                     &priv->data.ecKey, priv->data.ecKey.dp->id);
+        #ifdef WOLFPKCS11_TPM
+            if (ret == 0) {
+                /* unload handle and reload when used */
+                wolfTPM2_UnloadHandle(&slot->tpmDev, &priv->tpmKey.handle);
+            }
+        #endif
             Rng_Free(&rng);
         }
         if (ret == 0) {

tests/unit.h

@@ -321,9 +321,11 @@ static CK_RV run_tests(TEST_FUNC* testFunc, int testFuncCnt, int onlySet,
     int i;
     void* testArgs;
 
+#ifdef DEBUG_WOLFPKCS11
     if (verbose) {
         wolfPKCS11_Debugging_On();
     }
+#endif
 
     for (i = 0; i < testFuncCnt; i++) {
         if (testFunc[i].flags != flags)