tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_system_vold/Android.mk

169 lines
3.9 KiB
Makefile
Raw Normal View History

system: vold2: Initial skeleton for vold2. Let there be light. Signed-off-by: San Mehat <san@android.com>
2009-10-11 02:22:08 +02:00
LOCAL_PATH:= $(call my-dir)
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
common_src_files := \
VolumeManager.cpp \
CommandListener.cpp \
Move crypt commands to a different listener in vold In order to prevent this bug from happening, we must allow vold cryptfs commands to complete while a long running mount is underway. While waiting for vold to be changed to a binder interface, we will simply create two listeners, one for cryptfs and one for everything else. Bug: 19197175 Change-Id: If74142aa81abd58f718a9de6c9e387f6ea442754
2015-06-03 23:19:51 +02:00
CryptCommandListener.cpp \
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
VoldCommand.cpp \
NetlinkManager.cpp \
NetlinkHandler.cpp \
Process.cpp \
Add f2fs support for private volumes. When formatting volumes, pass along fsType string which can be "auto" to let the volume select the best choice. For now, private volumes assume that MMC devices (like SD cards) are best off using f2fs when both kernel support and tools are present, otherwise fall back to ext4. Use blkid when mounting to pick the right set of tools. Move filesystem utility methods into namespaces and place in separate directory to be more organized. Bug: 20275581 Change-Id: Id5f82d8672dda2e9f68c35b075f28232b0b55ed4
2015-05-22 07:35:42 +02:00
fs/Ext4.cpp \
fs/F2fs.cpp \
fs/Vfat.cpp \
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
Loop.cpp \
Devmapper.cpp \
ResponseCode.cpp \
Don't corrupt ssd when encrypting and power fails Stop encryption when battery is low, mark position, and continue on reboot. Note - support for multiple encrypted volumes removed as no devices seem to exist with an fstab that uses this feature. If you want support for such a device, contact me and we will re-add it with appropriate testing. Bug: 13284213 Change-Id: I1f7178e4f7dd8ea816cbc03ab5c4f6543e98acaa
2014-02-20 21:21:31 +01:00
CheckBattery.cpp \
Securely encrypt the master key Move all key management into vold Reuse vold's existing key management through the crypto footer to manage the device wide keys. Use ro.crypto.type flag to determine crypto type, which prevents any issues when running in block encrypted mode, as well as speeding up boot in block or no encryption. This is one of four changes to enable this functionality: https://android-review.googlesource.com/#/c/148586/ https://android-review.googlesource.com/#/c/148604/ https://android-review.googlesource.com/#/c/148606/ https://android-review.googlesource.com/#/c/148607/ Bug: 18151196 Change-Id: I3c68691717a61b5e1df76423ca0c02baff0dab98
2015-04-29 00:14:15 +02:00
Ext4Crypt.cpp \
vold: Add an optional wipe paramter to the volume format command The new wipe option to the vold format command will invoke BLKDISCARD on the partition before invoking newfs_msdos. This will be used whenever a full wipe of the device is wanted, as this is more secure than just doing newfs_msdos. Bug: 9392982 Change-Id: Ie106f1b9cc70abc61206006d1821641c27c7ccae
2013-06-12 04:10:20 +02:00
VoldUtil.c \
Change to use new WaitForProperty API Change to use WaitForProperty API to wait for vold.post_fs_data_done Also change cryptfs to C++ Bug: 35425974 Test: mma, marlin/angler boot Change-Id: Id821f2035788fcc91909f296c83c871c67571de3
2017-02-25 02:43:01 +01:00
cryptfs.cpp \
Checkpoint of better dynamic device support. This is the first in a series of changes that are designed to introduce better support for dynamic block devices. It starts by defining a new Volume object which represents a storage endpoint that knows how to mount, unmount, and format itself. This could be a filesystem directly on a partition, or it could be an emulated FUSE filesystem, an ASEC, or an OBB. These new volumes can be "stacked" so that unmounting a volume will also unmount any volumes stacked above it. Volumes that provide shared storage can also be asked to present themselves (through bind mounts) into user-specific mount areas. This change also adds a Disk class which is created based on block kernel netlink events. Instead of waiting for partition events from the kernel, it uses gptfdisk to read partition details and creates the relevant Volume objects. Change-Id: I0e8bc1f8f9dcb24405f5e795c0658998e22ae2f7
2015-03-03 06:01:40 +01:00
Disk.cpp \
VolumeBase.cpp \
PublicVolume.cpp \
Support for private (adopted) volumes. This adds support for private volumes which is just a filesystem wrapped in a dm-crypt layer. For now we're using the exact same configuration as internal encryption (aes-cbc-essiv:sha256), but we don't store any key material on the removable media. Instead, we store the key on internal storage, and use the GPT partition GUID to identify which key should be used. This means that private external storage is effectively as secure as the internal storage of the device. That is, if the internal storage is encrypted, then our external storage key is also encrypted. When partitioning disks, we now support a "private" mode which has a PrivateVolume partition, and a currently unused 16MB metadata partition reserved for future use. It also supports a "mixed" mode which creates both a PublicVolume and PrivateVolume on the same disk. Mixed mode is currently experimental. For now, just add ext4 support to PrivateVolume; we'll look at f2fs in a future change. Add VolumeBase lifecycle for setting up crypto mappings, and extract blkid logic into shared method. Sprinkle some more "static" around the cryptfs code to improve invariants. Bug: 19993667 Change-Id: Ibd1df6250735b706959a1eb9d9f7219ea85912a0
2015-03-31 19:35:33 +02:00
PrivateVolume.cpp \
Checkpoint of better dynamic device support. This is the first in a series of changes that are designed to introduce better support for dynamic block devices. It starts by defining a new Volume object which represents a storage endpoint that knows how to mount, unmount, and format itself. This could be a filesystem directly on a partition, or it could be an emulated FUSE filesystem, an ASEC, or an OBB. These new volumes can be "stacked" so that unmounting a volume will also unmount any volumes stacked above it. Volumes that provide shared storage can also be asked to present themselves (through bind mounts) into user-specific mount areas. This change also adds a Disk class which is created based on block kernel netlink events. Instead of waiting for partition events from the kernel, it uses gptfdisk to read partition details and creates the relevant Volume objects. Change-Id: I0e8bc1f8f9dcb24405f5e795c0658998e22ae2f7
2015-03-03 06:01:40 +01:00
EmulatedVolume.cpp \
Utils.cpp \
Migrate primary external storage. When requested, kick off a thread that will migrate storage contents between two locations. This is performed in several steps that also interact with the framework: 1. Take old and new volumes offline during migration 2. Wipe new location clean (10% of progress) 3. Copy files from old to new (60% of progress) 4. Inform framework that move was successful so it can persist 5. Wipe old location clean (15% of progress) Derives a hacky progress estimate by using a rough proxy of free disk space changes while a cp/rm is taking place. Add new internal path for direct access to volumes to bypass any FUSE emulation overhead, and send it to framework. Remove mutex around various exec calls since setexeccon() is already per-thread. Bug: 19993667 Change-Id: Ibcb4f6fe0126d05b2365f316f53e71dc3e79a2b8
2015-04-25 01:00:03 +02:00
MoveTask.cpp \
Initial pass at storage benchmarks. Now that we're offering to store private app data on adopted storage devices, the performance of those devices is much more important to overall user experience. To help set user expectations, this change offers to execute a real-world benchmark on a storage device, returning a metric that can be used to compare internal and external storage. The benchmark is generated from the strace-instrumented storage access patterns of typical apps. A typical device completes the benchmark in under two seconds on internal storage, a UHS-3 SD card is even faster (!), but a very slow Class 4 SD card takes about 30 seconds to complete, giving us a clear signal. The measured benchmark numbers are logged along with information about the storage device, such as manufacturer, model, etc. Card serial numbers are scrubbed from output. Bug: 21172095 Change-Id: I9b2713dafdfdfcf5d97bf1bc21841f39409a7e54
2015-05-15 05:33:55 +02:00
Benchmark.cpp \
Trim both internal and adopted private storage. Refactor fstrim code to be encapsulated in unique task object, and give it option of benchmarking when finished. Trimming now includes both storage from fstab and adopted private volumes. Cleaner timing stats are logged for each unique volume. Add wakelock during ongoing async move tasks. Push disk sysfs path to framework so it can parse any SD card registers as desired. Bug: 21831325 Change-Id: I76577685f5cae4929c251ad314ffdaeb5eb1c8bf
2015-06-26 23:02:09 +02:00
TrimTask.cpp \
Zero memory used for encryuption keys. std::vector with custom zeroing allocator is used instead of std::string for data that can contain encryption keys. Bug: 64201177 Test: manually created a managed profile, changed it's credentials Test: manually upgraded a phone with profile from O to MR1. Change-Id: Ic31877049f69eba9f8ea64fd99acaaca5a01d3dd
2017-08-01 18:15:53 +02:00
KeyBuffer.cpp \
Use a keymaster-based key storage module Instead of writing raw keys, encrypt the keys with keymaster. This paves the way to protecting them with auth tokens and passwords later. In addition, fold in the hash of a 16k file into their encryption, to ensure secure deletion works properly. Now even C++ier! Bug: 22502684 Bug: 22950892 Change-Id: If70f139e342373533c42d5a298444b8438428322
2016-01-21 21:26:12 +01:00
Keymaster.cpp \
KeyStorage.cpp \
Refactor to lay the groundwork for metadata encryption Bug: 26778031 Test: Angler, Marlin build and boot Change-Id: Ic136dfe6195a650f7db76d3489f36da6a1929dc5
2016-06-02 20:01:19 +02:00
KeyUtil.cpp \
Add scrypt-based password stretching. Bug: 27056334 Change-Id: Ifa7f776c21c439f89dad7836175fbd045e1c603e
2016-02-10 15:02:47 +01:00
ScryptParameters.cpp \
cryptfs: run e2fsck/fsck.f2fs in fsck domain e2fsck and fsck.f2fs must run in the fsck domain. Add call to setexeccon() to tell selinux to run in the fsck domain on exec. Addresses: avc: denied { execute_no_trans } for path="/system/bin/e2fsck" dev="mmcblk0p41" ino=241 scontext=u:r:vold:s0 tcontext=u:object_r:fsck_exec:s0 tclass=file Bug: 26872236 Change-Id: Ib2a583aeefc667f8aa67532e0ac0ff9619b65461
2016-01-30 00:34:43 +01:00
secontext.cpp \
Refactor to lay the groundwork for metadata encryption Bug: 26778031 Test: Angler, Marlin build and boot Change-Id: Ic136dfe6195a650f7db76d3489f36da6a1929dc5
2016-06-02 20:01:19 +02:00
EncryptInplace.cpp \
Add support for metadata encryption Support encrypting metadata in /userdata using the dm-default-key driver with a key in the /metadata partition. Bug: 29189559 Test: Angler & Marlin build and boot Change-Id: I716b117508d4bb4f6a4039293acb848cbc60f67b
2016-06-02 20:04:27 +02:00
MetadataCrypt.cpp \
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
common_c_includes := \
Revert "Revert "cryptfs: Added support for f2fs fast encryption"" This reverts commit a70abc60091aed3c3eaf8bc8e1766e233c1c3a2f. Change-Id: Ic41d1924638586cf9b2297f91ed5417f3b0303c6
2014-08-16 00:19:23 +02:00
system/extras/f2fs_utils \
Don't corrupt ssd when encrypting and power fails Stop encryption when battery is low, mark position, and continue on reboot. Note - support for multiple encrypted volumes removed as no devices seem to exist with an fstab that uses this feature. If you want support for such a device, contact me and we will re-add it with appropriate testing. Bug: 13284213 Change-Id: I1f7178e4f7dd8ea816cbc03ab5c4f6543e98acaa
2014-02-20 21:21:31 +01:00
external/scrypt/lib/crypto \
Refactor to lay the groundwork for metadata encryption Bug: 26778031 Test: Angler, Marlin build and boot Change-Id: Ic136dfe6195a650f7db76d3489f36da6a1929dc5
2016-06-02 20:01:19 +02:00
external/f2fs-tools/include \
Add keymaster support to cryptfs Use keymaster to wrap the cryptfs keys. Requires selinux change https://googleplex-android-review.git.corp.google.com/#/c/449411 Bug: 9467042 Change-Id: If25a01cb85ed193a271d61382de0560d85553b7e
2014-04-14 21:17:14 +02:00
frameworks/native/include \
system/security/keystore \
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
common_shared_libraries := \
libsysutils \
Don't corrupt ssd when encrypting and power fails Stop encryption when battery is low, mark position, and continue on reboot. Note - support for multiple encrypted volumes removed as no devices seem to exist with an fstab that uses this feature. If you want support for such a device, contact me and we will re-add it with appropriate testing. Bug: 13284213 Change-Id: I1f7178e4f7dd8ea816cbc03ab5c4f6543e98acaa
2014-02-20 21:21:31 +01:00
libbinder \
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
libcutils \
Switch to libkeyutils. Bug: http://b/37991155 Test: builds+boots Change-Id: I33a3ba0d59ffd504093dc94517815c1196e95e2b
2017-05-10 02:01:04 +02:00
libkeyutils \
Add liblog Bug: 8580410 Change-Id: I1a59b45c87cd901b3de52540ad7b670c42ffcbd5
2013-04-10 07:05:28 +02:00
liblog \
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
libdiskconfig \
Have vold grab a partial wakelock when encrypting The Progress bar UI grabs a full wakelock when encrypting, but we've seen a case where it looks like the progress bar UI crashes, and the wakelock is lost, and then all hell breaks loose. The enablecrypto command has a lot of work to do, and it will take some time, so it should grab a wakelock to ensure it can finish without being interrupted and put to sleep. It grabs a partial wake lock, as it doesn't need the screen to be on to do its work. If the UI wants to keep it on, it should also grab a full wakelock, which it does. If the UI crashes, the screen may turn off, but the encryption will keep going, and vold will reboot the device when it's done. Change-Id: I51d3a72b8c77383044a3facb1604c1ee510733ae
2011-01-31 04:06:03 +01:00
libhardware_legacy \
Replace custom logwrapper implementation with liblogwrap Use liblogwrap to provide logwrapper functionality instead of using vold's own implementation. Change-Id: I76aac5aa72a1fdca043a63b86c6a9b54e7abec16
2013-01-16 21:29:28 +01:00
liblogwrap \
Use a shared library when building vold A quick fix to a broken build resulted in using a static library to build vold when a shared library was available. This fixes that. Bug: 10332978 Change-Id: I31c2b4a87c7b37647e71f7f3c93b0d64dd52da44
2013-08-15 05:15:17 +02:00
libext4_utils \
Revert "Revert "cryptfs: Added support for f2fs fast encryption"" This reverts commit a70abc60091aed3c3eaf8bc8e1766e233c1c3a2f. Change-Id: Ic41d1924638586cf9b2297f91ed5417f3b0303c6
2014-08-16 00:19:23 +02:00
libf2fs_sparseblock \
Switch to BoringSSL crypto. This replaces the libmincrypt dependency with libcrypto_utils, which is needed due to libfec and fs_mgr switching to BoringSSL. Change-Id: I4f6f4d8cc5e200679331a9bcdf2cc3bad1082dd6
2016-03-31 16:32:59 +02:00
libcrypto_utils \
Add SELinux restorecon calls on ASEC containers. This will allow fine-grained labeling of the contents of ASEC containers. Some of the contents need to be world readable and thus should be distinguishable in policy. Change-Id: Iefee74214d664acd262edecbb4f981d633ff96ce Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-02-04 16:53:00 +01:00
libcrypto \
Don't corrupt ssd when encrypting and power fails Stop encryption when battery is low, mark position, and continue on reboot. Note - support for multiple encrypted volumes removed as no devices seem to exist with an fstab that uses this feature. If you want support for such a device, contact me and we will re-add it with appropriate testing. Bug: 13284213 Change-Id: I1f7178e4f7dd8ea816cbc03ab5c4f6543e98acaa
2014-02-20 21:21:31 +01:00
libselinux \
Add keymaster support to cryptfs Use keymaster to wrap the cryptfs keys. Requires selinux change https://googleplex-android-review.git.corp.google.com/#/c/449411 Bug: 9467042 Change-Id: If25a01cb85ed193a271d61382de0560d85553b7e
2014-04-14 21:17:14 +02:00
libutils \
libhardware \
Use a keymaster-based key storage module Instead of writing raw keys, encrypt the keys with keymaster. This paves the way to protecting them with auth tokens and passwords later. In addition, fold in the hash of a 16k file into their encryption, to ensure secure deletion works properly. Now even C++ier! Bug: 22502684 Bug: 22950892 Change-Id: If70f139e342373533c42d5a298444b8438428322
2016-01-21 21:26:12 +01:00
libbase \
Port to binder based keymaster hal Bug: 32020919 Change-Id: If45ece76fdaf4d2c80eddc537e429633e4d42f9d
2016-10-26 15:27:10 +02:00
libhwbinder \
libhidlbase \
android.hardware.keymaster@3.0 \
libkeystore_binder
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
Change key derivation to scrypt scrypt is a sequential memory-hard key derivation algorithm that makes it more difficult for adversaries to brute force passwords using specialized equipment. See http://www.tarsnap.com/scrypt/scrypt.pdf for more details of the algorithm. This adds support for initializing disk encryption using scrypt and upgrading from the previous PBKDF2 algorithm. Change-Id: I1d26db4eb9d27fea7310be3e49c8e6219e6d2c3b
2013-06-14 21:11:38 +02:00
common_static_libraries := \
Use libbootloader_message. Bug: 29582118 Change-Id: I8de2cfbc62908011dba2ab86d17f977ebcfadac0
2016-06-24 23:48:49 +02:00
libbootloader_message \
Change key derivation to scrypt scrypt is a sequential memory-hard key derivation algorithm that makes it more difficult for adversaries to brute force passwords using specialized equipment. See http://www.tarsnap.com/scrypt/scrypt.pdf for more details of the algorithm. This adds support for initializing disk encryption using scrypt and upgrading from the previous PBKDF2 algorithm. Change-Id: I1d26db4eb9d27fea7310be3e49c8e6219e6d2c3b
2013-06-14 21:11:38 +02:00
libfs_mgr \
Error correction: Add libfec dependencies for vold Vold requires libfec and related dependencies due to fs_mgr_mount_all. Bug: 21893453 Change-Id: If59df0c5fd3395d4aac97dd8119b7c70c0fa5d4d
2015-06-01 16:38:29 +02:00
libfec \
libfec_rs \
Add dependency on libsquashfs_utils due to fs_mgr dependency Change-Id: I894d18c2086a6532194f478853a9837eb4b6fc09 Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-04-07 03:15:53 +02:00
libsquashfs_utils \
Add libext4 and libmincrypt to vold. This accomodates verity changes, which now utilize these libraries. Change-Id: I1ff8c012e972e245cf3e4bc3a02bef0989165d75
2013-08-07 22:12:41 +02:00
libscrypt_static \
Use a keymaster-based key storage module Instead of writing raw keys, encrypt the keys with keymaster. This paves the way to protecting them with auth tokens and passwords later. In addition, fold in the hash of a 16k file into their encryption, to ensure secure deletion works properly. Now even C++ier! Bug: 22502684 Bug: 22950892 Change-Id: If70f139e342373533c42d5a298444b8438428322
2016-01-21 21:26:12 +01:00
libbatteryservice \
Include libavb in static libraries Bug: 31264231 Test: compile Change-Id: I1d84f7aa67a0ed31f2b6400cf1c9567bf503295a
2017-01-06 17:44:35 +01:00
libavb \
Change key derivation to scrypt scrypt is a sequential memory-hard key derivation algorithm that makes it more difficult for adversaries to brute force passwords using specialized equipment. See http://www.tarsnap.com/scrypt/scrypt.pdf for more details of the algorithm. This adds support for initializing disk encryption using scrypt and upgrading from the previous PBKDF2 algorithm. Change-Id: I1d26db4eb9d27fea7310be3e49c8e6219e6d2c3b
2013-06-14 21:11:38 +02:00
Enable clang-tidy for security sensitive domain. Start with clang-analyzer-security* and cert-*, but disable two specific errors: -- cert-err34-c, which checks for atoi(); heavily triggered by CommandListener, but will disappear when we move to Binder. -- cert-err58-cpp, which checks for exceptions before main(); it's a "Low" severity issue, and filed 36656327 to track cleanup. Fix all other triggered errors along the way. Test: builds, boots Bug: 36655947 Change-Id: I1391693fb521ed39700e25ab6b16bc741293bb79
2017-03-28 00:18:50 +02:00
# TODO: include "cert-err34-c" once we move to Binder
# TODO: include "cert-err58-cpp" once 36656327 is fixed
common_local_tidy_flags := -warnings-as-errors=clang-analyzer-security*,cert-*
common_local_tidy_checks := -*,clang-analyzer-security*,cert-*,-cert-err34-c,-cert-err58-cpp
Fix alignment of buffer used for dm_ioctl. Since the dm_ioctl struct was being allocated on the stack as a large character array, it was getting character alignment rather than the proper alignment for the struct. GCC had been getting away with this so far, but it's undefined behavior that clang managed to expose. Bug: 18736778 Change-Id: Ied275dfad7fcc41d712b2d02c8a185f499221f57
2014-12-18 19:00:55 +01:00
vold_conlyflags := -std=c11
Checkpoint of better dynamic device support. This is the first in a series of changes that are designed to introduce better support for dynamic block devices. It starts by defining a new Volume object which represents a storage endpoint that knows how to mount, unmount, and format itself. This could be a filesystem directly on a partition, or it could be an emulated FUSE filesystem, an ASEC, or an OBB. These new volumes can be "stacked" so that unmounting a volume will also unmount any volumes stacked above it. Volumes that provide shared storage can also be asked to present themselves (through bind mounts) into user-specific mount areas. This change also adds a Disk class which is created based on block kernel netlink events. Instead of waiting for partition events from the kernel, it uses gptfdisk to read partition details and creates the relevant Volume objects. Change-Id: I0e8bc1f8f9dcb24405f5e795c0658998e22ae2f7
2015-03-03 06:01:40 +01:00
vold_cflags := -Werror -Wall -Wno-missing-field-initializers -Wno-unused-variable -Wno-unused-parameter
Fix alignment of buffer used for dm_ioctl. Since the dm_ioctl struct was being allocated on the stack as a large character array, it was getting character alignment rather than the proper alignment for the struct. GCC had been getting away with this so far, but it's undefined behavior that clang managed to expose. Bug: 18736778 Change-Id: Ied275dfad7fcc41d712b2d02c8a185f499221f57
2014-12-18 19:00:55 +01:00
Add support for creating ext4 images with mke2fs We are investigating replacing make_ext4fs with the upstream tool mke2fs. See b/23686092 for more informations. To mitigate the trouble that may arise if the new tool behave differently compared to the old one, there will be a transition period where both mke2fs and make_ext4fs will be supported. This patch does 3 things: - add the necessary code to use mke2fs to format an ext4 partition; - add a dependency to the binary used by vold. Test: m -j32 with TARGET_USES_MKE2FS={,false,true} TARGET_USERIMAGES_USE_EXT4={,true} Change-Id: I89222642fe1d11a035155c8224b84b2e3719938b
2016-11-22 00:14:37 +01:00
required_modules :=
ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
cryptfs: remove reference to legacy make_ext4fs Use upstream mke2fs tool to format ext4 filesystem. Bug: 64395169 Change-Id: I383510f25a7c0935ddb280a14ef31fcbd143cba1
2017-08-16 01:44:04 +02:00
required_modules += mke2fs
Add support for creating ext4 images with mke2fs We are investigating replacing make_ext4fs with the upstream tool mke2fs. See b/23686092 for more informations. To mitigate the trouble that may arise if the new tool behave differently compared to the old one, there will be a transition period where both mke2fs and make_ext4fs will be supported. This patch does 3 things: - add the necessary code to use mke2fs to format an ext4 partition; - add a dependency to the binary used by vold. Test: m -j32 with TARGET_USES_MKE2FS={,false,true} TARGET_USERIMAGES_USE_EXT4={,true} Change-Id: I89222642fe1d11a035155c8224b84b2e3719938b
2016-11-22 00:14:37 +01:00
endif
system: vold2: Initial skeleton for vold2. Let there be light. Signed-off-by: San Mehat <san@android.com>
2009-10-11 02:22:08 +02:00
include $(CLEAR_VARS)
Remove makefile cruft. Don't manually include stlport, and don't use private bionic headers. Change-Id: I44dd212fdd5874e625890c548e9d7bf3a9c27912
2014-09-12 19:48:12 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
LOCAL_MODULE := libvold
Fix alignment of buffer used for dm_ioctl. Since the dm_ioctl struct was being allocated on the stack as a large character array, it was getting character alignment rather than the proper alignment for the struct. GCC had been getting away with this so far, but it's undefined behavior that clang managed to expose. Bug: 18736778 Change-Id: Ied275dfad7fcc41d712b2d02c8a185f499221f57
2014-12-18 19:00:55 +01:00
LOCAL_CLANG := true
Enable clang-tidy for security sensitive domain. Start with clang-analyzer-security* and cert-*, but disable two specific errors: -- cert-err34-c, which checks for atoi(); heavily triggered by CommandListener, but will disappear when we move to Binder. -- cert-err58-cpp, which checks for exceptions before main(); it's a "Low" severity issue, and filed 36656327 to track cleanup. Fix all other triggered errors along the way. Test: builds, boots Bug: 36655947 Change-Id: I1391693fb521ed39700e25ab6b16bc741293bb79
2017-03-28 00:18:50 +02:00
LOCAL_TIDY := true
LOCAL_TIDY_FLAGS := $(common_local_tidy_flags)
LOCAL_TIDY_CHECKS := $(common_local_tidy_checks)
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
LOCAL_SRC_FILES := $(common_src_files)
LOCAL_C_INCLUDES := $(common_c_includes)
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
Change key derivation to scrypt scrypt is a sequential memory-hard key derivation algorithm that makes it more difficult for adversaries to brute force passwords using specialized equipment. See http://www.tarsnap.com/scrypt/scrypt.pdf for more details of the algorithm. This adds support for initializing disk encryption using scrypt and upgrading from the previous PBKDF2 algorithm. Change-Id: I1d26db4eb9d27fea7310be3e49c8e6219e6d2c3b
2013-06-14 21:11:38 +02:00
LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
LOCAL_MODULE_TAGS := eng tests
Fix alignment of buffer used for dm_ioctl. Since the dm_ioctl struct was being allocated on the stack as a large character array, it was getting character alignment rather than the proper alignment for the struct. GCC had been getting away with this so far, but it's undefined behavior that clang managed to expose. Bug: 18736778 Change-Id: Ied275dfad7fcc41d712b2d02c8a185f499221f57
2014-12-18 19:00:55 +01:00
LOCAL_CFLAGS := $(vold_cflags)
LOCAL_CONLYFLAGS := $(vold_conlyflags)
Add support for creating ext4 images with mke2fs We are investigating replacing make_ext4fs with the upstream tool mke2fs. See b/23686092 for more informations. To mitigate the trouble that may arise if the new tool behave differently compared to the old one, there will be a transition period where both mke2fs and make_ext4fs will be supported. This patch does 3 things: - add the necessary code to use mke2fs to format an ext4 partition; - add a dependency to the binary used by vold. Test: m -j32 with TARGET_USES_MKE2FS={,false,true} TARGET_USERIMAGES_USE_EXT4={,true} Change-Id: I89222642fe1d11a035155c8224b84b2e3719938b
2016-11-22 00:14:37 +01:00
LOCAL_REQUIRED_MODULES := $(required_modules)
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
system: vold2: Initial skeleton for vold2. Let there be light. Signed-off-by: San Mehat <san@android.com>
2009-10-11 02:22:08 +02:00
Remove makefile cruft. Don't manually include stlport, and don't use private bionic headers. Change-Id: I44dd212fdd5874e625890c548e9d7bf3a9c27912
2014-09-12 19:48:12 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
Allow callers to prepare CE/DE user storage. Give callers the option of preparing CE and/or DE storage. The framework will only prepare CE storage after the CE keys have been unlocked for that user. When init is calling enablecrypto, kick off the work in a thread so that we can make other calls back into vold without causing deadlock. Leaves blocking call intact for framework callers. Clean up 'vdc' tool to send useful transaction numbers, and actually watch for the matching result to come back. This fixes race conditions when there are multiple 'vdc' callers. Also add other system and misc directories to match spec. Bug: 25796509 Change-Id: Ie4f853db6e387916b845d2b5fb92925d743b063d
2016-02-02 01:02:29 +01:00
LOCAL_MODULE := vold
Fix alignment of buffer used for dm_ioctl. Since the dm_ioctl struct was being allocated on the stack as a large character array, it was getting character alignment rather than the proper alignment for the struct. GCC had been getting away with this so far, but it's undefined behavior that clang managed to expose. Bug: 18736778 Change-Id: Ied275dfad7fcc41d712b2d02c8a185f499221f57
2014-12-18 19:00:55 +01:00
LOCAL_CLANG := true
Enable clang-tidy for security sensitive domain. Start with clang-analyzer-security* and cert-*, but disable two specific errors: -- cert-err34-c, which checks for atoi(); heavily triggered by CommandListener, but will disappear when we move to Binder. -- cert-err58-cpp, which checks for exceptions before main(); it's a "Low" severity issue, and filed 36656327 to track cleanup. Fix all other triggered errors along the way. Test: builds, boots Bug: 36655947 Change-Id: I1391693fb521ed39700e25ab6b16bc741293bb79
2017-03-28 00:18:50 +02:00
LOCAL_TIDY := true
LOCAL_TIDY_FLAGS := $(common_local_tidy_flags)
LOCAL_TIDY_CHECKS := $(common_local_tidy_checks)
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
LOCAL_SRC_FILES := \
main.cpp \
$(common_src_files)
bundle init.rc contents with its service Bug: 23186545 Change-Id: I82d8b6dc54ebe32ceb1ed997aaab3701ee7b6c4a
2015-08-14 22:06:45 +02:00
LOCAL_INIT_RC := vold.rc
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
LOCAL_C_INCLUDES := $(common_c_includes)
Fix alignment of buffer used for dm_ioctl. Since the dm_ioctl struct was being allocated on the stack as a large character array, it was getting character alignment rather than the proper alignment for the struct. GCC had been getting away with this so far, but it's undefined behavior that clang managed to expose. Bug: 18736778 Change-Id: Ied275dfad7fcc41d712b2d02c8a185f499221f57
2014-12-18 19:00:55 +01:00
LOCAL_CFLAGS := $(vold_cflags)
LOCAL_CONLYFLAGS := $(vold_conlyflags)
system: vold2: Initial skeleton for vold2. Let there be light. Signed-off-by: San Mehat <san@android.com>
2009-10-11 02:22:08 +02:00
Change ASCII conversion for hash and add tests Hash was printed using snprintf(), but we can just write yet another hex conversion utility! Change-Id: I04f1992deaf5bf1b3e2751c8f07072f8ed6660e9
2010-06-19 04:06:50 +02:00
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
Change key derivation to scrypt scrypt is a sequential memory-hard key derivation algorithm that makes it more difficult for adversaries to brute force passwords using specialized equipment. See http://www.tarsnap.com/scrypt/scrypt.pdf for more details of the algorithm. This adds support for initializing disk encryption using scrypt and upgrading from the previous PBKDF2 algorithm. Change-Id: I1d26db4eb9d27fea7310be3e49c8e6219e6d2c3b
2013-06-14 21:11:38 +02:00
LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
Add support for creating ext4 images with mke2fs We are investigating replacing make_ext4fs with the upstream tool mke2fs. See b/23686092 for more informations. To mitigate the trouble that may arise if the new tool behave differently compared to the old one, there will be a transition period where both mke2fs and make_ext4fs will be supported. This patch does 3 things: - add the necessary code to use mke2fs to format an ext4 partition; - add a dependency to the binary used by vold. Test: m -j32 with TARGET_USES_MKE2FS={,false,true} TARGET_USERIMAGES_USE_EXT4={,true} Change-Id: I89222642fe1d11a035155c8224b84b2e3719938b
2016-11-22 00:14:37 +01:00
LOCAL_REQUIRED_MODULES := $(required_modules)
Changes to encryption to work with the new filesystem manager The new filesystem manager is in charge of mounting the block devices now, removing much of the knowledge from init.<device>.rc. This also let us clean up some init code dealing with encryption, so this change updates vold to work with that. More cleanup is possible, but the main goal of the filesystem manager was to enable e2fsck, not a full cleanup of encryption. Change-Id: I00ea80a923d14770ed8fdd190e8840be195f8514
2012-04-02 08:58:44 +02:00
system: vold2: Initial skeleton for vold2. Let there be light. Signed-off-by: San Mehat <san@android.com>
2009-10-11 02:22:08 +02:00
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
vold: Convert to use OpenSSL MD5 API Change-Id: I9b84370fa9a98464c211ebe8983be8dbe9dd7ccd
2010-03-15 21:13:41 +01:00
Remove makefile cruft. Don't manually include stlport, and don't use private bionic headers. Change-Id: I44dd212fdd5874e625890c548e9d7bf3a9c27912
2014-09-12 19:48:12 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
Fix alignment of buffer used for dm_ioctl. Since the dm_ioctl struct was being allocated on the stack as a large character array, it was getting character alignment rather than the proper alignment for the struct. GCC had been getting away with this so far, but it's undefined behavior that clang managed to expose. Bug: 18736778 Change-Id: Ied275dfad7fcc41d712b2d02c8a185f499221f57
2014-12-18 19:00:55 +01:00
LOCAL_CLANG := true
Enable clang-tidy for security sensitive domain. Start with clang-analyzer-security* and cert-*, but disable two specific errors: -- cert-err34-c, which checks for atoi(); heavily triggered by CommandListener, but will disappear when we move to Binder. -- cert-err58-cpp, which checks for exceptions before main(); it's a "Low" severity issue, and filed 36656327 to track cleanup. Fix all other triggered errors along the way. Test: builds, boots Bug: 36655947 Change-Id: I1391693fb521ed39700e25ab6b16bc741293bb79
2017-03-28 00:18:50 +02:00
LOCAL_TIDY := true
LOCAL_TIDY_FLAGS := $(common_local_tidy_flags)
LOCAL_TIDY_CHECKS := $(common_local_tidy_checks)
Allow callers to prepare CE/DE user storage. Give callers the option of preparing CE and/or DE storage. The framework will only prepare CE storage after the CE keys have been unlocked for that user. When init is calling enablecrypto, kick off the work in a thread so that we can make other calls back into vold without causing deadlock. Leaves blocking call intact for framework callers. Clean up 'vdc' tool to send useful transaction numbers, and actually watch for the matching result to come back. This fixes race conditions when there are multiple 'vdc' callers. Also add other system and misc directories to match spec. Bug: 25796509 Change-Id: Ie4f853db6e387916b845d2b5fb92925d743b063d
2016-02-02 01:02:29 +01:00
LOCAL_SRC_FILES := vdc.cpp
LOCAL_MODULE := vdc
LOCAL_SHARED_LIBRARIES := libcutils libbase
Fix alignment of buffer used for dm_ioctl. Since the dm_ioctl struct was being allocated on the stack as a large character array, it was getting character alignment rather than the proper alignment for the struct. GCC had been getting away with this so far, but it's undefined behavior that clang managed to expose. Bug: 18736778 Change-Id: Ied275dfad7fcc41d712b2d02c8a185f499221f57
2014-12-18 19:00:55 +01:00
LOCAL_CFLAGS := $(vold_cflags)
LOCAL_CONLYFLAGS := $(vold_conlyflags)
bundle init.rc contents with its service Bug: 23186545 Change-Id: I82d8b6dc54ebe32ceb1ed997aaab3701ee7b6c4a
2015-08-14 22:06:45 +02:00
LOCAL_INIT_RC := vdc.rc
system: vold2: Initial skeleton for vold2. Let there be light. Signed-off-by: San Mehat <san@android.com>
2009-10-11 02:22:08 +02:00
include $(BUILD_EXECUTABLE)
Add tool for scrubbing files with BLKSECDISCARD. Bug: 19706593 (based on work in commit 8d0cd7ffd903a753c6bb5c6f33987a7a66621cef) Change-Id: I9699275a63f2d0a110435bd4a725d7dfcce4ed90
2015-05-19 18:31:39 +02:00
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CLANG := true
Enable clang-tidy for security sensitive domain. Start with clang-analyzer-security* and cert-*, but disable two specific errors: -- cert-err34-c, which checks for atoi(); heavily triggered by CommandListener, but will disappear when we move to Binder. -- cert-err58-cpp, which checks for exceptions before main(); it's a "Low" severity issue, and filed 36656327 to track cleanup. Fix all other triggered errors along the way. Test: builds, boots Bug: 36655947 Change-Id: I1391693fb521ed39700e25ab6b16bc741293bb79
2017-03-28 00:18:50 +02:00
LOCAL_TIDY := true
LOCAL_TIDY_FLAGS := $(common_local_tidy_flags)
LOCAL_TIDY_CHECKS := $(common_local_tidy_checks)
Move functions useful for crypto test into their own file More refactoring in advance of work on bug. Bug: 36029169 Test: compiles. Change-Id: Ic4cdd4761e4c2b11a3ddca5c3bbc4d5e42fac9d4
2017-06-16 18:37:31 +02:00
LOCAL_SRC_FILES:= \
FileDeviceUtils.cpp \
secdiscard.cpp \
Add tool for scrubbing files with BLKSECDISCARD. Bug: 19706593 (based on work in commit 8d0cd7ffd903a753c6bb5c6f33987a7a66621cef) Change-Id: I9699275a63f2d0a110435bd4a725d7dfcce4ed90
2015-05-19 18:31:39 +02:00
LOCAL_MODULE:= secdiscard
Use android-base logging not cutils in secdiscard Much nicer C++ style logging, but the main reason is to clean up AutoCloseFD.h so I don't have to use cutils to use it. Change-Id: I7a7f227508418046eecce6c89f813bd8854f448a
2016-01-11 13:26:44 +01:00
LOCAL_SHARED_LIBRARIES := libbase
Add tool for scrubbing files with BLKSECDISCARD. Bug: 19706593 (based on work in commit 8d0cd7ffd903a753c6bb5c6f33987a7a66621cef) Change-Id: I9699275a63f2d0a110435bd4a725d7dfcce4ed90
2015-05-19 18:31:39 +02:00
LOCAL_CFLAGS := $(vold_cflags)
LOCAL_CONLYFLAGS := $(vold_conlyflags)
include $(BUILD_EXECUTABLE)
Enable building and running the vold_tests module as part of a standard build; make it use only static libraries as per documented limitations of APCT. Bug: 33384925 Test: This is a test. Change-Id: I794adbfa3376795120cfbca1e9322093960009b5
2016-12-06 17:22:04 +01:00
include $(LOCAL_PATH)/tests/Android.mk
Reference in a new issue Copy permalink