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

Commit fdd15778 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add new key purpose Wrap Key to KeyProperties.java and""

parents 7d724ab5 66925ecc

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -36417,7 +36417,6 @@ package android.security.keystore { 
    field public static final int PURPOSE_ENCRYPT = 1; // 0x1

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

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

    field public static final int PURPOSE_WRAP_KEY = 16; // 0x10

    field public static final java.lang.String SIGNATURE_PADDING_RSA_PKCS1 = "PKCS1";

    field public static final java.lang.String SIGNATURE_PADDING_RSA_PSS = "PSS";

  }

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -39340,7 +39340,6 @@ package android.security.keystore { 
    field public static final int PURPOSE_ENCRYPT = 1; // 0x1

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

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

    field public static final int PURPOSE_WRAP_KEY = 16; // 0x10

    field public static final java.lang.String SIGNATURE_PADDING_RSA_PKCS1 = "PKCS1";

    field public static final java.lang.String SIGNATURE_PADDING_RSA_PSS = "PSS";

  }

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -36556,7 +36556,6 @@ package android.security.keystore { 
    field public static final int PURPOSE_ENCRYPT = 1; // 0x1

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

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

    field public static final int PURPOSE_WRAP_KEY = 16; // 0x10

    field public static final java.lang.String SIGNATURE_PADDING_RSA_PKCS1 = "PKCS1";

    field public static final java.lang.String SIGNATURE_PADDING_RSA_PSS = "PSS";

  }

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

+0 −2
Original line number Diff line number Diff line
@@ -138,8 +138,6 @@ public final class KeymasterDefs { 
    public static final int KM_PURPOSE_DECRYPT = 1;

    public static final int KM_PURPOSE_SIGN = 2;

    public static final int KM_PURPOSE_VERIFY = 3;

    public static final int KM_PURPOSE_DERIVE_KEY = 4;

    public static final int KM_PURPOSE_WRAP_KEY = 5;



    // Key formats.

    public static final int KM_KEY_FORMAT_X509 = 0;

keystore/java/android/security/keystore/KeyProperties.java

+0 −11
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ public abstract class KeyProperties { 
                PURPOSE_DECRYPT,

                PURPOSE_SIGN,

                PURPOSE_VERIFY,

                PURPOSE_WRAP_KEY,

                })

    public @interface PurposeEnum {}
@@ -69,12 +68,6 @@ public abstract class KeyProperties { 
     */

    public static final int PURPOSE_VERIFY = 1 << 3;



    /**

     * Purpose of key: wrapping key for secure key import.

     */

    public static final int PURPOSE_WRAP_KEY = 1 << 4;





    /**

     * @hide

     */
@@ -91,8 +84,6 @@ public abstract class KeyProperties { 
                    return KeymasterDefs.KM_PURPOSE_SIGN;

                case PURPOSE_VERIFY:

                    return KeymasterDefs.KM_PURPOSE_VERIFY;

                case PURPOSE_WRAP_KEY:

                    return KeymasterDefs.KM_PURPOSE_WRAP_KEY;

                default:

                    throw new IllegalArgumentException("Unknown purpose: " + purpose);

            }
@@ -108,8 +99,6 @@ public abstract class KeyProperties { 
                    return PURPOSE_SIGN;

                case KeymasterDefs.KM_PURPOSE_VERIFY:

                    return PURPOSE_VERIFY;

                case KeymasterDefs.KM_PURPOSE_WRAP_KEY:

                    return PURPOSE_WRAP_KEY;

                default:

                    throw new IllegalArgumentException("Unknown purpose: " + purpose);

            }