TEST ESYS: Changed nvHandle_handle to nvHandle

Despective name was changed in nv tests.

Signed-off-by: Juergen Repp <Juergen.Repp@sit.fraunhofer.de>

7 files changed, 95 insertions, 97 deletions

diff --git a/test/integration/esys-nv-certify.int.c b/test/integration/esys-nv-certify.int.c
index af4aaf75..955b4709 100644
--- a/test/integration/esys-nv-certify.int.c
+++ b/test/integration/esys-nv-certify.int.c
@@ -100,7 +100,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     r = Esys_TR_SetAuth(esys_context, ESYS_TR_RH_OWNER, &authValue);
     goto_if_error(r, "Error: TR_SetAuth", error);
 
-    ESYS_TR signHandle;
+    ESYS_TR signHandle = ESYS_TR_NONE;
     TPM2B_PUBLIC *outPublic;
     TPM2B_CREATION_DATA *creationData;
     TPM2B_DIGEST *creationHash;
@@ -113,7 +113,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                            &creationHash, &creationTicket);
     goto_if_error(r, "Error esys create primary", error);
 
-    ESYS_TR nvHandle_handle;
+    ESYS_TR nvHandle = ESYS_TR_NONE;
     TPM2B_AUTH auth = {.size = 20,
                        .buffer={10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
                                 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}};
@@ -146,7 +146,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                             ESYS_TR_NONE,
                             &auth,
                             &publicInfo,
-                            &nvHandle_handle);
+                            &nvHandle);
     goto_if_error(r, "Error esys define nv space", error);
 
     UINT16 offset = 0;
@@ -155,8 +155,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                                                   1, 2, 3, 4, 5, 6, 7, 8, 9}};
 
     r = Esys_NV_Write(esys_context,
-                      nvHandle_handle,
-                      nvHandle_handle,
+                      nvHandle,
+                      nvHandle,
                       ESYS_TR_PASSWORD,
                       ESYS_TR_NONE,
                       ESYS_TR_NONE,
@@ -173,7 +173,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
         esys_context,
         signHandle,
         ESYS_TR_RH_OWNER,
-        nvHandle_handle,
+        nvHandle,
         ESYS_TR_PASSWORD,
         ESYS_TR_PASSWORD,
         ESYS_TR_NONE,
@@ -187,7 +187,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     r = Esys_NV_UndefineSpace(esys_context,
                               ESYS_TR_RH_OWNER,
-                              nvHandle_handle,
+                              nvHandle,
                               ESYS_TR_PASSWORD,
                               ESYS_TR_NONE,
                               ESYS_TR_NONE
diff --git a/test/integration/esys-nv-ram-counter.int.c b/test/integration/esys-nv-ram-counter.int.c
index 48722101..6d2061ac 100644
--- a/test/integration/esys-nv-ram-counter.int.c
+++ b/test/integration/esys-nv-ram-counter.int.c
@@ -42,7 +42,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error: During initialization of session", error);
 #endif /* TEST_SESSION */
 
-    ESYS_TR nvHandle_handle;
+    ESYS_TR nvHandle = ESYS_TR_NONE;
     TPM2B_AUTH auth = {.size = 20,
                        .buffer={10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
                                 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}};
@@ -79,7 +79,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                             ESYS_TR_NONE,
                             &auth,
                             &publicInfo,
-                            &nvHandle_handle);
+                            &nvHandle);
 
     goto_if_error(r, "Error esys define nv space", error);
 
