summaryrefslogtreecommitdiffstats
path: root/luni
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge "Fix lookup order when opening directly from APK" into mnc-devDmitriy Ivanov2015-06-111-6/+8
|\ \ \ \ \ \
| * | | | | | Fix lookup order when opening directly from APKDmitriy Ivanov2015-06-111-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The order should be as follows: 1. Uncompressed native library dir (if any) 2. Directly from apk (<apk>!/lib/<abi>) 3. vendor/lib:/system/lib Bug: http://b/21647354 Bug: http://b/21667767 Bug: http://b/21726698 Bug: http://b/8076853 Change-Id: I62cd76b7e4ae927d865d7d0ee81ceb91caa54e99
* | | | | | | libcore: add tests to check behaviour for padding and decrypt modeSergio Giro2015-06-111-9/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19186852 Change-Id: I8c51b309ca98030ab1eda5b2a0201a97a5758072 (cherry-pick from 9f7960cfda26dab222d522c28ca44902d996f3e4)
* | | | | | | Merge "SSLSocketTest: add test with no ciphers" into mnc-devKenny Root2015-06-101-0/+31
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | SSLSocketTest: add test with no ciphersKenny Root2015-06-101-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are no ciphers set, there should just be a handshake failure. However, Conscrypt was throwing InvalidArgumentException in this configuration. (cherry picked from commit def50a267d0100fa560cf7bbcd0b9a9d5f5e068f) Bug: 21195269 Change-Id: I73cfc4927041ca9b1331b58859382573e7de6f63
* | | | | | | Merge "Explicitly set DateFormat.is24Hour value needed by tests" into mnc-devNeil Fuller2015-06-101-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Explicitly set DateFormat.is24Hour value needed by testsNeil Fuller2015-06-101-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 Change-Id: I0f03f54b76dc5d343a2c842434412ff59908b129
* | | | | | | | Relax the test for inappropriate fallbackKenny Root2015-06-091-4/+7
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't have a specific exception type for the SCSV inappropriate fallback cipher being used, we relied on scanning the cause message. BoringSSL has the error message of "INAPPROPRIATE_FALLBACK" which doesn't match the OpenSSL error message of "inappropriate fallback" so we need to relax the test a bit to accept both. This should be fine as we're just using the message as a proxy to determine whether the correct thing is done and not really trying to enforce a specific exception message. (cherry picked from commit 43e063b43daab0962554639dda272428a59f3c24) Bug: 21211765 Change-Id: I4e7cd5486c0eb8ab3e3f9b64b4e7234436ec4ee0
* | | | | | | Merge "Update CA certificates" into mnc-devKenny Root2015-06-091-57/+0
|\ \ \ \ \ \ \
| * | | | | | | Update CA certificatesKenny Root2015-06-091-57/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | REMOVE 1024-bit root phase-out SHA1 : 9F:AD:91:A6:CE:6A:C6:C5:00:47:C4:4E:C9:D4:A5:0D:92:D8:49:79 Subject : C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting cc, OU=Certification Services Division, CN=Thawte Server CA/emailAddress=server-certs@thawte.com Not Before: Aug 1 00:00:00 1996 GMT Not After : Jan 1 23:59:59 2021 GMT Bug: 13469917 Change-Id: Idb58dddb48c9cadc392960c6f19575823d005560
* | | | | | | | Skip AndroidKeyStore provider in ECDHKeyAgreementTest.Alex Klyubin2015-06-091-4/+19
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidKeyStore Provider requires special keys which cannot be created through standard JCA API. The Provider does not expose ECDH at the moment either. If/when it does expose ECDH, it will be tested in cts/tests/tests/keystore rather than here. Bug: 21723152 Change-Id: I73128907783b4f08c60c9af128e12a124a286054
* | | | | | | libcore: throw InvalidKeyException instead of ProviderExceptionSergio Giro2015-06-099-56/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In java.security javax.crypto and java.security classes with late binding, when guessing the provider and none of the available ones supports the specified key Bug: 18987633 (cherry pick from e38b83dd96281d178b01476b67d354655bf2de62) Change-Id: I5931046e9044984baf724157138bf3a7c7ef5e90
* | | | | | | Update CA certificatesKenny Root2015-06-0819-861/+890
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADDED Repository imported SHA1 : BA:29:41:60:77:98:3F:F4:F3:EF:F2:31:05:3B:2E:EA:6D:4D:45:FD Subject : C=US, O=IdenTrust, CN=IdenTrust Public Sector Root CA 1 Not Before: Jan 16 17:53:32 2014 GMT Not After : Jan 16 17:53:32 2034 GMT ADDED Repository imported SHA1 : D8:EB:6B:41:51:92:59:E0:F3:E7:85:00:C0:3D:B6:88:97:C9:EE:FC Subject : C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden Root CA - G3 Not Before: Nov 14 11:28:42 2013 GMT Not After : Nov 13 23:00:00 2028 GMT ADDED Repository imported SHA1 : 76:E2:7E:C1:4F:DB:82:C1:C0:A6:75:B5:05:BE:3D:29:B4:ED:DB:BB Subject : C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden EV Root CA Not Before: Dec 8 11:19:29 2010 GMT Not After : Dec 8 11:10:28 2022 GMT ADDED Repository imported SHA1 : E2:B8:29:4B:55:84:AB:6B:58:C2:90:46:6C:AC:3F:B8:39:8F:84:83 Subject : C=CN, O=China Financial Certification Authority, CN=CFCA EV ROOT Not Before: Aug 8 03:07:01 2012 GMT Not After : Dec 31 03:07:01 2029 GMT ADDED Repository imported SHA1 : DF:71:7E:AA:4A:D9:4E:C9:55:84:99:60:2D:48:DE:5F:BC:F0:3A:25 Subject : C=US, O=IdenTrust, CN=IdenTrust Commercial Root CA 1 Not Before: Jan 16 18:12:23 2014 GMT Not After : Jan 16 18:12:23 2034 GMT ADDED from http://www.turktrust.com.tr/sertifikalar/TURKTRUST_Elektronik_Sertifika_Hizmet_Saglayicisi_h5.crt (sha1 confirmed) SHA1 : C4:18:F6:4D:46:D1:DF:00:3D:27:30:13:72:43:A9:12:11:C6:75:FB Subject : C=TR, L=Ankara, O=T\xC3\x9CRKTRUST Bilgi \xC4\xB0leti\xC5\x9Fim ve Bili\xC5\x9Fim G\xC3\xBCvenli\xC4\x9Fi Hizmetleri A.\xC5\x9E., CN=T\xC3\x9CRKTRUST Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1 H5 Not Before: Apr 30 08:07:01 2013 GMT Not After : Apr 28 08:07:01 2023 GMT ADDED from http://www.turktrust.com.tr/sertifikalar/TURKTRUST_Elektronik_Sertifika_Hizmet_Saglayicisi_h6.crt (sha1 confirmed) SHA1 : 8A:5C:8C:EE:A5:03:E6:05:56:BA:D8:1B:D4:F6:C9:B0:ED:E5:2F:E0 Subject : C=TR, L=Ankara, O=T\xC3\x9CRKTRUST Bilgi \xC4\xB0leti\xC5\x9Fim ve Bili\xC5\x9Fim G\xC3\xBCvenli\xC4\x9Fi Hizmetleri A.\xC5\x9E., CN=T\xC3\x9CRKTRUST Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1 H6 Not Before: Dec 18 09:04:10 2013 GMT Not After : Dec 16 09:04:10 2023 GMT ADDED from http://www.certinomis.fr/publi/cer/AC_Racine_G3.cer (sha1 confirmed) SHA1 : 9D:70:BB:01:A5:A4:A0:18:11:2E:F7:1C:01:B9:32:C5:34:E7:88:A8 Subject : C=FR, O=Certinomis, OU=0002 433998903, CN=Certinomis - Root CA Not Before: Oct 21 09:17:18 2013 GMT Not After : Oct 21 09:17:18 2033 GMT REMOVE old root; last issued certificate expired SHA1 : DA:40:18:8B:91:89:A3:ED:EE:AE:DA:97:FE:2F:9D:F5:B7:D1:8A:41 Subject : C=US, O=Equifax Secure Inc., CN=Equifax Secure eBusiness CA-1 Not Before: Jun 21 04:00:00 1999 GMT Not After : Jun 21 04:00:00 2020 GMT REMOVE 1024-bit root removed SHA1 : 7E:78:4A:10:1C:82:65:CC:2D:E1:F1:6D:47:B4:40:CA:D9:0A:19:45 Subject : C=US, O=Equifax Secure Inc., CN=Equifax Secure Global eBusiness CA-1 Not Before: Jun 21 04:00:00 1999 GMT Not After : Jun 21 04:00:00 2020 GMT REMOVE 1024-bit root removed SHA1 : E0:AB:05:94:20:72:54:93:05:60:62:02:36:70:F7:CD:2E:FC:66:66 Subject : C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting cc, OU=Certification Services Division, CN=Thawte Premium Server CA/emailAddress=premium-server@thawte.com Not Before: Aug 1 00:00:00 1996 GMT Not After : Jan 1 23:59:59 2021 GMT REMOVE 1024-bit root SHA1 : 85:37:1C:A6:E5:50:14:3D:CE:28:03:47:1B:DE:3A:09:E8:F8:77:0F Subject : C=US, O=VeriSign, Inc., OU=Class 3 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network Not Before: May 18 00:00:00 1998 GMT Not After : Aug 1 23:59:59 2028 GMT REMOVE old root; last issued certificate expired SHA1 : 39:21:C1:15:C1:5D:0E:CA:5C:CB:5B:C4:F0:7D:21:D8:05:0B:56:6A Subject : C=US, O=America Online Inc., CN=America Online Root Certification Authority 1 Not Before: May 28 06:00:00 2002 GMT Not After : Nov 19 20:43:00 2037 GMT REMOVE old root; last issued certificate expired SHA1 : 85:B5:FF:67:9B:0C:79:96:1F:C8:6E:44:22:00:46:13:DB:17:92:84 Subject : C=US, O=America Online Inc., CN=America Online Root Certification Authority 2 Not Before: May 28 06:00:00 2002 GMT Not After : Sep 29 14:08:00 2037 GMT REMOVE old root cert no longer in use SHA1 : 80:25:EF:F4:6E:70:C8:D4:72:24:65:84:FE:40:3B:8A:8D:6A:DB:F5 Subject : C=DE, O=TC TrustCenter GmbH, OU=TC TrustCenter Class 3 CA, CN=TC TrustCenter Class 3 CA II Not Before: Jan 12 14:41:57 2006 GMT Not After : Dec 31 22:59:59 2025 GMT REMOVE unused, see https://bugzilla.mozilla.org/show_bug.cgi?id=850740 SHA1 : 6B:2F:34:AD:89:58:BE:62:FD:B0:6B:5C:CE:BB:9D:D9:4F:4E:39:F3 Subject : C=DE, O=TC TrustCenter GmbH, OU=TC TrustCenter Universal CA, CN=TC TrustCenter Universal CA I Not Before: Mar 22 15:54:28 2006 GMT Not After : Dec 31 22:59:59 2025 GMT REMOVE unused, see https://bugzilla.mozilla.org/show_bug.cgi?id=850740 SHA1 : AE:50:83:ED:7C:F4:5C:BC:8F:61:C6:21:FE:68:5D:79:42:21:15:6E Subject : C=DE, O=TC TrustCenter GmbH, OU=TC TrustCenter Class 2 CA, CN=TC TrustCenter Class 2 CA II Not Before: Jan 12 14:38:43 2006 GMT Not After : Dec 31 22:59:59 2025 GMT REMOVE Audit requirements not met SHA1 : DD:E1:D2:A9:01:80:2E:1D:87:5E:84:B3:80:7E:4B:B1:FD:99:41:34 Subject : C=TR, O=Elektronik Bilgi Guvenligi A.S., CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi Not Before: Jan 4 11:32:48 2007 GMT Not After : Jan 4 11:32:48 2017 GMT (cherry picked from commit 226c1f270ea2f96d13b31bdf47b929f960c29b56) Bug: 19418204 Bug: 20033228 Bug: 20069329 Bug: 20643923 Bug: 21480355 Change-Id: I17bf8f3224832b9d67f51e3b1011530f3319058e
* | | | | | Merge "Add VMRuntime.runFinalizationWithTimeout" into mnc-devMathieu Chartier2015-06-052-11/+22
|\ \ \ \ \ \
| * | | | | | Add VMRuntime.runFinalizationWithTimeoutMathieu Chartier2015-06-052-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used by native allocations to prevent deadlocks. Bug: 21544853 Change-Id: I57b2f7ae8b74185922eb3c15ba0ab71a4d2348aa
* | | | | | | Ignore AndroidKeyStore in SignatureTest.Alex Klyubin2015-06-041-0/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidKeyStore* provider's Signature implementation requires special keys which cannot be created through standard JCA API. This Signature implementation is tested separately in cts/test/test/keystore. Bug: 18088752 Bug: 20912868 Change-Id: I1f134cbae0c0136a4dec937103d6fde79192948d
* | | | | | No need to test EC keys of 192 bitsKenny Root2015-06-041-4/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EC keys of 192 bits have a security level of 96 bits which is well below accepted minimum levels according to NIST SP800 131A. No need to be able to generate these anymore. Instead test 521-bit EC keys. (cherry picked from commit 9b8f9a1bb00f70f79f175282969d428d2aade062) Bug: 20563457 Change-Id: I674c255c55c910bb8f9ccdf1e5ad7f69a2bdac69
* | | | | Update offered ciphersKenny Root2015-06-042-102/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropped support for non-ephemeral Diffie-Hellman cipher suites, anonymous authentication, some DES cipher suites, and export cipher suites. Bug: 21522548 Change-Id: Ie2048d303890935969cc7c1ac7bc9d93705c7a90
* | | | | Replace hyphen with en dashKenny Root2015-06-032-112/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this is a number range, the appropriate punctuation is actually en dash. (cherry picked from commit 814e15db27ab930f59c8e6731b901a6c82b8e262) Bug: 21522548 Change-Id: I99fe4c3a45b2df00671af4b6b82b21aa2c265820
* | | | | Merge "Configure ICU4C without relying on build-time flags" into mnc-devNeil Fuller2015-06-031-2/+7
|\ \ \ \ \
| * | | | | Configure ICU4C without relying on build-time flagsNeil Fuller2015-06-031-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The presence of the build-time flags appears to cause ICU4C to open the .dat file again as a fallback if it fails to find a config value. This is even though the .dat file is explicitly mapped using udata_setCommonData(). Bug: 19960867 Bug: 19961406 (cherry-picked from commit 79fdcc64ea2d9234f258dac57f04b1017a573311) Change-Id: I03f0f2d661dd2de2b0db085519159f7deb60816d
* | | | | | Improve HttpURLConnection Performance docsNeil Fuller2015-06-031-6/+14
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21582657 Bug: https://code.google.com/p/android/issues/detail?id=174949 (cherry-picked from commit b33ae4f5857e7b9ed870336655d2b42673c69146) Change-Id: Ide0cb3ae300dbad5ae371ae7ac4fcae363ca0eba
* | | | | Signature2Test: calling verify a second time can throwKenny Root2015-05-291-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs for Signature don't guarantee that the implementation will not throw. It is perfectly fine to throw here. The original bug for which this check was added is bogus (re: https://code.google.com/p/android/issues/detail?id=34933) in that the RI behavior is clearly not the same as this test indicates with the StandardNames.IS_RI branch. (cherry picked from commit fb8371585860dd8f2321f47c490c1a622f5158ce) Bug: 18869265 Change-Id: I6e413cac85daf5b14bc20adc2279741ab11d97f6
* | | | | Merge "Add test for application use of PathClassLoader." into mnc-devRichard Uhler2015-05-281-0/+23
|\ \ \ \ \
| * | | | | Add test for application use of PathClassLoader.Richard Uhler2015-05-281-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19937016 (cherry picked from commit 58bef8e53e41a4b7cfe9cf647dca7c6d46528f32) Change-Id: I347b4eee1f1e3702d34ea10feca6bc1b3f2f1ee8
* | | | | | Don't throw UnsupportedOpEx on multi-char negative/percent symbols.Narayan Kamath2015-05-282-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seem to be a fair number of apps that call through to this function, so just give them a "bogus" value (from Locale.ROOT) when we encounter a multi-char symbol. The formatters and other java.text APIs already use the correct multi-char value. bug: 18785260 (cherry picked from commit c3cedb412d85ffeb8121b69308b2d2c35c63b287) Change-Id: I71225102d4f501aaa689fa6e5f84ee967e32f0c8
* | | | | | Change >= to > in OldSystemTest.test_gcMathieu Chartier2015-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test no longer will pass if no GC happens. (cherry picked from commit ea43704065f3472072355a2e199ef99ebaecd681) Bug: 21211315 Change-Id: I9fd0a4b5e249ab7b47d6f8e339a4f6a059af7426
* | | | | | Fix OldSystemTest gcMathieu Chartier2015-05-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls System.gc + System.runFinalization since System.gc is usually a NOP. Bug: 21211315 (cherry picked from commit f49f9d8762770b0c9e2493b4656c70ecb6803df4) Change-Id: Ib816521c6ed43eca437bf8fa961650f7fb96ba61
* | | | | | Merge "Fix problems with DexClassLoaderTest." into mnc-devRichard Uhler2015-05-271-289/+154
|\ \ \ \ \ \
| * | | | | | Fix problems with DexClassLoaderTest.Richard Uhler2015-05-261-289/+154
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a problem with the DexClassLoaderTest where oat files from previous tests were being cached and reused for later tests. Now each test uses its own directory for loading-test.dex and friends so they are treated as separate dex files from test to test. As part of this fix, the helper functions for the tests were reorganized. Bug: 21033982 Change-Id: I66d011109259c0c3688b64b083d4ef1ed70feae2
* | | | | | Serialize minusSign/percentSign as strings in DecimalFormatSymbols.Narayan Kamath2015-05-272-4/+48
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to Parcel DFS objects (not sure why anybody would do that, but..) without crashes. bug: https://code.google.com/p/android/issues/detail?id=170718 bug: 21455225 (cherry picked from commit 4fd2c14ce54447f13cd115e105d7b000adf24c2e) Change-Id: I8f860b3fc764932291000ac6651bc95a8e457a99
* | | | | Revert "Expose getSpi from crypto operations as hidden API."Alex Klyubin2015-05-194-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 050e672aaaaa8f8c57788e8d551f43c5fbffe339. The users of public getSpi have been migrated to getCurrentSpi introduced in 5d15925a79b8beddfafa8de2ede7fff360a386cb. (cherry-picked from commit c52bf74f7e53b9f58bbeb29f4d248e7dba7d15ce) Bug: 18088752 Change-Id: Ied72c8a62a49d9fba8b7bc2d3ef2e30da7daa6e4
* | | | | Merge "Follow-up for incorrect test pre-condition" into mnc-devKenny Root2015-05-191-1/+1
|\ \ \ \ \
| * | | | | Follow-up for incorrect test pre-conditionKenny Root2015-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The provider should *not* be present before we install this provider, so update the test to actually assert the correct state. (cherry picked from commit b9129dc7847dd1a89fb5f8d3108369b4da3b0e21) Bug: 21159204 Change-Id: I30f4d4f47fcb6bf278b81c5fd5900d47233cefdb
* | | | | | Merge "Fix test18566 to have the correct expectation" into mnc-devKenny Root2015-05-191-4/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix test18566 to have the correct expectationKenny Root2015-05-191-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the test was allowing invalid encoding in PKCS#1 data, but this is an exploitable condition in certain cases. See for instance https://www.imperialviolet.org/2014/09/26/pkcs1.html Since BoringSSL has the change to disallow this problem, we are switching this to assert that the signature did not verify. (cherry picked from commit 559126c953cf0e1e4986e24c019bbf996d5ab795) Bug: 21209498 Bug: 5038554 Bug: http://code.google.com/p/android/issues/detail?id=18566 Change-Id: Ie040f644a4588c6801e5557e2f9a3bcdedfd30ac
* | | | | | Merge "Get rid of old Harmony Services cache" into mnc-devKenny Root2015-05-194-65/+42
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Get rid of old Harmony Services cacheKenny Root2015-05-194-65/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each java.security.Provider.Service has its own cache, so there is not a lot of benefit to having another cache of the caches. In fact, this makes adding a new provider a huge hit. This change makes adding a new empty provider go from ~5080 microseconds to 73 microseconds. (cherry picked from commit cc4791ad77128039c93d4c03b582d4dc397e6a02) Bug: 21159204 Change-Id: Ib23032f8cb0def79367a321b48241b6cc94de6b0
* | | | | | Expose getCurrentSpi from crypto operations as hidden API.Alex Klyubin2015-05-184-0/+57
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 050e672aaaaa8f8c57788e8d551f43c5fbffe339 exposed the existing getSpi method of Cipher, Signature, Mac, and KeyAgreement as hidden API. Unfortunately, the getSpi method creates an SPI instance if one is not yet set. This changes the state of the crypto operation and does does not lend itself well to being used for read-only querying of the SPI from a crypto operation. This CL addresses the issue by adding a getCurrentSpi hidden API to these crypto operations. getCurrentSpi simply returns the current SPI instance, if any, and does not modify the state of the crypto operation. A follow-up CL will revert 050e672aaaaa8f8c57788e8d551f43c5fbffe339 which will no longer be needed. This is not reverted here to avoid breaking the build. (cherry-picked from commit 5d15925a79b8beddfafa8de2ede7fff360a386cb) Bug: 18088752 Change-Id: I8de4c121c9a395b3687b173d0bba4e1931ebf958
* | | | | Add an additional check for ICU4J tz data versionNeil Fuller2015-05-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Confirm that ZoneInfoDB, ICU4C and now ICU4J all agree on the tz data version. (cherry-pick from commit 32e7bc11723014cc63706541286d0fdf9fbba510) Bug: 19941636 Change-Id: I841de7256f9409abe4b8bcdd66595c346de7c534
* | | | | Fix a couple of issues in DexClassLoaderTest.Narayan Kamath2015-05-141-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't create an empty file if test resources are unavailable, fail instead. - Only enumerate ".dex" files in the optimized directory - leave out things like ".flock" files etc. Partial fix for... bug: 21033982 Change-Id: Icf00d4d35f23a1927ea034fdf0ab8ea01f16fe0c
* | | | | Add tests for AES/GCM/NOPADDINGKenny Root2015-05-131-42/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d5ed0e9c84915f2a93e25a4d152f837a661c4774) Bug: 21085702 Change-Id: I1a88f6410bb61a885bbb447a6e7b86b011dc8625
* | | | | libcore: add test for arbitrary ECC groups.Adam Langley2015-05-131-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test verifies an ECDSA signature on the BitCoin curve. (cherry picked from commit daadb9f7d41188c0cf2eaaf58d43b7fd46c08da9) Bug: 21085331 Change-Id: I404979ce9b80959a1f88dc340b77507eb53b8cfe
* | | | | Update ICU / CLDR / Unicode versions for the preview.Narayan Kamath2015-05-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't have a release number or a codename yet, but this information is still useful. bug: 19890045 Change-Id: I272e9b9cdfa103f469cb84f1bb4648b39a4510d0
* | | | | Fix for TimSort in the two Java forms in libcoreNeil Fuller2015-05-133-10/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19493779 (cherry-picked from commit f547d3aa155a20cfc7cb9852f595ce0806bd1198) Change-Id: I71c7c143386aa4d805b6f1418b72573ddec05dec
* | | | | Fix a couple of Locale bugs discovered by ICU4J tests.Narayan Kamath2015-05-122-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ULocaleTest revealed two issues : - We weren't handling the legacy ja_JP_JP and th_TH_TH locales correctly. - We weren't lower-casing the extension key in forLanguageTag. This shouldn't matter since language tags are case insensitive, by definition but the convention is to keep them lowercase. This also fixes a bug in the builder where extension keys were case sensitive since we weren't normalizing them properly. bug: 20252611 (cherry picked from commit e45a8ec4f4c53bd068e2eec6d3d07e7567e8381a) Change-Id: Ide19c959c53e44f07e6b781a130c220b52e18352
* | | | | Fix file descriptor leak when opening invalid archives.Narayan Kamath2015-05-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | bug: https://code.google.com/p/android/issues/detail?id=171099 Change-Id: I8425d8289839579f1122c61a61ea403f3a7c49fb
* | | | | Fix bug in formatting intervals at month boundaries.Travis Keep2015-05-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In formatting date intervals, we subtract one day from the end time if it falls on midnight the next day so that both times are in the same day, thereby avoiding the date appearing in the formatted interval. We did this by calling endCalendar.roll(Calendar.DAY_OF_MONTH, false). However, if endCalendar was 1 May 2015 (say), the date rolls over to 31 May 2015 (this is the documented behaviour of roll). We now use endCalendar.add(Calendar.DAY_OF_MONTH, -1) which always subtracts a day so that 1 May 2015 becomes 30 April 2015, this is the desired behavior. bug: 20708022 (cherry picked from commit 13faecd3105c23f8a60ce3a5847056489fd2d037) Change-Id: Ic947c7c65008d23d1cb1b9bde6af35972ac6acd7
* | | | | Add a test for bug 20708022.Narayan Kamath2015-05-121-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that we correctly format date ranges that end at 00:00 on the first day of a month. bug: 20708022. (cherry picked from commit 61dd198b79cd5c63fd8f18f7096b0f44b1491cd5) Change-Id: Ia6387ac560024115314fd3fee2669c6cc11020a7
* | | | | Document that null collections aren't valid input.Narayan Kamath2015-05-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | bug: https://code.google.com/p/android/issues/detail?id=172274 Change-Id: Ib397bef6744249fd3241c03dc7cd5eb30f87fa75
generated by cgit v1.1 at 2025-01-22 23:05:22 +0000