summaryrefslogtreecommitdiff
path: root/chromeos
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-02-08 16:53:31 -0800
committerSimone Willett <swillett@nvidia.com>2012-07-23 10:30:26 -0700
commit87227c90f67895ddda5dab4b0c3b12ebcc6bb145 (patch)
treeacd743583a335ac1f4e59a21be1881c9b1b216d0 /chromeos
parentc92c50000f737569f7f319f2b9166fcaf08e6758 (diff)
CHROMIUM: config: enable DM_CRYPT target
The dm "crypt" target is needed for encrypted /var support. Additionally, since the expected hash alg will be sha256, built it in, and ready future support for sha512 as a module. BUG=chromium-os:22172 TEST=build, boot amd64-generic, verify target listed in "dmsetup targets" Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/15548 Reviewed-by: Kees Cook <keescook@chromium.org> Tested-by: Kees Cook <keescook@chromium.org> Commit-Ready: Kees Cook <keescook@chromium.org> (cherry-picked from commit 50180f134a6e23be3ce763524b6b5193d848c0f7) Modified to use: chromeos/config/config.common.chromeos instead of: chromeos/config/base.config Change-Id: Iac31f59f340f52a7017948fd5add3d316d38a123 Signed-off-by: Rhyland Klein <rklein@nvidia.com> Reviewed-on: http://git-master/r/117151 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/config/config.common.chromeos6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromeos/config/config.common.chromeos b/chromeos/config/config.common.chromeos
index 47cabc336e82..6d812040adca 100644
--- a/chromeos/config/config.common.chromeos
+++ b/chromeos/config/config.common.chromeos
@@ -291,8 +291,8 @@ CONFIG_CRYPTO_RNG2=y
# CONFIG_CRYPTO_SEQIV is not set
# CONFIG_CRYPTO_SERPENT is not set
CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=m
-# CONFIG_CRYPTO_SHA512 is not set
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
# CONFIG_CRYPTO_TEA is not set
# CONFIG_CRYPTO_TEST is not set
# CONFIG_CRYPTO_TGR192 is not set
@@ -368,7 +368,7 @@ CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_DMADEVICES is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_DMA_SHARED_BUFFER is not set
-# CONFIG_DM_CRYPT is not set
+CONFIG_DM_CRYPT=y
# CONFIG_DM_DEBUG is not set
# CONFIG_DM_DELAY is not set
# CONFIG_DM_FLAKEY is not set