diff options
| author | Kenny Root <kroot@google.com> | 2013-04-23 22:34:24 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-04-29 15:15:27 -0700 |
| commit | 12e752225aa96888358294be0d725d499a1c9f03 (patch) | |
| tree | d716c7eedc50ccdf146aaca9b55fae969cf753ec /keystore/java | |
| parent | 28b1f0ee02e14241ffb81f431fc54053771c1c90 (diff) | |
| download | frameworks_base-12e752225aa96888358294be0d725d499a1c9f03.zip frameworks_base-12e752225aa96888358294be0d725d499a1c9f03.tar.gz frameworks_base-12e752225aa96888358294be0d725d499a1c9f03.tar.bz2 | |
Track change to JSSE provider
Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/AndroidKeyPairGenerator.java | 2 | ||||
| -rw-r--r-- | keystore/java/android/security/AndroidKeyStore.java | 4 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyChain.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/keystore/java/android/security/AndroidKeyPairGenerator.java b/keystore/java/android/security/AndroidKeyPairGenerator.java index 6975583..11afbf5 100644 --- a/keystore/java/android/security/AndroidKeyPairGenerator.java +++ b/keystore/java/android/security/AndroidKeyPairGenerator.java @@ -18,7 +18,7 @@ package android.security; import com.android.org.bouncycastle.x509.X509V3CertificateGenerator; -import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine; +import com.android.org.conscrypt.OpenSSLEngine; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; diff --git a/keystore/java/android/security/AndroidKeyStore.java b/keystore/java/android/security/AndroidKeyStore.java index dcc9516..cf715d6 100644 --- a/keystore/java/android/security/AndroidKeyStore.java +++ b/keystore/java/android/security/AndroidKeyStore.java @@ -16,8 +16,8 @@ package android.security; -import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine; -import org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder; +import com.android.org.conscrypt.OpenSSLEngine; +import com.android.org.conscrypt.OpenSSLKeyHolder; import android.util.Log; diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index d7119fff..825a062 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -37,8 +37,8 @@ import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine; -import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore; +import com.android.org.conscrypt.OpenSSLEngine; +import com.android.org.conscrypt.TrustedCertificateStore; /** * The {@code KeyChain} class provides access to private keys and |