summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0HEADreplicant-6.0-0003replicant-6.0Wolfgang Wiedmeyer2017-12-102-0/+83
|\
| * FtpURLConnection: Throw on invalid characters in commands.Narayan Kamath2017-07-172-0/+83
* | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_libcore into...replicant-6.0-0002replicant-6.0-0001Wolfgang Wiedmeyer2016-12-1210-29/+303
|\ \ | |/
| * Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-092-4/+16
| |\
| | * IDN: Fix handling of long domain names.Narayan Kamath2016-09-272-4/+16
| * | Merge tag 'android-6.0.1_r72' into HEADJessica Wagantall2016-10-060-0/+0
| |\ \
| | * | CipherTest: in ASN1 encoding for GCM, no value for tag size means 12Sergio Giro2016-08-161-3/+4
| * | | Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-3/+4
| |\ \ \ | | | |/ | | |/|
| | * | CipherTest: in ASN1 encoding for GCM, no value for tag size means 12Sergio Giro2016-07-221-3/+4
| | |/
| * | Merge tag 'android-6.0.1_r43' into HEADJessica Wagantall2016-05-031-0/+68
| |\ \ | | |/
| | * CipherTest: add test for multiple updateAAD callsKenny Root2016-03-261-0/+27
| | * CipherTest: test instance reuse with updateAADKenny Root2016-03-261-0/+41
| * | XML Pull Parser optimizationsKevin Hart2016-04-201-8/+66
| * | Merge tag 'android-6.0.1_r30' into HEADJessica Wagantall2016-04-180-0/+0
| |\ \ | | |/
| | * GCMParameters: check that the default tag size is secure (16 bits)Sergio Giro2016-02-271-0/+22
| * | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-051-0/+22
| |\ \
| | * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-220-0/+0
| | |\ \
| | | * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-180-0/+0
| | | |\ \ | | | |/ / | | |/| |
| | * | | GCMParameters: check that the default tag size is secure (16 bits)Sergio Giro2016-03-011-0/+22
| | |/ /
| * | | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/li...Steve Kondik2016-03-116-17/+130
| |\ \ \ | | |/ /
| | * | Check for RFC 5746 TLS extensionKenny Root2016-01-062-2/+19
| | * | Merge "Change FinalizeTest to use helper function" into marshmallow-cts-dev a...Daniel Xie2015-12-211-2/+7
| | |\ \
| | | * \ Merge "Change FinalizeTest to use helper function" into marshmallow-cts-dev a...refs/keep-around/762c0d8cc3761d0f91063d6f7e2512de06f83f63Daniel Xie2015-12-211-2/+7
| | | |\ \
| | | | * \ Merge "Change FinalizeTest to use helper function" into marshmallow-cts-devrefs/keep-around/1e6284ec29aff9eb30ef00eedea2f786ac95b9caDaniel Xie2015-12-211-2/+7
| | | | |\ \
| | | | | * \ Merge "Change FinalizeTest to use helper function" into marshmallow-cts-devrefs/keep-around/d0ae2ffcb6246651504c36fec93f9c1fdcef0d4bDaniel Xie2015-12-211-2/+7
| | | | | |\ \
| | | | | | * | Change FinalizeTest to use helper functionMathieu Chartier2015-12-101-2/+7
| | * | | | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:...Daniel Xie2015-12-140-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:...refs/keep-around/45db0660a02f7cd613495b497ab3bac0bc28e5baDaniel Xie2015-12-140-0/+0
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:...refs/keep-around/14fdf89b34cb0b41d9c1094724856a82b59953baDaniel Xie2015-12-140-0/+0
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:...refs/keep-around/1c48ac828ee205a8bd8052a6f17adfb965790432Daniel Xie2015-12-100-0/+0
| | | | | |\ \ \
| | | | | | * \ \ Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:...refs/keep-around/9c763fb49d7155a2251a582d0a2ecce4d6c9120aDaniel Xie2015-12-060-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-devrefs/keep-around/a289f96778cf5e88406d6ccc8e85865fbe1d9f45Daniel Xie2015-12-060-0/+0
| | | | | | | |\ \ \
| | * | | | | | \ \ \ Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...Daniel Xie2015-12-140-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...refs/keep-around/3f4743b38d29ad0902e122b274b11d1cfe242edeDaniel Xie2015-12-140-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...refs/keep-around/2751cbfbddbc02987f5cb64d697c087b490eb447Daniel Xie2015-12-140-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...refs/keep-around/33d3334d178d3f671d60102437a15d62f27f0745Daniel Xie2015-12-100-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...refs/keep-around/960a6e939b19b1e605624c5261bbbda67ea26116Daniel Xie2015-12-060-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...refs/keep-around/0b8078f8b9cd096e6d104a04e9e381c94fe3c106Daniel Xie2015-12-061-36/+15
| | | | | | | |\ \ \ \
| | * | | | | | \ \ \ \ Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...Daniel Xie2015-12-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...refs/keep-around/f7fe8aaf72b3a1e4eab900583a82d463552113aaDaniel Xie2015-12-140-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...refs/keep-around/bebfb25f88e18206a5f9c5ad06d61ca9a5bff848Daniel Xie2015-12-140-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...refs/keep-around/d9f9980541cf95e316f952e19e0f36ac8dc968e8Daniel Xie2015-12-100-0/+0
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | | | | | | / / | | | | | | |_|_|_|/ / | | | | | |/| | | | |
| | | | | | * | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...refs/keep-around/cb245d2936763d1bea1842774fe51f178a0fa697Daniel Xie2015-12-060-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...refs/keep-around/bcd9db7050124d4d8bbd9b732f43efd3291b4aa4Daniel Xie2015-12-060-0/+0
| | | | | | | |\ \ \ \
| | * | | | | | \ \ \ \ Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev am: 111...Daniel Xie2015-12-032-12/+103
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev am: 111...refs/keep-around/a573f3040bc603b860783076db30f75eeea319abDaniel Xie2015-12-032-12/+103
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-devrefs/keep-around/cf4b283f02bdd2b17bc61e952d58a705dee81ba7Daniel Xie2015-12-032-12/+103
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-devrefs/keep-around/11173387202f799fad05bf696b81ca7f379e11dcDaniel Xie2015-12-032-12/+103
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Add more debugging to the DigestTestKenny Root2015-10-272-12/+103
| | * | | | | | | | | | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into mars...Daniel Xie2015-12-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /