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

Commit 8ed86d2b authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 25717 into eclair 

* changes:
  CertTool: avoid using final static array.
parents 794d36c6 c633253b

core/java/android/webkit/CertTool.java

+4 −2
Original line number Diff line number Diff line
@@ -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");

core/java/android/webkit/JWebCoreJavaBridge.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {