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

Commit 250dd262 authored by Shawn Willden's avatar Shawn Willden Committed by Android Git Automerger
Browse files

am 763100e6: am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys... 

am 763100e6: am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."

* commit '763100e6':
  Unbreak obtaining symmetric keys from AndroidKeyStore.
parents aaa29705 763100e6

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;