diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-26 20:29:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-26 20:29:17 -0700 |
| commit | d21a04c06c0d9b1cb401c30bf6da778010872957 (patch) | |
| tree | 605df7209d6a7b3adef1459e5ba7e66395a2e6f7 /keystore | |
| parent | ed5fede3f8a376ebed46beeb41796838847ad68d (diff) | |
| parent | 20a1156c6fd30f3ec1336894d6ae7e00298ad65b (diff) | |
| download | frameworks_base-d21a04c06c0d9b1cb401c30bf6da778010872957.zip frameworks_base-d21a04c06c0d9b1cb401c30bf6da778010872957.tar.gz frameworks_base-d21a04c06c0d9b1cb401c30bf6da778010872957.tar.bz2 | |
Merge change 21259 into eclair
* changes:
Make certificate-handling-related constants public
Diffstat (limited to 'keystore')
| -rw-r--r-- | keystore/java/android/security/CertTool.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/keystore/java/android/security/CertTool.java b/keystore/java/android/security/CertTool.java index 989432a..d1174ad 100644 --- a/keystore/java/android/security/CertTool.java +++ b/keystore/java/android/security/CertTool.java @@ -42,6 +42,15 @@ public class CertTool { 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 = "android.security.ADD_CREDENTIAL"; 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 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 Keystore sKeystore = Keystore.getInstance(); |