From 4ff6274fa770edf86d31dfea36e518d2964b2eee Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Tue, 5 Oct 2021 18:07:07 -0700 Subject: Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry. Fix a NullPointerException when trying to insert SecretKey that already exists. Bug: 202146009 Test: atest android.keystore.cts.AndroidKeyStoreTest#testKeyStore_SetKeyEntry_ReplacedWithSameGeneratedSecretKey Change-Id: If3a4bd6677ab3173c5c1a7c921ba567b7981662b --- keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'keystore/java') diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java index 67358c4f3255..33411e1ec5b9 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java @@ -601,8 +601,6 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { } KeyProtection params = (KeyProtection) param; - @SecurityLevel int securityLevel = params.isStrongBoxBacked() ? SecurityLevel.STRONGBOX : - SecurityLevel.TRUSTED_ENVIRONMENT; @Domain int targetDomain = (getTargetDomain()); if (key instanceof AndroidKeyStoreSecretKey) { @@ -794,6 +792,9 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { flags |= IKeystoreSecurityLevel.KEY_FLAG_AUTH_BOUND_WITHOUT_CRYPTOGRAPHIC_LSKF_BINDING; } + @SecurityLevel int securityLevel = params.isStrongBoxBacked() ? SecurityLevel.STRONGBOX : + SecurityLevel.TRUSTED_ENVIRONMENT; + try { KeyStoreSecurityLevel securityLevelInterface = mKeyStore.getSecurityLevel( securityLevel); -- cgit v1.2.3-59-g8ed1b