Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f246dc63 authored Feb 01, 2021 by Janis Danisevskis Committed by Gerrit Code Review Feb 01, 2021

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

parents 8d8f48f0 05943c30

keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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;

keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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