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

Commit 69ffb7d1 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86c5c808f585ff6a721f233b69d44826a44bd5fa
parents 843c68e5 b30a7eb0

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

+5 −0
Original line number 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;

        // We just need one digest for the algorithm name

        int keymasterDigest = -1;

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

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { 
            int[] keymasterEncryptionPaddings =

                    KeyProperties.EncryptionPadding.allToKeymaster(

                            spec.getEncryptionPaddings());

            if (((spec.getPurposes() & KeyProperties.PURPOSE_DECRYPT) != 0)

            if (((spec.getPurposes() & KeyProperties.PURPOSE_ENCRYPT) != 0)

                    && (spec.isRandomizedEncryptionRequired())) {

                for (int keymasterPadding : keymasterEncryptionPaddings) {

                    if (!KeymasterUtils