summaryrefslogtreecommitdiffstats
path: root/crypto
Commit message (Expand)AuthorAgeFilesLines
* am 99e1ae90: Merge "NativeCrypto: Fix a lot of random doc bugs"Kenny Root2013-05-0825-69/+37
|\
| * Merge "NativeCrypto: Fix a lot of random doc bugs"Kenny Root2013-05-0725-69/+37
| |\
| | * NativeCrypto: Fix a lot of random doc bugsKenny Root2013-05-0725-69/+37
* | | am 4ffab68b: Merge "NativeCrypto: use strings instead of loading class"Kenny Root2013-05-081-65/+63
|\ \ \ | |/ /
| * | Merge "NativeCrypto: use strings instead of loading class"Kenny Root2013-05-071-65/+63
| |\ \
| | * | NativeCrypto: use strings instead of loading classKenny Root2013-05-071-65/+63
| | |/
* | | am 30abb655: Merge "NativeCrypto: make our own X.509 key class"Kenny Root2013-05-082-2/+87
|\ \ \ | |/ /
| * | Merge "NativeCrypto: make our own X.509 key class"Kenny Root2013-05-072-2/+87
| |\ \ | | |/ | |/|
| | * NativeCrypto: make our own X.509 key classKenny Root2013-05-072-2/+87
* | | am dafcbf80: Merge changes Ided7a6bf,I61339e02Kenny Root2013-05-081-3/+5
|\ \ \ | |/ /
| * | NativeCrypto: inline call to peekIntKenny Root2013-05-061-2/+5
| * | NativeCrypto: remove unused importKenny Root2013-05-061-1/+0
| |/
* | am ab4ab99b: Merge "NativeCrypto: remove dep on Android host verifier"Kenny Root2013-05-061-3/+48
|\ \ | |/
| * Merge "NativeCrypto: remove dep on Android host verifier"Kenny Root2013-05-061-3/+48
| |\
| | * NativeCrypto: remove dep on Android host verifierKenny Root2013-05-061-3/+48
* | | am 7b65c5f0: Merge "NativeCrypto: pull in copy of EmptyArray"Kenny Root2013-05-0611-10/+45
|\ \ \ | |/ /
| * | NativeCrypto: pull in copy of EmptyArrayKenny Root2013-05-0611-10/+45
| |/
* | am 3e7a5a21: Merge "NativeCrypto: replace Harmony routines with OpenSSL"Kenny Root2013-05-063-82/+40
|\ \ | |/
| * NativeCrypto: replace Harmony routines with OpenSSLKenny Root2013-05-063-82/+40
* | am aed4814b: Merge "NativeCrypto: exit early when ssl_session is null"Kenny Root2013-05-031-0/+3
|\ \ | |/
| * NativeCrypto: exit early when ssl_session is nullKenny Root2013-05-031-0/+3
* | am 6821dc7b: Merge "NativeCrypto: move key conversion to Java"Kenny Root2013-05-035-204/+83
|\ \ | |/
| * NativeCrypto: move key conversion to JavaKenny Root2013-05-035-204/+83
* | am 603a9f11: Merge "Move encoding method out of NativeCrypto"Kenny Root2013-05-032-11/+10
|\ \ | |/
| * Move encoding method out of NativeCryptoKenny Root2013-05-032-11/+10
* | am 9eda20c2: Merge "NativeCrypto: build native library standalone"Kenny Root2013-05-023-60/+123
|\ \ | |/
| * NativeCrypto: build native library standaloneKenny Root2013-05-023-60/+123
* | am 0800e47a: Merge "Move JSSE to new package"Kenny Root2013-04-29132-0/+38579
|\ \ | |/
| * Move JSSE to new packageKenny Root2013-04-29132-0/+38575
|/
* merge more modules into luniPeter Hallam2010-04-27156-26653/+0
* resolved conflicts for merge of dd53c703 to dalvik-devElliott Hughes2010-04-051-8/+0
|\
| * Froyo InputStream.available documentation improvement.Elliott Hughes2010-04-051-8/+0
* | Remove all remaining "@since Android" tags.Elliott Hughes2010-03-223-14/+20
* | Resync a load of tests with upstream, make our build faster.Elliott Hughes2010-02-1926-117/+5
* | Remove obviously bogus @KnownFailure annotations.Elliott Hughes2010-02-031-1/+0
|/
* A new hygenic way for tests to clean up before or after execution.Jesse Wilson2009-10-253-3/+22
* Update crypto package to Harmony r802921. Only Javadoc changes.Jesse Wilson2009-08-3141-624/+285
* Integrate luni module (but not tests) to Harmony r772995.Jesse Wilson2009-07-241-0/+2
* AI 143385: am: CL 143235 am: CL 143073 Bringing the Crypto tests down to zero...Jorg Pleumann2009-03-275-13/+20
* 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