Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_libcore into...HEADreplicant-6.0-0001replicant-6.0 | Wolfgang Wiedmeyer | 2016-12-12 | 10 | -29/+303 |
|\ | |||||
| * | Merge tag 'android-6.0.1_r74' into HEAD | Jessica Wagantall | 2016-11-09 | 2 | -4/+16 |
| |\ | |||||
| | * | IDN: Fix handling of long domain names. | Narayan Kamath | 2016-09-27 | 2 | -4/+16 |
| * | | Merge tag 'android-6.0.1_r72' into HEAD | Jessica Wagantall | 2016-10-06 | 0 | -0/+0 |
| |\ \ | |||||
| | * | | CipherTest: in ASN1 encoding for GCM, no value for tag size means 12 | Sergio Giro | 2016-08-16 | 1 | -3/+4 |
| * | | | Merge tag 'android-6.0.1_r66' into HEAD | Jessica Wagantall | 2016-09-07 | 1 | -3/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | CipherTest: in ASN1 encoding for GCM, no value for tag size means 12 | Sergio Giro | 2016-07-21 | 1 | -3/+4 |
| | |/ | |||||
| * | | Merge tag 'android-6.0.1_r43' into HEAD | Jessica Wagantall | 2016-05-03 | 1 | -0/+68 |
| |\ \ | | |/ | |||||
| | * | CipherTest: add test for multiple updateAAD calls | Kenny Root | 2016-03-25 | 1 | -0/+27 |
| | * | CipherTest: test instance reuse with updateAAD | Kenny Root | 2016-03-25 | 1 | -0/+41 |
| * | | XML Pull Parser optimizations | Kevin Hart | 2016-04-20 | 1 | -8/+66 |
| * | | Merge tag 'android-6.0.1_r30' into HEAD | Jessica Wagantall | 2016-04-18 | 0 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | GCMParameters: check that the default tag size is secure (16 bits) | Sergio Giro | 2016-02-26 | 1 | -0/+22 |
| * | | Merge tag 'android-6.0.1_r24' into HEAD | Jessica Wagantall | 2016-04-05 | 1 | -0/+22 |
| |\ \ | |||||
| | * \ | merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | The Android Automerger | 2016-03-22 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * \ | merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | The Android Automerger | 2016-03-17 | 0 | -0/+0 |
| | | |\ \ | | | |/ / | | |/| | | |||||
| | * | | | GCMParameters: check that the default tag size is secure (16 bits) | Sergio Giro | 2016-03-01 | 1 | -0/+22 |
| | |/ / | |||||
| * | | | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/li... | Steve Kondik | 2016-03-10 | 6 | -17/+130 |
| |\ \ \ | | |/ / | |||||
| | * | | Check for RFC 5746 TLS extension | Kenny Root | 2016-01-06 | 2 | -2/+19 |
| | * | | Merge "Change FinalizeTest to use helper function" into marshmallow-cts-dev a... | Daniel Xie | 2015-12-21 | 1 | -2/+7 |
| | |\ \ | |||||
| | | * \ | Merge "Change FinalizeTest to use helper function" into marshmallow-cts-dev a... | Daniel Xie | 2015-12-21 | 1 | -2/+7 |
| | | |\ \ | |||||
| | | | * \ | Merge "Change FinalizeTest to use helper function" into marshmallow-cts-dev | Daniel Xie | 2015-12-21 | 1 | -2/+7 |
| | | | |\ \ | |||||
| | | | | * \ | Merge "Change FinalizeTest to use helper function" into marshmallow-cts-dev | Daniel Xie | 2015-12-21 | 1 | -2/+7 |
| | | | | |\ \ | |||||
| | | | | | * | | Change FinalizeTest to use helper function | Mathieu Chartier | 2015-12-10 | 1 | -2/+7 |
| | * | | | | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:... | Daniel Xie | 2015-12-14 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:... | Daniel Xie | 2015-12-14 | 0 | -0/+0 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:... | Daniel Xie | 2015-12-14 | 0 | -0/+0 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | * | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:... | Daniel Xie | 2015-12-10 | 0 | -0/+0 |
| | | | | |\ \ \ | |||||
| | | | | | * \ \ | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:... | Daniel Xie | 2015-12-06 | 0 | -0/+0 |
| | | | | | |\ \ \ | |||||
| | | | | | | * \ \ | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev | Daniel Xie | 2015-12-06 | 0 | -0/+0 |
| | | | | | | |\ \ \ | |||||
| | * | | | | | \ \ \ | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts... | Daniel Xie | 2015-12-14 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts... | Daniel Xie | 2015-12-14 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | * | | | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts... | Daniel Xie | 2015-12-14 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | |||||
| | | | | * | | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts... | Daniel Xie | 2015-12-10 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | |||||
| | | | | | * | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts... | Daniel Xie | 2015-12-06 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | |||||
| | | | | | | * | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts... | Daniel Xie | 2015-12-06 | 1 | -36/+15 |
| | | | | | | |\ \ \ \ | |||||
| | * | | | | | \ \ \ \ | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ... | Daniel Xie | 2015-12-14 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ... | Daniel Xie | 2015-12-14 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ... | Daniel Xie | 2015-12-14 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | |||||
| | | | | * | | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ... | Daniel Xie | 2015-12-10 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | | | | | | / / | | | | | | |_|_|_|/ / | | | | | |/| | | | | | |||||
| | | | | | * | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ... | Daniel Xie | 2015-12-06 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | |||||
| | | | | | | * | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ... | Daniel Xie | 2015-12-06 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ | |||||
| | * | | | | | \ \ \ \ | Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev am: 111... | Daniel Xie | 2015-12-03 | 2 | -12/+103 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev am: 111... | Daniel Xie | 2015-12-03 | 2 | -12/+103 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev | Daniel Xie | 2015-12-03 | 2 | -12/+103 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | |||||
| | | | | * | | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev | Daniel Xie | 2015-12-03 | 2 | -12/+103 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | Add more debugging to the DigestTest | Kenny Root | 2015-10-27 | 2 | -12/+103 |
| | * | | | | | | | | | | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into mars... | Daniel Xie | 2015-12-03 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into mars... | Daniel Xie | 2015-12-03 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | |||||
| | | | * | | | | | | | | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into mars... | Daniel Xie | 2015-12-03 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | / | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | | |