summaryrefslogtreecommitdiffstats
path: root/security/src
Commit message (Collapse)AuthorAgeFilesLines
* Move ThirdPartyProject.prop for bouncycastle from libcoreBrian Carlstrom2010-09-201-10/+0
| | | | Change-Id: I13aa5e61e81e363b41fe463223fd65030da6c9d0
* am 3d667044: am 16b704e4: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+10
|\ | | | | | | | | | | | | Merge commit '3d66704483f1b8ea8b6eea1939f02508c551fd62' * commit '3d66704483f1b8ea8b6eea1939f02508c551fd62': add meta-files about 3rd party projects
| * add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+10
| | | | | | | | Change-Id: Ib22265632a3be569eeab0320021365b2d80a805e
* | merge more modules into luniPeter Hallam2010-04-271163-207564/+0
| |
* | Remove "Messages" from the nio, prefs, sql, text, and x-net modules.Elliott Hughes2010-04-141-563/+0
| | | | | | | | | | | | | | | | | | | | Also remove an file of unused messages from luni, and inline one of luni's other files. (There are plenty more.) Also remove some German translations of bouncycastle messages (that are actually in English anyway). Change-Id: I9c565f6f2201a5d877eba5bf0af4ffad7b769984
* | resolved conflicts for merge of dd53c703 to dalvik-devElliott Hughes2010-04-051-35/+8
|\ \ | | | | | | | | | Change-Id: Ia95af76e2995ce7fb0778b020baf2882a8b0a3dd
| * \ am f3c7fd52: Merge "Froyo InputStream.available documentation improvement." ↵Elliott Hughes2010-04-051-35/+8
| |\ \ | | |/ | | | | | | into froyo
| | * Froyo InputStream.available documentation improvement.Elliott Hughes2010-04-051-35/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method causes a lot of confusion, and we can do a lot better. (Ideally, the API would either not exist or be something like "public boolean ready()".) I've removed poor-quality documentation overrides too, so the full documentation is visible in most places. (InflaterInputStream is an obvious exception.) Also, to a lesser extent, improve the InputStream.skip documentation. Change-Id: I6d6cd788e6a32ad4a2613d1e381610f1ad8575fe
* | | am 3d82ade7: Merge "Have certimport.sh list certificates in BKS keystore ↵Brian Carlstrom2010-04-021-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | after importing for verification/debugging" Merge commit '3d82ade7a9b764695bad89d2476a73441118411b' into dalvik-dev * commit '3d82ade7a9b764695bad89d2476a73441118411b': Have certimport.sh list certificates in BKS keystore after importing for verification/debugging
| * | Have certimport.sh list certificates in BKS keystore after importing for ↵Brian Carlstrom2010-03-311-0/+9
| |/ | | | | | | | | | | verification/debugging Change-Id: Ic336f10d96bbf93b1dc5cfd8b64a4c9eaa4f3a68
| * Suppressing additional tests that fail in Froyo.Jesse Wilson2010-03-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Our File class doesn't do SecurityManager checks at the same time as it did previously. We added a failing logging test but not the fix. We moved the SQL drivers around, causing some SQL tests to fail. A new logging test doesn't load its resources using the safe pattern. Change-Id: I34ab81e4001969aa536f61a89c277ae2b879d49d
* | Add Java 6's ResourceBundle/Properties API.Elliott Hughes2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've pretty much taken the upstream ResourceBundle implementations as-is, putting back our string-to-locale conversion, removing a bit of duplication and non-free, non-spec EBCDIC support, and hard-coding the text of the MissingResourceExceptions (since harmony's changed its message catalog from ours, so I had to touch those bits of the code anyway). (Why haven't I bothered to pay much attention to the resource bundle implementations? Because I already rewrote our only code that was using them to not use them, and third-party developers should be using Android's resource system instead. There's very little chance anyone needs Java resource bundles. I paid some attention to Properties, because they're still somewhat useful.) Also remove various unused messages, and update our tests. I've mostly _not_ taken the upstream tests, because it would require a lot of work that we'll be doing anyway when we switch to using their test suite properly. I ran the jtreg tests we're able to run, and the normal-case ones (plus the stress test) seemed okay. Bug: 2497395 Change-Id: I91606df0dc1a45e6974fbb27a0d334af87254f0b
* | Remove explicit 8192 arguments to BufferedReader and friends.Elliott Hughes2010-03-235-18/+6
| | | | | | | | | | | | | | | | | | | | | | These were clearly added just to shut up our own warning, and are now unnecessary and misleading to future maintainers. There's one barely-related change: InputStreamReader and OutputStreamWriter are very similar, and this patch makes them more similar, and adds a few missing modifiers from their fields. Change-Id: I959011f914ff215e92bbfa41c1bac66465803685
* | Remove all remaining "@since Android" tags.Elliott Hughes2010-03-227-11/+3
| | | | | | | | | | | | | | I've fixed a few typos, and removed a few of the more egregiously nonsensical or incorrect comments that were nearby. Change-Id: I35851baebd532f949cc269f4738a26eeb9b6e697
* | Add some certimport.sh documentionBrian Carlstrom2010-03-161-0/+33
| | | | | | | | | | | | | | | | | | hku had some questions about the meaning of the filenames in cacerts. ngm responded so I captured the knowledge in the certimport.sh for future reference so we can continue to follow the convention. Change-Id: I79b4ed333e541f09d60143f785e5b10d3f5e60f4
* | Fix all instances of "new Integer" (et cetera).Elliott Hughes2010-03-115-26/+24
| | | | | | | | | | | | (This doesn't include libcore/xml/ because I don't want to get in the way there.) Change-Id: I46f638105d26e82d09128fca605117322229e146
* | am a536d01c: Merge "Fix certimport.sh to check for Bouncy Castle provider ↵Brian Carlstrom2010-03-091-4/+32
|\ \ | |/ | | | | | | | | | | | | | | installation (and add 1.6 JDK to PATH)" Merge commit 'a536d01c1c0119322d655a9ec35665a36abbed6d' into dalvik-dev * commit 'a536d01c1c0119322d655a9ec35665a36abbed6d': Fix certimport.sh to check for Bouncy Castle provider installation (and add 1.6 JDK to PATH)
| * Fix certimport.sh to check for Bouncy Castle provider installation (and add ↵Brian Carlstrom2010-03-091-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.6 JDK to PATH) Now if certimport.sh is run on a machine without the BouncyCastleProvider installed, it will suggest how to apt-get install the proper package. At enh's suggestion, I tried running with out own local Bouncy Castle classes to see what would happen, but the code ended up depending on our NativeCrypto JNI code and there that isn't proper JNI code to be loading into a RI JDK. Also at enh's suggestion, we now prepend a JDK 1.6 bin directory to the path for correctly correct default behavior. I do make sure it exists and warn if it does not. Change-Id: Ic936a6cc69fa3795e917c052ed79d19b2e66b5a1
* | Merge remote branch 'goog/master' into mmElliott Hughes2010-02-223-0/+171
|\ \ | |/ | | | | | | Conflicts: libcore/JavaLibrary.mk
| * Merge "Add two TrustCenter roots: - TC TrustCenter Class 2 CA II - TC ↵Nagendra Modadugu2010-02-043-0/+171
| |\ | | | | | | | | | TrustCenter Universal CA I"
| | * Add two TrustCenter roots:Nagendra Modadugu2010-02-043-0/+171
| | | | | | | | | | | | | | | - TC TrustCenter Class 2 CA II - TC TrustCenter Universal CA I
* | | Resync a load of tests with upstream, make our build faster.Elliott Hughes2010-02-1950-292/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I started off with a mission to remove uses of dalvik.annotation.* (stuff like @TestTargetNew and other useless junk that just makes it harder to stay in sync with upstream). I wrote a script to go through tests showing me the diff between what we have and what upstream has, thinking that in cases where upstream has also added tests, I may as well pull them in at the same time... ...but I didn't realize how close we were to having dx fill its 1.5GiB heap. After trying various alternatives, I decided to bite the bullet and break core-tests up into one .jar per module. This adds parallelism back into this, the slowest part of our build. (I can do even better, but I'll do that in a separate patch, preferably after we've merged recent changes from master.) Only a couple of dependencies were problematic: the worthless TestSuiteFactory which already contained a comment suggesting we get rid of it, and the fact that some tests -- most notably the concurrent ones -- also contained main methods that started the JUnit tty-based TestRunner. (In the long run, we want to be running the harmony tests directly from a pristine "svn co" of upstream, using DalvikRunner. But this will be a big help in the meantime, and starts the work of getting our current copy of the tests into a state where we can start to extract any meaningful changes/additions we've made.)
* | am ffea5ceb: am 0e9d568e: Merge "Mark libcore cert tests using expired certs ↵Brett Chabot2010-01-272-2/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | as known failures." into eclair Merge commit 'ffea5cebcb45bb58d61b903f4e04c45f48442c86' * commit 'ffea5cebcb45bb58d61b903f4e04c45f48442c86': Mark libcore cert tests using expired certs as known failures.
| * | Mark libcore cert tests using expired certs as known failures.Brett Chabot2010-01-212-2/+7
| | | | | | | | | | | | | | | | | | Bug 2322662 Change-Id: If35a5a75f664535bd4eb97cf11a6afe5b0e5b4a9
* | | Spelling fixesBrian Carlstrom2010-01-262-2/+2
| | |
* | | Fix spelling of explicitlyJesse Wilson2010-01-261-1/+1
| |/ |/|
* | Remove StartCom MD5 root which is no longer in use:Nagendra Modadugu2010-01-212-90/+0
| | | | | | | | - Free SSL Certification Authority
* | Remove expired root CAs:Nagendra Modadugu2010-01-203-99/+0
| | | | | | | | | | - IPS SERVIDORES/emailAddress=ips@mail.ips.es - Secure Server Certification Authority
* | Add StartCom CA certificates:Nagendra Modadugu2010-01-203-0/+277
| | | | | | | | | | - StartCom Certification Authority - StartCom Extended Validation Server CA
* | Add two Verisign Root CA certificates:Nagendra Modadugu2010-01-203-0/+200
| | | | | | | | | | - VeriSign Class 3 Extended Validation SSL SGC CA - VeriSign Class 3 Public Primary Certification Authority - G5
* | am e732bb04: am 1c7705b6: Merge change I96996494 into eclair-mr2Elliott Hughes2009-11-242-35/+15
|\ \ | | | | | | | | | | | | | | | | | | Merge commit 'e732bb040be84bd2ac652ca53330b80367a65725' * commit 'e732bb040be84bd2ac652ca53330b80367a65725': Fix browser crashes if server certificates have > 32 subjectAltNames.
| * | Fix browser crashes if server certificates have > 32 subjectAltNames.Elliott Hughes2009-11-242-35/+15
| |/ | | | | | | | | | | | | | | | | Android-only changes added an arbitrary limit that upstream doesn't have. This limit-free implementation is still more efficient than upstream (which always allocates three Vectors). Dr No: danfuzz Bug: 2281869
* | Remove 'GTE CyberTrust Root', which expired on 2/23/06.Nagendra Modadugu2009-11-052-47/+0
| |
* | A new hygenic way for tests to clean up before or after execution.Jesse Wilson2009-10-252-0/+8
| | | | | | | | This replaces PrefsTester and is more general purpose.
* | Respond to impossible CloneNotSupportedExceptions with AssertionErrors.Jesse Wilson2009-10-163-4/+3
| | | | | | | | See bug 2183132.
* | Fix build.Elliott Hughes2009-10-141-3/+0
| | | | | | | | Work around apicheck bug.
* | Update libcore/security to Harmony r823222.Elliott Hughes2009-10-13260-4623/+2095
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit e3083dde77b71fa817c8a52d9edafcb6325cfc25 Author: Elliott Hughes <enh@google.com> Date: Fri Oct 9 13:10:11 2009 -0700 security_dalvik commit 0fc0101e5dbfb3e3044702579ab8087a4e07984a Author: Elliott Hughes <enh@google.com> Date: Fri Oct 9 13:09:48 2009 -0700 security_527399
* | Rewrite Support_Exec to support timeouts on waiting processes.Jesse Wilson2009-10-091-11/+10
|/ | | | | | Also rewriting SupportExec to use ProcessBuilder rather than Runtime.exec(). Changed callers to use the ProcessBuilder directly rather than calling-through chained methods.
* Merge change 26055 into eclairAndroid (Google) Code Review2009-09-211-1/+16
|\ | | | | | | | | * changes: Replaced an O(N) algorithm with an O(1) algorithm. This shaves off 2/3 of the server cert checking time or ~200ms on Sapphire. This is in preparation for tripling the number of certs in an upcoming change.
| * Replaced an O(N) algorithm with an O(1) algorithm. This shaves off 2/3 of ↵Bob Lee2009-09-201-1/+16
| | | | | | | | the server cert checking time or ~200ms on Sapphire. This is in preparation for tripling the number of certs in an upcoming change.
* | Fix cert code to use the String form for TELETEX-encoded certs; see bug 2102191.Jesse Wilson2009-09-104-1/+105
|/
* Update GlobalSign Root CA to one that expires in 2028.Nagendra Modadugu2009-09-032-32/+31
|
* Add Entrust root and intermediate certs.Nagendra Modadugu2009-09-015-0/+290
|
* Each time we start an SSL session, we have to find the trust anchor. This ↵Bob Lee2009-08-265-48/+205
| | | | used to be an O(N) operation. If the trust anchor we're looking for was close to N, finding it could take a couple seconds. This change makes the operation O(1).
* Removing MD2Urs Grob2009-07-2925-517/+1250
|
* Adding:Nagendra Modadugu2009-06-154-0/+365
| | | | | | QuoVadis Root Certification Authority QuoVadis Root CA 2 QuoVadis Root CA 3
* Reactivating tests disabled because of ClassLoader loopUrs Grob2009-05-282-6/+8
| | | | | | | Since ClassLoader.isAncestorOf has been fixed these tests now succeed. So they can be reactivated. BUG=1732214
* AI 148447: Marking some more tests as broken, because theyJorg Pleumann2009-05-071-0/+2
| | | | | | | | don't work properly in the CTS environment for some reason. BUG=1285921 Automated import of CL 148447
* AI 147896: Some more fixes for tests that failed inJorg Pleumann2009-04-282-16/+7
| | | | | | | | | | | | | | | | the CTS, but worked fine in run-core-tests: - One cert test needs isolation, because it destroys the security provider. - The Thread.sleep() tests were too flaky. - Tests that tried to open a temporary DEX file failed in the CTS because we do not have access to the system DEX cache. We are now simply creating our own. The Java plan in the CTS should now pass fully. Yippie! BUG=1285921 Automated import of CL 147896
* AI 147838: A couple of fixes for making theJorg Pleumann2009-04-273-3/+32
| | | | | | | | | | | | | core tests work better in the CTS environment. Some tests had to be marked broken either because they either expose different behavior than in run-core-tests or they take too much time (beyond the CTS' timeout). BUG=1285921 Automated import of CL 147838