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

Merge "Keystore 2.0 SPI: Small fix to apease CTS test." am: f246dc6346

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564074

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1363de7ca5d2600cfa999627ead673752e43b91
This commit is contained in:
Janis Danisevskis
2021-02-01 19:58:52 +00:00
committed by Automerger Merge Worker
parent 4ef820417a f246dc6346
commit b30a7eb006
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java
View File

@@ -363,6 +363,11 @@ public class AndroidKeyStoreProvider extends Provider {
} }
} }
if (response.iSecurityLevel == null) {
// This seems to be a pure certificate entry, nothing to return here.
return null;
}
Integer keymasterAlgorithm = null; Integer keymasterAlgorithm = null;
// We just need one digest for the algorithm name // We just need one digest for the algorithm name
int keymasterDigest = -1; int keymasterDigest = -1;

2
keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
View File

@@ -490,7 +490,7 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
int[] keymasterEncryptionPaddings = int[] keymasterEncryptionPaddings =
KeyProperties.EncryptionPadding.allToKeymaster( KeyProperties.EncryptionPadding.allToKeymaster(
spec.getEncryptionPaddings()); spec.getEncryptionPaddings());
if (((spec.getPurposes() & KeyProperties.PURPOSE_DECRYPT) != 0) if (((spec.getPurposes() & KeyProperties.PURPOSE_ENCRYPT) != 0)
&& (spec.isRandomizedEncryptionRequired())) { && (spec.isRandomizedEncryptionRequired())) {
for (int keymasterPadding : keymasterEncryptionPaddings) { for (int keymasterPadding : keymasterEncryptionPaddings) {
if (!KeymasterUtils if (!KeymasterUtils