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

Fix operation auth bound keys.

Browse Source 
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
This commit is contained in:
Janis Danisevskis
2021-04-16 12:38:01 -07:00
parent 2195e2b514
commit 8c97d4fe79
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/biometrics/CryptoObject.java
View File

@@ -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;

6
keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
View File

@@ -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);
}
/**