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

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

Browse Source 
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
This commit is contained in:
Kenny Root
2013-04-29 23:09:03 -07:00
parent be53f1806c 1f6e789b7e
commit e9ae6822a8
19 changed files with 147 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@@ -247,7 +247,7 @@ LOCAL_INTERMEDIATE_SOURCES := \
$(framework_res_source_path)/com/android/internal/R.java
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit ext okhttp
LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt core core-junit ext okhttp
LOCAL_MODULE := framework
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
@@ -415,6 +415,7 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \
framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \
bouncycastle \
conscrypt \
core \
okhttp \
ext \

3
core/java/android/app/ActivityThread.java
View File

@@ -92,8 +92,7 @@ import com.android.internal.os.BinderInternal;
import com.android.internal.os.RuntimeInit;
import com.android.internal.os.SamplingProfilerIntegration;
import com.android.internal.util.Objects;
import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl;
import com.android.org.conscrypt.OpenSSLSocketImpl;
import java.io.File;
import java.io.FileDescriptor;

6
core/java/android/net/SSLCertificateSocketFactory.java
View File

@@ -18,6 +18,9 @@ package android.net;
import android.os.SystemProperties;
import android.util.Log;
import com.android.org.conscrypt.OpenSSLContextImpl;
import com.android.org.conscrypt.OpenSSLSocketImpl;
import com.android.org.conscrypt.SSLClientSessionCache;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
@@ -36,9 +39,6 @@ import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;
import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl;
import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;
/**
* SSLSocketFactory implementation with several extra features:

6
core/java/android/net/SSLSessionCache.java
View File

@@ -16,12 +16,12 @@
package android.net;
import org.apache.harmony.xnet.provider.jsse.FileClientSessionCache;
import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;
import android.content.Context;
import android.util.Log;
import com.android.org.conscrypt.FileClientSessionCache;
import com.android.org.conscrypt.SSLClientSessionCache;
import java.io.File;
import java.io.IOException;

4
core/java/android/net/http/CertificateChainValidator.java
View File

@@ -16,6 +16,8 @@
package android.net.http;
import com.android.org.conscrypt.SSLParametersImpl;
import com.android.org.conscrypt.TrustManagerImpl;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -30,8 +32,6 @@ import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.X509TrustManager;
import org.apache.harmony.xnet.provider.jsse.SSLParametersImpl;
import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl;
/**
* Class responsible for all server certificate validation functionality

6
core/java/android/net/http/HttpsConnection.java
View File

@@ -18,9 +18,9 @@ package android.net.http;
import android.content.Context;
import android.util.Log;
import org.apache.harmony.xnet.provider.jsse.FileClientSessionCache;
import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;
import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;
import com.android.org.conscrypt.FileClientSessionCache;
import com.android.org.conscrypt.OpenSSLContextImpl;
import com.android.org.conscrypt.SSLClientSessionCache;
import org.apache.http.Header;
import org.apache.http.HttpException;
import org.apache.http.HttpHost;

2
core/java/android/net/http/X509TrustManagerExtensions.java
View File

@@ -16,7 +16,7 @@
package android.net.http;
import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl;
import com.android.org.conscrypt.TrustManagerImpl;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;

4
core/java/android/webkit/BrowserFrame.java
View File

@@ -55,8 +55,8 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import org.apache.harmony.xnet.provider.jsse.OpenSSLKey;
import org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder;
import com.android.org.conscrypt.OpenSSLKey;
import com.android.org.conscrypt.OpenSSLKeyHolder;
class BrowserFrame extends Handler {

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

@@ -20,9 +20,9 @@ import android.os.Handler;
import java.security.PrivateKey;
import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate;
import org.apache.harmony.xnet.provider.jsse.NativeCrypto;
import org.apache.harmony.xnet.provider.jsse.OpenSSLKey;
import org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder;
import com.android.org.conscrypt.NativeCrypto;
import com.android.org.conscrypt.OpenSSLKey;
import com.android.org.conscrypt.OpenSSLKeyHolder;
/**
* ClientCertRequestHandler: class responsible for handling client

2
core/tests/coretests/Android.mk
View File

@@ -23,7 +23,7 @@ LOCAL_SRC_FILES := \
LOCAL_DX_FLAGS := --core-library
LOCAL_STATIC_JAVA_LIBRARIES := core-tests android-common frameworks-core-util-lib mockwebserver guava littlemock
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt telephony-common
LOCAL_PACKAGE_NAME := FrameworksCoreTests
LOCAL_CERTIFICATE := platform

2
core/tests/coretests/src/android/net/http/X509TrustManagerExtensionsTest.java
View File

@@ -25,7 +25,7 @@ import javax.net.ssl.X509TrustManager;
import junit.framework.TestCase;
import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl;
import com.android.org.conscrypt.TrustManagerImpl;
public class X509TrustManagerExtensionsTest extends TestCase {

2
keystore/java/android/security/AndroidKeyPairGenerator.java
View File

@@ -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;

4
keystore/java/android/security/AndroidKeyStore.java
View File

@@ -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;

4
keystore/java/android/security/KeyChain.java
View File

@@ -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

2
keystore/tests/Android.mk
View File

@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)

2
keystore/tests/src/android/security/AndroidKeyStoreTest.java
View File

@@ -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 android.test.AndroidTestCase;

228
preloaded-classes
View File

@@ -1685,6 +1685,120 @@ com.android.org.bouncycastle.util.encoders.Hex
com.android.org.bouncycastle.util.encoders.HexEncoder
com.android.org.bouncycastle.util.io.Streams
com.android.org.bouncycastle.x509.ExtendedPKIXParameters
com.android.org.conscrypt.AbstractSessionContext
com.android.org.conscrypt.AbstractSessionContext$1
com.android.org.conscrypt.ByteArray
com.android.org.conscrypt.CertPinManager
com.android.org.conscrypt.ChainStrengthAnalyzer
com.android.org.conscrypt.ClientSessionContext
com.android.org.conscrypt.ClientSessionContext$HostAndPort
com.android.org.conscrypt.DefaultSSLContextImpl
com.android.org.conscrypt.FileClientSessionCache
com.android.org.conscrypt.FileClientSessionCache$Impl
com.android.org.conscrypt.JSSEProvider
com.android.org.conscrypt.KeyManagerFactoryImpl
com.android.org.conscrypt.KeyManagerImpl
com.android.org.conscrypt.NativeCrypto
com.android.org.conscrypt.NativeCrypto$SSLHandshakeCallbacks
com.android.org.conscrypt.OpenSSLBIOInputStream
com.android.org.conscrypt.OpenSSLCipher
com.android.org.conscrypt.OpenSSLCipher$AES
com.android.org.conscrypt.OpenSSLCipher$AES$CBC
com.android.org.conscrypt.OpenSSLCipher$AES$CBC$NoPadding
com.android.org.conscrypt.OpenSSLCipher$AES$CBC$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$AES$CFB
com.android.org.conscrypt.OpenSSLCipher$AES$CFB$NoPadding
com.android.org.conscrypt.OpenSSLCipher$AES$CFB$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$AES$CTR
com.android.org.conscrypt.OpenSSLCipher$AES$CTR$NoPadding
com.android.org.conscrypt.OpenSSLCipher$AES$CTR$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$AES$ECB
com.android.org.conscrypt.OpenSSLCipher$AES$ECB$NoPadding
com.android.org.conscrypt.OpenSSLCipher$AES$ECB$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$AES$OFB
com.android.org.conscrypt.OpenSSLCipher$AES$OFB$NoPadding
com.android.org.conscrypt.OpenSSLCipher$AES$OFB$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$ARC4
com.android.org.conscrypt.OpenSSLCipher$DESEDE
com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC
com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC$NoPadding
com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$DESEDE$CFB
com.android.org.conscrypt.OpenSSLCipher$DESEDE$CFB$NoPadding
com.android.org.conscrypt.OpenSSLCipher$DESEDE$CFB$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB
com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB$NoPadding
com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$DESEDE$OFB
com.android.org.conscrypt.OpenSSLCipher$DESEDE$OFB$NoPadding
com.android.org.conscrypt.OpenSSLCipher$DESEDE$OFB$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipherRSA
com.android.org.conscrypt.OpenSSLCipherRSA$PKCS1
com.android.org.conscrypt.OpenSSLCipherRSA$Raw
com.android.org.conscrypt.OpenSSLContextImpl
com.android.org.conscrypt.OpenSSLDSAKeyFactory
com.android.org.conscrypt.OpenSSLDSAKeyPairGenerator
com.android.org.conscrypt.OpenSSLECDHKeyAgreement
com.android.org.conscrypt.OpenSSLECKeyFactory
com.android.org.conscrypt.OpenSSLECKeyPairGenerator
com.android.org.conscrypt.OpenSSLKey
com.android.org.conscrypt.OpenSSLKeyHolder
com.android.org.conscrypt.OpenSSLMac
com.android.org.conscrypt.OpenSSLMac$HmacMD5
com.android.org.conscrypt.OpenSSLMac$HmacSHA1
com.android.org.conscrypt.OpenSSLMac$HmacSHA256
com.android.org.conscrypt.OpenSSLMac$HmacSHA384
com.android.org.conscrypt.OpenSSLMac$HmacSHA512
com.android.org.conscrypt.OpenSSLMessageDigestJDK
com.android.org.conscrypt.OpenSSLMessageDigestJDK$MD5
com.android.org.conscrypt.OpenSSLMessageDigestJDK$SHA1
com.android.org.conscrypt.OpenSSLProvider
com.android.org.conscrypt.OpenSSLRSAKeyFactory
com.android.org.conscrypt.OpenSSLRSAKeyPairGenerator
com.android.org.conscrypt.OpenSSLRSAPublicKey
com.android.org.conscrypt.OpenSSLRandom
com.android.org.conscrypt.OpenSSLSessionImpl
com.android.org.conscrypt.OpenSSLSignature
com.android.org.conscrypt.OpenSSLSignature$1
com.android.org.conscrypt.OpenSSLSignature$EngineType
com.android.org.conscrypt.OpenSSLSignature$MD5RSA
com.android.org.conscrypt.OpenSSLSignature$SHA1DSA
com.android.org.conscrypt.OpenSSLSignature$SHA1ECDSA
com.android.org.conscrypt.OpenSSLSignature$SHA1RSA
com.android.org.conscrypt.OpenSSLSignature$SHA256ECDSA
com.android.org.conscrypt.OpenSSLSignature$SHA256RSA
com.android.org.conscrypt.OpenSSLSignature$SHA384ECDSA
com.android.org.conscrypt.OpenSSLSignature$SHA384RSA
com.android.org.conscrypt.OpenSSLSignature$SHA512ECDSA
com.android.org.conscrypt.OpenSSLSignature$SHA512RSA
com.android.org.conscrypt.OpenSSLSignatureRawRSA
com.android.org.conscrypt.OpenSSLSocketFactoryImpl
com.android.org.conscrypt.OpenSSLSocketImpl
com.android.org.conscrypt.OpenSSLSocketImpl$SSLInputStream
com.android.org.conscrypt.OpenSSLSocketImpl$SSLOutputStream
com.android.org.conscrypt.OpenSSLSocketImplWrapper
com.android.org.conscrypt.OpenSSLX509CertPath
com.android.org.conscrypt.OpenSSLX509CertPath$Encoding
com.android.org.conscrypt.OpenSSLX509Certificate
com.android.org.conscrypt.OpenSSLX509CertificateFactory
com.android.org.conscrypt.OpenSSLX509CertificateFactory$1
com.android.org.conscrypt.OpenSSLX509CertificateFactory$2
com.android.org.conscrypt.OpenSSLX509CertificateFactory$Parser
com.android.org.conscrypt.ProtocolVersion
com.android.org.conscrypt.SSLClientSessionCache
com.android.org.conscrypt.SSLContextImpl
com.android.org.conscrypt.SSLParametersImpl
com.android.org.conscrypt.ServerSessionContext
com.android.org.conscrypt.TrustManagerFactoryImpl
com.android.org.conscrypt.TrustManagerImpl
com.android.org.conscrypt.TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker
com.android.org.conscrypt.TrustedCertificateIndex
com.android.org.conscrypt.TrustedCertificateKeyStoreSpi
com.android.org.conscrypt.TrustedCertificateStore
com.android.org.conscrypt.TrustedCertificateStore$1
com.android.org.conscrypt.TrustedCertificateStore$2
com.android.org.conscrypt.TrustedCertificateStore$3
com.android.org.conscrypt.TrustedCertificateStore$CertSelector
com.android.server.NetworkManagementSocketTagger
com.android.server.NetworkManagementSocketTagger$1
com.android.server.NetworkManagementSocketTagger$SocketTags
@@ -2503,120 +2617,6 @@ org.apache.harmony.security.x509.Validity
org.apache.harmony.security.x509.Validity$1
org.apache.harmony.xml.ExpatAttributes
org.apache.harmony.xml.ExpatParser
org.apache.harmony.xnet.provider.jsse.AbstractSessionContext
org.apache.harmony.xnet.provider.jsse.AbstractSessionContext$1
org.apache.harmony.xnet.provider.jsse.ByteArray
org.apache.harmony.xnet.provider.jsse.CertPinManager
org.apache.harmony.xnet.provider.jsse.ChainStrengthAnalyzer
org.apache.harmony.xnet.provider.jsse.ClientSessionContext
org.apache.harmony.xnet.provider.jsse.ClientSessionContext$HostAndPort
org.apache.harmony.xnet.provider.jsse.DefaultSSLContextImpl
org.apache.harmony.xnet.provider.jsse.FileClientSessionCache
org.apache.harmony.xnet.provider.jsse.FileClientSessionCache$Impl
org.apache.harmony.xnet.provider.jsse.JSSEProvider
org.apache.harmony.xnet.provider.jsse.KeyManagerFactoryImpl
org.apache.harmony.xnet.provider.jsse.KeyManagerImpl
org.apache.harmony.xnet.provider.jsse.NativeCrypto
org.apache.harmony.xnet.provider.jsse.NativeCrypto$SSLHandshakeCallbacks
org.apache.harmony.xnet.provider.jsse.OpenSSLBIOInputStream
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$CBC
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$CBC$NoPadding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$CBC$PKCS5Padding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$CFB
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$CFB$NoPadding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$CFB$PKCS5Padding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$CTR
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$CTR$NoPadding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$CTR$PKCS5Padding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$ECB
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$ECB$NoPadding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$ECB$PKCS5Padding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$OFB
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$OFB$NoPadding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$AES$OFB$PKCS5Padding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$ARC4
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$CBC
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$CBC$NoPadding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$CBC$PKCS5Padding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$CFB
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$CFB$NoPadding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$CFB$PKCS5Padding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$ECB
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$ECB$NoPadding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$ECB$PKCS5Padding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$OFB
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$OFB$NoPadding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipher$DESEDE$OFB$PKCS5Padding
org.apache.harmony.xnet.provider.jsse.OpenSSLCipherRSA
org.apache.harmony.xnet.provider.jsse.OpenSSLCipherRSA$PKCS1
org.apache.harmony.xnet.provider.jsse.OpenSSLCipherRSA$Raw
org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl
org.apache.harmony.xnet.provider.jsse.OpenSSLDSAKeyFactory
org.apache.harmony.xnet.provider.jsse.OpenSSLDSAKeyPairGenerator
org.apache.harmony.xnet.provider.jsse.OpenSSLECDHKeyAgreement
org.apache.harmony.xnet.provider.jsse.OpenSSLECKeyFactory
org.apache.harmony.xnet.provider.jsse.OpenSSLECKeyPairGenerator
org.apache.harmony.xnet.provider.jsse.OpenSSLKey
org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder
org.apache.harmony.xnet.provider.jsse.OpenSSLMac
org.apache.harmony.xnet.provider.jsse.OpenSSLMac$HmacMD5
org.apache.harmony.xnet.provider.jsse.OpenSSLMac$HmacSHA1
org.apache.harmony.xnet.provider.jsse.OpenSSLMac$HmacSHA256
org.apache.harmony.xnet.provider.jsse.OpenSSLMac$HmacSHA384
org.apache.harmony.xnet.provider.jsse.OpenSSLMac$HmacSHA512
org.apache.harmony.xnet.provider.jsse.OpenSSLMessageDigestJDK
org.apache.harmony.xnet.provider.jsse.OpenSSLMessageDigestJDK$MD5
org.apache.harmony.xnet.provider.jsse.OpenSSLMessageDigestJDK$SHA1
org.apache.harmony.xnet.provider.jsse.OpenSSLProvider
org.apache.harmony.xnet.provider.jsse.OpenSSLRSAKeyFactory
org.apache.harmony.xnet.provider.jsse.OpenSSLRSAKeyPairGenerator
org.apache.harmony.xnet.provider.jsse.OpenSSLRSAPublicKey
org.apache.harmony.xnet.provider.jsse.OpenSSLRandom
org.apache.harmony.xnet.provider.jsse.OpenSSLSessionImpl
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$1
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$EngineType
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$MD5RSA
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$SHA1DSA
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$SHA1ECDSA
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$SHA1RSA
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$SHA256ECDSA
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$SHA256RSA
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$SHA384ECDSA
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$SHA384RSA
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$SHA512ECDSA
org.apache.harmony.xnet.provider.jsse.OpenSSLSignature$SHA512RSA
org.apache.harmony.xnet.provider.jsse.OpenSSLSignatureRawRSA
org.apache.harmony.xnet.provider.jsse.OpenSSLSocketFactoryImpl
org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl
org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl$SSLInputStream
org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl$SSLOutputStream
org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImplWrapper
org.apache.harmony.xnet.provider.jsse.OpenSSLX509CertPath
org.apache.harmony.xnet.provider.jsse.OpenSSLX509CertPath$Encoding
org.apache.harmony.xnet.provider.jsse.OpenSSLX509Certificate
org.apache.harmony.xnet.provider.jsse.OpenSSLX509CertificateFactory
org.apache.harmony.xnet.provider.jsse.OpenSSLX509CertificateFactory$1
org.apache.harmony.xnet.provider.jsse.OpenSSLX509CertificateFactory$2
org.apache.harmony.xnet.provider.jsse.OpenSSLX509CertificateFactory$Parser
org.apache.harmony.xnet.provider.jsse.ProtocolVersion
org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache
org.apache.harmony.xnet.provider.jsse.SSLContextImpl
org.apache.harmony.xnet.provider.jsse.SSLParametersImpl
org.apache.harmony.xnet.provider.jsse.ServerSessionContext
org.apache.harmony.xnet.provider.jsse.TrustManagerFactoryImpl
org.apache.harmony.xnet.provider.jsse.TrustManagerImpl
org.apache.harmony.xnet.provider.jsse.TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker
org.apache.harmony.xnet.provider.jsse.TrustedCertificateIndex
org.apache.harmony.xnet.provider.jsse.TrustedCertificateKeyStoreSpi
org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore
org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore$1
org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore$2
org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore$3
org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore$CertSelector
org.apache.http.ConnectionReuseStrategy
org.apache.http.FormattedHeader
org.apache.http.Header

2
tests/CoreTests/android/Android.mk
View File

@@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := \
$(call all-subdir-java-files)
LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt
LOCAL_PACKAGE_NAME := CoreTests

6
tests/CoreTests/android/core/SSLSocketTest.java
View File

@@ -18,10 +18,10 @@ package android.core;
import junit.framework.TestCase;
import com.android.org.conscrypt.FileClientSessionCache;
import com.android.org.conscrypt.OpenSSLContextImpl;
import com.android.org.conscrypt.SSLClientSessionCache;
import org.apache.commons.codec.binary.Base64;
import org.apache.harmony.xnet.provider.jsse.FileClientSessionCache;
import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;
import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;