Commit graph

232 commits

Author SHA1 Message Date
Brian Carlstrom
70080d97cf Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (6 of 6)" 2011-05-17 10:37:56 -07:00
Brian Carlstrom
a31a351182 Make CertInstaller installed CA certs trusted by applications via default TrustManager (6 of 6)
frameworks/base

        Adding IKeyChainService APIs for CertInstaller and Settings use
    	keystore/java/android/security/IKeyChainService.aidl

    libcore

        Improve exceptions to include more information
    	luni/src/main/java/javax/security/auth/x500/X500Principal.java

        Move guts of RootKeyStoreSpi to TrustedCertificateStore, leaving only KeyStoreSpi methods.
        Added support for adding user CAs in a separate directory for system.
        Added support for removing system CAs by placing a copy in a sytem directory
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/RootKeyStoreSpi.java
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStore.java

        Formerly static methods on RootKeyStoreSpi are now instance methods on TrustedCertificateStore
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java

        Added test for NativeCrypto.X509_NAME_hash_old and X509_NAME_hash
        to make sure the implementing algorithms doe not change since
        TrustedCertificateStore depend on X509_NAME_hash_old (OpenSSL
        changed the algorithm from MD5 to SHA1 when moving from 0.9.8 to
        1.0.0)

    	luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

        Extensive test of new TrustedCertificateStore behavior
    	luni/src/test/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStoreTest.java

        TestKeyStore improvements
        - Refactored TestKeyStore to provide simpler createCA method (and
          internal createCertificate)
        - Cleaned up to remove use of BouncyCastle specific X509Principal
          in the TestKeyStore API when the public X500Principal would do.
        - Cleaned up TestKeyStore support methods to not throw Exception
          to remove need for static blocks for catch clauses in tests.

    	support/src/test/java/libcore/java/security/TestKeyStore.java
    	luni/src/test/java/libcore/java/security/KeyStoreTest.java
    	luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

        Added private PKIXParameters contructor for use by
        IndexedPKIXParameters to avoid wart of having to lookup and pass
        a TrustAnchor to satisfy the super-class sanity check.

    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java
    	luni/src/main/java/java/security/cert/PKIXParameters.java

    packages/apps/CertInstaller

        Change CertInstaller to call IKeyChainService.installCertificate
        for CA certs to pass them to the KeyChainServiceTest which will
        make them available to all apps through the
        TrustedCertificateStore. Change PKCS12 extraction to use AsyncTask.

    	src/com/android/certinstaller/CertInstaller.java

        Added installCaCertsToKeyChain and hasCaCerts accessor for use by
        CertInstaller. Use hasUserCertificate() internally. Cleanup coding
        style.

    	src/com/android/certinstaller/CredentialHelper.java

    packages/apps/KeyChain

        Added MANAGE_ACCOUNTS so that IKeyChainService.reset
        implementation can remove KeyChain accounts.

    	AndroidManifest.xml

        Implement new IKeyChainService methods:
        - Added IKeyChainService.installCaCertificate to install certs
          provided by CertInstaller using the TrustedCertificateStore.
        - Added IKeyChainService.reset to allow Settings to remove the
          KeyChain accounts so that any app granted access to keystore
          credentials are revoked when the keystore is reset.

    	src/com/android/keychain/KeyChainService.java

    packages/apps/Settings

        Changed com.android.credentials.RESET credential reset action to
        also call IKeyChainService.reset to remove any installed user CAs
        and remove KeyChain accounts to have AccountManager revoke
        credential granted to private keys removed during the RESET.

    	src/com/android/settings/CredentialStorage.java

        Added toast text value for failure case

    	res/values/strings.xml

    system/core

        Have init create world readable /data/misc/keychain to allow apps
        to access user added CA certificates installed by the CertInstaller.

    	rootdir/init.rc

Change-Id: I768ca8e8e990ff333ce0f7069a0935173498c5ed
2011-05-16 18:05:23 -07:00
Chia-chi Yeh
69f43c90cb Update the device permission of /dev/tun.
Change-Id: Ie8ad60047fc7160997100bd28a0abb439406806a
2011-05-12 13:43:34 -07:00
David 'Digit' Turner
7db617efc0 resolved conflicts for merge of b013bfc1 to honeycomb-plus-aosp
Change-Id: I159dd58c403bc38f9637163d8cd5e6270e4f201c
2011-04-29 13:31:31 +02:00
David 'Digit' Turner
b013bfc171 am 52a64057: Merge "ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc"
* commit '52a64057b60b0ad242e95fdc285ec60e0191d5b5':
  ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc
