summaryrefslogtreecommitdiffstats
path: root/support
Commit message (Collapse)AuthorAgeFilesLines
* Add more debugging to the DigestTestKenny Root2015-10-271-0/+82
| | | | | | | | | | | | 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)
* Add RSA-OAEP and RSA-PSS to StandardNames.Alex Klyubin2015-06-171-0/+11
| | | | | | | | | | This fixes libcore.java.security.ProviderTest#test_Provider_getServices which got broken by Android Keystore Provider exposing RSA encryption with RSA-OAEP padding scheme and RSA signatures with RSA-PSS padding scheme. Bug: 21870225 Change-Id: I661a333579a29b5ede2b517e1a020d73122bfffc
* Update offered ciphersKenny Root2015-06-041-48/+48
| | | | | | | | Dropped support for non-ephemeral Diffie-Hellman cipher suites, anonymous authentication, some DES cipher suites, and export cipher suites. Bug: 21522548 Change-Id: Ie2048d303890935969cc7c1ac7bc9d93705c7a90
* No need to test "GCM" mode in regular Cipher testKenny Root2015-05-191-1/+1
| | | | | | | | | | | | Partially revert change from 6e0cdd08e2a671393b8a410690d28140a80d9387. Since the regular cipher test expects to be able to use all padding types with every mode, testing GCM is not appropriate here. It is still tested elsewhere in CipherTest. (cherry picked from commit a174063b24e6f792fc58373439808842e1c0d657) Bug: 21209499 Change-Id: Ie20ddab4112f350cce08114c913a89a659823823
* Track change from GCM -> AES/GCM/NoPaddingKenny Root2015-05-191-2/+2
| | | | | | | | | Update tests to track the change from GCM to AES/GCM/NoPadding (cherry picked from commit 6e0cdd08e2a671393b8a410690d28140a80d9387) Bug: 21209499 Change-Id: Ie8383cd2cd0bcb62a38c4c55cd86aa90ad834b2b
* Unbreak SecretKeyFactory-related ProviderTest.Alex Klyubin2015-04-151-0/+6
| | | | | | | | | The test was broken by AndroidKeyStore Provider adding support for SecretKeyFactory for key algorithms AES, HmacSHA1, HmacSHA224, HmacSHA256, HmacSHA384, and HmacSHA512. Bug: 20250820 Change-Id: Iba2d8f269844e01913fbf82a744e83da8f951af1
* StrictJarFile: unittest for missing filesNick Kralevich2015-04-141-0/+0
| | | | | | | | Add a test to verify that we error out when the manifest declares a file which isn't present in the jar. Bug: 1162500 Change-Id: I3c6814c500d218036a5c0515e9f4f93e3f7a63d5
* libcore: change SSLEngineTest to close SSLEngine instancesSergio Giro2015-04-081-0/+18
| | | | | | | | | | It was leaking resources allocated by SSLEngine's, pipes among others, thus causing subsequent tests to fail with "too many open files" errors. In OpenSSLEngineImpl, the resources are freed in the finalizer, so there's no guarantee that resources as pipes will ever be freed unless the engines are explicitly closed. Change-Id: Ide90808a64278486a19bcdfcba628f623c62afc9
* Fix misspelling of KerberosBrian Carlstrom2015-03-181-1/+1
| | | | Change-Id: I6473665bc00fa45d8a3941657791334e97df7c85
* am f0841451: Merge "Add SSLSocket tests which inspect emitted ClientHello ↵Alex Klyubin2015-01-235-58/+311
|\ | | | | | | | | | | | | fields." * commit 'f0841451c86cc9fa932dbc08271c8dc96da6ca38': Add SSLSocket tests which inspect emitted ClientHello fields.
| * Add SSLSocket tests which inspect emitted ClientHello fields.Alex Klyubin2015-01-225-58/+311
| | | | | | | | | | | | | | | | | | | | | | | | This CL adds basic tests which capture the ClientHello emitted by SSLSocket and assert that the various fields are as expected. In particular, this CL adds tests for: * client protocol version, * cipher suite list, * compression methods, * server_name extension (SNI). Change-Id: I387c44363ad26f064885f9bfa28572da37871078
* | am ed755e7c: Merge "SSLEngineTest: position should be same as produced/consumed"Kenny Root2015-01-081-3/+11
|\ \ | |/ | | | | | | * commit 'ed755e7c7aed927e164eb513d6ea92131667cdfa': SSLEngineTest: position should be same as produced/consumed
| * SSLEngineTest: position should be same as produced/consumedKenny Root2015-01-071-3/+11
| | | | | | | | | | | | | | | | The position of the buffer should match the number of bytes produced or consumed. Make sure all the tests have this condition on the handshake. Bug: 18921387 Change-Id: I8d248b2ac189d801586510fb5aca2e3bd6701ffe
* | am 8f090052: Merge "Repurpose "HexEncoding" for internal users."Narayan Kamath2014-12-163-97/+4
|\ \ | |/ | | | | | | * commit '8f090052bdddc1312fe9238eca702c4e8eafff11': Repurpose "HexEncoding" for internal users.
| * Repurpose "HexEncoding" for internal users.Narayan Kamath2014-12-163-97/+4
| | | | | | | | | | | | | | | | | | Frameworks callers either roll their own or use an internal apache class. Given that apache is going away, we need to provide them with an alternative. bug: 18027885 Change-Id: Iec01cba9f3d2027828457c0b450eac0dd08fcaf6
* | am cb43b294: Merge "Get rid of Support_Configuration.SpecialInetTestAddress ..."Narayan Kamath2014-12-051-359/+14
|\ \ | |/ | | | | | | * commit 'cb43b294c4fc686c38f7bdd7c81c07f66f8eb9ce': Get rid of Support_Configuration.SpecialInetTestAddress ...
| * Get rid of Support_Configuration.SpecialInetTestAddress ...Narayan Kamath2014-12-041-359/+14
| | | | | | | | | | | | | | ... aka. "www.google.com" and lots of other unused support configuration values. Change-Id: I07f07d656e77317a50ac54dda07f493437c15e58
| * Fix URLConnectionTest for devices without full internet access.Aaron Whyte2014-11-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes two bad tests that are covered elsewhere, using mocks. test_getContentEncoding() was hitting http://www.amazon.com, to see if a URLConnection getter was working. That getter is now tested in libcore/luni/src/test/java/libcore/java/net/URLConnectionTest.java, in testClientConfiguredGzipContentEncoding(). test_getLastModified() was hitting http://www.php.net/manual/en/function.explode.php, to see if getHeaderFieldDate was working for Last-Modified. That getter is better tested in test_getHeaderFieldDateLjava_lang_StringJ(), in the same file. Bug:18480776 (cherry picked from commit 939e6a1aceff448445928ad5d815479e84e84383) Change-Id: Ia01fd59809683317271017364179e1843c149e65
* | am 06609270: Merge "Assert finite default timeout for TLS/SSL sessions."Alex Klyubin2014-11-251-1/+2
|\ \ | |/ | | | | | | * commit '06609270f635ac19a90bb01c480185b702882cf3': Assert finite default timeout for TLS/SSL sessions.
| * Assert finite default timeout for TLS/SSL sessions.Alex Klyubin2014-11-241-1/+2
| | | | | | | | | | | | | | | | | | This makes CTS tests expect 8 hours as the default timeout for TLS/SSL sessions. Prior to this change, sessions were expected to not time out by default. Bug: 18370076 Change-Id: I09ae9ee91df2fb4bb2e8cc812127dc9f05a14696
* | am aa0045f5: am 939e6a1a: Fix URLConnectionTest for devices without full ↵Aaron Whyte2014-11-251-2/+0
|\ \ | | | | | | | | | | | | | | | | | | internet access. * commit 'aa0045f52b0c780794dcf85acffc66e188b3681c': Fix URLConnectionTest for devices without full internet access.
| * \ am 939e6a1a: Fix URLConnectionTest for devices without full internet access.Aaron Whyte2014-11-251-2/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '939e6a1aceff448445928ad5d815479e84e84383': Fix URLConnectionTest for devices without full internet access.
| | * | Fix URLConnectionTest for devices without full internet access.Aaron Whyte2014-11-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes two bad tests that are covered elsewhere, using mocks. test_getContentEncoding() was hitting http://www.amazon.com, to see if a URLConnection getter was working. That getter is now tested in libcore/luni/src/test/java/libcore/java/net/URLConnectionTest.java, in testClientConfiguredGzipContentEncoding(). test_getLastModified() was hitting http://www.php.net/manual/en/function.explode.php, to see if getHeaderFieldDate was working for Last-Modified. That getter is better tested in test_getHeaderFieldDateLjava_lang_StringJ(), in the same file. Bug:18480776 Change-Id: I21ffc5c9c72eb4379478c11687d197dab176a851
* | | | am 4b5092ae: Merge "Fix SSLContextTest.test_SSLContext_defaultConfiguration ↵Alex Klyubin2014-11-183-241/+255
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | failure" * commit '4b5092ae80e4c3681080090eebd63a82d65eafd9': Fix SSLContextTest.test_SSLContext_defaultConfiguration failure
| * | | Merge "Fix SSLContextTest.test_SSLContext_defaultConfiguration failure"Alex Klyubin2014-11-183-241/+255
| |\ \ \
| | * | | Fix SSLContextTest.test_SSLContext_defaultConfiguration failureAlex Klyubin2014-11-183-241/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-11/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5a32ef575b3657168a1a53e7bc8c2cd2481dd3ec': Adjust tests for removal of DSS TLS/SSL cipher suites.
| * | | | Adjust tests for removal of DSS TLS/SSL cipher suites.Alex Klyubin2014-11-171-11/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for migration from OpenSSL to BoringSSL. BoringSSL does not support DSS. Bug: 17409664 Change-Id: I6b2ac5f7c7b9c41416650cdbdce2deed03372f49
* | | | am 657afa6c: Merge "JarUtils: stop trying to build chain past candidates ↵Kenny Root2014-11-141-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | length" into lmp-mr1-dev * commit '657afa6cd8da378f30afe7b491e6d9de6c7c23fd': JarUtils: stop trying to build chain past candidates length
| * | | JarUtils: stop trying to build chain past candidates lengthKenny Root2014-11-131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the certs in the PKCS#7 bag are in a loop, it will go on forever trying to build a chain. Instead just stop trying to build the chain when our chain exceeds the length of the candidates. Bug: 17972577 Change-Id: If4f92e3eeabe893612a618bab0068a0f8cf75ea9
* | | | am 5dbbe831: Merge "Basic library for parsing TLS/SSL ClientHellos in tests."Alex Klyubin2014-11-1311-0/+1194
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '5dbbe8317afd79d21bdbe931fe476ccf9a4bf269': Basic library for parsing TLS/SSL ClientHellos in tests.
| * | | Basic library for parsing TLS/SSL ClientHellos in tests.Alex Klyubin2014-11-1211-0/+1194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CTS tests in libcore assert certain properties of TLS/SSL and HTTPS stacks, but they do not check whether these are correctly reflected in the underlying TLS/SSL traffic generated by these stacks. This basic TLS wire-protocol library will enable CTS tests to inspect in detail ClientHello messages, such as which protocol is being signalled as the higest supported by the client, which cipher suites are enabled, whether SNI extension is provided and set to the correct value. As an example, in this CL I switched one test in SSLSocketTest to this library. Change-Id: I93251dd873a78ec7f6caa704b71f5fa0ecf2c2f2
* | | | am 258e3d15: TestKeyStore: more possibilities for KeyStore creationKenny Root2014-11-121-31/+78
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '258e3d158c9a876307d5111972f7e9f1ad87b076': TestKeyStore: more possibilities for KeyStore creation
| * | TestKeyStore: more possibilities for KeyStore creationKenny Root2014-11-121-31/+78
| |/ | | | | | | | | | | | | | | Needed for change I379de26bdae3de1d0fe867adc1d8b7d5443c8c7a in external/conscrypt Bug: 17972577 Change-Id: Iaeb36167d953533e23d610bf218488bd79b6430e
* | Fix OldSocketTest#test_connectLjava_net_SocketAddressI.Elliott Hughes2014-11-112-16/+15
| | | | | | | | | | | | | | Use the same address as StuckServer. Bug: 18143878 Change-Id: I3759776ed3a9d46175c4b987fa0c47b27033441d
* | am d4d881ff: Merge "SSLSocket: track update to TLS defaults"Kenny Root2014-11-041-6/+8
|\ \ | | | | | | | | | | | | * commit 'd4d881ff8989346583de40c49519f83b4b51d160': SSLSocket: track update to TLS defaults
| * | SSLSocket: track update to TLS defaultsKenny Root2014-11-031-6/+8
| | | | | | | | | | | | | | | | | | | | | SSLv3 is no longer in the default list. Bug: 17136008 Change-Id: I4092e17f79c29d10d11ffe01d130d0d03cd2215f
* | | am 140f3a33: Merge "SSLSocket: document current behavior with SSLContext"Kenny Root2014-11-041-0/+50
|\ \ \ | |/ / | | / | |/ |/| * commit '140f3a336ff5383b3462a720786143f3dda347bf': SSLSocket: document current behavior with SSLContext
| * SSLSocket: document current behavior with SSLContextKenny Root2014-11-031-0/+50
| | | | | | | | | | | | | | | | Currently Android does not pay attention to the algorithm choice, so use this test as documentation of that. Bug: 17136008 Change-Id: If8e516be48721bf65a98f22a9cdf02eded8f6375
| * Add support for TLS_FALLBACK_SCSVKenny Root2014-10-221-0/+12
| | | | | | | | | | | | | | Bug: 17750026 (cherry picked from commit e6a6e935e98f426c7000b2bf4086f87101f4441c) Change-Id: Ia7f0714157b0dc36579122b27eb921a54f3a6818
* | Add support for TLS_FALLBACK_SCSVKenny Root2014-10-061-0/+12
| | | | | | | | | | Bug: 17750026 Change-Id: I8dec89ae59a6f745f63120b11b4f6dbe9b21a139
* | am 9a497b6d: Merge "Fix UnmodifiableEntrySet.toArray() ordering"Neil Fuller2014-07-172-161/+191
|\ \ | |/ | | | | | | * commit '9a497b6d3b95d774f28f0203409ce6ebf6cb1241': Fix UnmodifiableEntrySet.toArray() ordering
| * Merge "Fix UnmodifiableEntrySet.toArray() ordering"Neil Fuller2014-07-172-161/+191
| |\
| | * Fix UnmodifiableEntrySet.toArray() orderingNeil Fuller2014-06-232-161/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toArray() was returning entries in reverse order. toArray(T[]) was correct. Thanks to Chris Povirk for discovering. The fix is simple. Change includes additional tests to avoid regressions. Test & support code has been cleaned up a little to improve coverage and make it (slightly) less horrible. Bug: https://code.google.com/p/android/issues/detail?id=72073 Change-Id: I42ff90e0f592482289cd0cd9fdbdaabf0c17ad93
* | | am ea43fa14: Merge "TLS-PSK cipher suites enabled when PSKKeyManager is ↵Alex Klyubin2014-07-151-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | provided." * commit 'ea43fa1424058748e3ec4ac01d2f6e1898e9a4e3': TLS-PSK cipher suites enabled when PSKKeyManager is provided.
| * | TLS-PSK cipher suites enabled when PSKKeyManager is provided.Alex Klyubin2014-07-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | This documents and tests that TLS-PSK cipher suites are enabled if a PSKKeyManager is provided to SSLContext during its initialization. Bug: 15073623 Change-Id: I8e2bc3e7a1ea8a986e468973b6bad19dc6b7bc3c
| * | RemoveBrian Carlstrom2014-07-072-109/+9
| | | | | | | | | | | | | | | | | | (cherry picked from commit 36214feb86a0963b23f34c8c63584252bd757e19) Change-Id: I96d5109c01e39255b9970f7a515ddd3575a50e56
* | | RemoveBrian Carlstrom2014-07-072-109/+9
| | | | | | | | | | | | Change-Id: I143d0b26b116e75892223e74b6c22b6c8db05466
* | | am 33c1c8c3: am e0affcdc: Merge "Assert the updated list of supported ↵Alex Klyubin2014-06-191-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ECDHE-PSK cipher suites." * commit '33c1c8c36c62c1238876bddf916bdf92a5654543': Assert the updated list of supported ECDHE-PSK cipher suites.
| * \ \ am e0affcdc: Merge "Assert the updated list of supported ECDHE-PSK cipher ↵Alex Klyubin2014-06-191-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | suites." * commit 'e0affcdc8c4513d91352c0fc6f4c5c29b0605d2d': Assert the updated list of supported ECDHE-PSK cipher suites.