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

Commit 5eacd777 authored by Alex Klyubin's avatar Alex Klyubin
Browse files

Unbreak obtaining symmetric keys from AndroidKeyStore. 

This tracks 59f977c6 due to which
AndroidKeyStore is unable to provide symmetric keys because it
assumes that the digest field is not repeating.

Bug: 18088752
Change-Id: Ie8ed01449280b7c759e81aeaf2066953b0abaf2a
parent 82992b72

keystore/java/android/security/AndroidKeyStore.java

+10 −5
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import java.util.Date; 
import java.util.Enumeration;

import java.util.HashSet;

import java.util.Iterator;

import java.util.List;

import java.util.Set;



import javax.crypto.SecretKey;
@@ -116,11 +117,15 @@ public class AndroidKeyStore extends KeyStoreSpi { 
                throw new UnrecoverableKeyException("Key algorithm unknown");

            }



            int keymasterDigest =

                    keyCharacteristics.hwEnforced.getInt(KeymasterDefs.KM_TAG_DIGEST, -1);

            if (keymasterDigest == -1) {

                keymasterDigest =

                        keyCharacteristics.swEnforced.getInt(KeymasterDefs.KM_TAG_DIGEST, -1);

            List<Integer> keymasterDigests =

                    keyCharacteristics.getInts(KeymasterDefs.KM_TAG_DIGEST);

            int keymasterDigest;

            if (keymasterDigests.isEmpty()) {

                keymasterDigest = -1;

            } else {

                // More than one digest can be permitted for this key. Use the first one to form the

                // JCA key algorithm name.

                keymasterDigest = keymasterDigests.get(0);

            }



            String keyAlgorithmString;