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

Commit 750b71c6 authored by Robert Berry's avatar Robert Berry
Browse files

Unhide RecoverySession#recoverKeyChainSnapshot() method 

The other methods expose raw key materials, which is a security flaw. This
new API is already being used by GMSCore, via reflection (although falling
back to the old methods if it is not available). Would be good to switch it
on ASAP.

Bug: 74345822
Test: Tested with GMSCore
Change-Id: I30d53c9e825888d1122c72d23b7c1c10c6edb1e9
parent 98ea60c4

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -4388,7 +4388,8 @@ package android.security.keystore.recovery { 


  public class RecoverySession implements java.lang.AutoCloseable {

    method public void close();

    method public java.util.Map<java.lang.String, byte[]> recoverKeys(byte[], java.util.List<android.security.keystore.recovery.WrappedApplicationKey>) throws android.security.keystore.recovery.DecryptionFailedException, android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.SessionExpiredException;

    method public java.util.Map<java.lang.String, java.security.Key> recoverKeyChainSnapshot(byte[], java.util.List<android.security.keystore.recovery.WrappedApplicationKey>) throws android.security.keystore.recovery.DecryptionFailedException, android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.SessionExpiredException;

    method public deprecated java.util.Map<java.lang.String, byte[]> recoverKeys(byte[], java.util.List<android.security.keystore.recovery.WrappedApplicationKey>) throws android.security.keystore.recovery.DecryptionFailedException, android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.SessionExpiredException;

    method public deprecated byte[] start(byte[], byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;

    method public deprecated byte[] start(java.security.cert.CertPath, byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;

    method public byte[] start(java.lang.String, java.security.cert.CertPath, byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;

core/java/android/security/keystore/recovery/RecoverySession.java

+2 −12
Original line number Diff line number Diff line
@@ -197,17 +197,9 @@ public class RecoverySession implements AutoCloseable { 
    }



    /**

     * Imports keys.

     *

     * @param recoveryKeyBlob Recovery blob encrypted by symmetric key generated for this session.

     * @param applicationKeys Application keys. Key material can be decrypted using recoveryKeyBlob

     *     and session. KeyStore only uses package names from the application info in {@link

     *     WrappedApplicationKey}. Caller is responsibility to perform certificates check.

     * @return Map from alias to raw key material.

     * @throws SessionExpiredException if {@code session} has since been closed.

     * @throws DecryptionFailedException if unable to decrypt the snapshot.

     * @throws InternalRecoveryServiceException if an error occurs internal to the recovery service.

     * @deprecated Use {@link #recoverKeyChainSnapshot(byte[], List)} instead.

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)

    public Map<String, byte[]> recoverKeys(

            @NonNull byte[] recoveryKeyBlob,
@@ -239,8 +231,6 @@ public class RecoverySession implements AutoCloseable { 
     * @throws SessionExpiredException if {@code session} has since been closed.

     * @throws DecryptionFailedException if unable to decrypt the snapshot.

     * @throws InternalRecoveryServiceException if an error occurs internal to the recovery service.

     *

     * @hide

     */

    @RequiresPermission(Manifest.permission.RECOVER_KEYSTORE)

    public Map<String, Key> recoverKeyChainSnapshot(