rev164: Adjust SMAC_IMPLEMENTED define

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

diff --git a/src/tpm2/crypto/CryptHash.h b/src/tpm2/crypto/CryptHash.h
index fee394f3e5d20ee9d4c40729b9bdd57e54f8f7e7..20f52e83123d6c4ab518df8889867809e3443634 100644 (file)
--- a/src/tpm2/crypto/CryptHash.h
+++ b/src/tpm2/crypto/CryptHash.h
@@ -88,16 +88,7 @@ typedef struct sequenceMethods {
     SMAC_DATA_METHOD          data;
     SMAC_END_METHOD           end;
 } SMAC_METHODS;
-
-#if 0   /* libtpms changed begin (undefined behavior of macro expansion) */
-#define SMAC_IMPLEMENTED (defined CC_MAC || defined CC_MAC_Start)
-#else
-# if defined TPM_CC_MAC || defined TPM_CC_MAC_Start
-#  define SMAC_IMPLEMENTED 1
-# else
-#  define SMAC_IMPLEMENTED 0
-# endif
-#endif  /* libtpms changed end */
+#define SMAC_IMPLEMENTED (CC_MAC || CC_MAC_Start)
 
 /* These definitions are here because the SMAC state is in the union of hash states. */