summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | Improve tests for TLS fallback.Neil Fuller2014-11-201-58/+369
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a small improvement over the changes that were submitted to Android when TLS_FALLBACK_SCSV was introduced. Previously the test would cripple the server to use a low quality protocol so the TLS_FALLBACK_SCSV check would pass for all connection attempts. This change modifies that approach. Instead it introduces a test client socket factory that ignores any attempt to set the TLS_FALLBACK_SCSV cipher. This means that the server will not attempt to enforce the fallback check. The ideal solution would be to disable TLS_FALLBACK_SCSV checks in the MockWebServer for the tests that are supposed to simulate servers that do not perform TLS_FALLBACK_SCSV checks. However, we do not currently have a mechanism to do this. This change also adjusts tests that test fallback to explicitly enable SSLv3 for server-side socket factories. The Android default was changed to disable SSLv3 (though it is still supported). An up-coming change should remove the need for this. Change-Id: I5bd6c2659ebbb8eff729f75b5208ca414d70e385
* | | | | | | | | | | am 801fa388: Merge "Add exceptions for test_connectLjava_net_SocketAddressI"Elliott Hughes2014-11-191-0/+12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '801fa3882348ed265c9952210a08c59332a203e4': Add exceptions for test_connectLjava_net_SocketAddressI
| * | | | | | | | | | Merge "Add exceptions for test_connectLjava_net_SocketAddressI"Elliott Hughes2014-11-191-0/+12
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Add exceptions for test_connectLjava_net_SocketAddressITiberiu Breana2014-11-191-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OldSocketTest's test_connectLjava_net_SocketAddressI would sometimes fail on certain networks. The connection attempt to the 'non-reachable' IP would be reset by a local router before the expected timeout occured, thus causing the test to fail. This change adds additional catch clauses for cases like this, looking for ECONNREFUSED messages. Bug: 18143878 Change-Id: Ia98cfe75a5abce9a53bc062d5c8e81cf2d1d63e4 Signed-off-by: Tiberiu Breana <tiberiu.a.breana@intel.com>
* | | | | | | | | | | am aff22a6d: Merge "Fix DecimalFormatSymbols.setCurrency."Elliott Hughes2014-11-192-3/+29
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aff22a6ddb474b00719dea04d8a4258b8773d0d0': Fix DecimalFormatSymbols.setCurrency.
| * | | | | | | | | | Merge "Fix DecimalFormatSymbols.setCurrency."Elliott Hughes2014-11-192-3/+29
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix DecimalFormatSymbols.setCurrency.Elliott Hughes2014-11-192-3/+29
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cache values from the Currency but can allow those cached values to be overwritten, so even if a later call to setCurrency is for the same Currency as last time, we can't assume that's a no-op. Bug: 18437206 Bug: https://code.google.com/p/android/issues/detail?id=79925 Change-Id: Ic44dbc66a190567438b8b9f866f2a6cdee693e10
* | | | | | | | | | | am a553773d: Improve backward compatibility of plurals formatting.Elliott Hughes2014-11-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a553773d208f874df5f94a79eec1e3a9d3fa3407': Improve backward compatibility of plurals formatting.
| * | | | | | | | | | Improve backward compatibility of plurals formatting.Elliott Hughes2014-11-192-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | icu4c's behavior changed such that it now looks at the absolute value of the input. For now, preserve compatibility by treating all negative numbers as being case OTHER. Bug: 18429565 Bug: https://code.google.com/p/android/issues/detail?id=78962 (cherry picked from commit 099eddad18ef2fff2b995f661b8abde2d35fd539) Change-Id: I230210bb875cdc3c393db45fbdc347bc3486338b
* | | | | | | | | | | am 84864297: Merge "Improve backward compatibility of plurals formatting."Elliott Hughes2014-11-192-0/+22
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '848642974cdd2606f21a596a2c7224ed4f0a70db': Improve backward compatibility of plurals formatting.
| * | | | | | | | | | Merge "Improve backward compatibility of plurals formatting."Elliott Hughes2014-11-192-0/+22
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Improve backward compatibility of plurals formatting.Elliott Hughes2014-11-182-0/+22
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | icu4c's behavior changed such that it now looks at the absolute value of the input. For now, preserve compatibility by treating all negative numbers as being case OTHER. Bug: 18429565 Bug: https://code.google.com/p/android/issues/detail?id=78962 Change-Id: I1e98af973f408c8809071c15d07d4fd585d77e4c
* | | | | | | | | | resolved conflicts for merge of eecc5b7c to lmp-mr1-dev-plus-aospAlex Klyubin2014-11-192-1/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18432707 Change-Id: I48ae60eeaf724aad18f8bf3da96fed3a3d1408cd
| * | | | | | | | | Fix a bug in DefaultHostnameVerifier wildcard handling.Alex Klyubin2014-11-182-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wildcard domain name patterns of the form *.remainder are supposed to match domain names that exactly match the remainder. Due to a bug, the match was not exact but rather a prefix match: domain names starting with the remainder would match too. This CL fixes the issue. Bug: 18432707 Change-Id: Ic2fccbfeac4f5d6e71b49ecbd36c248214baebad
* | | | | | | | | | am d910cf33: Merge "Fix DefaultHostnameVerifierTest failure."Alex Klyubin2014-11-191-4/+8
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd910cf339d61153d66f9a3d835eff027791ad78c': Fix DefaultHostnameVerifierTest failure.
| * | | | | | | | | Merge "Fix DefaultHostnameVerifierTest failure."Alex Klyubin2014-11-191-4/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix DefaultHostnameVerifierTest failure.Alex Klyubin2014-11-181-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The failure was caused by me forgetting to update the tests when merging in 14d4830f4048657722cbec1c4aaa8747a07c9495 which makes DefaultHostnameVerifier reject wildcard domain name patterns consisting of fewer than two labels (excluding root). Bug: 17552202 Change-Id: Ibd1928621dbffb43830ff9d014eb1e3c50232172
* | | | | | | | | | | am 1b1065ec: Merge "Delete pointer sized fields" into lmp-mr1-devMathieu Chartier2014-11-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b1065ec410f7286a6fe0a1bf40462410109ca49': Delete pointer sized fields
| * | | | | | | | | | Merge "Delete pointer sized fields" into lmp-mr1-devMathieu Chartier2014-11-181-30/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Delete pointer sized fieldsMathieu Chartier2014-11-141-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia0ad61589542c5ce317b6a5a6bb4ca12d7e6647b
* | | | | | | | | | | | am be5e80e2: Merge "Delete pointer sized fields"Mathieu Chartier2014-11-181-29/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be5e80e21d4b06d72b30b78ed195fe557a0b687c': Delete pointer sized fields
| * | | | | | | | | | | Merge "Delete pointer sized fields"Mathieu Chartier2014-11-181-29/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Delete pointer sized fieldsMathieu Chartier2014-11-181-29/+0
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia0ad61589542c5ce317b6a5a6bb4ca12d7e6647b (cherry picked from commit 13e57c9c508dea33e9bd5768a3cbd79eb263790e)
* | | | | | | | | | | | am 4b5092ae: Merge "Fix SSLContextTest.test_SSLContext_defaultConfiguration ↵Alex Klyubin2014-11-189-249/+262
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failure" * commit '4b5092ae80e4c3681080090eebd63a82d65eafd9': Fix SSLContextTest.test_SSLContext_defaultConfiguration failure
| * | | | | | | | | | | Merge "Fix SSLContextTest.test_SSLContext_defaultConfiguration failure"Alex Klyubin2014-11-189-249/+262
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix SSLContextTest.test_SSLContext_defaultConfiguration failureAlex Klyubin2014-11-189-249/+262
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was failing because it assumed that all SSLContext instances have the same set of TLS protocol versions enabled. The fix refactored SSLDefaultConfigurationAsserts class into SSLConfigurationAsserts class. The main difference is that the new class has wider scope: it can assert that (1) the default configuration of TLS/SSL primitives is as expected -- exactly what the old SSLDefaultConfigurationAsserts class offered, and (2) that TLS/SSL primitives are configured the same as a provided SSLContext. Assertions about the default configuration of primitives other than SSLContext are now implemented by asserting that these primitives are configured exactly like the default SSLContext. Change-Id: I52d6514768c4053054df2cf79e7182d8fd87bfe2
* | | | | | | | | | | am 5a32ef57: Merge "Adjust tests for removal of DSS TLS/SSL cipher suites."Alex Klyubin2014-11-183-11/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a32ef575b3657168a1a53e7bc8c2cd2481dd3ec': Adjust tests for removal of DSS TLS/SSL cipher suites.
| * | | | | | | | | | Merge "Adjust tests for removal of DSS TLS/SSL cipher suites."Alex Klyubin2014-11-183-11/+13
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Adjust tests for removal of DSS TLS/SSL cipher suites.Alex Klyubin2014-11-173-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for migration from OpenSSL to BoringSSL. BoringSSL does not support DSS. Bug: 17409664 Change-Id: I6b2ac5f7c7b9c41416650cdbdce2deed03372f49
* | | | | | | | | | | am e9795c29: SSLSocketTest: add error message test for fallback_scsvKenny Root2014-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9795c29b377a5c5b51b87c4f2fcdbf7ae0cd83b': SSLSocketTest: add error message test for fallback_scsv
| * | | | | | | | | | SSLSocketTest: add error message test for fallback_scsvKenny Root2014-11-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upgrade to OpenSSL 1.0.1j caused a regression for the error message produced by inappropriate fallback protection mechanism. Add a test to make sure this doesn't happen again. (cherry picked from commit cce4d86d447d0e86f94035dd0285726c4025fae6) Bug: 18018599 Change-Id: If8896d8f644095c13cbe44dd8ba7d4ef235385cf
* | | | | | | | | | | am 2f629d3e: Merge "Add Bouncy Castle to classpath in run-libcore-tests."Alex Klyubin2014-11-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f629d3eff3e73b64efdc95b90446d1ff8d4e831': Add Bouncy Castle to classpath in run-libcore-tests.
| * | | | | | | | | | Merge "Add Bouncy Castle to classpath in run-libcore-tests."Alex Klyubin2014-11-171-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add Bouncy Castle to classpath in run-libcore-tests.Alex Klyubin2014-11-171-0/+1
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most security-related tests are failing unless Bouncy Castle is in the classpath because they create a KeyStore of algorithm "BKS". Change-Id: I8138523015f2e281f25b3210b43c71ebff1bf804
* | | | | | | | | | | am 3fd279f7: Merge "SSLSocketTest: add error message test for fallback_scsv"Kenny Root2014-11-171-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3fd279f7853b2f0a523da11fbbe84adc26f835b7': SSLSocketTest: add error message test for fallback_scsv
| * | | | | | | | | | Merge "SSLSocketTest: add error message test for fallback_scsv"Kenny Root2014-11-171-0/+8
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | SSLSocketTest: add error message test for fallback_scsvKenny Root2014-11-171-0/+8
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upgrade to OpenSSL 1.0.1j caused a regression for the error message produced by inappropriate fallback protection mechanism. Add a test to make sure this doesn't happen again. Bug: 18018599 Change-Id: If8896d8f644095c13cbe44dd8ba7d4ef235385cf
* | | | | | | | | | am 9a9c59af: Prefer "jpg" over "jpeg" as the extension for "image/jpeg".Elliott Hughes2014-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a9c59af7f1003f6e35ce060482eefda40b380f1': Prefer "jpg" over "jpeg" as the extension for "image/jpeg".
| * | | | | | | | | Prefer "jpg" over "jpeg" as the extension for "image/jpeg".Elliott Hughes2014-11-172-1/+6
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18390752 (cherry picked from commit 2a63032eb1c020ad3e73177951142735e11e044e) Change-Id: I713930b8ad8d8a1353d289c1f9268159c3ad862d
* | | | | | | | | am 47f356d0: Merge "Prefer "jpg" over "jpeg" as the extension for "image/jpeg"."Elliott Hughes2014-11-172-1/+6
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '47f356d012543f359b0a23d3838337d9c457de34': Prefer "jpg" over "jpeg" as the extension for "image/jpeg".
| * | | | | | | | Merge "Prefer "jpg" over "jpeg" as the extension for "image/jpeg"."Elliott Hughes2014-11-172-1/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Prefer "jpg" over "jpeg" as the extension for "image/jpeg".Elliott Hughes2014-11-142-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18390752 Change-Id: Iaffa75629a7b618dd8809416934733e7314bf820
* | | | | | | | | | am ae26e552: Merge "Add a test for native versus non-native digits."Elliott Hughes2014-11-171-0/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ae26e5527f665eadacd403ad8e3e0f10ecdc1a63': Add a test for native versus non-native digits.
| * | | | | | | | | Merge "Add a test for native versus non-native digits."Elliott Hughes2014-11-171-0/+19
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add a test for native versus non-native digits.Elliott Hughes2014-11-141-0/+19
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18340949 Change-Id: I80c6ce0933f7b745d092369579819538f40af1b5
* | | | | | | | | | am c820ad52: Merge "Set random seeds post fork."Narayan Kamath2014-11-175-23/+39
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c820ad5233494b0c3e7c33342687698cb124bdab': Set random seeds post fork.
| * | | | | | | | | Merge "Set random seeds post fork."Narayan Kamath2014-11-175-23/+39
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Set random seeds post fork.Narayan Kamath2014-11-175-23/+39
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gets rid of static Random objects from various classes and makes them use Math.random instead. Also add hidden APIs to set the random seed post fork (where we're single threaded). This has the nice side effect of fixing a performance bug related to linpack (11388705) where threads were serializing on Math.class while calling Math.random. bug: https://code.google.com/p/android/issues/detail?id=79143 bug: 11388705 Change-Id: Ide3a7d17fe855a8086601348be87a890e4c42ab4
* | | | | | | | | | am 473a6b65: Merge "Add benchmark for reflection performance on large classes."Narayan Kamath2014-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '473a6b6589da3c4e45cb1786e0db0149e6ce24fa': Add benchmark for reflection performance on large classes.
| * | | | | | | | | Merge "Add benchmark for reflection performance on large classes."Narayan Kamath2014-11-172-0/+2560
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-10 16:39:55 +0000