2011-04-28 02:30:33 -07:00
David 'Digit' Turner
f431d0499b ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc
+ Add /dev/qemu_pipe line for QEMU pipes.

Change-Id: If3c5c675bfc1585a1d6ffcd1042aaedbc2e94763
2011-04-26 18:07:45 +02:00
Jeffrey Tinker
f642c3d12f Make drmserver's primary group be system, so setgid is not required in ueventd.stingray.rc
Change-Id: Ie8a287620d22b5c1bdc459fb288b7403589ab474
2011-03-17 10:55:05 -07:00
Glenn Kasten
cfce282678 Bug 4089635 mediaserver fewer supplementary groups
Change-Id: I90111567564397ca08e87dcfcbdf23337bf79ae6
2011-03-14 11:43:45 -07:00
Glenn Kasten
b7b770dd76 Bug 4086255 drmserver process needs system group
Change-Id: If9a325b9e716abe00f3ad6f20b012861308abd2d
2011-03-11 14:33:11 -08:00
Ken Sumrall
5db0897c65 Merge "Load the persistent properties after decrypting the /data partition" into honeycomb-mr1 2011-03-10 19:32:27 -08:00
Ken Sumrall
c5c51033c8 Load the persistent properties after decrypting the /data partition
Fix for bug 3415286.  The persistent properties are normally read early
in the boot process after /data is mounted.  However, for an encrypted
system, at that point /data is a tmpfs ramdisk.  This change adds a new
command to init (load_persist_props) to read the persistent properties,
and adds an action to init.rc to load the persistent properties.  This
action is triggered by setting a property in vold, but that's in a
different CL.

Change-Id: I74b3057974ee6029c29d956b76fef5566700d471
2011-03-10 18:12:19 -08:00
Mathias Agopian
a40481b2cc Run surfaceflinger in its own process. [DO NOT MERGE]
This is to allow OpenGL ES rendering from the system process,
and help with debugging.

Bug: 4086003
Change-Id: I732e95f4fcaa358f430cc195d8e63a69263bffdc
2011-03-10 17:30:08 -08:00
David Turner
f0900adeb2 am 663268ca: am fe111c83: am e6b638be: Merge "x86: Add vold.fstab to mount the SD card"
* commit '663268caac636e32b19173743594899e52df0830':
  x86: Add vold.fstab to mount the SD card
2011-03-02 15:33:14 -08:00
David Turner
663268caac am fe111c83: am e6b638be: Merge "x86: Add vold.fstab to mount the SD card"
* commit 'fe111c83708dd3c8746b3a05d4b2f53c7a9f4477':
  x86: Add vold.fstab to mount the SD card
2011-03-02 11:38:57 -08:00
David Turner
fe111c8370 am e6b638be: Merge "x86: Add vold.fstab to mount the SD card"
* commit 'e6b638be199a5f16f3eaff69710d92ea248d60a3':
  x86: Add vold.fstab to mount the SD card
2011-03-02 07:58:39 -08:00
Mike Lockwood
0c8b18b960 am 126d4bc1: Give system server permission to enable and disable USB functions DO NOT MERGE
* commit '126d4bc18c93f06016998cf6d014c6055c2d3a40':
  Give system server permission to enable and disable USB functions DO NOT MERGE
2011-02-28 13:14:42 -08:00
Mike Lockwood
5ebe6fe677 am 642075b6: Set USB group for /dev/usb_accessory DO NOT MERGE
* commit '642075b6f74faeca53d9449ec9b74d7c66fe7cdd':
  Set USB group for /dev/usb_accessory DO NOT MERGE
2011-02-28 13:14:39 -08:00
Mike Lockwood
126d4bc18c Give system server permission to enable and disable USB functions DO NOT MERGE
Change-Id: Ie43b6679838436ac004d0b5fa59d3d98cb5b0c76
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-27 17:43:59 -08:00
Mike Lockwood
642075b6f7 Set USB group for /dev/usb_accessory DO NOT MERGE
Change-Id: I41264272ff6ce245cb2b8989ddee4a82059444a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-27 17:43:52 -08:00
Ken Sumrall
012cf8f2de Merge "Fix for bug 3379244, non-eMMC devices don't start all services." 2011-02-22 12:15:10 -08:00
Ken Sumrall
dd4d786cbf Fix for bug 3379244, non-eMMC devices don't start all services.
Fix for non-eMMC based devices to properly start the "on nonencrypted"
action.

