summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Support for TLS Extensions enabled SSLSockets with fallback to vanila SSLBrian Carlstrom2010-07-292-5/+2
* Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-masterBrian Carlstrom2010-07-2817-90/+1263
|\
| * Merge commit 'd0dd5d9b8f7f1a0e3e15eb4e6257c3efa96f399c' into mmBrian Carlstrom2010-07-270-0/+0
| |\
| | * Merge commit 'goog/froyo' into froyo-releaseandroid-build SharedAccount2010-07-220-0/+0
| | |\
| | * | support renegotiation with handshake cutthroughBrian Carlstrom2010-07-083-15/+17
| * | | am 7bee5127: am f695f1cc: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-191-0/+10
| |\ \ \ | |/ / / |/| | |
* | | | am f695f1cc: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+10
|\ \ \ \
| * | | | add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+10
| | * | | Restoring openssl s_server, pkey, pkeyparam, pkeyutlBrian Carlstrom2010-07-1610-58/+1070
| | * | | Improved client certificate and certificate chain supportBrian Carlstrom2010-07-138-32/+193
| | * | | am 46eb2641: Remove diff between master and dalvik-dev branches due to incons...Brian Carlstrom2010-07-080-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Remove diff between master and dalvik-dev branches due to inconsistent confli...Brian Carlstrom2010-07-081-1/+1
| | * | | am cbffe1cc: Update openssl regression testing instructionsBrian Carlstrom2010-07-080-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Update openssl regression testing instructionsBrian Carlstrom2010-07-081-2/+10
| | * | | am 97e70271: (-s ours) Change openssl testing instructions from run-core-test...Brian Carlstrom2010-07-080-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Change openssl testing instructions from run-core-tests to vogarBrian Carlstrom2010-07-081-4/+6
| | * | | Merge "Don't include termio.h if compile with android toolchain, since curren...Brian Carlstrom2010-07-083-4/+16
| | |\ \ \
| | | * | | Don't include termio.h if compile with android toolchain, sinceBrian Carlstrom2010-07-083-4/+16
| | * | | | am 92362636: (-s ours) import_openssl.sh improvements based on external/bounc...Brian Carlstrom2010-07-080-0/+0
| | |\ \ \ \ | |_|/ / / / |/| | / / / | | |/ / /
* | | | | import_openssl.sh improvements based on external/bouncycastle workBrian Carlstrom2010-07-084-232/+244
| | * | | am 1cf4269a: resolved conflicts for merge of 9b613ca4 to masterBrian Carlstrom2010-07-083-21/+23
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | resolved conflicts for merge of 9b613ca4 to masterBrian Carlstrom2010-07-073-21/+23
|\ \ \ \ \ | |/ / / /
| * | | | am 4a25f3f3: support renegotiation with handshake cutthroughBrian Carlstrom2010-07-073-15/+17
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | support renegotiation with handshake cutthroughBrian Carlstrom2010-07-043-15/+17
| | | |/ | | |/|
| | | * am b2c3821c: (-s ours) Merge commit \'130cba1b\' into manualmergeBrian Carlstrom2010-07-080-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | Merge commit '130cba1b' into manualmergeBrian Carlstrom2010-05-282-1/+6
|\ \ \ \ | |/ / /
| * | | am 17b28b5c: Disable ZLIB in OpenSSL for better compatabilityBrian Carlstrom2010-05-282-1/+6
| |\ \ \ | | |/ /
| | | * am ffbefd3f: (-s ours) Don\'t include termio.h if compile with android toolch...Jing Yu2010-07-080-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | Don't include termio.h if compile with android toolchain, sinceJing Yu2010-05-183-5/+17
| | | * am 945326ca: (-s ours) Add a CleanSpec for all targets, not just openssl comm...Brian Carlstrom2010-07-080-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | Add a CleanSpec for all targets, not just openssl command line toolBrian Carlstrom2010-05-141-0/+1
| | | * am fa68c412: (-s ours) Update CleanSpec.mk to force a clean buildBrian Carlstrom2010-07-080-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | Update CleanSpec.mk to force a clean buildBrian Carlstrom2010-05-141-0/+1
| | | * am 904c5bb0: (-s ours) Adding SSL_set_cipher_lists and turning on elliptic curveBrian Carlstrom2010-07-080-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | Adding SSL_set_cipher_lists and turning on elliptic curveBrian Carlstrom2010-05-1418-23/+1553
| | | * am fd113c07: (-s ours) Adding SSL_set_session_creation_enabled for SSLSocket....Brian Carlstrom2010-07-080-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | Adding SSL_set_session_creation_enabled for SSLSocket.setEnableSessionCreatio...Brian Carlstrom2010-05-0413-18/+251
| | | * am 0e804cad: (-s ours) Fix for openssl-1.0.0 small_records.patchBrian Carlstrom2010-07-080-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | Fix for openssl-1.0.0 small_records.patchBrian Carlstrom2010-04-265-69/+141
| | | * am ef1d1817: (-s ours) Re-enable SSL\'s cut-through feature in Master over op...Huahui Wu2010-07-080-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | Re-enable SSL's cut-through feature in Master over openSSL 1.0.0.Huahui Wu2010-04-2312-51/+163
| | | * am 3d1c36f3: (-s ours) am 10034867: (-s ours) DO NOT MERGEHuahui Wu2010-07-080-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | am 10034867: (-s ours) DO NOT MERGEHuahui Wu2010-04-210-0/+0
|\ \ \ \ | |/ / /
| * | | DO NOT MERGEHuahui Wu2010-04-2111-12/+123
| | | * am 53fa936a: (-s ours) am 327b64c9: (-s ours) am 35ae949c: (-s ours) DO NOT M...Huahui Wu2010-07-080-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | am 327b64c9: (-s ours) am 35ae949c: (-s ours) DO NOT MERGEHuahui Wu2010-04-210-0/+0
|\ \ \ \ | |/ / /
| * | | am 35ae949c: (-s ours) DO NOT MERGEHuahui Wu2010-04-210-0/+0
| |\ \ \
| | | | * am 221304ee: (-s ours) openssl-1.0.0 upgradeBrian Carlstrom2010-07-080-0/+0
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | openssl-1.0.0 upgradeBrian Carlstrom2010-04-19724-49905/+68815
|/ / / /
| | | * am 06801217: am 7f9d8bc8: disable handshake_cutthrough.patchBrian Carlstrom2010-07-080-0/+0
| | | |\ | |_|_|/ |/| | |
generated by cgit v1.1 at 2024-09-24 07:30:29 +0000