diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-04-16 12:38:01 -0700 |
|---|---|---|
| committer | Janis Danisevskis <jdanis@google.com> | 2021-04-16 12:55:33 -0700 |
| commit | 8c97d4fe79d18c8a7b2a09e870e87c6a242aeb4f (patch) | |
| tree | 526e802a825041e6c1a6cb71d8b0bf729461d6d3 /keystore/java/android | |
| parent | 2195e2b5146ce8ca8a638584e45008da71f23a77 (diff) | |
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
Diffstat (limited to 'keystore/java/android')
| -rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreProvider.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java index ecb082e71321..62fe54f1f089 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); } /** |