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

am 8ed86d2b: Merge change 25717 into eclair

Browse Source 
Merge commit '8ed86d2b463be60d65e86aac33550d8fc84bd2a5' into eclair-plus-aosp

* commit '8ed86d2b463be60d65e86aac33550d8fc84bd2a5':
  CertTool: avoid using final static array.
This commit is contained in:
Chia-chi Yeh
2009-09-17 23:03:53 -07:00
committed by Android Git Automerger
parent b80d9296fd 8ed86d2b46
commit 0a08b1d02a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/CertTool.java
View File

@@ -36,11 +36,13 @@ class CertTool {
private static final AlgorithmIdentifier MD5_WITH_RSA =
new AlgorithmIdentifier(PKCSObjectIdentifiers.md5WithRSAEncryption);
static final String[] KEY_STRENGTH_LIST = {"High Grade", "Medium Grade"};
static final String CERT = Credentials.CERTIFICATE;
static final String PKCS12 = Credentials.PKCS12;
static String[] getKeyStrengthList() {
return new String[] {"High Grade", "Medium Grade"};
}
static String getSignedPublicKey(Context context, int index, String challenge) {
try {
KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA");

2
core/java/android/webkit/JWebCoreJavaBridge.java
View File

@@ -233,7 +233,7 @@ final class JWebCoreJavaBridge extends Handler {
}
private String[] getKeyStrengthList() {
return CertTool.KEY_STRENGTH_LIST;
return CertTool.getKeyStrengthList();
}
private String getSignedPublicKey(int index, String challenge, String url) {