commit 0ed642cb8b985b4c345dcc71979bc0ade22b4224
author Shawn Willden <swillden@google.com> Fri May 26 10:13:28 2017 -0600
committer Shawn Willden <swillden@google.com> Fri May 26 10:13:28 2017 -0600
tree 65488ef6a3438692c5a618ccf5e9ebe934c7f694
parent e9830589dde19b080fbbfad5fdb1ae6e2955df68

Make zeroing more portable.

Bug:35849499
Test: None required.
Change-Id: Iadee02a253b491f192c4a8b1cf3e57125ad866a6

keystore/blob.cpp

diff --git a/keystore/blob.cpp b/keystore/blob.cpp
index e9e6387..a33334e 100644
--- a/keystore/blob.cpp
+++ b/keystore/blob.cpp
@@ -42,11 +42,13 @@
 
 DEFINE_OPENSSL_OBJECT_POINTER(EVP_CIPHER_CTX);
 
-#ifdef __clang__
+#if defined(__clang__)
 #define OPTNONE __attribute__((optnone))
-#else  // not __clang__
+#elif defined(__GNUC__)
 #define OPTNONE __attribute__((optimize("O0")))
-#endif  // not __clang__
+#else
+#error Need a definition for OPTNONE
+#endif
 
 class ArrayEraser {
   public:
@@ -54,7 +56,7 @@
     OPTNONE ~ArrayEraser() { std::fill(mArr, mArr + mSize, 0); }
 
   private:
-    uint8_t* mArr;
+    volatile uint8_t* mArr;
     size_t mSize;
 };