diff options
author | Chung-yih Wang <cywang@google.com> | 2009-07-02 23:42:12 +0800 |
---|---|---|
committer | Chung-yih Wang <cywang@google.com> | 2009-07-04 00:22:51 +0800 |
commit | bf20b9963add781a35de658f3228760015a163c9 (patch) | |
tree | ab310659e9be96273833221ba4dbf9863eba1407 /core/java/android/webkit | |
parent | 24ad29c6dbbf62096bcb41ddb2fa3975720ee625 (diff) | |
download | frameworks_base-bf20b9963add781a35de658f3228760015a163c9.zip frameworks_base-bf20b9963add781a35de658f3228760015a163c9.tar.gz frameworks_base-bf20b9963add781a35de658f3228760015a163c9.tar.bz2 |
Migrate to the CertTool library.
Keystore is reimplemented and it is mainly for storing
(key, value) pair generically. The certificate related
APIs are moved to the class CertTool instead.
Updates:
Provide the getInstance() which gives the singleton.
Fix the missing construction of the BIO in cert.c.
Diffstat (limited to 'core/java/android/webkit')
-rw-r--r-- | core/java/android/webkit/JWebCoreJavaBridge.java | 6 | ||||
-rw-r--r-- | core/java/android/webkit/LoadListener.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java index 5c0bd93..1dbd007 100644 --- a/core/java/android/webkit/JWebCoreJavaBridge.java +++ b/core/java/android/webkit/JWebCoreJavaBridge.java @@ -18,7 +18,7 @@ package android.webkit; import android.os.Handler; import android.os.Message; -import android.security.Keystore; +import android.security.CertTool; import android.util.Log; final class JWebCoreJavaBridge extends Handler { @@ -188,12 +188,12 @@ final class JWebCoreJavaBridge extends Handler { } private String[] getKeyStrengthList() { - return Keystore.getInstance().getSupportedKeyStrenghs(); + return CertTool.getInstance().getSupportedKeyStrenghs(); } private String getSignedPublicKey(int index, String challenge, String url) { // generateKeyPair expects organizations which we don't have. Ignore url. - return Keystore.getInstance().generateKeyPair(index, challenge, null); + return CertTool.getInstance().generateKeyPair(index, challenge, null); } private native void nativeConstructor(); diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java index 07e03ff..39360cd 100644 --- a/core/java/android/webkit/LoadListener.java +++ b/core/java/android/webkit/LoadListener.java @@ -28,7 +28,7 @@ import android.net.http.SslError; import android.os.Handler; import android.os.Message; -import android.security.Keystore; +import android.security.CertTool; import android.util.Log; import android.webkit.CacheManager.CacheResult; import android.widget.Toast; @@ -999,7 +999,7 @@ class LoadListener extends Handler implements EventHandler { } mDataBuilder.releaseChunk(c); } - Keystore.getInstance().addCertificate(cert); + CertTool.getInstance().addCertificate(cert, mContext); Toast.makeText(mContext, R.string.certificateSaved, Toast.LENGTH_SHORT).show(); mBrowserFrame.stopLoading(); |