summaryrefslogtreecommitdiffstats
path: root/crypto/src/test/java
Commit message (Collapse)AuthorAgeFilesLines
* Move conscrypt out to external/conscryptKenny Root2013-10-0111-4430/+0
| | | | Change-Id: I8895638441ceccb5d794238eb2c8f91a3028dcc9
* Conscrypt: use certificate references in SSL codeKenny Root2013-09-121-22/+52
| | | | | | | Instead of marshalling and unmarshalling to ASN.1 DER, just use references to OpenSSL X509 objects everywhere applicable. Change-Id: I1a28ae9232091ee199a9d4c7cd3c7bbd1efa1ca4
* Make sure ChannelID key is initializedKenny Root2013-09-061-0/+2
| | | | | | | | | | | This test used the test ChannelID key, but it didn't make sure it was initialized first. This made it appear sometimes depending on the order the tests were executed. (cherry picked from commit debfff83084b79b65c092cfe72ebea9d9a9548d6) Bug: 10210673 Change-Id: I5212e265611208ecb641a7d6b403985df603cb03
* NativeCrypto: Add ALPN supportKenny Root2013-06-251-57/+122
| | | | | | | | | | | | | | | This adds the ability to use Application-Layer Protocol Negotiation (ALPN) as both a client and a server. ALPN is essentially like Next Protocol Negotiation (NPN) but negotiation is done in the clear. This allows the use of other protocols on the same port (e.g., SPDY instead of HTTP on port 80). Although previously clients using NPN were able to use cut-through, the new ALPN API does not provide for a way for a client to enable that during a callback. So the only difference is that NPN clients can enable SSL False Start while ALPN clients cannot currently. Change-Id: I42ff70f3711e9cccaf754d189f76eeaa9db5f981
* NativeCrypto: move key conversion to JavaKenny Root2013-05-031-34/+22
| | | | | | | | Key type conversion in native code is from the legacy period before the OpenSSLKey class existed. Use that to hold PKEY reference instead of converting it in native code. Change-Id: I84e9a6e1f2e0f95d2f44c18fa9f65cd15e039d63
* Move JSSE to new packageKenny Root2013-04-2911-0/+4345
| | | | | | | | 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
* merge more modules into luniPeter Hallam2010-04-2796-18496/+0
|
* Resync a load of tests with upstream, make our build faster.Elliott Hughes2010-02-1926-117/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | I started off with a mission to remove uses of dalvik.annotation.* (stuff like @TestTargetNew and other useless junk that just makes it harder to stay in sync with upstream). I wrote a script to go through tests showing me the diff between what we have and what upstream has, thinking that in cases where upstream has also added tests, I may as well pull them in at the same time... ...but I didn't realize how close we were to having dx fill its 1.5GiB heap. After trying various alternatives, I decided to bite the bullet and break core-tests up into one .jar per module. This adds parallelism back into this, the slowest part of our build. (I can do even better, but I'll do that in a separate patch, preferably after we've merged recent changes from master.) Only a couple of dependencies were problematic: the worthless TestSuiteFactory which already contained a comment suggesting we get rid of it, and the fact that some tests -- most notably the concurrent ones -- also contained main methods that started the JUnit tty-based TestRunner. (In the long run, we want to be running the harmony tests directly from a pristine "svn co" of upstream, using DalvikRunner. But this will be a big help in the meantime, and starts the work of getting our current copy of the tests into a state where we can start to extract any meaningful changes/additions we've made.)
* Remove obviously bogus @KnownFailure annotations.Elliott Hughes2010-02-031-1/+0
| | | | | | | | | | | | | | We've already agreed @KnownFailure Must Die (to be replaced by expectations for DalvikRunner), but some are -- I think -- obviously in need of investigation. This patch removes @KnownFailure for all cases where the reason looks bogus. I've left the @KnownFailure annotations in cases where I it looks "reasonable" in that we simply haven't implemented the functionality (pack200, say), and a few other cases. Those should probably be done in a separate patch that adds expectations at the same time. But these ones, I think, all need investigating. (There's a scary number of Arabic-related bugs in here, given that we're supposed to be shipping Arabic in froyo.)
* A new hygenic way for tests to clean up before or after execution.Jesse Wilson2009-10-253-3/+22
| | | | This replaces PrefsTester and is more general purpose.
* Integrate luni module (but not tests) to Harmony r772995.Jesse Wilson2009-07-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notable changes - Stripped "@since Android 1.0" from many files. Most files are now 100% the same in Dalvik and Harmony. - AbstractStringBuilder.reverse() supports surrogates - AbstractStringBuilder shares less to waste less memory - Bitset optimized - BufferedInputStream changed to support unsynchronized close() - BufferedOutputStream does flushInternal - BufferedReader supports EBCDIC NEL - Collections.synchronizedList().indexOf() does a copy for more concurrency - Classes in nio module changed: DatagramChannelImpl, SocketChannelImpl and ServerSocketChannelImpl (these depend on internal APIs changed in this update) - DataInputStream/DataOutputStream now use a small buffer to limit the number of times the underlying stream is accessed - Date now has a minutes offset, more efficient toString() - ExposedByteArrayInputStream: new internal class - DeleteOnExit moved to top-level class - FileDescriptor.isValid() now non-native - Float, Double lessThan optimized (fix for compare(-0.0F, 0.0F) still pending) - FileURLConnection now guesses content types from streams - HashMap iterator changes - Hashtable iterator changes - INetworkSystem - removes bind2(), createMulticastSocket, sendStream(), - renames createSocket to createStreamSocket - JarURLConnection rewritten - LinkedHashMap: new iterator - Locale, Currency, TimeZone: now use ICU in Harmony, plain Java in Dalvik - ObjectInputStream: Accessor objects in Harmony, direct native in Dalvik - ProxyClassFile - many changes - String - optimized ascii for toLowerCase, toUpperCase, compare - Timer - rewritten - TreeMap - rewritten - URLClassLoader - new - URLConnection - new guessContentTypeFromStream(), uses org.apache.harmony.awt.www.content to lookup content type handlers
* AI 143385: am: CL 143235 am: CL 143073 Bringing the Crypto tests down to ↵Jorg Pleumann2009-03-275-13/+20
| | | | | | | | | | | zero failures. Original author: jorgp Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143385
* auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-1813-255/+253
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0396-0/+18583
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0396-18583/+0
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-1030-299/+167
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-0982-2480/+6163
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1786-0/+15032