aboutsummaryrefslogtreecommitdiff
path: root/tpm_types.h
diff options
context:
space:
mode:
authornagendra modadugu <ngm@google.com>2016-03-08 11:05:25 -0800
committerchrome-bot <chrome-bot@chromium.org>2016-03-08 22:11:33 +0000
commit16e65be1bdf7ee570373449d8cff729c55fc8776 (patch)
treece48901f4cb8e16173572d3d4e335312cf36fd50 /tpm_types.h
parentafa437246f4e5ec2c15f1ff5259a5a0c6e856a9d (diff)
downloadtpm2-16e65be1bdf7ee570373449d8cff729c55fc8776.tar.gz
Disable algorithms ECDAA, ECSCHNORR, and SM2 (take 2).
Disable optional algorithms that are currently unimplemented in EMBEDDED_MODE. This will allow the TPM2 suite to run the appropriate sub-set of tests. A previous attempt (7709a63d45f6f7822) at this change broke the android build, which does not allow undefined symbols in libraries. TEST=compilation succeeds BRANCH=none BUG=chrome-os-partner:43025,chrome-os-partner:47524 Change-Id: Ibc69b8ad36b2e00baa5a440a388345b65ba960a3 Signed-off-by: nagendra modadugu <ngm@google.com> Reviewed-on: https://chromium-review.googlesource.com/331670 Commit-Ready: Nagendra Modadugu <ngm@google.com> Tested-by: Nagendra Modadugu <ngm@google.com> Tested-by: Darren Krahn <dkrahn@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Diffstat (limited to 'tpm_types.h')
-rw-r--r--tpm_types.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/tpm_types.h b/tpm_types.h
index eec5e48..f01d505 100644
--- a/tpm_types.h
+++ b/tpm_types.h
@@ -1119,9 +1119,12 @@ typedef union {
#ifdef TPM_ALG_ECDSA
TPMS_SIG_SCHEME_ECDSA ecdsa;
#endif
-#ifdef TPM_ALG_ECDAA
+// TODO(ngm): ECDAA is not currently supported
+// on CR50, but this field has unguarded references
+// in CryptUtil.c, so allow its inclusion.
+// #ifdef TPM_ALG_ECDAA
TPMS_SIG_SCHEME_ECDAA ecdaa;
-#endif
+// #endif
#ifdef TPM_ALG_SM2
TPMS_SIG_SCHEME_SM2 sm2;
#endif