Merge "Request rollback resistance for FBE keys." am: aae52f4816

am: 0b895c13bc Change-Id: Ic3ad961ae342d65dd86bc7fd6a06201d55101eba
5 years ago · a15dbc415d
parent 5ccd3e3c39 0b895c13bc
commit a15dbc415d
1 changed files with 7 additions and 1 deletions
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@ -126,7 +126,13 @@ static bool generateKeymasterKey(Keymaster& keymaster, const KeyAuthentication&
        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(