commit 636b243d4b94ce4f2dc6f2306174de514ee48e43
author Rubin Xu <rubinxu@google.com> Wed Apr 19 16:38:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 19 16:38:42 2017 +0000
tree cc83c99b12deefd049915929432857b486db1443
parent e089388a94c9b236ec40f2b84a931520983b3a4b
parent d28dcca48ce4990329519181f4099e1add41af67

Disable super encryption for now am: 484779559c
am: d28dcca48c

Change-Id: Id5ccfb6069ab722282e23d4bf7917f99613f104a

keystore/blob.cpp

diff --git a/keystore/blob.cpp b/keystore/blob.cpp
index e173b68..8c8267b 100644
--- a/keystore/blob.cpp
+++ b/keystore/blob.cpp
@@ -83,8 +83,11 @@
     mBlob.flags = setFlag(mBlob.flags, encrypted, KEYSTORE_FLAG_ENCRYPTED);
 }
 
-void Blob::setSuperEncrypted(bool superEncrypted) {
-    mBlob.flags = setFlag(mBlob.flags, superEncrypted, KEYSTORE_FLAG_SUPER_ENCRYPTED);
+void Blob::setSuperEncrypted(__attribute__((unused)) bool superEncrypted) {
+    // Do not enable super encryption yet, as it's clashing with synthetic password flow
+    // TODO: re-enables this once keystore knows about synthetic password keys
+
+    //mBlob.flags = setFlag(mBlob.flags, superEncrypted, KEYSTORE_FLAG_SUPER_ENCRYPTED);
 }
 
 void Blob::setFallback(bool fallback) {