Paul Crowley
9df68a1364
Merge "Add vold commands for setting up per-user encrypted user directories"
9 years ago
Paul Crowley
75a5202d9f
Add vold commands for setting up per-user encrypted user
...
directories
Bug: 19704432
Change-Id: I15980eed8e4960ca270cf0f8db4e480a8c2ca832
9 years ago
Paul Crowley
eb0c05ced4
Merge "Break key installation into its own function so we can install non-master keys."
9 years ago
Paul Crowley
1da96dc549
Break key installation into its own function so we can install
...
non-master keys.
Bug: 19704432
Change-Id: I5050d0e79c37f2a1366260e3f892d5b59e77b14b
9 years ago
Paul Lawrence
cb2a94ac76
am 86ddbbf4: Merge "Delete password as per block encryption"
...
* commit '86ddbbf4143daa721b84f0f253022d19d61b6fe3':
Delete password as per block encryption
9 years ago
Paul Lawrence
86ddbbf414
Merge "Delete password as per block encryption"
9 years ago
Paul Crowley
4f817d1bd2
am 42696d97: Merge "Make vdc a C++ file as a base for further improvement."
...
* commit '42696d97ce138fa5e7a1380b3841250549acb615':
Make vdc a C++ file as a base for further improvement.
9 years ago
Paul Lawrence
855f78c29b
am eae7fc77: Merge "Fix problem that reading/writing crypto footers wasn\'t identity"
...
* commit 'eae7fc77b60962c9384b31e0f98d14724731ce88':
Fix problem that reading/writing crypto footers wasn't identity
9 years ago
Paul Lawrence
823caaf761
am b32ebf30: Merge "Retry unmounts in ext4 encryption"
...
* commit 'b32ebf308a95ffa937d9b9a36417cdea70add0e5':
Retry unmounts in ext4 encryption
9 years ago
Paul Lawrence
621d12e7e3
am 4571383c: Merge "Use default key permissions for ext4enc"
...
* commit '4571383cbf711df21d99529448277966e7ffb11e':
Use default key permissions for ext4enc
9 years ago
Paul Lawrence
7edb3c761a
am 0f29aec5: Merge "Simplify password checking logic"
...
* commit '0f29aec5af81083a558eeae7ec348b4f4fa9fb0e':
Simplify password checking logic
9 years ago
Paul Lawrence
00f4aade5c
Delete password as per block encryption
...
Bug: 18151196
Change-Id: Iee0f932c61ff4a309dc2861725b24bf976adb4c7
9 years ago
Paul Crowley
42696d97ce
Merge "Make vdc a C++ file as a base for further improvement."
9 years ago
Paul Lawrence
eae7fc77b6
Merge "Fix problem that reading/writing crypto footers wasn't identity"
9 years ago
Paul Lawrence
b32ebf308a
Merge "Retry unmounts in ext4 encryption"
9 years ago
Paul Crowley
fde9cd8c82
Make vdc a C++ file as a base for further improvement.
...
Bug: 19704432
Change-Id: I784e8a91d3b0f4d6cd0dc668e9e55d0290f768e8
9 years ago
Paul Lawrence
75c922f49b
Fix problem that reading/writing crypto footers wasn't identity
...
Bug: 18151196
Change-Id: Ideef6bcdbccf068a64ed3e042be50c4837a373f8
9 years ago
Paul Lawrence
29b54aab8e
Retry unmounts in ext4 encryption
...
Bug: 18151196
Change-Id: I52ca23b2ce3adcff44bd003d4a12243a0bd6ac34
9 years ago
Paul Lawrence
4571383cbf
Merge "Use default key permissions for ext4enc"
9 years ago
Paul Lawrence
1190a26f6d
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
9 years ago
Paul Lawrence
0f29aec5af
Merge "Simplify password checking logic"
9 years ago
Paul Lawrence
aaccfac344
Simplify password checking logic
...
Bug: 18151196
Change-Id: I07ffde534dee7d1032149cfcbaa1a61c5246d759
9 years ago
Paul Lawrence
04e0f4d240
am babba576: Merge "Enable properties in ext4enc"
...
* commit 'babba576ba0d1b6fb69c849848c8b01c8b585e24':
Enable properties in ext4enc
9 years ago
Paul Lawrence
babba576ba
Merge "Enable properties in ext4enc"
9 years ago
Paul Lawrence
4e7274551c
Enable properties in ext4enc
...
Enables OwnerInfo and pattern suppression
Bug: 18151196
Change-Id: I46144e16cb00319deeb5492ab82c67f5dd43d6d3
9 years ago
Paul Lawrence
2184bad367
am 744a7aa5: Merge "Check password is correct by checking hash"
...
* commit '744a7aa54b551bbdaa0edbd806e2a125801eb1c4':
Check password is correct by checking hash
9 years ago
Jeff Sharkey
47b9deba5b
am 74e6349d: Merge "Fix signed issue with hex conversion." into mnc-dev
...
* commit '74e6349d8e4dde988c121e9674472908cc8c748d':
Fix signed issue with hex conversion.
9 years ago
Paul Lawrence
744a7aa54b
Merge "Check password is correct by checking hash"
9 years ago
Jeff Sharkey
74e6349d8e
Merge "Fix signed issue with hex conversion." into mnc-dev
9 years ago
Paul Lawrence
783d40a604
am d7399147: Merge "New ext4enc kernel switching from xattrs to ioctl"
...
* commit 'd7399147685a6b54c2d899bc84aa9839eaa07c71':
New ext4enc kernel switching from xattrs to ioctl
9 years ago
Paul Lawrence
3ca21e227a
Check password is correct by checking hash
...
Handle failures gracefully
Change-Id: Ifb6da8c11a86c50fb11964c18cc1be1326461f78
9 years ago
Paul Lawrence
d739914768
Merge "New ext4enc kernel switching from xattrs to ioctl"
9 years ago
Paul Lawrence
5e7f004231
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
9 years ago
Jeff Sharkey
ab0e376060
am 1bfb375f: Update primary symlinks after mounting.
...
* commit '1bfb375f77c093a8e16bef4ddeab2681ca126d56':
Update primary symlinks after mounting.
9 years ago
Jeff Sharkey
1bfb375f77
Update primary symlinks after mounting.
...
Since otherwise we might have a stale path.
Bug: 19993667
Change-Id: I099e3dc0c5aa9ab6820cded4f2ae7fd6bf18ea40
9 years ago
Jeff Sharkey
ef3697545b
Fix signed issue with hex conversion.
...
Change-Id: Ia11c689c373f41b2a63bc84151eb16f7c7b9d155
9 years ago
Paul Lawrence
e225260184
Merge commit 'c3e4cc29' into manualmerge
...
Change-Id: I1f6feaf743e0b9a62fe212af3cd9dd16abefeb00
9 years ago
Paul Lawrence
c3e4cc29f8
Merge "Securely encrypt the master key"
9 years ago
Jeff Sharkey
3005fd38ee
am b0667870: Property to enable debugging.
...
* commit 'b0667870ff036c598486a8ec87ad2bbe321b2a20':
Property to enable debugging.
9 years ago
Jeff Sharkey
b0667870ff
Property to enable debugging.
...
Bug: 19993667
Change-Id: Ie226e06edcb426caca2dbc97d2d5d60ae948c85e
9 years ago
Jeff Sharkey
16c1219e2d
am ba6747f1: Scan failure still means we finished scan.
...
* commit 'ba6747f119811032b258cf3c6334a4d0f9b675bf':
Scan failure still means we finished scan.
9 years ago
Jeff Sharkey
ba6747f119
Scan failure still means we finished scan.
...
Bug: 19993667
Change-Id: If6a79391e34b652b2ba4e6df40a8e712f7a2e172
9 years ago
Paul Lawrence
707fd6c7cc
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
9 years ago
Paul Lawrence
f7de12b264
resolved conflicts for merge of bf9dcad7
to mnc-dev-plus-aosp
...
Change-Id: Ic0d4ed7e6c83ad857e2a4a198d069b73fcf399e6
9 years ago
Paul Lawrence
bf9dcad78e
Merge "Revert "Securely encrypt the master key""
9 years ago
Paul Lawrence
beadcb6ec0
Revert "Securely encrypt the master key"
...
This reverts commit 7053e9cd5e
.
Change-Id: I77ed4dbdff8643c80629d2126cb29f85c24c7b43
9 years ago
Paul Lawrence
74e85f1872
resolved conflicts for merge of 86138731
to mnc-dev-plus-aosp
...
Change-Id: I89203aa1665bb42f9a98fd8b94b933e8406dde02
9 years ago
Paul Lawrence
86138731da
Merge "Securely encrypt the master key"
9 years ago
Paul Lawrence
7053e9cd5e
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
9 years ago
Elliott Hughes
c98d1f5883
am 85c7c08e: am d5aa67cc: Merge "Wait for completion of device mapping in mountObb"
...
* commit '85c7c08e2511509a306c3a5b202ceda922f5f2b5':
Wait for completion of device mapping in mountObb
9 years ago