commit 5c18d72e028eb0aa1ad9487589b495889bb3b905
author nagendra modadugu <ngm@google.com> Thu Apr 07 11:22:35 2016 -0700
committer chrome-bot <chrome-bot@chromium.org> Thu Apr 07 19:56:34 2016 +0000
tree 814dd364fad89da24d2981765ff9663cd85a426a
parent 24f8b1918812346e57274ed6a377954fe58b7bc0

CR50: update sources to build under clang 3.9

Libfuzz requires clang 3.9, which fails to
build TPM2 as is with -fsanitize-coverage.

This change makes appropriate changes to enable
compilation under clang 3.9.

BRANCH=none
BUG=chrome-os-partner:43025,chrome-os-partner:47524
TEST=compilation under clang 3.8 / 3.9 pass

Change-Id: I1dc7447ac719d9a9a0cb8f0e4ee5a8aeddb403bf
Signed-off-by: nagendra modadugu <ngm@google.com>
Reviewed-on: https://chromium-review.googlesource.com/337662
Commit-Ready: Nagendra Modadugu <ngm@google.com>
Tested-by: Nagendra Modadugu <ngm@google.com>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>

CryptUtil.c

diff --git a/CryptUtil.c b/CryptUtil.c
index 912c365..a60703c 100644
--- a/CryptUtil.c
+++ b/CryptUtil.c
@@ -3171,7 +3171,7 @@
     TPM_ALG_ID           scheme             // IN: the algorithm selector
     )
 {
-    if(   scheme != scheme
+    if(   0
 #    ifdef   TPM_ALG_ECDAA
        || scheme == TPM_ALG_ECDAA
 #    endif   // TPM_ALG_ECDAA

Locality.c

diff --git a/Locality.c b/Locality.c
index 7297e52..c31cc58 100644
--- a/Locality.c
+++ b/Locality.c
@@ -39,7 +39,7 @@
               locality_attributes.locFour = SET;
               break;
           default:
-              pAssert(locality < 256 && locality > 31);
+              pAssert(locality > 31);
               *localityAsByte = locality;
               break;
       }