Change-Id: I5d2966db352b02f1a1724fb105e1cefc46037e42
2011-02-17 18:09:47 -08:00
Jun Nakajima
0db0921b59 x86: Add vold.fstab to mount the SD card
Change-Id: Ie1f70a22dd4e27e8ea956d5e627877d1e2379b95
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-02-13 21:10:40 -08:00
Mike Lockwood
ddc4cfd8b2 ueventd.rc: Give system process permission to enable and disable USB functions
Change-Id: I4af1f3fed857df2be96a640f65cd612577c957c7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-08 17:41:19 -05:00
Mike Lockwood
45e96d0e49 Set USB group for /dev/usb_accessory
Change-Id: I17db8d9bb1bf6336979e9b7bce62306d0d7a79d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-08 17:40:50 -05:00
Ying Wang
9ac8484e0b Merge "Reorder BOOTCLASSPATH to match change 7eff81df2a" 2011-02-08 09:59:10 -08:00
Ying Wang
04e5232ac2 Reorder BOOTCLASSPATH to match change 7eff81df2a
Bug: 3385161
Change-Id: I8bb91753c02c031c32ab0070dd424a6ac859311a
2011-02-07 20:04:31 -08:00
Glenn Kasten
b03afaafb5 Merge "Bug 3381298 Remove old /data/drm/plugins/native" 2011-02-02 15:58:08 -08:00
Rebecca Schultz Zavin
63e99f447f am e442cff0: am 58fb8220: Raise the viking killer min free values to match the system properties
* commit 'e442cff05ff9f083c91caa3bed74e37318a69fda':
  Raise the viking killer min free values to match the system properties
2011-01-30 12:53:21 -08:00
Rebecca Schultz Zavin
58fb822024 Raise the viking killer min free values to match the system properties
Change-Id: Idcbdb106d704ef63c9a44e635b6e995e0e5f6479
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2011-01-28 22:56:18 -08:00
Dianne Hackborn
24823cfa84 am fee2cfb0: am 9efdcd96: Fix issue #3401380: Raise OOM killer limits
* commit 'fee2cfb01165f6797d783c6a8c0b1fba4f591355':
  Fix issue #3401380: Raise OOM killer limits
2011-01-28 16:40:26 -08:00
Dianne Hackborn
9efdcd969e Fix issue #3401380: Raise OOM killer limits
Change-Id: Ia9c82e7d31b7f1b89bf9650ebea697d9b3a64506
2011-01-28 15:33:13 -08:00
Glenn Kasten
b81dfcb4f6 Bug 3381298 Remove old /data/drm/plugins/native
Change-Id: Ic299d328f2e04a65a9dce68909c7b83f3ac03b20
2011-01-23 12:37:03 -08:00
Glenn Kasten
328c0d4a89 Merge "Bug 3361124 Remove drmioserver" 2011-01-23 09:45:24 -08:00
David 'Digit' Turner
0897a4353e am 100511ff: am 88af5ff4: Merge "goldfish: Work-around to start the RIL daemon." into honeycomb
* commit '100511ffaa11b33a6856a434c62ad326a899f252':
  goldfish: Work-around to start the RIL daemon.
2011-01-21 19:04:02 -08:00
David 'Digit' Turner
dc743112ca goldfish: Work-around to start the RIL daemon.
This change forces the start of the RIL daemon used to provide
3G connectivity to the system. It should normally be started
automatically by init.rc but there is a bug within
system/core/init/builtins.c that prevents this to happen.

Fixes the "No network connectivity" bug while the network
interface and route were properly setup.

Change-Id: Ieec0f513aabf92b8a59f0a86f64a16e97057c3c3
2011-01-22 02:24:36 +01:00
Glenn Kasten
b29b33841b Bug 3361124 Remove drmioserver
Change-Id: Ie3b20b487c1466737921567ab2d043e230356bf4
Note: safe to re-use the drmio uid/gid as no files were ever created.
2011-01-20 07:45:27 -08:00
Ken Sumrall
852c13d1b2 am afa099a1: am 3a159d62: Move rild to the late_start class
* commit 'afa099a1909c02196574d125d735adb0c8918392':
  Move rild to the late_start class
