summaryrefslogtreecommitdiffstats
path: root/crypto
Commit message (Collapse)AuthorAgeFilesLines
* NativeCrypto: exit early when ssl_session is nullKenny Root2013-05-031-0/+3
| | | | | | | to_SSL_SESSION already throws NPE, so we should exit early. Otherwise we'll throw another NPE needlessly. Change-Id: I664340485e0b6335dc1ff7cca5343205894bc2fc
* NativeCrypto: move key conversion to JavaKenny Root2013-05-035-204/+83
| | | | | | | | 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 encoding method out of NativeCryptoKenny Root2013-05-032-11/+10
| | | | | | | Move the encoding method for X.509 out of NativeCrypto to the class that uses it. Change-Id: I57198101553f309c04b5e757716d1d807eb99a90
* NativeCrypto: build native library standaloneKenny Root2013-05-023-60/+123
| | | | Change-Id: I678f5c1b985d72ab1d41ae22dfcae35814c44e85
* Move JSSE to new packageKenny Root2013-04-29132-0/+38575
| | | | | | | | 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-27156-26653/+0
|
* resolved conflicts for merge of dd53c703 to dalvik-devElliott Hughes2010-04-051-8/+0
|\ | | | | | | Change-Id: Ia95af76e2995ce7fb0778b020baf2882a8b0a3dd
| * Froyo InputStream.available documentation improvement.Elliott Hughes2010-04-051-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | This method causes a lot of confusion, and we can do a lot better. (Ideally, the API would either not exist or be something like "public boolean ready()".) I've removed poor-quality documentation overrides too, so the full documentation is visible in most places. (InflaterInputStream is an obvious exception.) Also, to a lesser extent, improve the InputStream.skip documentation. Change-Id: I6d6cd788e6a32ad4a2613d1e381610f1ad8575fe
* | Remove all remaining "@since Android" tags.Elliott Hughes2010-03-223-14/+20
| | | | | | | | | | | | | | I've fixed a few typos, and removed a few of the more egregiously nonsensical or incorrect comments that were nearby. Change-Id: I35851baebd532f949cc269f4738a26eeb9b6e697
* | 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.
* Update crypto package to Harmony r802921. Only Javadoc changes.Jesse Wilson2009-08-3141-624/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit d5d4307b5b9f37e6f66ab1273be1acd2a29177de Merge: 2c2287b 1c60d7c Author: Jesse Wilson <jessewilson@google.com> Date: Mon Aug 31 15:36:46 2009 -0700 Merge branch 'crypto_802921' into crypto_dalvik Conflicts: libcore/crypto/.classpath libcore/crypto/build.xml libcore/crypto/src/main/java/javax/crypto/BadPaddingException.java libcore/crypto/src/main/java/javax/crypto/Cipher.java libcore/crypto/src/main/java/javax/crypto/CipherInputStream.java libcore/crypto/src/main/java/javax/crypto/CipherOutputStream.java libcore/crypto/src/main/java/javax/crypto/CipherSpi.java libcore/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java libcore/crypto/src/main/java/javax/crypto/ExemptionMechanism.java libcore/crypto/src/main/java/javax/crypto/ExemptionMechanismException.java libcore/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java libcore/crypto/src/main/java/javax/crypto/IllegalBlockSizeException.java libcore/crypto/src/main/java/javax/crypto/KeyAgreement.java libcore/crypto/src/main/java/javax/crypto/KeyAgreementSpi.java libcore/crypto/src/main/java/javax/crypto/KeyGenerator.java libcore/crypto/src/main/java/javax/crypto/KeyGeneratorSpi.java libcore/crypto/src/main/java/javax/crypto/Mac.java libcore/crypto/src/main/java/javax/crypto/MacSpi.java libcore/crypto/src/main/java/javax/crypto/NoSuchPaddingException.java libcore/crypto/src/main/java/javax/crypto/NullCipher.java libcore/crypto/src/main/java/javax/crypto/SealedObject.java libcore/crypto/src/main/java/javax/crypto/SecretKey.java libcore/crypto/src/main/java/javax/crypto/SecretKeyFactory.java libcore/crypto/src/main/java/javax/crypto/SecretKeyFactorySpi.java libcore/crypto/src/main/java/javax/crypto/ShortBufferException.java libcore/crypto/src/main/java/javax/crypto/interfaces/DHKey.java libcore/crypto/src/main/java/javax/crypto/interfaces/DHPrivateKey.java libcore/crypto/src/main/java/javax/crypto/interfaces/DHPublicKey.java libcore/crypto/src/main/java/javax/crypto/interfaces/PBEKey.java libcore/crypto/src/main/java/javax/crypto/spec/DESKeySpec.java libcore/crypto/src/main/java/javax/crypto/spec/DESedeKeySpec.java libcore/crypto/src/main/java/javax/crypto/spec/DHGenParameterSpec.java libcore/crypto/src/main/java/javax/crypto/spec/DHParameterSpec.java libcore/crypto/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java libcore/crypto/src/main/java/javax/crypto/spec/DHPublicKeySpec.java libcore/crypto/src/main/java/javax/crypto/spec/IvParameterSpec.java libcore/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java libcore/crypto/src/main/java/javax/crypto/spec/PBEKeySpec.java libcore/crypto/src/main/java/javax/crypto/spec/PBEParameterSpec.java libcore/crypto/src/main/java/javax/crypto/spec/PSource.java libcore/crypto/src/main/java/javax/crypto/spec/RC2ParameterSpec.java libcore/crypto/src/main/java/javax/crypto/spec/RC5ParameterSpec.java libcore/crypto/src/main/java/javax/crypto/spec/SecretKeySpec.java commit 2c2287b521cc5f558d9929e14e31ec92da6285b1 Author: Jesse Wilson <jessewilson@google.com> Date: Mon Aug 31 14:56:45 2009 -0700 crypto_dalvik commit 1c60d7c222c55ae49add8345a192c54357bb4a1f Author: Jesse Wilson <jessewilson@google.com> Date: Mon Aug 31 14:56:34 2009 -0700 crypto_802921 commit 50cf7f5d97de2f65ee0769aafec7b5a3551cb5d0 Author: Jesse Wilson <jessewilson@google.com> Date: Mon Aug 31 14:56:27 2009 -0700 crypto_527399
* 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-03156-0/+27081
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03156-27081/+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-2472/+6163
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-17134-885/+18332
|
* Initial ContributionThe Android Open Source Project2008-10-2151-0/+6075
generated by cgit v1.1 at 2025-01-25 18:04:00 +0000