Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SyntheticPasswordCrypto: be less picky about Keystore error codes"

Browse Source
This commit is contained in:
Eric Biggers
2022-10-06 17:17:55 +00:00
committed by Android (Google) Code Review
parent 9e1f0003d3 986c5022ab
commit d0038f9738
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/locksettings/SyntheticPasswordCrypto.java
View File

@@ -17,7 +17,6 @@
package com.android.server.locksettings;
import android.security.AndroidKeyStoreMaintenance;
import android.security.keymaster.KeymasterDefs;
import android.security.keystore.KeyProperties;
import android.security.keystore.KeyProtection;
import android.security.keystore2.AndroidKeyStoreLoadStoreParameter;
@@ -223,13 +222,6 @@ public class SyntheticPasswordCrypto {
keyStore.setEntry(protectorKeyAlias, entry, protRollbackResistant);
Slog.i(TAG, "Using rollback-resistant key");
} catch (KeyStoreException e) {
if (!(e.getCause() instanceof android.security.KeyStoreException)) {
throw e;
}
int errorCode = ((android.security.KeyStoreException) e.getCause()).getErrorCode();
if (errorCode != KeymasterDefs.KM_ERROR_ROLLBACK_RESISTANCE_UNAVAILABLE) {
throw e;
}
Slog.w(TAG, "Rollback-resistant keys unavailable. Falling back to "
+ "non-rollback-resistant key");
keyStore.setEntry(protectorKeyAlias, entry, protNonRollbackResistant);