Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d21a04c0: Merge change 21259 into eclair

Browse Source 
Merge commit 'd21a04c06c0d9b1cb401c30bf6da778010872957' into eclair-plus-aosp

* commit 'd21a04c06c0d9b1cb401c30bf6da778010872957':
  Make certificate-handling-related constants public
This commit is contained in:
Hung-ying Tyan
2009-08-26 20:31:29 -07:00
committed by Android Git Automerger
parent c66f5ebf42 d21a04c06c
commit 8464eb2eab
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
keystore/java/android/security/CertTool.java
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();