Commits · f80cadc42c3b42f8f40a1bc5d51b94a48f8dc1c0 · halo / external_conscrypt

29 Apr, 2013 1 commit

Kenny Root authored 12 years ago

To help with shipping the JSSE with apps that want to bundle it, move
it to a new package so that the tangles in other parts of the library
can be untangled.

Change-Id: I810b6861388635301e28aee5b9b47b8e6b35b430

860d2707

11 Aug, 2010 1 commit
- Sorting imports. · 7a19bf9f
  Jesse Wilson authored 14 years ago
```
Change-Id: I8347bc625480a1c37a1ed9976193ddfedeb00bbc
```
  7a19bf9f
13 May, 2010 1 commit
- Remove all trailing whitespace from the dalvik team-maintained parts of libcore. · 73f1fad2
  Elliott Hughes authored 15 years ago
```
Gentlemen, you may now set your editors to "strip trailing whitespace"...

Change-Id: I85b2f6c80e5fbef1af6cab11789790b078c11b1b
```
  73f1fad2
04 May, 2010 1 commit
- Merge awt-kernel, icu, luni-kernel, prefs, security-kernel, x-net into luni · 252a1997
  Peter Hallam authored 15 years ago
```
Merge xml except xmlpull and kxml into luni
```
  252a1997
13 Nov, 2009 1 commit
- eclair snapshot · 1d02a569
  Jean-Baptiste Queru authored 15 years ago
  
  1d02a569
27 Aug, 2009 1 commit

Update x-net to Harmony r802921. · bb8f91fc

Jesse Wilson authored 15 years ago

Notable changes
 - synchronization added where it was needed!
 - try/finally added to reliably tear down in DefaultSSLContext
 - ContextImpl deleted, it wasn't necessary
 - methods reordered to make statics first in the class
 - PrivilegedActions parameterized with <Void>
 - DigitalSignature now throws AssertionErrors in impossible states
   and throws AlertExceptions on invalid keys (rather than dumping
   a stacktrace)
 - ValueKeys added to SSLSessionImpl instead of TwoKeyMaps
 - SSLSessionImpl.clone() simplified to do a traditional clone

Squashed commit of the following:

commit 2d9e43d542ab7086af271bf52e847c582decbab1
Merge: 8b79eb4 a8dc377
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 15:25:21 2009 -0700

    Merge branch 'x-net_802921' into x-net_dalvik

    Conflicts:
    	libcore/x-net/.classpath
    	libcore/x-net/.settings/org.eclipse.jdt.core.prefs
    	libcore/x-net/build.xml
    	libcore/x-net/src/main/java/javax/net/DefaultServerSocketFactory.java
    	libcore/x-net/src/main/java/javax/net/DefaultSocketFactory.java
    	libcore/x-net/src/main/java/javax/net/ServerSocketFactory.java
    	libcore/x-net/src/main/java/javax/net/SocketFactory.java
    	libcore/x-net/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java
    	libcore/x-net/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
    	libcore/x-net/src/main/java/javax/net/ssl/DefaultSSLContext.java
    	libcore/x-net/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java
    	libcore/x-net/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
    	libcore/x-net/src/main/java/javax/net/ssl/HandshakeCompletedListener.java
    	libcore/x-net/src/main/java/javax/net/ssl/HostnameVerifier.java
    	libcore/x-net/src/main/java/javax/net/ssl/HttpsURLConnection.java
    	libcore/x-net/src/main/java/javax/net/ssl/KeyManager.java
    	libcore/x-net/src/main/java/javax/net/ssl/KeyManagerFactory.java
    	libcore/x-net/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java
    	libcore/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
    	libcore/x-net/src/main/java/javax/net/ssl/ManagerFactoryParameters.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLContext.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLContextSpi.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLEngine.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLEngineResult.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLException.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLHandshakeException.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLKeyException.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLPermission.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLProtocolException.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLServerSocket.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLServerSocketFactory.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLSession.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLSessionBindingListener.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLSessionContext.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLSocket.java
    	libcore/x-net/src/main/java/javax/net/ssl/SSLSocketFactory.java
    	libcore/x-net/src/main/java/javax/net/ssl/TrustManager.java
    	libcore/x-net/src/main/java/javax/net/ssl/TrustManagerFactory.java
    	libcore/x-net/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java
    	libcore/x-net/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java
    	libcore/x-net/src/main/java/javax/net/ssl/X509KeyManager.java
    	libcore/x-net/src/main/java/javax/net/ssl/X509TrustManager.java
    	libcore/x-net/src/main/java/javax/net/ssl/package-info.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImplWrapper.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImpl.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java
    	libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketOutputStream.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HandshakeCompletedEventTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HttpsURLConnectionTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext1Test.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory1Test.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java
    	libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java
    	libcore/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java
    	libcore/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java
    	libcore/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java
    	libcore/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLSocketFactoryTest.java
    	libcore/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java
    	libcore/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java
    	libcore/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/HandshakeProtocolTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/KeyManagerImplTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImplTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLStreamedInputTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImplTest.java
    	libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
    	libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java
    	libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/KeyManagerFactoryImplTest.java
    	libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/ProtocolVersionTest.java
    	libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/TrustManagerFactoryImplTest.java
    	libcore/x-net/src/test/java/javax/net/ssl/KeyManagerFactorySpiTests.java
    	libcore/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java
    	libcore/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java
    	libcore/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java
    	libcore/x-net/src/test/java/javax/net/ssl/SSLContextSpiTests.java
    	libcore/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java
    	libcore/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
    	libcore/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
    	libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
    	libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
    	libcore/x-net/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
    	libcore/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java
    	libcore/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java
    	libcore/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java

commit 8b79eb40a27f0b336d5516606d43162ecead09ca
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 12:58:17 2009 -0700

    x-net_dalvik

commit a8dc3778cd2a1a5d6d0cfff6eec22e7bfbdb9c14
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 12:56:55 2009 -0700

    x-net_802921

commit 07ca0ed8aa5927c909f880559c17d162c111608e
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 12:56:07 2009 -0700

    x-net_527399

commit 9b44ccfc38c2fc2a6cf2c3cc39a13cc5bce635ba
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 11:14:01 2009 -0700

    Small changes missed in the original submission of 22482.

bb8f91fc

04 Mar, 2009 2 commits
- auto import from //depot/cupcake/@135843 · 08ecc8c0
  The Android Open Source Project authored 16 years ago
  
  08ecc8c0
- auto import from //depot/cupcake/@135843 · 6cc83374
  The Android Open Source Project authored 16 years ago
  
  6cc83374
21 Oct, 2008 1 commit
- Initial Contribution · 10da3cb6
  The Android Open Source Project authored 16 years ago
  
  10da3cb6