@@ -87,7 +87,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     TPM2B_NAME *nvName;
 
     r = Esys_NV_ReadPublic(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -97,7 +97,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     RSRC_NODE_T *nvHandleNode;
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -106,8 +106,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
         goto error;
     }
     r = Esys_NV_Increment(esys_context,
-                          nvHandle_handle,
-                          nvHandle_handle,
+                          nvHandle,
+                          nvHandle,
 #ifdef TEST_SESSION
                           session,
 #else
@@ -119,7 +119,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error esys nv write", error);
 
     r = Esys_NV_ReadPublic(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -127,7 +127,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                            &nvName);
     goto_if_error(r, "Error: nv read public", error);
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -139,8 +139,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     TPM2B_MAX_NV_BUFFER *nv_test_data;
 
     r = Esys_NV_Read(esys_context,
-                     nvHandle_handle,
-                     nvHandle_handle,
+                     nvHandle,
+                     nvHandle,
 #ifdef TEST_SESSION
                      session,
 #else
@@ -155,7 +155,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error esys nv read", error);
 
     r = Esys_NV_ReadPublic(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -163,7 +163,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                            &nvName);
     goto_if_error(r, "Error: nv read public", error);
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -174,7 +174,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     r = Esys_NV_UndefineSpace(esys_context,
                               ESYS_TR_RH_OWNER,
-                              nvHandle_handle,
+                              nvHandle,
 #ifdef TEST_SESSION
                               session,
 #else
diff --git a/test/integration/esys-nv-ram-extend-index.int.c b/test/integration/esys-nv-ram-extend-index.int.c
index a5903497..059f949f 100644
--- a/test/integration/esys-nv-ram-extend-index.int.c
+++ b/test/integration/esys-nv-ram-extend-index.int.c
@@ -44,7 +44,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error: During initialization of session", error);
 #endif /* TEST_SESSION */
 
-    ESYS_TR nvHandle_handle;
+    ESYS_TR nvHandle = ESYS_TR_NONE;
     TPM2B_AUTH auth = {.size = 20,
                        .buffer={10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
                                 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}};
@@ -82,7 +82,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
         ESYS_TR_NONE,
         &auth,
         &publicInfo,
-        &nvHandle_handle);
+        &nvHandle);
 
     goto_if_error(r, "Error esys define nv space", error);
 
@@ -95,7 +95,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     r = Esys_NV_ReadPublic(
         esys_context,
-        nvHandle_handle,
+        nvHandle,
         ESYS_TR_NONE,
         ESYS_TR_NONE,
         ESYS_TR_NONE,
@@ -105,7 +105,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     RSRC_NODE_T *nvHandleNode;
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -115,8 +115,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     }
     r = Esys_NV_Extend (
         esys_context,
-        nvHandle_handle,
-        nvHandle_handle,
+        nvHandle,
+        nvHandle,
 #ifdef TEST_SESSION
         session,
 #else
@@ -130,7 +130,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     r = Esys_NV_ReadPublic(
         esys_context,
-        nvHandle_handle,
+        nvHandle,
         ESYS_TR_NONE,
         ESYS_TR_NONE,
         ESYS_TR_NONE,
@@ -138,7 +138,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
         &nvName);
     goto_if_error(r, "Error: nv read public", error);
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -149,26 +149,26 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     TPM2B_MAX_NV_BUFFER *nv_test_data2;
 
-r = Esys_NV_Read(
-    esys_context,
-    nvHandle_handle,
-    nvHandle_handle,
+    r = Esys_NV_Read(
+        esys_context,
+        nvHandle,
+        nvHandle,
 #ifdef TEST_SESSION
-    session,
+        session,
 #else
-    ESYS_TR_PASSWORD,
+        ESYS_TR_PASSWORD,
 #endif
-    ESYS_TR_NONE,
-    ESYS_TR_NONE,
-    20,
-    0,
-    &nv_test_data2);
+        ESYS_TR_NONE,
+        ESYS_TR_NONE,
+        20,
+        0,
+        &nv_test_data2);
 
     goto_if_error(r, "Error esys nv read", error);
 
     r = Esys_NV_ReadPublic(
         esys_context,
-        nvHandle_handle,
+        nvHandle,
         ESYS_TR_NONE,
         ESYS_TR_NONE,
         ESYS_TR_NONE,
@@ -176,7 +176,7 @@ r = Esys_NV_Read(
         &nvName);
     goto_if_error(r, "Error: nv read public", error);
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -185,20 +185,18 @@ r = Esys_NV_Read(
         goto error;
     }
 
-    r = Esys_NV_UndefineSpace(
-        esys_context,
-        ESYS_TR_RH_OWNER,
-        nvHandle_handle,
+    r = Esys_NV_UndefineSpace(esys_context,
+                              ESYS_TR_RH_OWNER,
+                              nvHandle,
 #ifdef TEST_SESSION
-        session,
+                              session,
 #else
-        ESYS_TR_PASSWORD,
+                              ESYS_TR_PASSWORD,
 #endif
-        ESYS_TR_NONE,
-        ESYS_TR_NONE
-        );
-
-    goto_if_error(r, "Error esys undefine nv space", error);
+                              ESYS_TR_NONE,
+                              ESYS_TR_NONE
+                              );
+    goto_if_error(r, "Error: NV_UndefineSpace", error);
 
     return 0;
 
diff --git a/test/integration/esys-nv-ram-ordinary-index.int.c b/test/integration/esys-nv-ram-ordinary-index.int.c
index fd2e94e5..37d2a671 100644
--- a/test/integration/esys-nv-ram-ordinary-index.int.c
+++ b/test/integration/esys-nv-ram-ordinary-index.int.c
@@ -48,7 +48,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error: During initialization of session", error);
 #endif /* TEST_SESSION */
 
-    ESYS_TR nvHandle_handle;
+    ESYS_TR nvHandle = ESYS_TR_NONE;
     TPM2B_AUTH auth = {.size = 20,
                        .buffer={10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
                                 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}};
@@ -85,7 +85,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                             ESYS_TR_NONE,
                             &auth,
                             &publicInfo,
-                            &nvHandle_handle);
+                            &nvHandle);
 
     goto_if_error(r, "Error esys define nv space", error);
 
@@ -98,7 +98,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     TPM2B_NAME *nvName;
 
     r = Esys_NV_ReadPublic(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -108,7 +108,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     RSRC_NODE_T *nvHandleNode;
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -117,8 +117,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
         goto error;
     }
     r = Esys_NV_Write(esys_context,
-                      nvHandle_handle,
-                      nvHandle_handle,
+                      nvHandle,
+                      nvHandle,
 #ifdef TEST_SESSION
                       session,
 #else
@@ -132,7 +132,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error esys nv write", error);
 
     r = Esys_NV_ReadPublic(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -140,7 +140,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                            &nvName);
     goto_if_error(r, "Error: nv read public", error);
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -152,8 +152,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     TPM2B_MAX_NV_BUFFER *nv_test_data2;
 
     r = Esys_NV_Read(esys_context,
-                     nvHandle_handle,
-                     nvHandle_handle,
+                     nvHandle,
+                     nvHandle,
 #ifdef TEST_SESSION
                      session,
 #else
@@ -168,7 +168,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error esys nv read", error);
 
     r = Esys_NV_ReadPublic(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -176,7 +176,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                            &nvName);
     goto_if_error(r, "Error: nv read public", error);
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -187,8 +187,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
 #ifdef TEST_READ_LOCK
     r = Esys_NV_ReadLock(esys_context,
-                         nvHandle_handle,
-                         nvHandle_handle,
+                         nvHandle,
+                         nvHandle,
 #ifdef TEST_SESSION
                          session,
 #else
@@ -200,7 +200,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error: NV_ReadLock", error);
 
     r = Esys_NV_ReadPublic(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -208,7 +208,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                            &nvName);
     goto_if_error(r, "Error: nv read public", error);
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -218,8 +218,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     }
 
     r = Esys_NV_Read(esys_context,
-                     nvHandle_handle,
-                     nvHandle_handle,
+                     nvHandle,
+                     nvHandle,
 #ifdef TEST_SESSION
                      session,
 #else
@@ -235,8 +235,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 #else /* TEST_READ_LOCK */
 #ifdef TEST_WRITE_LOCK
     r = Esys_NV_WriteLock(esys_context,
-                          nvHandle_handle,
-                          nvHandle_handle,
+                          nvHandle,
+                          nvHandle,
 #ifdef TEST_SESSION
                           session,
 #else
@@ -248,7 +248,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error: NV_WriteLock", error);
 
     r = Esys_NV_ReadPublic(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -256,7 +256,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                            &nvName);
     goto_if_error(r, "Error: NV_ReadPublic", error);
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -265,8 +265,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
         goto error;
     }
     r = Esys_NV_Write(esys_context,
-                      nvHandle_handle,
-                      nvHandle_handle,
+                      nvHandle,
+                      nvHandle,
 #ifdef TEST_SESSION
                       session,
 #else
@@ -282,7 +282,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     r = Esys_NV_UndefineSpace(esys_context,
                               ESYS_TR_RH_OWNER,
-                              nvHandle_handle,
+                              nvHandle,
 #ifdef TEST_SESSION
                               session,
 #else
diff --git a/test/integration/esys-nv-ram-set-bits.int.c b/test/integration/esys-nv-ram-set-bits.int.c
index e8a395a5..909af346 100644
--- a/test/integration/esys-nv-ram-set-bits.int.c
+++ b/test/integration/esys-nv-ram-set-bits.int.c
@@ -42,7 +42,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error: During initialization of session", error);
 #endif /* TEST_SESSION */
 
-    ESYS_TR nvHandle_handle;
+    ESYS_TR nvHandle = ESYS_TR_NONE;
     TPM2B_AUTH auth = {.size = 20,
                        .buffer={10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
                                 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}};
@@ -79,7 +79,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                             ESYS_TR_NONE,
                             &auth,
                             &publicInfo,
-                            &nvHandle_handle);
+                            &nvHandle);
 
     goto_if_error(r, "Error esys define nv space", error);
 
@@ -87,7 +87,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     TPM2B_NAME *nvName;
 
     r = Esys_NV_ReadPublic(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -97,7 +97,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     RSRC_NODE_T *nvHandleNode;
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -109,8 +109,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     UINT64 bits = 0x0102030405060708;
 
     r = Esys_NV_SetBits(esys_context,
-                        nvHandle_handle,
-                        nvHandle_handle,
+                        nvHandle,
+                        nvHandle,
 #ifdef TEST_SESSION
                         session,
 #else
@@ -123,7 +123,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error esys nv write", error);
 
     r = Esys_NV_ReadPublic(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -131,7 +131,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                            &nvName);
     goto_if_error(r, "Error: nv read public", error);
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -143,8 +143,8 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     TPM2B_MAX_NV_BUFFER *nv_test_data;
 
     r = Esys_NV_Read(esys_context,
-                     nvHandle_handle,
-                     nvHandle_handle,
+                     nvHandle,
+                     nvHandle,
 #ifdef TEST_SESSION
                      session,
 #else
@@ -159,7 +159,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error esys nv read", error);
 
     r = Esys_NV_ReadPublic(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -167,7 +167,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                            &nvName);
     goto_if_error(r, "Error: nv read public", error);
 
-    r = esys_GetResourceObject(esys_context, nvHandle_handle, &nvHandleNode);
+    r = esys_GetResourceObject(esys_context, nvHandle, &nvHandleNode);
     goto_if_error(r, "Error: nv get resource object", error);
 
     if (nvName->size != nvHandleNode->rsrc.name.size ||
@@ -178,7 +178,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     r = Esys_NV_UndefineSpace(esys_context,
                               ESYS_TR_RH_OWNER,
-                              nvHandle_handle,
+                              nvHandle,
 #ifdef TEST_SESSION
                               session,
 #else
diff --git a/test/integration/esys-policy-nv-changeauth.int.c b/test/integration/esys-policy-nv-changeauth.int.c
index d230991d..5627c6db 100644
--- a/test/integration/esys-policy-nv-changeauth.int.c
+++ b/test/integration/esys-policy-nv-changeauth.int.c
@@ -74,7 +74,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                              );
     goto_if_error(r, "Error: PolicyGetDigest", error);
 
-    ESYS_TR nvHandle_handle;
+    ESYS_TR nvHandle = ESYS_TR_NONE;
     TPM2B_AUTH auth = {.size = 20,
                        .buffer={10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
                                 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}};
@@ -104,7 +104,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                             ESYS_TR_NONE,
                             &auth,
                             &publicInfo,
-                            &nvHandle_handle);
+                            &nvHandle);
 
     goto_if_error(r, "Error esys define nv space", error);
 
@@ -149,7 +149,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error: PolicyCommandCode", error);
 
     r = Esys_NV_ChangeAuth(esys_context,
-                           nvHandle_handle,
+                           nvHandle,
                            policySession,
                            ESYS_TR_NONE,
                            ESYS_TR_NONE,
@@ -159,7 +159,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
 
     r = Esys_NV_UndefineSpace(esys_context,
                               ESYS_TR_RH_OWNER,
-                              nvHandle_handle,
+                              nvHandle,
                               ESYS_TR_PASSWORD,
                               ESYS_TR_NONE,
                               ESYS_TR_NONE
diff --git a/test/integration/esys-policy-nv-undefine-special.int.c b/test/integration/esys-policy-nv-undefine-special.int.c
index e99e9e01..857fe08d 100644
--- a/test/integration/esys-policy-nv-undefine-special.int.c
+++ b/test/integration/esys-policy-nv-undefine-special.int.c
@@ -71,7 +71,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                              );
     goto_if_error(r, "Error: PolicyGetDigest", error);
 
-    ESYS_TR nvHandle_handle;
+    ESYS_TR nvHandle;
     TPM2B_AUTH auth = {.size = 20,
                        .buffer={10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
                                 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}};
@@ -103,7 +103,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
                             ESYS_TR_NONE,
                             &auth,
                             &publicInfo,
-                            &nvHandle_handle);
+                            &nvHandle);
 
     goto_if_error(r, "Error esys define nv space", error);
 
@@ -143,7 +143,7 @@ test_invoke_esapi(ESYS_CONTEXT * esys_context)
     goto_if_error(r, "Error: PolicyCommandCode", error);
 
     r = Esys_NV_UndefineSpaceSpecial(esys_context,
-                                     nvHandle_handle,
+                                     nvHandle,
                                      ESYS_TR_RH_PLATFORM,
                                      policySession,
                                      ESYS_TR_PASSWORD,