From f79c8800fd6d633d69f033e6f39832f09ec913a5 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Thu, 12 Jul 2018 09:40:53 -0400
Subject: [PATCH] rev148: Cleanup some TSS related extensions to Unmarshal
 functions

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 src/tpm2/Unmarshal.c    | 14 +-------------
 src/tpm2/Unmarshal_fp.h | 12 ++----------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/src/tpm2/Unmarshal.c b/src/tpm2/Unmarshal.c
index 1fa870f..ddd2773 100644
--- a/src/tpm2/Unmarshal.c
+++ b/src/tpm2/Unmarshal.c
@@ -41,7 +41,6 @@
 
 #include <string.h>
 
-/* TSS needs TPM_TSS for TSS side structures */
 #include "Unmarshal_fp.h"
 
 TPM_RC
@@ -1919,11 +1918,7 @@ TPML_HANDLE_Unmarshal(TPML_HANDLE *target, BYTE **buffer, INT32 *size)
 */
 
 TPM_RC
-TPML_DIGEST_Unmarshal(TPML_DIGEST *target, BYTE **buffer, INT32 *size
-#ifdef TPM_TSS
-		      , uint32_t minCount
-#endif
-		      )
+TPML_DIGEST_Unmarshal(TPML_DIGEST *target, BYTE **buffer, INT32 *size)
 {
     TPM_RC rc = TPM_RC_SUCCESS;
     
@@ -1932,17 +1927,10 @@ TPML_DIGEST_Unmarshal(TPML_DIGEST *target, BYTE **buffer, INT32 *size
 	rc = UINT32_Unmarshal(&target->count, buffer, size);
     }
     if (rc == TPM_RC_SUCCESS) {
-#ifdef TPM_TSS
-	/* TSS side permits the caller to specify the minimum */
-	if (target->count < minCount) {
-	    rc = TPM_RC_SIZE;
-	}
-#else
 	/* TPM side is hard coded to 2 minimum */
 	if (target->count < 2) {
 	    rc = TPM_RC_SIZE;
 	}
-#endif
     }
     if (rc == TPM_RC_SUCCESS) {
 	if (target->count > 8) {
diff --git a/src/tpm2/Unmarshal_fp.h b/src/tpm2/Unmarshal_fp.h
index 696aad0..9c09e4a 100644
--- a/src/tpm2/Unmarshal_fp.h
+++ b/src/tpm2/Unmarshal_fp.h
@@ -3,7 +3,7 @@
 /*			     							*/
 /*			     Written by Ken Goldman				*/
 /*		       IBM Thomas J. Watson Research Center			*/
-/*            $Id: Unmarshal_fp.h 1259 2018-07-10 19:11:09Z kgoldman $		*/
+/*            $Id: Unmarshal_fp.h 1262 2018-07-11 21:03:43Z kgoldman $		*/
 /*										*/
 /*  Licenses and Notices							*/
 /*										*/
@@ -64,11 +64,7 @@
 #ifndef UNMARSHAL_FP_H
 #define UNMARSHAL_FP_H
 
-#ifndef TPM_TSS
 #include "TpmTypes.h"
-#else
-#include "TPM_Types.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -247,11 +243,7 @@ extern "C" {
     LIB_EXPORT TPM_RC
     TPML_HANDLE_Unmarshal(TPML_HANDLE *target, BYTE **buffer, INT32 *size);
     LIB_EXPORT TPM_RC
-    TPML_DIGEST_Unmarshal(TPML_DIGEST *target, BYTE **buffer, INT32 *size
-#ifdef TPM_TSS
-			  ,uint32_t minCount
-#endif
-			  );
+    TPML_DIGEST_Unmarshal(TPML_DIGEST *target, BYTE **buffer, INT32 *size);
     LIB_EXPORT TPM_RC
     TPML_DIGEST_VALUES_Unmarshal(TPML_DIGEST_VALUES *target, BYTE **buffer, INT32 *size);
     LIB_EXPORT TPM_RC
-- 
2.39.5