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

Commit a8f0e5a7 authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

Merge "KeyStore: Verbose error reporting" am: 9d805c35 

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

Change-Id: If990bbb1146e842bf08f971135145f36e661c979
parents fa7a88e8 9d805c35

core/api/current.txt

+22 −0
Original line number Diff line number Diff line
@@ -36192,6 +36192,28 @@ package android.security { 
    method @Deprecated @NonNull public android.security.KeyPairGeneratorSpec.Builder setSubject(@NonNull javax.security.auth.x500.X500Principal);

  }













  public class KeyStoreException extends java.lang.Exception {













    method public int getNumericErrorCode();













    method public boolean isSystemError();













    method public boolean isTransientFailure();













    method public boolean requiresUserAuthentication();













    field public static final int ERROR_ATTESTATION_CHALLENGE_TOO_LARGE = 9; // 0x9













    field public static final int ERROR_ID_ATTESTATION_FAILURE = 8; // 0x8













    field public static final int ERROR_INCORRECT_USAGE = 13; // 0xd













    field public static final int ERROR_INTERNAL_SYSTEM_ERROR = 4; // 0x4













    field public static final int ERROR_KEYMINT_FAILURE = 10; // 0xa













    field public static final int ERROR_KEYSTORE_FAILURE = 11; // 0xb













    field public static final int ERROR_KEYSTORE_UNINITIALIZED = 3; // 0x3













    field public static final int ERROR_KEY_CORRUPTED = 7; // 0x7













    field public static final int ERROR_KEY_DOES_NOT_EXIST = 6; // 0x6













    field public static final int ERROR_KEY_NOT_TEMPORALLY_VALID = 14; // 0xe













    field public static final int ERROR_KEY_OPERATION_EXPIRED = 15; // 0xf













    field public static final int ERROR_OTHER = 1; // 0x1













    field public static final int ERROR_PERMISSION_DENIED = 5; // 0x5













    field public static final int ERROR_UNIMPLEMENTED = 12; // 0xc













    field public static final int ERROR_USER_AUTHENTICATION_REQUIRED = 2; // 0x2













  }



























  @Deprecated public final class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter {















    method @Deprecated public boolean isEncryptionRequired();















  }

























core/api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -2196,8 +2196,8 @@ package android.security {













  }































  public class KeyStoreException extends java.lang.Exception {













    ctor public KeyStoreException(int, String);















    method public int getErrorCode();













    method public static boolean hasFailureInfoForError(int);















  }































}

































core/java/android/security/keymaster/KeymasterDefs.java



+19
−0




























Original line number
Diff line number
Diff line








@@ -317,16 +317,35 @@ public final class KeymasterDefs {













            ErrorCode.MISSING_MIN_MAC_LENGTH; // -58;















    public static final int KM_ERROR_UNSUPPORTED_MIN_MAC_LENGTH =















            ErrorCode.UNSUPPORTED_MIN_MAC_LENGTH; // -59;













    public static final int KM_ERROR_UNSUPPORTED_KDF = ErrorCode.UNSUPPORTED_KDF; // -60













    public static final int KM_ERROR_UNSUPPORTED_EC_CURVE = ErrorCode.UNSUPPORTED_EC_CURVE; // -61













    // -62 is KEY_REQUIRES_UPGRADE and is handled by Keystore.













    public static final int KM_ERROR_ATTESTATION_CHALLENGE_MISSING =













            ErrorCode.ATTESTATION_CHALLENGE_MISSING; // -63













    public static final int KM_ERROR_KEYMINT_NOT_CONFIGURED =













            ErrorCode.KEYMINT_NOT_CONFIGURED; // -64













    public static final int KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING =













            ErrorCode.ATTESTATION_APPLICATION_ID_MISSING; // -65;















    public static final int KM_ERROR_CANNOT_ATTEST_IDS =















            ErrorCode.CANNOT_ATTEST_IDS; // -66;













    public static final int KM_ERROR_ROLLBACK_RESISTANCE_UNAVAILABLE =













            ErrorCode.ROLLBACK_RESISTANCE_UNAVAILABLE; // -67;















    public static final int KM_ERROR_HARDWARE_TYPE_UNAVAILABLE =















            ErrorCode.HARDWARE_TYPE_UNAVAILABLE; // -68;















    public static final int KM_ERROR_DEVICE_LOCKED =















            ErrorCode.DEVICE_LOCKED; // -72;













    public static final int KM_ERROR_STORAGE_KEY_UNSUPPORTED =













            ErrorCode.STORAGE_KEY_UNSUPPORTED; // -77,













    public static final int KM_ERROR_INCOMPATIBLE_MGF_DIGEST =













            ErrorCode.INCOMPATIBLE_MGF_DIGEST; // -78,













    public static final int KM_ERROR_UNSUPPORTED_MGF_DIGEST =













            ErrorCode.UNSUPPORTED_MGF_DIGEST; // -79,















    public static final int KM_ERROR_MISSING_NOT_BEFORE =















            ErrorCode.MISSING_NOT_BEFORE; // -80;















    public static final int KM_ERROR_MISSING_NOT_AFTER =















            ErrorCode.MISSING_NOT_AFTER; // -80;













    public static final int KM_ERROR_HARDWARE_NOT_YET_AVAILABLE =













            ErrorCode.HARDWARE_NOT_YET_AVAILABLE; // -85















    public static final int KM_ERROR_UNIMPLEMENTED =















            ErrorCode.UNIMPLEMENTED; // -100;















    public static final int KM_ERROR_VERSION_MISMATCH =

































keystore/java/android/security/KeyStoreException.java



+428
−5


























File changed.
Preview size limit exceeded, changes collapsed.