summaryrefslogtreecommitdiffstats
path: root/luni/src/main/java/javax
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am 97bfa99b: Merge "Break dependency from libcore to Apache XML libraries."Jesse Wilson2011-01-101-4/+6
|\ \ \ | |/ / | | | | | | | | | * commit '97bfa99b73cba7e1d04eb761167c95140c249010': Break dependency from libcore to Apache XML libraries.
| * | Break dependency from libcore to Apache XML libraries.Jesse Wilson2011-01-091-4/+6
| |/ | | | | | | | | Change-Id: I482ba29551423c682696db44f78bc6b74fa04341 http://b/1414929
* | More SecurityManager cleanup.Elliott Hughes2011-01-071-7/+1
| | | | | | | | | | Bug: 2585285 Change-Id: Ib9c5fdadc1361d67227b6f82a774b76c53840ff0
* | Retire SecurityManager.Elliott Hughes2011-01-077-99/+27
|/ | | | | | | | | | This change removes all the code that was calling getSecurityManager, and removes all use of AccessController.doPrivileged. It also changes the implementation of AccessController so it doesn't actually do anything; it's only there for source-level compatibility. Bug: 2585285 Change-Id: I1f0295a4f12bce0316d8073011d8593fee116f71
* Optimize DefaultHostnameVerifier.Jesse Wilson2010-12-201-218/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only behavior change should be a bug fix. There was a heck "cn.lastIndexOf('.') >= 0" that was always true. This has been fixed to match the comment "require two dots". Don't call getDNSSubjectAlts unless necessary. Errors were created and then dropped. Now they're not created. strictWithSubDomains was supported but unused. Now it isn't supported. IP address parsing is now left up to the experts (InetAddress). No more unnecessary conversions to arrays. Before & After performance saves ~40% for google.com, which was the only host that took more than 150 microseconds to verify: host run us linear runtime % www.amazon.com baseline 92.6 = 4% www.amazon.com optimized 26.7 1% www.google.com baseline 2,457.0 ============================== 100% www.google.com optimized 1,421.2 ================= 58% www.ubs.com baseline 143.2 = 6% www.ubs.com optimized 24.4 1% Change-Id: I42782bec6a86b95e8fa089aa6edeca45110c2fc4 http://b/2811070
* Use our canonical Arrays range-checking methods.Elliott Hughes2010-12-032-17/+10
| | | | | | | | There are a handful of manual range-checkers left, thanks to specified API that throws IllegalArgumentException instead, and a few other weird cases. Change-Id: I80914c2257288fc184100545aff4fd6f57bf32c9
* Comments/javadoc should be in en_US, not en_CA.Elliott Hughes2010-12-033-3/+3
| | | | Change-Id: Ie9dde4971e0a6a8dadd14af43d631158fc488cd8
* Stop allocating empty arrays.Elliott Hughes2010-11-094-8/+13
| | | | | Bug: 3166662 Change-Id: I151de373b2bf53786d19824336fa434c02b0b0e8
* resolved conflicts for merge of a5c608e5 to dalvik-devBrian Carlstrom2010-11-021-2/+0
|\ | | | | | | Change-Id: I0319c132ec8f42782475906da267439938308e77
| * TrustManager improvementsBrian Carlstrom2010-11-021-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overhaul of TrustManagerImpl - PKIXParameters can now be final in TrustManagerImpl because we always immediately create an IndexedPKIXParameters instead of only doing it in SSLParametersImpl.createDefaultTrustManager. - Use new KeyStore constructor for IndexedPKIXParameters to remove duplicate logic for creating set of TrustAnchors from a KeyStore. - Improved checkTrusted/cleanupCertChain to remove special cases for directly trusting the end cert or pruning only self signed certs. To support b/2530852, we need to stop prune the chain as soon as we find any trust anchor (using newly improved TrustManagerImpl.isTrustAnchor), which could be at the beginning, middle, or end. That means cleanupCertChain can return an empty chain if everything was trusted directly. (and we don't need to do extra checks on exception cases to see if the problem was just that the trust anchor was in the chain) - isDirectlyTrusted -> isTrustAnchor here as well, using new IndexedPKIXParameters.isTrustAnchor APIs - Fix incorrect assumption in getAcceptedIssuers that all TrustAnchor instances have non-null results for getTrustedCert. luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java Removed indexing in createDefaultTrustManager since we always index now luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParametersImpl.java Overhaul of IndexedPKIXParameters - Single map from subject X500Principal to TrustAnchors instead of two different X500Principal keyed maps to check - Removed map based on encoded cert. For b/2530852, we want to treat certs as equal if they have the same name and public key, not byte-for-byte equality, which can be done with the remaining map. Revamped isDirectlyTrusted into isTrustAnchor(cert) to perform this new name/key based comparison. - Added helper isTrustAnchor(cert, anchors) to reuse code in non-IndexedPKIXParameters case in TrustManagerImpl. - Added constructor from KeyStore - Moved anchor indexing code to index() from old constructor luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java TestKeyStore.getPrivateKey allowed some existing test simplification. luni/src/test/java/libcore/java/security/KeyStoreTest.java luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java support/src/test/java/libcore/java/security/TestKeyStore.java Added missing "fail()" before catching expected exceptions. luni/src/test/java/libcore/java/security/KeyStoreTest.java Expanded KeyManagerFactoryTest to excercise ManagerFactoryParameters b/1628001 luni/src/test/java/libcore/javax/net/ssl/KeyManagerFactoryTest.java Added KeyStoreBuilderParametersTest because I thought I saw a bug in KeyStoreBuilderParameters, but this convinced me otherwise. luni/src/test/java/libcore/javax/net/ssl/KeyStoreBuilderParametersTest.java New TrustManagerFactory test modeled on expanded KeyManagerFactoryTest. test_TrustManagerFactory_intermediate specifically is targeting the new functionality of b/2530852 to handling trust anchors within the chain. luni/src/test/java/libcore/javax/net/ssl/TrustManagerFactoryTest.java support/src/test/java/libcore/java/security/StandardNames.java Some initial on tests for Elliptic Curve (b/3058375) after the RI started reporting it was supported. Removed old @KnownFailure tags. Skipped a test on the RI that it can't handle. Improved some assert messages. luni/src/test/java/libcore/javax/net/ssl/SSLEngineTest.java luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java support/src/test/java/libcore/java/security/StandardNames.java support/src/test/java/libcore/java/security/TestKeyStore.java Removed unneeded bytes->javax->bytes->java case of which can just go bytes->java directly. luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java Removed super() luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java Made Security.secprops final luni/src/main/java/java/security/Security.java Pulled SamplingProfiler fix from dalvik-dev branch git cherry-pick --no-commit f9dc3450e8f23cab91efc9df99bb860221ac3d6c dalvik/src/main/java/dalvik/system/SamplingProfiler.java Bug: 2530852 Change-Id: I95e0c7ee6a2f66b6986b3a9da9583d1ae52f94dd
* | am 8ae047f5: Merge "Change Engine.getInstance interfaces to make usage less ↵Brian Carlstrom2010-10-199-117/+76
|\ \ | |/ | | | | | | | | | | | | | | error prone" Merge commit '8ae047f5329f8bc216e3fe377c068fd8457966f4' into dalvik-dev * commit '8ae047f5329f8bc216e3fe377c068fd8457966f4': Change Engine.getInstance interfaces to make usage less error prone
| * Change Engine.getInstance interfaces to make usage less error proneBrian Carlstrom2010-10-199-117/+76
| | | | | | | | Change-Id: I4c58c95ab4216b52aa8af4fbce7a8d7f4860c2b7
* | am 0a480846: Remove Engine.spi memory leak by clearing after accessBrian Carlstrom2010-10-199-106/+117
|\ \ | |/ | | | | | | | | | | Merge commit '0a480846a9798c763b088a122ab0dcd3dc3a17b6' into dalvik-dev * commit '0a480846a9798c763b088a122ab0dcd3dc3a17b6': Remove Engine.spi memory leak by clearing after access
| * Remove Engine.spi memory leak by clearing after accessBrian Carlstrom2010-10-199-106/+117
| | | | | | | | | | | | | | | | | | Also other minor code cleanup such as: - made assorted fields final - fixed lazy initialization without volatile or sync Bug: 1322442 Change-Id: I34e428dff5f07a7291d635c724111d44f2deff1c
* | am 44b0fe09: am fc15fc0f: am 7b4e6828: Merge "Favor Harmony\'s ↵Brian Carlstrom2010-10-071-52/+43
|\ \ | |/ | | | | | | | | | | | | | | CertificateFactory.X509 over BouncyCastle\'s" into gingerbread Merge commit '44b0fe099dae10a9908194af0aebf2849adce785' into dalvik-dev * commit '44b0fe099dae10a9908194af0aebf2849adce785': Favor Harmony's CertificateFactory.X509 over BouncyCastle's
| * am fc15fc0f: am 7b4e6828: Merge "Favor Harmony\'s CertificateFactory.X509 ↵Brian Carlstrom2010-10-071-52/+43
| |\ | | | | | | | | | | | | | | | | | | | | | | | | over BouncyCastle\'s" into gingerbread Merge commit 'fc15fc0f9902bdecd1c535e6e06ea52669695fce' * commit 'fc15fc0f9902bdecd1c535e6e06ea52669695fce': Favor Harmony's CertificateFactory.X509 over BouncyCastle's
| | * Favor Harmony's CertificateFactory.X509 over BouncyCastle'sBrian Carlstrom2010-10-041-52/+43
| | | | | | | | | | | | | | | Bug: 2225935 Change-Id: Ibca92c9fa34fc539ebb8ea86fb0ced62e3dbe5de
* | | Use IoUtils.closeQuietly where possible.Jesse Wilson2010-10-033-22/+8
| | | | | | | | | | | | Change-Id: I354c1e00b7068108032d09c0a1c38e29f6283fb0
* | | Simplify skip() to use skipByReading or the superclass where possible.Jesse Wilson2010-10-011-23/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Several classes were overriding InputStream.skip() but not doing anything better than the base class. These were deleted. Others were allocating skip buffers which was correct, but duplicated code with our Streams utility class. The CipherInputStream class had a skip method that always skipped 0 bytes. This has been fixed and tested. Change-Id: Ic96c600e111c11cf7364b4e0a721791d7e3c2ae1
* | am 901c9c6f: am 8047b6f0: Merge "Support creating unbound server sockets in ↵Jesse Wilson2010-09-291-6/+3
|\ \ | |/ | | | | | | | | | | | | | | DefaultServerSocketFactory." into gingerbread Merge commit '901c9c6f79e63e3babd3c1184455f3b44abd197d' * commit '901c9c6f79e63e3babd3c1184455f3b44abd197d': Support creating unbound server sockets in DefaultServerSocketFactory.
| * Merge "Support creating unbound server sockets in ↵Jesse Wilson2010-09-291-6/+3
| |\ | | | | | | | | | DefaultServerSocketFactory." into gingerbread
| | * Support creating unbound server sockets in DefaultServerSocketFactory.Jesse Wilson2010-09-291-6/+3
| | | | | | | | | | | | | | | Change-Id: I34106bb55ad99a134b4aae4e24e61b59c0aaa967 http://b/2587385
* | | resolved conflicts for merge of 53e83038 to masterBrian Carlstrom2010-09-281-2/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: luni/src/main/java/java/io/FileInputStream.java luni/src/main/java/java/io/FileOutputStream.java luni/src/main/java/javax/crypto/ExemptionMechanism.java luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java Change-Id: I0dd5da8e8cb1819cb90440c462ba307dffde8ed7
| * | Merge "Scrub missing calls to super.finalize()" into gingerbreadBrian Carlstrom2010-09-281-4/+7
| |\ \
| | * | Scrub missing calls to super.finalize()Brian Carlstrom2010-09-281-4/+7
| | |/ | | | | | | | | | | | | Bug: 3024226 Change-Id: I6642cb9d4929ba72244529efe4ebdfa595ae4fa7
* | | am 395f899e: am 2a275f06: Merge "Tests for ↵Jesse Wilson2010-09-281-18/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | ServerSocketFactory.getDefault()." into gingerbread Merge commit '395f899e35b62795c4cf9415c13c2bf8aa02552e' * commit '395f899e35b62795c4cf9415c13c2bf8aa02552e': Tests for ServerSocketFactory.getDefault().
| * | Tests for ServerSocketFactory.getDefault().Jesse Wilson2010-09-281-18/+13
| |/ | | | | | | | | | | Motivated by http://b/2587385 Change-Id: If30898859f869c88342d1069a2425575752ebf6e
* | Merge "Don't null out fields in ExemptionMechanism.finalize()." into dalvik-devJesse Wilson2010-09-021-6/+8
|\ \ | |/ |/|
| * Don't null out fields in ExemptionMechanism.finalize().Jesse Wilson2010-09-021-6/+8
| | | | | | | | | | | | See http://b/issue?id=2099626 Change-Id: Iab79282b30bc2acbb39f8cfcfab2a45a5a8cf528
| * Don't use StringBuffer where we don't need to.Elliott Hughes2010-09-017-16/+13
| | | | | | | | | | | | I've left xalan alone, because that's just one big steaming heap. Change-Id: I47e80399ebced922656e46dacd8dcbfc698e94f8
* | Use idiomatic Java "type[] id" syntax instead of "type id[]".Elliott Hughes2010-09-022-4/+4
| | | | | | | | | | | | I've left xalan and the other xml filth alone, as usual. Change-Id: I6be274501fff73e67ca6b3c872704988e0e30486
* | Don't use StringBuffer where we don't need to.Brian Carlstrom2010-09-017-16/+13
|/ | | | | | I've left xalan alone, because that's just one big steaming heap. Change-Id: Ibf7b2b5e347196d4de857217b022003ccc409ac5
* Adding documentation for a API bug in FilterInputStream subclassesJesse Wilson2010-08-311-0/+4
| | | | Change-Id: I76a3fdb51e9d0071efef013c6879eb2bc9e7977c
* Clean up some dead/useless code.Elliott Hughes2010-08-111-2/+49
| | | | | | | (The DatagramPacketTest.java change is unrelated, but it's been lurking in my repository for weeks now.) Change-Id: I65d3ad53dd30709b2daed3c5787cc38c6081ffea
* Sorting imports.Jesse Wilson2010-08-1152-88/+36
| | | | Change-Id: I8347bc625480a1c37a1ed9976193ddfedeb00bbc
* Fixing the last API deltas between Dalvik and Java 6.Jesse Wilson2010-06-046-168/+168
| | | | | | | This addresses some problems with generic type signatures (missing <?>) and new factory methods for XML factory classes. Change-Id: I9cd886e38b8bc9d495ae4e5ed70f71f27ac3f0cc
* Merge "Remove the last exception message catalog." into dalvik-devElliott Hughes2010-05-291-5/+2
|\
| * Remove the last exception message catalog.Elliott Hughes2010-05-281-5/+2
| | | | | | | | | | Bug: 1251121 Change-Id: I45931b9ff908531bda06d6569a4e9618986f821b
* | Further small fixes to increase API compatibility with RI v6.Jesse Wilson2010-05-282-15/+133
|/ | | | | | | | | | Highlights: code was moved from SSLContextImpl to its superclass. took X500Principal code from Harmony Tested with Harmony's tests.api.javax.security.auth.x500.X500PrincipalTest. Change-Id: I89b46d4b47e692a5461916cca972e05de95f3280
* RI 6 support for javax.net.sslBrian Carlstrom2010-05-2613-170/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: - RI 6 support for javax.net.ssl - SSLEngine fixes based on new SSLEngineTest - fix Cipher.checkMode bug recently introduced in dalvik-dev Details: Fix Cipher.checkMode that was preventing most javax.net.ssl tests from working luni/src/main/java/javax/crypto/Cipher.java RI 6 has introduced the concept of a "Default" SSLContext. This is accessed via SSLContext.getDefault() and also SSLContext.getInstance("Default"). Harmony had its own DefaultSSLContext but it was not created via an SSLContextSpi. It also was a single shared instance whereas the new RI6 Default SSLContext shares internal SSLSessionContext instances between different Default SSLContexts. Refactored the old code into an SSLContextImpl subclass that allows it to be created via SSLContext.getInstance. SSLContextImpl ensures that we only ever create one set of SSLSessionContext instances for the Default context. luni/src/main/java/javax/net/ssl/DefaultSSLContext.java luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DefaultSSLContextImpl.java luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java Added SSLContext.getDefault and SSLContext.setDefault luni/src/main/java/javax/net/ssl/SSLContext.java Replace dependencies of old DefaultSSLContext with use of SSLContext.getDefault luni/src/main/java/javax/net/ssl/SSLServerSocketFactory.java luni/src/main/java/javax/net/ssl/SSLSocketFactory.java Register "SSLContext.Default" as DefaultSSLContextImpl class for SSLContext.getInstance() luni/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java Added constant for new "Default" standard name and added it to SSL_CONTEXT_PROTOCOLS. New tests based on SSL_CONTEXT_PROTOCOLS made it clear that neither Android or RI support SSLv2 so removed it from SSL_CONTEXT_PROTOCOLS and SSL_SOCKET_PROTOCOLS. Added constant for TLS as well which was previously scattered all over tests. Remove SSLv2Hello from SSL_SOCKET_PROTOCOLS for Android since with OpenSSL disablign SSLv2 means you can not use SSLv2Hello either. support/src/test/java/javax/net/ssl/StandardNames.java Added tests for SSLContext.getDefault and SSLContext.setDefault. Changed existing tests to work on all protocols including new "Default". luni/src/test/java/javax/net/ssl/SSLContextTest.java RI 6 has introduced the notion of SSLParameters which encapsulate SSL the handshake parameters of desired cipher suites, protocols, and client authentication requirements. The main new class SSLParameters is basically just a bag of fields with accessors and a couple simple constructors. The only things of note are that it clones all String arrays on input and output and the setters for the two boolean fields ensure that only one is true at a time. luni/src/main/java/javax/net/ssl/SSLParameters.java Added SSLContext.getDefaultSSLParameters and SSLContext.getSupportedSSLParameters which simply delegate to the SSLContextSpi. luni/src/main/java/javax/net/ssl/SSLContext.java Added abstract SSLContextSpi.engineGetDefaultSSLParameters and SSLContext.engineGetSupportedSSLParameters. luni/src/main/java/javax/net/ssl/SSLContextSpi.java Added engineGetDefaultSSLParameters and engineGetSupportedSSLParameters implementation. The RI documents in SSLContextSpi that these are implemented by default by creating a socket via the SSLContext's SocketFactory and asking for the enabled/supported cipher suites and protocols respectively, so that is what is done. The doc mentions throwing UnsupportedOperationException if there is a problem, so we do that as well. luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java Added {SSLEngine,SSLSocket}.{getSSLParameters,setSSLParameters} which are analogous. luni/src/main/java/javax/net/ssl/SSLEngine.java luni/src/main/java/javax/net/ssl/SSLSocket.java Added SSLParametersTest luni/src/test/java/javax/net/ssl/SSLParametersTest.java luni/src/test/java/javax/net/ssl/AllTests.java Added SSLContext.get{Default,Supported}SSLParameters tests luni/src/test/java/javax/net/ssl/SSLContextTest.java Added SSLSocket.{getSSLParameters,setSSLParameters} tests and added some extra asserts to test_SSLSocketPair_create based on experience with test_SSLEnginePair_create. luni/src/test/java/javax/net/ssl/SSLSocketTest.java Dummy implementation of new SSLContextSpi for test classes. support/src/test/java/org/apache/harmony/security/tests/support/MySSLContextSpi.java support/src/test/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java Other minor RI 6 API changes: RI 6 removed Serializable from HandshakeCompletedEvent and SSLSessionBindingEvent luni/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java luni/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java RI 6 added generic types to the KeyStoreBuilderParameters List constructor and accessor as well as to SSLSessionContext.getIds. Fixed tests to compile with generic types. luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java luni/src/main/java/javax/net/ssl/SSLSessionContext.java luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java SSLEngine improvements. Since I was changing SSLEngine, I wrote an SSLEngineTest based on my SSLSocketTest to do some simply sanity checking. It expose a number of issues. I've fixed the small ones, marked the rest as known failures. Renamed some TLS_ cipher suites to SSL_ to match JSSE standard names. These were all old suites no longer supported by RI or OpenSSL which is why they were missed in an earlier cleanup of this type in this class. Also fixed SSLEngine supported cipher suites list not to include SSL_NULL_WITH_NULL_NULL which is not a valid suite to negotiate. luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java SSLEngine instances can have null host values, which caused a NullPointerException in the ClientSessionContext implementation. luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java SSLEngine tests were failing because SSLParameters was throwing NullPointerException instead of IllegalArgument exception on null element values. Fixed null pointer message style while I was here. luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java Fixed SSLEngine instances to default to server mode like RI luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java Fixed KEY_TYPES based on SSLEngine implementation. Removed dead code NativeCrypto.getEnabledProtocols which was recently made obsolete. Cleaned up null exception messages to follow our convention. luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java Added SSLEngineTest which parallels SSLSocketTest in its coverage. Similarly added TestSSLEnginePair which loosely parallels TestSSLSocketPair. luni/src/test/java/javax/net/ssl/SSLEngineTest.java luni/src/test/java/javax/net/ssl/AllTests.java support/src/test/java/javax/net/ssl/TestSSLEnginePair.java SSLEngineTest betters exposed the differences between SSLSocket and SSLEngine supported cipher suites. StandardNames now has an CIPHER_SUITES_SSLENGINE definition which denotes what is missing and what is extra and why in the SSLEngine implementation. support/src/test/java/javax/net/ssl/StandardNames.java Created StandardNames.assert{Valid,Supported}{CipherSuites,Protocols} to factor out some code test code that is also used by new tests. support/src/test/java/javax/net/ssl/StandardNames.java luni/src/test/java/javax/net/ssl/SSLSocketFactoryTest.java luni/src/test/java/javax/net/ssl/SSLSocketTest.java Remove SSLSocketTest known failure and add new SSLEngineTest known failures expectations/knownfailures.txt SSL_OP_NO_TICKET change was recently merged from master which required some fixes. For the moment, sslServerSocketSupportsSessionTickets always returns false. support/src/test/java/javax/net/ssl/TestSSLContext.java Fixed flakey test_SSLSocket_HandshakeCompletedListener which had a race because the client thread look in the server session context for an session by id potentially before the server thread had a chance to store its session. Made noticable because of SSL_OP_NO_TICKET recently merged from master (before this code path was host only, not device) luni/src/test/java/javax/net/ssl/SSLSocketTest.java Fix checkjni issue where we need to check for pending exception in OpenSSL callback. Possibly introduced by recent merge of SSL_OP_NO_TICKET from master. luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp Expectation updates Remove SSLSocketTest known failure and add new SSLEngineTest known failures expectations/knownfailures.txt Tag test_SSLSocket_getSupportedCipherSuites_connect as large expectations/taggedtests.txt Misc changes: opening brace on wrong line luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerSessionContext.java Long line cleanup while debugging luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketFactoryImpl.java luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java support/src/test/java/javax/net/ssl/TestKeyStore.java Removed bogus import luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java Comment clarify while debugging luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java Ctor -> Constructor in comment luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java Fixed naming of SocketTest_Test_create to TestSocketPair_Create to match renamed classes luni/src/test/java/javax/net/ssl/SSLSocketTest.java Change-Id: I99505e97d6047eeabe4a0b93202075a0b2d486ec
* Implement Java 6 SQL API. Javadoc is still messy and some unit testsJeremy Sharpe2010-05-257-132/+1122
| | | | | | need to be updated to reflect newly implemented parts of the API. Change-Id: Icee718ef997d29aa08fc78b101f87532dc89167f
* Remove more localized exception messages.Elliott Hughes2010-05-2118-311/+202
| | | | | | | | I also accidentally mixed two unrelated changes in here: replacing "".equals and equals("") with String.isEmpty, and removing some dead code in org.apache.harmony.luni.util.Util. Change-Id: I0aaad43290b083085b3095b624caf096de487223
* Remove more localized exception messages.Elliott Hughes2010-05-215-45/+39
| | | | Change-Id: I88eba4180e66d328c23a266f133b96d53cf62d40
* Remove all trailing whitespace from the dalvik team-maintained parts of libcore.Elliott Hughes2010-05-13105-1891/+1891
| | | | | | Gentlemen, you may now set your editors to "strip trailing whitespace"... Change-Id: I85b2f6c80e5fbef1af6cab11789790b078c11b1b
* Convert tabs to spaces.Elliott Hughes2010-05-1323-998/+998
| | | | Change-Id: I16cfbd2faac6b565b78b5dd97e2345323a36f652
* Remove //$NON-NLS-\d$ cruft.Elliott Hughes2010-05-1326-205/+205
| | | | | | | | Mostly done by perl(1), with manual cleanup of the few misspelled instances. This makes our trailing whitespace slightly worse, but I'll fix all that with a follow-on change. Change-Id: I0b4ca98819be6f9519c4ba980d759bd1ee1a0303
* Documentation improvements.Elliott Hughes2010-05-111-8/+0
| | | | | | | Remove a bunch of content-free "package.html" files, and rewrite the Pattern documentation. Change-Id: Ieb4eee940dbbeab21828b8d7b2f172732f9dd6de
* Merge awt-kernel, icu, luni-kernel, prefs, security-kernel, x-net into luniPeter Hallam2010-05-04118-0/+21283
| | | | Merge xml except xmlpull and kxml into luni
* merge more modules into luniPeter Hallam2010-04-2781-0/+12725
generated by cgit v1.1 at 2025-09-14 13:29:41 +0000