2011-01-19 23:14:43 -08:00
Ken Sumrall
3a159d62a9 Move rild to the late_start class
Now that rild can be killed in a reasonable amount of time, move it
from the core class to late_start.  I was going to move it to main,
but it would get killed and restarted right after the disk crypto
password was entered, which is when the late_start class is started,
and I was seeing issues with rild not re-connecting to the network
when it was killed and restarted.

Change-Id: I60479ddb853953029890fc816538d615ef5a96ab
2011-01-19 23:06:12 -08:00
David 'Digit' Turner
ba3bcef024 am 794fb914: am eeeca4dd: rootdir: goldfish: Fix network route during emulation.
* commit '794fb914bef34c1c5f32764947801c95575ecd41':
  rootdir: goldfish: Fix network route during emulation.
2011-01-18 21:57:46 -08:00
David 'Digit' Turner
eeeca4dd45 rootdir: goldfish: Fix network route during emulation.
The net.eth0.gw system property is used by the ConnectivityService
to set the default route when it detects that 3G connectivity is
established. Because the property was undefined, the route was
unset which broke networking.

+ Format / document init.goldfish.sh

Change-Id: I1133cf6c093609300315cd0ea363c9e139b42521
2011-01-18 23:38:00 +01:00
David 'Digit' Turner
a42f152b4a Merge "rootdir: Fix system emulation startup." into honeycomb 2011-01-18 11:08:04 -08:00
Ken Sumrall
701d40f721 am 383b76f8: am e4349157: Add a new trigger to support a progress bar UI for encrypt in place.
* commit '383b76f86af48d4a1a502d7767ab79f024483864':
  Add a new trigger to support a progress bar UI for encrypt in place.
2011-01-17 15:00:09 -08:00
Ken Sumrall
e434915787 Add a new trigger to support a progress bar UI for encrypt in place.
Change-Id: I6a14eb43462505cb7fecfee9fd1ecdea50065963
2011-01-17 14:26:34 -08:00
David 'Digit' Turner
95df887ac0 rootdir: Fix system emulation startup.
This fixes the goldfish-specific config scripts used by init and ueventd
to properly setup the system under emulation. This fixes a lot of broken-ess
introduced by recent permission changes in the system.

Note that there are still several problems after this patch is applied, but
at least it becomes possible to get an adb connection to the emulated system,

Change-Id: Iff47bbf0fe5cb759fa93089284bb0f71e32405a2
2011-01-15 03:15:47 +01:00
Jesse Wilson
30d5d038a9 Move apache-xml to external. (project 4 of 4)
Change-Id: I8e1ea723481ae6d8e609563331c187576f306bce
http://b/3351604
2011-01-13 17:22:50 -08:00
Ken Sumrall
63990cf56f Merge "Move rild to the core class." into honeycomb 2011-01-13 13:42:17 -08:00
Ken Sumrall
a02714bd3e Move rild to the core class.
Changes in init.stingray.rc now prevent rild from making sockets
or named pipes on /data.  Now that rild no longer prevents /data
from being unmounted, we can put it in the core class, which doesn't
restart when we enable encryption.  This speeds up the boot by 20+
seconds.

Change-Id: I737baf804e089f4ddbd664eaa1e675a7bd62e699
2011-01-13 13:41:06 -08:00
Ken Sumrall
f3c42b6ee4 Move rild to the core class.
Changes in init.stingray.rc now prevent rild from making sockets
or named pipes on /data.  Now that rild no longer prevents /data
from being unmounted, we can put it in the core class, which doesn't
restart when we enable encryption.  This speeds up the boot by 20+
seconds.

Change-Id: I71c426dab1b725e401116234167d41c7ccd958c1
2011-01-10 19:00:49 -08:00
Gloria Wang
a44aca6580 Temporarily disable the drm service. do not merge
Change-Id: I5cb04a9c2cc5b95443c6c0ea77132a4102ca47fc
2011-01-10 17:33:25 -08:00
Mike Lockwood
48b911c573 am af7bdc64: Add separate permission and group for access to MTP USB driver
* commit 'af7bdc646088e3112052f4fd35061bb720393287':
  Add separate permission and group for access to MTP USB driver
2011-01-10 09:27:56 -08:00