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

Merge "Inform the remote provisioner when a key may have been consumed"

Browse Source
This commit is contained in:
Seth Moore
2022-03-30 14:12:05 +00:00
committed by Gerrit Code Review
parent e5e6e495aa 68cca7a7c6
commit ca344c9949
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
identity/java/android/security/identity/CredstoreIdentityCredentialStore.java
View File

@@ -19,7 +19,10 @@ package android.security.identity;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.security.GenerateRkpKey;
import android.security.keymaster.KeymasterDefs;
class CredstoreIdentityCredentialStore extends IdentityCredentialStore { class CredstoreIdentityCredentialStore extends IdentityCredentialStore {
@@ -104,6 +107,16 @@ class CredstoreIdentityCredentialStore extends IdentityCredentialStore {
try { try {
IWritableCredential wc; IWritableCredential wc;
wc = mStore.createCredential(credentialName, docType); wc = mStore.createCredential(credentialName, docType);
try {
GenerateRkpKey keyGen = new GenerateRkpKey(mContext);
// We don't know what the security level is for the backing keymint, so go ahead and
// poke the provisioner for both TEE and SB.
keyGen.notifyKeyGenerated(KeymasterDefs.KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT);
keyGen.notifyKeyGenerated(KeymasterDefs.KM_SECURITY_LEVEL_STRONGBOX);
} catch (RemoteException e) {
// Not really an error state. Does not apply at all if RKP is unsupported or
// disabled on a given device.
}
return new CredstoreWritableIdentityCredential(mContext, credentialName, docType, wc); return new CredstoreWritableIdentityCredential(mContext, credentialName, docType, wc);
} catch (android.os.RemoteException e) { } catch (android.os.RemoteException e) {
throw new RuntimeException("Unexpected RemoteException ", e); throw new RuntimeException("Unexpected RemoteException ", e);