aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagendra modadugu <ngm@google.com>2016-11-03 00:47:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-03 00:47:18 +0000
commit5e61a778981e74e74d500533bf79f9b3e245b581 (patch)
tree439bc2c493a8ad4e98d4ca214ab25fecc2b785d4
parent1ad80faae94a4d14e9971dcec107dc4b5b0857df (diff)
parentefd9019ab15ab0e6bebc3bab0756eeedf1f162d5 (diff)
downloadtpm2-5e61a778981e74e74d500533bf79f9b3e245b581.tar.gz
tpm: fix assert failure in PCRComputeCurrentDigest am: 07ec984d63 am: c5912a41a9
am: efd9019ab1 Change-Id: I8c1dba1a158e9b07558e99ecbbd25378323c2bc3
-rw-r--r--Object_spt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Object_spt.c b/Object_spt.c
index dd37f1b..4cf13c7 100644
--- a/Object_spt.c
+++ b/Object_spt.c
@@ -533,6 +533,8 @@ PublicAttributesValidation(
OBJECT *parentObject = NULL;
if(HandleGetType(parentHandle) != TPM_HT_PERMANENT)
parentObject = ObjectGet(parentHandle);
+ if (publicArea->nameAlg == TPM_ALG_NULL)
+ return TPM_RC_HASH;
// Check authPolicy digest consistency
if( publicArea->authPolicy.t.size != 0
&& ( publicArea->authPolicy.t.size