summaryrefslogtreecommitdiffstats
path: root/luni
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_libcore ↵HEADreplicant-6.0-0001replicant-6.0Wolfgang Wiedmeyer2016-12-127-20/+153
|\ | | | | | | into replicant-6.0
| * Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-092-4/+16
| |\ | | | | | | | | | | | | | | | | | | | | | CYNGNOS-3303 Android 6.0.1 release 74 Change-Id: I5d30d03599d97e81621add2516955ab40f1aeef7
| | * IDN: Fix handling of long domain names.Narayan Kamath2016-09-272-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix merge conflict into mnc-mr2-release We were incorrectly using sizeof() to calculate the size of the output array. Note that this change also changes the output size to 512 to minimize behavioural differences (especially wrt. ICU checks on sizes). bug: 30765246 Change-Id: I5d28ddc45d2d6d2bed3e479ca195ed2779b906ed
| * | Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-3/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Android 6.0.1 release 66 # gpg: Signature made Tue 06 Sep 2016 09:26:59 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| | * CipherTest: in ASN1 encoding for GCM, no value for tag size means 12Sergio Giro2016-07-211-3/+4
| | | | | | | | | | | | | | | | | | | | | Bug: 26231099 Bug: 26234568 Bug: 29876633 Change-Id: I44c0c68f1e92caf6547c9e3b494ec5b82b8cff5f
| * | Merge tag 'android-6.0.1_r43' into HEADJessica Wagantall2016-05-031-0/+68
| |\ \ | | |/ | | | | | | | | | | | | | | | Ticket: CYNGNOS-2373 Android 6.0.1 release 43 (MOB30J) Change-Id: Ib43d0956f24c0d3c4ce16ab3144f88c21c7feac2
| | * CipherTest: add test for multiple updateAAD callsKenny Root2016-03-251-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that multiple updateAAD calls are equivalent to other calls to updateAAD with the same data. (cherry picked from commit 67ee3c5c2dad218e497035de5100e9036d140fdd) Bug: 27371173 Change-Id: Ie69df0906438ad26c566daed3f55b07ba60fe468
| | * CipherTest: test instance reuse with updateAADKenny Root2016-03-251-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAD was not being reset on each Cipher init or doFinal call, so add regression tests to make sure that is now the case. (cherry picked from commit d90a44bf4956d335e2a876015cf258dc46e226ea) Bug: 27324690 Change-Id: I5f7606efb6dfcd412166eed2bd5f417097a97f1f
| | * GCMParameters: check that the default tag size is secure (16 bits)Sergio Giro2016-02-261-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | Note: port of cr/110497945 Bug: 26231099 Bug: 26234568 Change-Id: I3eef233b15ded9553c3cdfd1c51ffef306276f7d
| * | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-051-0/+22
| |\ \ | | | | | | | | | | | | | | | | Ticket: CYNGNOS-2213 Android 6.0.1 release 24
| | * | GCMParameters: check that the default tag size is secure (16 bits)Sergio Giro2016-03-011-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: port of cr/110497945 Bug: 26231099 Bug: 26234568 Change-Id: I3eef233b15ded9553c3cdfd1c51ffef306276f7d
| * | | Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-104-16/+46
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/libcore into cm-13.0 Android 6.0.1 release 22
| | * | Check for RFC 5746 TLS extensionKenny Root2016-01-061-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC 5746 allows you to either include a signaling cipher suite or a TLS extension. However, since TLS API has no way to indicate or check that a certain TLS extension is used, we insert it into the cipher suites we see to check against the enabled cipher suites. (cherry picked from commit 81885494e46596c796cdcb5037b91d92915b65a7) Bug: 24602368 Change-Id: I06422b9a90f47bb5ffa10ef614233d856773d336
| | * | Merge "Change FinalizeTest to use helper function" into marshmallow-cts-devDaniel Xie2015-12-211-2/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d0ae2ffcb6 * commit 'd0ae2ffcb6246651504c36fec93f9c1fdcef0d4b': Change FinalizeTest to use helper function
| | | * | Change FinalizeTest to use helper functionMathieu Chartier2015-12-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old way kept the object live in a vreg. Bug: 25851249 (cherry picked from commit cf3d432790a78b7d81da656f9a666f3d1ce4962c) Change-Id: I3cefd317e23c602c6c74dd866f0831161ef10962 (cherry picked from commit 8210c23a598b363e89d6cd32dedeeae673bf9212)
| | * | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-devDaniel Xie2015-12-031-12/+21
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | am: 1117338720 * commit '11173387202f799fad05bf696b81ca7f379e11dc': Add more debugging to the DigestTest
| | | * | Merge "Add more debugging to the DigestTest" into marshmallow-cts-devDaniel Xie2015-12-031-12/+21
| | | |\ \
| | | | * | Add more debugging to the DigestTestKenny Root2015-10-271-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test sometimes fails, but we don't know what the coefficient of variation is on the test results. Add this to the debug output so we can see if there is just some wild swing during testing. Also add a few rounds of warm-up as well. Bug: 24011092 Change-Id: Ic58f106f68eb93976e3f030e2f23e0156fe84be8 (cherry picked from commit 5fe1cd001f38fba460ac0ce5c15b85250e400f25)
| | * | | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into ↵Daniel Xie2015-12-031-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | marshmallow-cts-dev am: 79810ceebb * commit '79810ceebb071f7a52999783de2a3a529071bb93': Fix time calculation in test_SSLSession_getLastAccessedTime
| | | * | Fix time calculation in test_SSLSession_getLastAccessedTimezhulin09102015-10-301-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [root cause] Time precision in NativeCrypto SSL_SESSION_get_time is second, ignore millisecond. Then, assertTrue( Math.abs(s.server.getLastAccessedTime() - s.client.getLastAccessedTime()) < 1 * 1000); is not rigorous. [changes] modify diff time of s.server.getLastAccessedTime() and s.client.getLastAccessedTime() <= 1*1000 Bug: https://code.google.com/p/android/issues/detail?id=183898 (cherry picked from commit 3f49882b1d3316e37d8312d707c29261d14ece65) Change-Id: Ib0d5eb512f717f1fd88818eac5bf8ef0e5cbac6b
* | | | cacerts: CaCert Root CA and Class 3 CAPaul Kocialkowski2015-12-302-0/+286
|/ / / | | | | | | | | | | | | Change-Id: I073e2d0d697093502dbb6e5813fc9a129b7cb7c1 Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-082-2/+8
|\ \ \ | |/ / | | | | | | | | | | | | https://android.googlesource.com/platform/libcore into HEAD Android 6.0.1 release 3
| * | Patch for awaitNanos() for coarse-grained clocksNeil Fuller2015-10-092-2/+8
| |/ | | | | | | | | | | | | | | | | | | If System.nanoTime() returns the same value twice in awaitNanos() then (remaining == initialNanos) will be true but the code will conclude that a (less likely) overflow occurred. Bug: 24284239 (cherry-picked from commit 8fc2ac0fa8eb47ce607f8412e469d4f680b6ef85) Change-Id: I3b9d573ea822e18f4c1849c8ab66071e66274a50
* | libcore: add a way to clear cached time zone stringsRoman Birg2015-11-072-0/+19
| | | | | | | | | | | | | | Ref: CYNGNOS-453 Change-Id: I5aaf315f0d2b7b039cacb5de135501cea4f7cf0c Signed-off-by: Roman Birg <roman@cyngn.com>
* | fix getNetworkInterfacesList with unexpected files in /sys/class/netDedy Lansky2015-10-061-1/+6
|/ | | | | | | | | | | | | getNetworkInterfacesList works by iterating over all files in /sys/class/net. It expects that each file is actually a directory containing an "ifindex" file. It is possible that /sys/class/net contains files that doesn't adhere to above expectation in which case getNetworkInterfacesList returned with exception. This commit fixes this by ignoring files that do not adhere to above expectation. Change-Id: Ic39a0a9d311fc3269a5d1a8a5e6cbadc3f5a2105
* am 45b87713: am 3e8abdd9: am 57601a42: am d387c0ad: Merge "Fixes and ↵Neil Fuller2015-08-241-37/+67
|\ | | | | | | | | | | | | improvements for SerializationTest" into lollipop-cts-dev automerge: 660504a * commit '45b87713e7b0a50ffa369a6e0674580281e37d38': Fixes and improvements for SerializationTest
| * am 3e8abdd9: am 57601a42: am d387c0ad: Merge "Fixes and improvements for ↵Neil Fuller2015-08-241-37/+67
| |\ | | | | | | | | | | | | | | | | | | SerializationTest" into lollipop-cts-dev automerge: 660504a * commit '3e8abdd9bdca823a635aac3adacf71ef227b18e1': Fixes and improvements for SerializationTest
| | * Merge "Fixes and improvements for SerializationTest" into lollipop-cts-devNeil Fuller2015-08-241-37/+67
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | automerge: 660504a * commit '660504acb29860588107fdf175768e9b036fd3ff': Fixes and improvements for SerializationTest
| | | * Fixes and improvements for SerializationTestNeil Fuller2015-08-201-37/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests were order-dependent and flawed: test support classes were used in multiple tests but each relied on it being possible to detect static initialization of those classes. There was an incorrect assertion. This change splits out unique test support classes for those that need them, adds more assertions and fixes the broken assertion. Also tidies up some warnings. Bug: 23031484 Change-Id: Ia3bb32dd1dbd02a74931604cae424d7e9312c76d (cherry picked from commit 729d4ecafff8e6af5a71e4fecb2007917cbc2e2a)
* | | | am 236dcb77: am cd07c28b: am 8fd977f6: am bebe6fa7: Merge "Revert "Revert ↵Neil Fuller2015-08-071-18/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | "Changes associated with an OkHttp bad proxy response fix""" into lollipop-mr1-cts-dev * commit '236dcb7781bbacb52f9a0834198ca99379c87a84': Revert "Revert "Changes associated with an OkHttp bad proxy response fix""
| * | | am cd07c28b: am 8fd977f6: am bebe6fa7: Merge "Revert "Revert "Changes ↵Neil Fuller2015-08-061-18/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | associated with an OkHttp bad proxy response fix""" into lollipop-mr1-cts-dev * commit 'cd07c28b3c4178600bf38a55e9f4535d9034c6f9': Revert "Revert "Changes associated with an OkHttp bad proxy response fix""
| | * | Revert "Revert "Changes associated with an OkHttp bad proxy response fix""Neil Fuller2015-08-051-18/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 11c3934f61c6c873fd9caae16947285bc0068965. commit 11c3934f61c6c873fd9caae16947285bc0068965 was incorrectly merged from lollipop-cts-dev into lollipop-mr1-cts-dev. Change-Id: I66fa65f08397fb34d6af1cb73d2c0fa7f57ef1b6
* | | | am a84fc26d: am c1c9f15e: am 3a6966a3: am 8426987b: Merge "Revert "Changes ↵Neil Fuller2015-08-051-8/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev automerge: 34d183b * commit 'a84fc26d15aed853ec69632ceb5999ae9431be28': Revert "Changes associated with an OkHttp bad proxy response fix"
| * | | am c1c9f15e: am 3a6966a3: am 8426987b: Merge "Revert "Changes associated ↵Neil Fuller2015-08-051-8/+18
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | with an OkHttp bad proxy response fix"" into lollipop-cts-dev automerge: 34d183b * commit 'c1c9f15edfbc1f86b679c90f963e9eb852ad9c53': Revert "Changes associated with an OkHttp bad proxy response fix"
| | * | Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" ↵Neil Fuller2015-08-041-8/+18
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lollipop-cts-dev automerge: 34d183b * commit '34d183b404333627266d568e905a60e2be3a06f3': Revert "Changes associated with an OkHttp bad proxy response fix"
| | | * Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" ↵Neil Fuller2015-08-041-8/+18
| | | |\ | | | | | | | | | | | | | | | into lollipop-cts-dev
| | | | * Revert "Changes associated with an OkHttp bad proxy response fix"Neil Fuller2015-07-171-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 467a6809cd31cbfa94c326415ff3c441d9b1e8be. commit 467a6809cd31cbfa94c326415ff3c441d9b1e8be is present in lollipop-cts-dev but not lollipop-release. This causes the tests to fail when run against a lollipop-release build. DO NOT MERGE ANYWHERE Bug: 22546532 Change-Id: I4582824e94679213f27352e18e7d9bb985954909
| | | * | Fixes associated with the tzdata 2015a updateNeil Fuller2015-08-031-8/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chile has changed the rules for DST. The test duplicates testApia below it, so it can be removed. Bug: 19212588 (cherry-picked from commit ebfb8f8b0ee0c0a75d92d8fc56ccd0d87ee7e9ad) Change-Id: Ibe7c0dc510813826dca13993b6600d368e03740a (cherry picked from commit a88856485e84ad5cd45a6e16310490d871a679c4)
* | | | Fix broken Zip64 extended info size checks.Narayan Kamath2015-07-314-32/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We assumed that all fields listed in the extended info layout were always present. This is not the case. Only the size / uncompressed size are required fields (in the LFH) and the directory offset is required only if the corresponding field in the regular record is 0xFFFFFFFF. The same goes for disk number too, but we don't support spanned archives, so we can assume that it's never present. This change also fixes a spec violation where we were *not* writing 0xFFFFFFFF to the central directories LFH offset field when we were putting the actual information in the Zip64 Extended info field. This change also adds lower level unit tests to some of the Zip64 parsing functions since it's pretty hard (impossible ?) to find a Zip64 tool that outputs stuff in the format we want. bug: 22851464 (cherry picked from commit 837aeb356c331960073e5ddbf449779c6194f164) Change-Id: I031b3151b7deeda8a0a98acfba3f5a906c0c360c
* | | | Update code name / version number.Narayan Kamath2015-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | bug: 19890045 Change-Id: I058972a86021846429263c59869544627a073686
* | | | Late binding: add Cipher#init checksKenny Root2015-07-232-85/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cipher should check that the chosen CipherSpi actually supports initalization with the given parameters. If not, it should return the first exception that it ran into so that the developer can have an idea of why the initialization failed. This is most likely do to unsupported key or algorithm parameters. Collapse some functions into one so it's easier to keep track of the exception that should be thrown should all else fail. Also since we try to initialize during the CipherSpi selection, there is no need to initialize the returned CipherSpi again. Also remove an instanceof check to be in line with other implementations that just throw a ClassCastException since we now will try other providers before falling back to throwing the unchecked exception. This might actually provide better debug messages for a developer working on a CipherSpi provider. (cherry picked from commit f591462f7901011b2bce61c3cbbdc54840e5b4bc) Bug: 22573249 Change-Id: Ieec97a8f00e9c0c3889520a3ec9f8bc4e514b35a
* | | | Late binding: add more Cipher testsKenny Root2015-07-232-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any provider throwing an unchecked exception should not prevent the next possibly working provider from having a chance. (cherry picked from commit f7cae3971c030257c62ebc20e9e5dfd6d734b34c) Bug: 22573249 Change-Id: If3f508ed3e87de58b39ab380fb298a92fb1b593b
* | | | Late binding: add tests for init-time rejectionKenny Root2015-07-232-0/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cipher should try to to initialize the CipherSpi it selects before returning it as a successful match. These tests ensure that it is correct. (cherry picked from commit 85d1800ec694bb4c2f629073d79520c4a7ad0cc8) Bug: 22573249 Change-Id: I12ed5021cf85fccb5d04a0904a302f6cd3569c3d
* | | | am c8596a95: am 157dae46: am 88051ed3: Merge "Add testInterfaceProperties() ↵Neil Fuller2015-07-131-12/+33
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev automerge: 19679b0 automerge: 2cc1870 * commit 'c8596a95c03ce733ba8202c938f3c17a8f0b7827': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
| * | | am 157dae46: am 88051ed3: Merge "Add testInterfaceProperties() . Move ↵Neil Fuller2015-07-131-12/+33
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Ethernet verification out of testLoopback()." into kitkat-cts-dev automerge: 19679b0 automerge: 2cc1870 * commit '157dae465d0190edb0fb0bed8ad779cadd755faf': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
| | * | Merge "Add testInterfaceProperties() . Move Ethernet verification out of ↵Neil Fuller2015-07-131-12/+33
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | testLoopback()." into kitkat-cts-dev automerge: 19679b0 automerge: 2cc1870 * commit '2cc187049ed0a5fc6168ffdb8f837b59462e5b53': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
| | | * Merge "Add testInterfaceProperties() . Move Ethernet verification out of ↵Neil Fuller2015-07-131-12/+33
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testLoopback()." into kitkat-cts-dev automerge: 19679b0 * commit '19679b0fde4e1a7321101b558e2f4961daec923e': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
| | | | * Add testInterfaceProperties() . Move Ethernet verification out of ↵Tochau Hoang2015-07-081-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testLoopback(). Add testInterfaceProperties(): verify if each interface can be retrieved using getByName(). Use type properties of these interfaces to determine if they are Ethernet. Perform address tests on all active Ethernet interfaces. Move Ethernet verification out of testLoopback into testInterfaceProperties. Change-Id: I1641f2995f4ceb858eda38d1ba6137382b2c7ba3 Signed-off-by: Tochau Hoang <tochau.hoang@panasonic.aero>
| * | | | am 45c2f8a3: am a17cd656: Merge "Explicitly set DateFormat.is24Hour value ↵Daniel Xie2015-07-021-0/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | needed by tests" into lollipop-mr1-cts-dev * commit '45c2f8a384ab789ac0410a02debe32d56105ae96': Explicitly set DateFormat.is24Hour value needed by tests
| | * | | Explicitly set DateFormat.is24Hour value needed by testsNeil Fuller2015-06-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests fail under CTS if the device is set to use the 24 hour clock. The tests that depend on the value of the setting are now being explicit. Bug: 20899571 Bug: 20937589 Bug: 20939139 Bug: 20378566 Bug: 21585934 Bug: https://code.google.com/p/android/issues/detail?id=162384 (cherry-picked from commit 38a0b85afd4231f46fac59e59ee38729bd5154c4) Change-Id: I1a369baeeac929ef010e7906e92544b9f483f02c
generated by cgit v1.1 at 2024-05-19 06:05:44 +0000