rev148: Rework USE_BN_ECC_DATA

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

diff --git a/src/tpm2/TpmBuildSwitches.h b/src/tpm2/TpmBuildSwitches.h
index 0f298eb732c4f7013d72f9c84a6203e635202c8f..83864fc89770df198e8a7d73a61e8fabe7d96ed6 100644 (file)
--- a/src/tpm2/TpmBuildSwitches.h
+++ b/src/tpm2/TpmBuildSwitches.h
@@ -73,7 +73,11 @@
 /* Don't move this include ahead of the INLINE_FUNCTIONS definition. */
 #include "CompilerDependencies.h"
 /* This definition is required for the re-factored code */
-#define USE_BN_ECC_DATA
+#if (!defined USE_BN_ECC_DATA) || ((USE_BN_ECC_DATA != NO) && (USE_BN_ECC_DATA != YES))
+#   undef   USE_BN_ECC_DATA
+#   define  USE_BN_ECC_DATA     YES     // Default: Either YES or NO
+#endif
+
 /* Comment these out as needed */
 #ifndef SIMULATION
 //#  define SIMULATION

diff --git a/src/tpm2/crypto/openssl/CryptEccMain.c b/src/tpm2/crypto/openssl/CryptEccMain.c
index c330717e355123ebb3ef176f6b74c824ff70ac65..8def8de345bfad72e0083affae9b12667e687567 100644 (file)
--- a/src/tpm2/crypto/openssl/CryptEccMain.c
+++ b/src/tpm2/crypto/openssl/CryptEccMain.c
@@ -64,7 +64,7 @@
 #include "Tpm.h"
 #ifdef TPM_ALG_ECC
 /* This version requires that the new format for ECC data be used */
-#ifndef USE_BN_ECC_DATA
+#if !USE_BN_ECC_DATA
 #error "Need to define USE_BN_ECC_DATA in Implementaion.h"
 #endif
 /* 10.2.12.2 Functions */