summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove junit source from libcore.Brett Chabot2012-04-1621-1523/+0
| | | | | | | | Will be replaced with library built from external/junit. Bug 5826326 Change-Id: I78518a04b57bade113b1797a808ec1a39bd82ad7
* Upgrade libcore/junit classes to their JUnit4.10 implementation.Brett Chabot2012-04-1115-324/+484
| | | | | | Bug 5826326 Change-Id: Iddb8b8ed7b056d705375a2d458c26ba83fc07d7f
* am 83b85dfe: am d903a83f: Add No Arg Constructor for Some TestsBrian Muramatsu2012-04-040-0/+0
|\ | | | | | | * commit '83b85dfe7255e26a812c15d3d6da113173c7ab46':
| * am d903a83f: Add No Arg Constructor for Some TestsBrian Muramatsu2012-04-033-36/+0
| |\ | | | | | | | | | | | | * commit 'd903a83f3a8776065e9c98436227ab7a0915d9ed': Add No Arg Constructor for Some Tests
* | \ Merge "Add a test for an already-fixed publicly-reported bug."Elliott Hughes2012-04-041-0/+10
|\ \ \
| * | | Add a test for an already-fixed publicly-reported bug.Elliott Hughes2012-04-041-0/+10
| | | | | | | | | | | | | | | | | | | | Bug: http://code.google.com/p/android/issues/detail?id=28095 Change-Id: I26ff2834becce6f51e668ec71b4e5050b15f06cd
* | | | am e660af5f: am f06967f5: am d903a83f: Add No Arg Constructor for Some TestsBrian Muramatsu2012-04-030-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | * commit 'e660af5f24546c1904f8c33132c7bb2cddcfcbb2':
| * \ \ \ am f06967f5: am d903a83f: Add No Arg Constructor for Some TestsBrian Muramatsu2012-04-030-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | * commit 'f06967f5ceb6c9abf99b9b48b9d510cc8f59815c':
| | * \ \ \ am d903a83f: Add No Arg Constructor for Some TestsBrian Muramatsu2012-04-033-36/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit 'd903a83f3a8776065e9c98436227ab7a0915d9ed': Add No Arg Constructor for Some Tests
* | | | | | am bc5c2fdf: am 9b25ac0e: am d903a83f: Add No Arg Constructor for Some TestsBrian Muramatsu2012-04-033-36/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'bc5c2fdf95b6ee3100d488aca3d3e9a236190dc2': Add No Arg Constructor for Some Tests
| * | | | | am 9b25ac0e: am d903a83f: Add No Arg Constructor for Some TestsBrian Muramatsu2012-04-033-36/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b25ac0e0cd94b44332ef040d4f64688b3633d7c': Add No Arg Constructor for Some Tests
| | * \ \ \ \ am d903a83f: Add No Arg Constructor for Some TestsBrian Muramatsu2012-04-033-36/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit 'd903a83f3a8776065e9c98436227ab7a0915d9ed': Add No Arg Constructor for Some Tests
| | | * | | | Add No Arg Constructor for Some TestsBrian Muramatsu2012-04-023-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://code.google.com/p/android/issues/detail?id=26543 Without a no arg constructor, these tests cannot be instantiated by the test runner when trying to run a single test. Change-Id: I250282319a6ed8f9af828f27341773adc468932f
* | | | | | | Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | am 99918765: Fix for number pattern tests for devices not supporting "ar" localepnath2012-02-062-0/+11
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit '999187657af9408e86ae680be1f19f184512d210': Fix for number pattern tests for devices not supporting "ar" locale
| * | | | | | am 990a6879: DO NOT MERGE Fix testCalendarSerializationBrian Muramatsu2012-02-021-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '990a68790304f9a87d4a07d5ba0e2b2fdba31f22': DO NOT MERGE Fix testCalendarSerialization
| * \ \ \ \ \ \ am 806d834d: Ensure faster OpenSSLSignature is used when possible by doing ↵Brian Carlstrom2012-01-301-35/+42
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proper case insensitive comparison * commit '806d834df24db86be0540ce0846e03fc4d43cb0b': Ensure faster OpenSSLSignature is used when possible by doing proper case insensitive comparison
| * \ \ \ \ \ \ \ am a468471e: Don\'t throw needlessly when returning the CacheResponse.Jesse Wilson2012-01-262-3/+51
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a468471e8ccc2f642d5b2ae3c75873a74267ece2': Don't throw needlessly when returning the CacheResponse.
| * \ \ \ \ \ \ \ \ am cc676d34: Test case for verifier to handle floats that look like boolean.jeffhao2012-01-201-0/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc676d34e461aefaf17bb33573308eaa63de338b': Test case for verifier to handle floats that look like boolean.
| * \ \ \ \ \ \ \ \ \ am 4ff58546: libcore: BlockGuard: untag socket on closeJP Abgrall2011-11-281-5/+18
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ff585466887785d48c02d14a15dcde64934442b': libcore: BlockGuard: untag socket on close
| * \ \ \ \ \ \ \ \ \ \ am 0c180b1a: Fix OldFormaterTest FlakinessBrian Muramatsu2011-11-101-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c180b1a4953c9d543e8183cd887e2a06cb2bd75': Fix OldFormaterTest Flakiness
| * \ \ \ \ \ \ \ \ \ \ \ am e3df4987: Move OpenSSLSocketImpl.close resource cleanup into a finally clauseBrian Carlstrom2011-11-082-16/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3df4987da1cc4af786b54e6a446687ec148d5a9': Move OpenSSLSocketImpl.close resource cleanup into a finally clause
| * \ \ \ \ \ \ \ \ \ \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am c5ed03d6: am c16a5993: Merge remote branch \'goog/ics-mr0\' into ics-mr1Ed Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c5ed03d699aa7abb40ce3559dde17bc8dc0364a2':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b62b2d01: am ec8de076: Fix socket timeout test failures.Elliott Hughes2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b62b2d0115841037780f1a0d538dad5c30870827': Fix socket timeout test failures.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f3c9acbc: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3c9acbc3ebd72090221f1781f7f48c0390c1c44': Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
* | | | | | | | | | | | | | | | | | | Add test for case insensitivity in OpenSSLSignature.Geremy Condra2012-04-021-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0741891ea7bb3e0913374d3090296a40767610b5
* | | | | | | | | | | | | | | | | | | Disable TLSv1.1 and TLSv1.2 by defaultBrian Carlstrom2012-03-285-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6234791 Change-Id: I5d829211c9e1d5672fc96e42ef603c53d789e695
* | | | | | | | | | | | | | | | | | | Merge "Use WRAP/UNWRAP for key exchange"Brian Carlstrom2012-03-272-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use WRAP/UNWRAP for key exchangeBrian Carlstrom2012-03-272-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://code.google.com/p/android/issues/detail?id=12955 Change-Id: I1a2be021e0a22ec6a00ba354fb3f19a78c601be9
* | | | | | | | | | | | | | | | | | | Merge "Use the release name in Locale's table of releases."Elliott Hughes2012-03-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Use the release name in Locale's table of releases.Elliott Hughes2012-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5905761 Change-Id: If0fc5fd19bddefd72f216e8c230893b0387fa03d
* | | | | | | | | | | | | | | | | | | | Merge "More support for ENGINE-based keys"Kenny Root2012-03-266-22/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | More support for ENGINE-based keysKenny Root2012-03-266-22/+65
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak some of the parameters for RSA and DSA keys to allow ENGINE-based keys to exist without needing to define private key material. Change-Id: Ide2884d6d97636ae2178f8e789eaeec1babd9650
* | | | | | | | | | | | | | | | | | | | Don't use the SSL_CTX prefix for a method that takes an SSL.Jesse Wilson2012-03-264-7/+7
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation is asymmetric: enabling NPN is per-context, but actually looking up the negotiated protocol is per-SSL. This caused me to screw up in following the SSL_CTX naming scheme; I applied it in too many places. Change-Id: I5bd1be334d513f220086c901527d0b8416f2ba3f
* | | | | | | | | | | | | | | | | | | Fix phone bootBrian Carlstrom2012-03-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit a8ef467e8e6be1681d63fe692ecce3b301801faa) Change-Id: I650d1fc98277b64f127204cae408acb69db354e9
* | | | | | | | | | | | | | | | | | | Merge "Expose NPN in OpenSSL."Jesse Wilson2012-03-254-84/+288
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Expose NPN in OpenSSL.Jesse Wilson2012-03-254-84/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is derived from costin's change Ib18da136cb628515d6909c438cd0809452d7058a. It moves the protocols data to the AppData's callbacks so the memory can be released when the handshake completes. Change-Id: Id61feaa6f28250e393f5c8093688b099e92dce9c
* | | | | | | | | | | | | | | | | | | | Updating test failuresBrian Carlstrom2012-03-232-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2daff9fbb29f64366b24927824867ec40551ed83
* | | | | | | | | | | | | | | | | | | | Split OpenSSLRSAPrivateCrtKey from OpenSSLRSAPrivateKeyBrian Carlstrom2012-03-227-274/+350
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a58044162758b3b74db5d17e9044f97dbe53bae
* | | | | | | | | | | | | | | | | | | Tracking openssl-1.0.1Brian Carlstrom2012-03-2114-27/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6168278 Change-Id: I240d2cbc91f616fd486efc5203e2221c9896d90f
* | | | | | | | | | | | | | | | | | | Remove unnecessary last parameter to nativeExit.Jeff Brown2012-03-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c46e643647440fb3606179f773cd202a38a36ce
* | | | | | | | | | | | | | | | | | | Merge "Add support for OpenSSL engines"Kenny Root2012-03-138-15/+386
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add support for OpenSSL enginesKenny Root2012-03-138-15/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows OpenSSL ENGINE to be used for RSA and DSA private key operations. Also add in support for directly passing an OpenSSLKey to the OpenSSLSocketImpl in case we are using ENGINEs. Change-Id: Ia31735109052a13e421900b69ba5de13bbce0f6f
* | | | | | | | | | | | | | | | | | | | Make classes accessible to ParsedHeadersTestBrian Carlstrom2012-03-122-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5835156 (cherry picked from commit 943036db28577070ae5b5fed5051a2e47d95f6ea) Change-Id: I7a1a9d7ae7003e54847fb2b0e99cc560e1fe34f0
* | | | | | | | | | | | | | | | | | | | Merge "Fix incorrect documentation for non proxy hosts."Jesse Wilson2012-03-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix incorrect documentation for non proxy hosts.Jesse Wilson2012-03-121-3/+3
| |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/6152698 Change-Id: I5b0bd61aeaf8d27c0087210859de1fd2cbcf88d7
* | | | | | | | | | | | | | | | | | | | CA certificate update: Security Communication RootCA2Brian Carlstrom2012-03-121-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SHA1 : 5F:3B:8C:F2:F8:10:B3:7D:78:B4:CE:EC:19:19:C3:73:34:B9:C7:74 Subject : C=JP, O=SECOM Trust Systems CO.,LTD., OU=Security Communication RootCA2 Bug: http://code.google.com/p/android/issues/detail?id=26616 Change-Id: I9e37c787029a84b19a725773f30b9d8bc6842ebf
generated by cgit v1.1 at 2025-04-02 05:19:07 +0000