From 8c97d4fe79d18c8a7b2a09e870e87c6a242aeb4f Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Fri, 16 Apr 2021 12:38:01 -0700 Subject: [PATCH] Fix operation auth bound keys. CryptoObject still called the legacy AndroidKeystoreProvider which did not return the correct operation handle for per operation auth bound keys. Bug: 184804041 Bug: 185181377 Test: CtsVerifier->Security->Biometric Tests->2a Strong Biometrics + Crypto Merged-In: I0bceff0425e7ef32c394f33deda3c78f729c0c6c Change-Id: I0bceff0425e7ef32c394f33deda3c78f729c0c6c --- core/java/android/hardware/biometrics/CryptoObject.java | 2 +- .../android/security/keystore/AndroidKeyStoreProvider.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/java/android/hardware/biometrics/CryptoObject.java b/core/java/android/hardware/biometrics/CryptoObject.java index 0af18dfb0e3a0..7648cf241298e 100644 --- a/core/java/android/hardware/biometrics/CryptoObject.java +++ b/core/java/android/hardware/biometrics/CryptoObject.java @@ -18,7 +18,7 @@ package android.hardware.biometrics; import android.annotation.NonNull; import android.security.identity.IdentityCredential; -import android.security.keystore.AndroidKeyStoreProvider; +import android.security.keystore2.AndroidKeyStoreProvider; import java.security.Signature; diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java index ecb082e71321a..62fe54f1f0896 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java @@ -62,10 +62,8 @@ public class AndroidKeyStoreProvider extends Provider { */ @UnsupportedAppUsage public static long getKeyStoreOperationHandle(Object cryptoPrimitive) { - if (cryptoPrimitive == null) { - throw new NullPointerException(); - } - return 0; + return android.security.keystore2.AndroidKeyStoreProvider + .getKeyStoreOperationHandle(cryptoPrimitive); } /**