commit d6a1d5fdb5db314ab5213437c5ce8604244e8a9f
author nagendra modadugu <ngm@google.com> Thu Apr 07 20:00:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 07 20:00:40 2016 +0000
tree cf2259c2d98067094a658944d7ffd37e1b7dce06
parent 32936cbe6f40a1a13661680c1e430b34feb146e5
parent 5c18d72e028eb0aa1ad9487589b495889bb3b905

CR50: update sources to build under clang 3.9
am: 5c18d72

* commit '5c18d72e028eb0aa1ad9487589b495889bb3b905':
  CR50: update sources to build under clang 3.9

Change-Id: Icba12d6f08094ab55beb46fba2fbab90d2a95d8a

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;
       }