rev148: Cleanup some TSS related extensions to Unmarshal functions

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

diff --git a/src/tpm2/Unmarshal.c b/src/tpm2/Unmarshal.c
index 1fa870f5f18bd5359af33165daebc837b2774cb2..ddd2773c8d79a5cd72e622434eb8c834b5cc6ac7 100644 (file)
--- 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 696aad00f12238421c2a9e292e9e4ec565571ded..9c09e4ad1224bdfa532bcfb4debbb7fd626ea9b5 100644 (file)
--- 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