OSDN Git Service
Paul Crowley [Tue, 12 May 2015 12:59:55 +0000 (12:59 +0000)]
Merge "Break key installation into its own function so we can install non-master keys."
Paul Crowley [Wed, 6 May 2015 12:38:53 +0000 (13:38 +0100)]
Break key installation into its own function so we can install
non-master keys.
Bug:
19704432
Change-Id: I5050d0e79c37f2a1366260e3f892d5b59e77b14b
Paul Lawrence [Thu, 7 May 2015 15:26:35 +0000 (15:26 +0000)]
Merge "Delete password as per block encryption"
Paul Lawrence [Wed, 6 May 2015 20:53:43 +0000 (13:53 -0700)]
Delete password as per block encryption
Bug:
18151196
Change-Id: Iee0f932c61ff4a309dc2861725b24bf976adb4c7
Paul Crowley [Wed, 6 May 2015 15:57:10 +0000 (15:57 +0000)]
Merge "Make vdc a C++ file as a base for further improvement."
Paul Lawrence [Wed, 6 May 2015 14:08:25 +0000 (14:08 +0000)]
Merge "Fix problem that reading/writing crypto footers wasn't identity"
Paul Lawrence [Wed, 6 May 2015 14:08:05 +0000 (14:08 +0000)]
Merge "Retry unmounts in ext4 encryption"
Paul Crowley [Wed, 6 May 2015 10:27:44 +0000 (11:27 +0100)]
Make vdc a C++ file as a base for further improvement.
Bug:
19704432
Change-Id: I784e8a91d3b0f4d6cd0dc668e9e55d0290f768e8
Paul Lawrence [Tue, 5 May 2015 22:58:27 +0000 (15:58 -0700)]
Fix problem that reading/writing crypto footers wasn't identity
Bug:
18151196
Change-Id: Ideef6bcdbccf068a64ed3e042be50c4837a373f8
Paul Lawrence [Tue, 5 May 2015 21:28:25 +0000 (14:28 -0700)]
Retry unmounts in ext4 encryption
Bug:
18151196
Change-Id: I52ca23b2ce3adcff44bd003d4a12243a0bd6ac34
Paul Lawrence [Tue, 5 May 2015 20:18:35 +0000 (20:18 +0000)]
Merge "Use default key permissions for ext4enc"
Paul Lawrence [Tue, 5 May 2015 18:09:07 +0000 (11:09 -0700)]
Use default key permissions for ext4enc
As per discussion default permissions are the correct ones.
Note that since we use logon keys, they cannot be read outside
the kernel.
Note also that we limit who can read/write keys in selinux policy.
Bug:
18151196
Change-Id: Icc916f430a70eff22e6b74c20ec361c8f3789c1c
Paul Lawrence [Tue, 5 May 2015 14:13:04 +0000 (14:13 +0000)]
Merge "Simplify password checking logic"
Paul Lawrence [Mon, 4 May 2015 22:48:24 +0000 (15:48 -0700)]
Simplify password checking logic
Bug:
18151196
Change-Id: I07ffde534dee7d1032149cfcbaa1a61c5246d759
Paul Lawrence [Fri, 1 May 2015 15:13:38 +0000 (15:13 +0000)]
Merge "Enable properties in ext4enc"
Paul Lawrence [Wed, 15 Apr 2015 21:12:00 +0000 (14:12 -0700)]
Enable properties in ext4enc
Enables OwnerInfo and pattern suppression
Bug:
18151196
Change-Id: I46144e16cb00319deeb5492ab82c67f5dd43d6d3
Paul Lawrence [Thu, 30 Apr 2015 17:20:08 +0000 (17:20 +0000)]
Merge "Check password is correct by checking hash"
Paul Lawrence [Tue, 14 Apr 2015 22:26:29 +0000 (15:26 -0700)]
Check password is correct by checking hash
Handle failures gracefully
Change-Id: Ifb6da8c11a86c50fb11964c18cc1be1326461f78
Paul Lawrence [Thu, 30 Apr 2015 16:28:52 +0000 (16:28 +0000)]
Merge "New ext4enc kernel switching from xattrs to ioctl"
Paul Lawrence [Fri, 10 Apr 2015 14:48:51 +0000 (07:48 -0700)]
New ext4enc kernel switching from xattrs to ioctl
This is one of three changes to enable this functionality:
https://android-review.googlesource.com/#/c/146259/
https://android-review.googlesource.com/#/c/146264/
https://android-review.googlesource.com/#/c/146265/
Bug:
18151196
Change-Id: Iba5146b8be1e15050ae901e08b3aaa26d96dcf7e
Paul Lawrence [Wed, 29 Apr 2015 16:24:38 +0000 (16:24 +0000)]
Merge "Securely encrypt the master key"
Paul Lawrence [Tue, 28 Apr 2015 22:14:15 +0000 (22:14 +0000)]
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
Paul Lawrence [Tue, 28 Apr 2015 19:16:57 +0000 (19:16 +0000)]
Merge "Revert "Securely encrypt the master key""
Paul Lawrence [Tue, 28 Apr 2015 19:16:46 +0000 (19:16 +0000)]
Revert "Securely encrypt the master key"
This reverts commit
7053e9cd5ebbbb783bf4140381090e6bd0caa740.
Change-Id: I77ed4dbdff8643c80629d2126cb29f85c24c7b43
Paul Lawrence [Mon, 27 Apr 2015 20:08:57 +0000 (20:08 +0000)]
Merge "Securely encrypt the master key"
Paul Lawrence [Thu, 26 Mar 2015 15:32:18 +0000 (08:32 -0700)]
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
This is one of four changes to enable this functionality:
https://android-review.googlesource.com/#/c/144586/
https://android-review.googlesource.com/#/c/144663/
https://android-review.googlesource.com/#/c/144672/
https://android-review.googlesource.com/#/c/144673/
Bug:
18151196
Change-Id: I9a162b90afe5f46a4ff15b3878e2ab503795425e
Elliott Hughes [Sat, 25 Apr 2015 16:42:37 +0000 (16:42 +0000)]
Merge "Wait for completion of device mapping in mountObb"
yoshiyuki hama [Wed, 28 Jan 2015 07:37:23 +0000 (16:37 +0900)]
Wait for completion of device mapping in mountObb
The VolumeManager::mountObb() creates a mapping between
a loopback device and a dm device. However the device-mapper
carries it out asynchronously, so there is a possibility that
Vold accesses to the dm device which is being built. Added
waiting for completion of the mapping in that function, like
mountAsec().
To verify install FrameworksCoreTests.apk and do:
adb shell am instrument -r -w -e class android.os.storage.\
StorageManagerIntegrationTest#testMountTwoEncryptedObb \
com.android.frameworks.coretests/android.test.\
InstrumentationTestRunner
Change-Id: If42f4b7494bb2f8a8b72d106ad84b3e3bf91fd9b
Mohamad Ayyash [Tue, 7 Apr 2015 18:00:52 +0000 (18:00 +0000)]
Merge "Add dependency on libsquashfs_utils due to fs_mgr dependency"
Mohamad Ayyash [Tue, 7 Apr 2015 01:15:53 +0000 (18:15 -0700)]
Add dependency on libsquashfs_utils due to fs_mgr dependency
Change-Id: I894d18c2086a6532194f478853a9837eb4b6fc09
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Elliott Hughes [Mon, 30 Mar 2015 21:03:04 +0000 (21:03 +0000)]
Merge "Fixed type mismatch for ioctl(BLKGETSIZE)"
Hiroaki Miyazawa [Wed, 4 Feb 2015 04:29:15 +0000 (13:29 +0900)]
Fixed type mismatch for ioctl(BLKGETSIZE)
ioctl(BLKGETSIZE) expects unsigned long
(8 bytes on 64 bit environment).
This is fixing fails in android.os.storage.StorageManagerIntegrationTest
(in FrameworkCoreTests).
To verify, install FrameworksCoreTests.apk and do:
adb shell am instrument -r -w -e class android.os.storage.\
StorageManagerIntegrationTest#testMountSingleEncryptedObb \
com.android.frameworks.coretests/android.test.InstrumentationTestRunner
Change-Id: Ib6d5c7490c02521c93f107c35ad0aac49f6a3f1a
Paul Lawrence [Fri, 27 Mar 2015 20:46:05 +0000 (20:46 +0000)]
Merge "Adding e4crypt support"
Paul Lawrence [Thu, 5 Mar 2015 17:46:23 +0000 (09:46 -0800)]
Adding e4crypt support
Redirect all crypto calls to e4crypt equivalents if file level encryption
detected. Note this change implements only the ones needed for minimal
functionality.
Requires matching change:
https://googleplex-android-review.git.corp.google.com/#/c/642778/
Change-Id: I622d1a91704de4b3ab655486e6d38cd6718e6016
Nick Kralevich [Thu, 5 Mar 2015 21:03:15 +0000 (21:03 +0000)]
am
3393bb65: Merge "fstrim.c: use open(O_DIRECTORY) instead of stat"
* commit '
3393bb650fd931e494a0280fc13717f36aea22fc':
fstrim.c: use open(O_DIRECTORY) instead of stat
Nick Kralevich [Thu, 5 Mar 2015 20:57:54 +0000 (20:57 +0000)]
Merge "fstrim.c: use open(O_DIRECTORY) instead of stat"
Nick Kralevich [Thu, 5 Mar 2015 20:50:23 +0000 (12:50 -0800)]
fstrim.c: use open(O_DIRECTORY) instead of stat
open(O_DIRECTORY) returns an error if the open attempt
is against anything other than a directory. This basically
duplicates the check that the stat() call was trying to do.
Eliminate the unnecessary stat() call and use O_DIRECTORY
instead.
Change-Id: I1821abbed325f29a7214fdc41ed27cd9e26817d0
Shawn Willden [Thu, 26 Feb 2015 23:31:10 +0000 (23:31 +0000)]
am
5054f7ee: Merge "Rename keymaster_device_t to keymaster0_device_t."
* commit '
5054f7ee4fa6e747eb8d08f60ec91ba6a9363878':
Rename keymaster_device_t to keymaster0_device_t.
Shawn Willden [Thu, 26 Feb 2015 23:24:53 +0000 (23:24 +0000)]
Merge "Rename keymaster_device_t to keymaster0_device_t."
JP Abgrall [Thu, 26 Feb 2015 19:03:35 +0000 (19:03 +0000)]
am
c19c6738: Merge "vold: acquire wakelock on fstrim thread"
* commit '
c19c67388cca4bda7b2042f065a7dc596f72fee8':
vold: acquire wakelock on fstrim thread
JP Abgrall [Thu, 26 Feb 2015 18:56:15 +0000 (18:56 +0000)]
Merge "vold: acquire wakelock on fstrim thread"
Young-ho Cha [Fri, 20 Jun 2014 10:48:36 +0000 (19:48 +0900)]
vold: acquire wakelock on fstrim thread
If fstrim thread creation or detachment is failed, wakelock can be leaked.
So move wakelock acquire to do_fstrim_filesystems function
Change-Id: I4da3164343af83fae3e5b01700f43d1752661276
Signed-off-by: Young-ho Cha <ganadist@gmail.com>
Shawn Willden [Tue, 24 Feb 2015 16:51:34 +0000 (09:51 -0700)]
Rename keymaster_device_t to keymaster0_device_t.
This is to accomodate the new keymaster1_device_t, which has an entirely
different interface.
Soon I'll provide a libkeymaster which provides a unified (and nicer)
interface for dealing with both v0 and v1 keymaster implementations
using a v1 keymaster API. For now this change is just so that vold will
build and run.
Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
Elliott Hughes [Sat, 7 Feb 2015 07:38:37 +0000 (07:38 +0000)]
am
d55d8dac: Merge "prevent ioctl_init() to write outside buffer"
* commit '
d55d8dac45dc60cb2cc9e599d3e89532db0cfc39':
prevent ioctl_init() to write outside buffer
Elliott Hughes [Sat, 7 Feb 2015 07:38:37 +0000 (07:38 +0000)]
am
8c0a0db1: Merge "Change strncpy to strlcpy"
* commit '
8c0a0db1ad217f3238e31c291afa6b5e6a6fc98d':
Change strncpy to strlcpy
Elliott Hughes [Sat, 7 Feb 2015 07:29:43 +0000 (07:29 +0000)]
Merge "prevent ioctl_init() to write outside buffer"
Elliott Hughes [Sat, 7 Feb 2015 07:28:05 +0000 (07:28 +0000)]
Merge "Change strncpy to strlcpy"
Paul Lawrence [Sat, 7 Feb 2015 00:11:29 +0000 (00:11 +0000)]
am
223fd1ca: Revert "Make encryption configurable"
* commit '
223fd1cad8d627dc36e11da8cdd342c1a810d226':
Revert "Make encryption configurable"
Paul Lawrence [Fri, 6 Feb 2015 16:56:13 +0000 (16:56 +0000)]
Revert "Make encryption configurable"
This reverts commit
6a69cfc411c086f15d59b7dc105763af16620414.
The original fix seems to have led to boot failures in QA. Rather than
risk shipping, revert the change. Bug
18764230 reopened.
Requires change
https://googleplex-android-review.git.corp.google.com/#/c/629950/
Bug:
19278390
Bug:
19199624
Change-Id: Ia858c4db0abb917f9364ec8048f59ca4fb48e233
Nick Kralevich [Fri, 6 Feb 2015 17:20:23 +0000 (17:20 +0000)]
am
d9f2082f: Merge "VolumeManager: don\'t use faccessat(AT_SYMLINK_NOFOLLOW)"
* commit '
d9f2082fd798e77cc15735bc582507abb64c8ed4':
VolumeManager: don't use faccessat(AT_SYMLINK_NOFOLLOW)
Nick Kralevich [Fri, 6 Feb 2015 17:11:00 +0000 (17:11 +0000)]
Merge "VolumeManager: don't use faccessat(AT_SYMLINK_NOFOLLOW)"
Nick Kralevich [Fri, 6 Feb 2015 16:55:08 +0000 (08:55 -0800)]
VolumeManager: don't use faccessat(AT_SYMLINK_NOFOLLOW)
Don't use faccessat(AT_SYMLINK_NOFOLLOW). In Android, AT_SYMLINK_NOFOLLOW
is ignored. In glibc, it returns counter intuitive results when a
symbolic link is encountered, returning true all the time even though
an open(O_NOFOLLOW) will eventually fail.
Instead, stat the file and check to see if it's a regular file,
not a directory or symlink or some other weirdness.
In addition, fix a bug where isAsecInDirectory would return
true ("-1") if the asec directory didn't exist. It should return
false.
Bug:
18867827
Change-Id: I33d90e9095fad36ce0f83fde105b70f72e4eaef4
Henrik Baard [Fri, 6 Feb 2015 08:24:14 +0000 (09:24 +0100)]
Change strncpy to strlcpy
Change all function calls to strncpy to strlcpy.
Change-Id: I2bbefb7829d715847c5b26f4b9f0faddbd4c89d0
Marek Pola [Thu, 5 Feb 2015 13:22:34 +0000 (14:22 +0100)]
prevent ioctl_init() to write outside buffer
The strncpy operation does not write a 0 termination
if the name is larger than the target buffer.
Ensure that zero termination is always written using
safe strlcpy function.
Change-Id: Idb68cdff7cd1a860c1dfac7494fa99f3d382cb91
Elliott Hughes [Thu, 5 Feb 2015 20:26:52 +0000 (20:26 +0000)]
am
f805a8b3: Merge "Change lseek to lseek64"
* commit '
f805a8b3a917b163c789f1ad4b272560f98eb6f1':
Change lseek to lseek64
Elliott Hughes [Thu, 5 Feb 2015 18:51:07 +0000 (18:51 +0000)]
am
ebc83b3e: Merge "Fix memory leak in upgrade_crypt_ftr"
* commit '
ebc83b3e8ef6d0dbab84bec88e0231c7911e5378':
Fix memory leak in upgrade_crypt_ftr
Elliott Hughes [Thu, 5 Feb 2015 17:36:01 +0000 (17:36 +0000)]
Merge "Change lseek to lseek64"
Elliott Hughes [Thu, 5 Feb 2015 17:08:58 +0000 (17:08 +0000)]
Merge "Fix memory leak in upgrade_crypt_ftr"
Björn Landström [Tue, 20 Jan 2015 11:43:56 +0000 (12:43 +0100)]
Change lseek to lseek64
Using lseek on 64-bit offset parameter caused failure
to write persistent data in crypto footer.
Changed calls to use lseek64 instead.
Change-Id: I4e4c397a6d36201b8b08be3017e17c9fac3b34e4
Henrik Baard [Thu, 5 Feb 2015 14:09:17 +0000 (15:09 +0100)]
Fix memory leak in upgrade_crypt_ftr
The structure crypt_persist_data was allocated,
but never freed.
Added free of allocated memory in normal and
error case.
Change-Id: I9aaa067e6f6501e8ce007f8659004b5dbcf2b246
Paul Lawrence [Wed, 28 Jan 2015 21:21:30 +0000 (21:21 +0000)]
am
fcca3faa: Merge "Make encryption configurable"
* commit '
fcca3faad48fc37be78a7307ee94b1b55cb89f16':
Make encryption configurable
Paul Lawrence [Wed, 28 Jan 2015 21:14:19 +0000 (21:14 +0000)]
Merge "Make encryption configurable"
Elliott Hughes [Wed, 28 Jan 2015 20:14:17 +0000 (20:14 +0000)]
am
61c19efd: Merge "Add missing <string.h> include."
* commit '
61c19efd0b9015eb0a7350f8ec6b7e61ae5a75ab':
Add missing <string.h> include.
Elliott Hughes [Wed, 28 Jan 2015 20:04:02 +0000 (20:04 +0000)]
Merge "Add missing <string.h> include."
Elliott Hughes [Wed, 28 Jan 2015 19:47:21 +0000 (11:47 -0800)]
Add missing <string.h> include.
Change-Id: I31f5cd6fb4ff55d7cfe213f66955e3dbcbdff101
Paul Lawrence [Wed, 21 Jan 2015 17:58:26 +0000 (09:58 -0800)]
Make encryption configurable
Add maybeenabledefaultencryption function, that encrypts based
on the encryption flag and appropriate environment variable
Bug:
18764230
Change-Id: Id9a1967d09a7ae63a51240c0a5f3c41505af0e9a
Paul Lawrence [Mon, 26 Jan 2015 15:53:01 +0000 (15:53 +0000)]
am
6a69cfc4: Make encryption configurable
* commit '
6a69cfc411c086f15d59b7dc105763af16620414':
Make encryption configurable
Kenny Root [Fri, 23 Jan 2015 01:17:16 +0000 (01:17 +0000)]
am
26970299: Merge "Remove superfluous OpenSSL include paths."
* commit '
269702997153cdf92c65cfee277c76afed44e9e5':
Remove superfluous OpenSSL include paths.
Kenny Root [Fri, 23 Jan 2015 01:05:47 +0000 (01:05 +0000)]
Merge "Remove superfluous OpenSSL include paths."
Adam Langley [Fri, 23 Jan 2015 00:45:28 +0000 (16:45 -0800)]
Remove superfluous OpenSSL include paths.
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.
Additionally, cryptfs.h was including an OpenSSL header just to get the
length of a SHA-256 hash. Rather than force all users of this header to
also depend on libcrypto, it's easier just to define that value in the
header file.
Change-Id: I3e3e0db906a212e1093944b298e4a8ff2e2fb07d
Paul Lawrence [Wed, 21 Jan 2015 17:58:26 +0000 (09:58 -0800)]
Make encryption configurable
Add maybeenabledefaultencryption function, that encrypts based
on the encryption flag and appropriate environment variable
Bug:
18764230
Change-Id: Id9a1967d09a7ae63a51240c0a5f3c41505af0e9a
Yabin Cui [Tue, 6 Jan 2015 18:21:52 +0000 (18:21 +0000)]
am
f3b2637e: Merge "Use getmntent when accessing /proc/mounts."
* commit '
f3b2637e0611ac7953c18ce39a47b7c408a70160':
Use getmntent when accessing /proc/mounts.
Yabin Cui [Tue, 6 Jan 2015 18:06:08 +0000 (18:06 +0000)]
Merge "Use getmntent when accessing /proc/mounts."
Yabin Cui [Fri, 2 Jan 2015 21:28:28 +0000 (13:28 -0800)]
Use getmntent when accessing /proc/mounts.
Bug:
18887435
Change-Id: Ibcb446fac954d9c42ebdfc4b684e6f3503337ab4
Elliott Hughes [Tue, 30 Dec 2014 12:21:15 +0000 (12:21 +0000)]
am
ac2bbd08: Merge "Fix missing #includes in system/vold."
* commit '
ac2bbd08c61e7412912613605d3e561eb22c41c1':
Fix missing #includes in system/vold.
Elliott Hughes [Mon, 29 Dec 2014 22:10:51 +0000 (22:10 +0000)]
Merge "Fix missing #includes in system/vold."
Elliott Hughes [Mon, 29 Dec 2014 22:09:42 +0000 (14:09 -0800)]
Fix missing #includes in system/vold.
Change-Id: I53611cf8373daf638b0cc45b7b3d17e4d3e7247e
Brian Carlstrom [Fri, 19 Dec 2014 01:01:40 +0000 (17:01 -0800)]
Remove unused local variable to fix the build
Change-Id: Ic0a77a754b649d360d07eaa9e6a93274e7eaf0a8
Dan Albert [Thu, 18 Dec 2014 22:08:43 +0000 (14:08 -0800)]
resolved conflicts for merge of
88aba541 to lmp-mr1-dev-plus-aosp
Change-Id: Ie5ef819dd8168cb6a73f84a881a92c116705fffc
Dan Albert [Thu, 18 Dec 2014 18:42:15 +0000 (18:42 +0000)]
Merge "Fix alignment of buffer used for dm_ioctl."
Dan Albert [Thu, 18 Dec 2014 18:00:55 +0000 (10:00 -0800)]
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
Tim Murray [Thu, 18 Dec 2014 00:41:07 +0000 (16:41 -0800)]
resolved conflicts for merge of
4be36106 to lmp-mr1-dev-plus-aosp
Change-Id: If504710a618d8c3adf85297d5fd2909558ed57a3
Tim Murray [Thu, 18 Dec 2014 00:23:26 +0000 (00:23 +0000)]
Merge "Make vold compile with -Werror -Wall."
Tim Murray [Mon, 15 Dec 2014 19:56:11 +0000 (11:56 -0800)]
Make vold compile with -Werror -Wall.
-Wno-missing-field-initializers is used as well, but that is an
overzealous warning from initializing structs with {0} and not a
real warning.
bug
18736778 and
16868177
Change-Id: Iffde89cd7200d9a11193e1614f1819f9fcace30a
Dan Albert [Sat, 13 Dec 2014 02:17:32 +0000 (02:17 +0000)]
am
a20bb17e: Merge "Move vold to GCC."
* commit '
a20bb17e4c6095a77425418d7eb0c1ceb50d05f7':
Move vold to GCC.
Dan Albert [Sat, 13 Dec 2014 02:03:13 +0000 (02:03 +0000)]
Merge "Move vold to GCC."
Dan Albert [Sat, 13 Dec 2014 01:47:16 +0000 (17:47 -0800)]
Move vold to GCC.
It looks like clang might have a miscompile that is causing SIGBUS in
`ioctl_init` when the device is encrypted. Move back to GCC until we
can sort this out.
Bug:
18736778
Change-Id: I21ae3b9d7d9ebff8679ecc1a828b7c59f27d0903
Paul Lawrence [Tue, 2 Dec 2014 18:54:41 +0000 (18:54 +0000)]
am
acfdc30e: Merge "Fix error in clocks leading to devices staying unlocked" into lmp-mr1-dev
* commit '
acfdc30e3793512de4b9a5e15da69533735dd8be':
Fix error in clocks leading to devices staying unlocked
Paul Lawrence [Tue, 2 Dec 2014 18:45:42 +0000 (18:45 +0000)]
am
d44a8f59: Merge "Fix encrypt-and-wipe" into lmp-mr1-dev
* commit '
d44a8f59a7518b87a3fe4174c78dfb9727e63f89':
Fix encrypt-and-wipe
Paul Lawrence [Tue, 2 Dec 2014 18:45:42 +0000 (18:45 +0000)]
am
b25302e1: Do not log passwords returned through vdc
* commit '
b25302e1b0232ac2f9d6ffa441f2ab1ff23a2de3':
Do not log passwords returned through vdc
Paul Lawrence [Tue, 2 Dec 2014 18:34:14 +0000 (18:34 +0000)]
Merge "Fix error in clocks leading to devices staying unlocked" into lmp-mr1-dev
Paul Lawrence [Tue, 2 Dec 2014 18:20:04 +0000 (18:20 +0000)]
Merge "Fix encrypt-and-wipe" into lmp-mr1-dev
Paul Lawrence [Tue, 11 Nov 2014 20:26:09 +0000 (12:26 -0800)]
Do not log passwords returned through vdc
Requires framework change:
https://googleplex-android-review.git.corp.google.com/#/c/585511/
Bug:
18260068
Change-Id: I95d3bb39404ede7128b8f5d61ce2423a5f09a9b8
Paul Lawrence [Tue, 11 Nov 2014 20:47:03 +0000 (12:47 -0800)]
Fix error in clocks leading to devices staying unlocked
Use BOOTTIME consistently!
Bug:
18246810
Change-Id: I630bf39f72ab69f971d2f772e8d4545ffe467b82
Paul Lawrence [Tue, 25 Nov 2014 22:57:32 +0000 (14:57 -0800)]
Fix encrypt-and-wipe
encrypt-and-wipe was broken when checks were added that encryption succeeded
which assumed a 'normal' full encrypt traversing the device.
encrypt-and-wipe doesn't traverse, it just lays down a file system over
the encrypted device, so in this mode do not check the amount encrypted -
it will always be 0.
Bug:
18511900
Change-Id: Icb1d7e0cdb67abd2eac0ab3cbfc1a88912768f9d
Iliyan Malchev [Fri, 21 Nov 2014 08:56:42 +0000 (08:56 +0000)]
am
bb7d9afe: fall back to dm-crypt if device already encrypted
* commit '
bb7d9afea9479eabbc98133d3d968225a1e1019e':
fall back to dm-crypt if device already encrypted
Iliyan Malchev [Fri, 21 Nov 2014 08:52:40 +0000 (00:52 -0800)]
resolved conflicts for merge of
87701e27 to lmp-mr1-dev-plus-aosp
Change-Id: Ie873baff626fe786515497f2e81aa9db2329168d
Iliyan Malchev [Fri, 21 Nov 2014 02:42:23 +0000 (18:42 -0800)]
fall back to dm-crypt if device already encrypted
Devices already encrypted with aes-cbc-essiv:sha256 will continue to be
decrypted in software, until a factory data reset. New devices that
implement CONFIG_HW_DISK_ENCRYPTION will switch to aes-xts.
b/
17475056 Enable hardware crypto for userdata encryption
Change-Id: I62d1583bdaf7ff06b87e386e758fa3b18c719bca
Signed-off-by: Iliyan Malchev <malchev@google.com>
Ajay Dudani [Thu, 18 Sep 2014 04:02:52 +0000 (21:02 -0700)]
Adding support of dm-req-crypt
Currently Android provides disk encryption support using dm-crypt
which is based on bios. dm-crypt uses 512 bytes packet size for
crypto operations. While 512 bytes size packet is ok for SW based
disk encryption, it is inefficient for HW based crypto engines.
dm-req-crypt is similar to dm-crypt except it uses block requests
rathe bios for crypto operations. block requests when unpacked
carries data upto 512KB. Hence, HW based crypto engine can be used
more efficiently.
Also move create disk encryption key before framework start as
HW based disk encryption creates key in secure side. Key creation
can take sometime to create the key securely. If framework is
started before creating the key, it is possible that framework
requests service from secure side. Secure side can serve mostly one
request at a time. Secure side may reject framework request if key
creation request is still going on. This may cause problem in the
system
b/
17475056 Enable hardware crypto for userdata encryption
Change-Id: I5480ab72a37c02532218a18faaba598a824589fd
Signed-off-by: Iliyan Malchev <malchev@google.com>
Dan Albert [Thu, 6 Nov 2014 00:18:54 +0000 (00:18 +0000)]
am
89bcc638: am
36859212: Merge "Move vold to libc++."
* commit '
89bcc638ab24af7bee0ff3ccfa190a08b721f0a4':
Move vold to libc++.