Merge change 21259 into eclair

* changes:
  Make certificate-handling-related constants public
This commit is contained in:
Android (Google) Code Review
2009-08-26 20:29:17 -07:00

View File

@@ -42,6 +42,15 @@ public class CertTool {
System.loadLibrary("certtool_jni"); System.loadLibrary("certtool_jni");
} }
/** Keystore namespace for CA certificates. */
public static final String CA_CERTIFICATE = "CACERT";
/** Keystore namespace for user certificates. */
public static final String USER_CERTIFICATE = "USRCERT";
/** Keystore namespace for user private keys. */
public static final String USER_KEY = "USRKEY";
public static final String ACTION_ADD_CREDENTIAL = public static final String ACTION_ADD_CREDENTIAL =
"android.security.ADD_CREDENTIAL"; "android.security.ADD_CREDENTIAL";
public static final String KEY_TYPE_NAME = "typeName"; public static final String KEY_TYPE_NAME = "typeName";
@@ -60,10 +69,6 @@ public class CertTool {
private static final String ISSUER_NAME = "Issuer Name:"; private static final String ISSUER_NAME = "Issuer Name:";
private static final String DISTINCT_NAME = "Distinct Name:"; private static final String DISTINCT_NAME = "Distinct Name:";
private static final String CA_CERTIFICATE = "CACERT";
private static final String USER_CERTIFICATE = "USRCERT";
private static final String USER_KEY = "USRKEY";
private static final String KEYNAME_DELIMITER = "_"; private static final String KEYNAME_DELIMITER = "_";
private static final Keystore sKeystore = Keystore.getInstance(); private static final Keystore sKeystore = Keystore.getInstance();