commit afa437246f4e5ec2c15f1ff5259a5a0c6e856a9d
author nagendra modadugu <ngm@google.com> Mon Mar 07 18:38:56 2016 -0800
committer Nagendra Modadugu <ngm@google.com> Tue Mar 08 02:51:45 2016 +0000
tree c8874816979f70c10e382dab79285066a6fec20a
parent 7709a63d45f6f782230326c16be7bfa149e9e497

Revert "Disable algorithms ECDAA, ECSCHNORR, and SM2."

This reverts commit 7709a63d45f6f782230326c16be7bfa149e9e497,
as it breaks the android build (due to _cpri__EccCommitCompute
remaining undefined, which the android build is stricter about).

BRANCH=none
BUG=chrome-os-partner:43025,chrome-os-partner:47524
TEST=compilation succeeds

Change-Id: I80c5b238b81e68e5673ac8ea72bf112143d328ba
Reviewed-on: https://chromium-review.googlesource.com/331325
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Tested-by: Nagendra Modadugu <ngm@google.com>

CpriECC.c

diff --git a/CpriECC.c b/CpriECC.c
index 8b9f362..228c2c2 100644
--- a/CpriECC.c
+++ b/CpriECC.c
@@ -422,7 +422,6 @@
     BN_CTX_free(context);
     return retVal;
 }
-#if defined TPM_ALG_ECDAA || defined TPM_ALG_SM2 //%
 //
 //
 //       ClearPoint2B()
@@ -439,6 +438,7 @@
         p->y.t.size = 0;
     }
 }
+#if defined TPM_ALG_ECDAA || defined TPM_ALG_SM2 //%
 //
 //
 //       _cpri__EccCommitCompute()

Implementation.h

diff --git a/Implementation.h b/Implementation.h
index b60c957..361c36e 100644
--- a/Implementation.h
+++ b/Implementation.h
@@ -60,9 +60,9 @@
 #define   ALG_ECC                   ALG_YES
 #define   ALG_ECDH                  (ALG_YES*ALG_ECC)
 #define   ALG_ECDSA                 (ALG_YES*ALG_ECC)
-#define   ALG_ECDAA                 (ALG_NO*ALG_ECC)
-#define   ALG_SM2                   (ALG_NO*ALG_ECC)
-#define   ALG_ECSCHNORR             (ALG_NO*ALG_ECC)
+#define   ALG_ECDAA                 (ALG_YES*ALG_ECC)
+#define   ALG_SM2                   (ALG_YES*ALG_ECC)
+#define   ALG_ECSCHNORR             (ALG_YES*ALG_ECC)
 #define   ALG_ECMQV                 (ALG_NO*ALG_ECC)
 #define   ALG_SYMCIPHER             ALG_YES
 #define   ALG_KDF1_SP800_56A        (ALG_YES*ALG_ECC)

tpm_types.h

diff --git a/tpm_types.h b/tpm_types.h
index 63f8918..eec5e48 100644
--- a/tpm_types.h
+++ b/tpm_types.h
@@ -1119,12 +1119,9 @@
 #ifdef TPM_ALG_ECDSA
   TPMS_SIG_SCHEME_ECDSA      ecdsa;
 #endif
-// TODO(ngm): ECDAA is not currently supported,
-// but this field has unguarded references in
-// CryptUtil.c, so allow its inclusion.
-// #ifdef TPM_ALG_ECDAA
+#ifdef TPM_ALG_ECDAA
   TPMS_SIG_SCHEME_ECDAA      ecdaa;
-// #endif
+#endif
 #ifdef TPM_ALG_SM2
   TPMS_SIG_SCHEME_SM2        sm2;
 #endif