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

Commit 2b106ada authored by Janis Danisevskis's avatar Janis Danisevskis
Browse files

Fix IllegalArgumentException in KeyChain 

The legacy support importKey method uses the wrong method to add date
fields to the import keymaster arguments.

Bug: 119549023
Change-Id: Iff841086f6616303b365ad28aae429ccae1f3406
parent 082bf0cc

keystore/java/android/security/KeyStore.java

+4 −5
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import java.io.ByteArrayInputStream; 
import java.io.IOException;

import java.security.InvalidKeyException;

import java.util.Arrays;

import java.util.Date;

import java.util.List;

import java.util.Locale;

import java.util.concurrent.CompletableFuture;
@@ -688,11 +689,9 @@ public class KeyStore { 
        args.addEnum(KeymasterDefs.KM_TAG_DIGEST, KeymasterDefs.KM_DIGEST_SHA_2_384);

        args.addEnum(KeymasterDefs.KM_TAG_DIGEST, KeymasterDefs.KM_DIGEST_SHA_2_512);

        args.addBoolean(KeymasterDefs.KM_TAG_NO_AUTH_REQUIRED);

        args.addUnsignedLong(KeymasterDefs.KM_TAG_ORIGINATION_EXPIRE_DATETIME,

                             KeymasterArguments.UINT64_MAX_VALUE);

        args.addUnsignedLong(KeymasterDefs.KM_TAG_USAGE_EXPIRE_DATETIME,

                             KeymasterArguments.UINT64_MAX_VALUE);

        args.addUnsignedLong(KeymasterDefs.KM_TAG_ACTIVE_DATETIME, BigInteger.ZERO);

        args.addDate(KeymasterDefs.KM_TAG_ORIGINATION_EXPIRE_DATETIME, new Date(Long.MAX_VALUE));

        args.addDate(KeymasterDefs.KM_TAG_USAGE_EXPIRE_DATETIME, new Date(Long.MAX_VALUE));

        args.addDate(KeymasterDefs.KM_TAG_ACTIVE_DATETIME, new Date(0));

        return args;

    }