commit 7e65d8dd004257530d1c5c42b8dabc878c2b2155
author Eric Biggers <ebiggers@google.com> Mon Sep 16 21:03:26 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 16 21:03:26 2019 +0000
tree ee2d3ad0e0514f70ba87b4cd943d353191b59bf0
parent 88dba9a558d68b7735d924bcf487bde8ef323a16
parent f2201709233e29e5d943937a9593891a140dc4cd

Merge "vold: use system-clang-format"

KeyStorage.cpp

diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index 271a220..d5ac7d0 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -126,7 +126,13 @@
         paramBuilder.Authorization(km::TAG_USER_AUTH_TYPE, km::HardwareAuthenticatorType::PASSWORD);
         paramBuilder.Authorization(km::TAG_AUTH_TIMEOUT, AUTH_TIMEOUT);
     }
-    return keymaster.generateKey(paramBuilder, key);
+
+    auto paramsWithRollback = paramBuilder;
+    paramsWithRollback.Authorization(km::TAG_ROLLBACK_RESISTANCE);
+
+    // Generate rollback-resistant key if possible.
+    return keymaster.generateKey(paramsWithRollback, key) ||
+           keymaster.generateKey(paramBuilder, key);
 }
 
 static std::pair<km::AuthorizationSet, km::HardwareAuthToken> beginParams(

OWNERS

diff --git a/OWNERS b/OWNERS
index 4e45284..6c5c150 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
 jsharkey@android.com
 paulcrowley@google.com
 paullawrence@google.com
+ebiggers@google.com
\ No newline at end of file