c4b00eb7049611bc16a42ca0e21ea80f614ed3a4 - kernel/common

commit: c4b00eb7049611bc16a42ca0e21ea80f614ed3a4
[log]
author: Alistair Strachan <astrachan@google.com>
Tue Oct 23 12:37:23 2018 -0700
committer: Alistair Strachan <astrachan@google.com>
Tue Oct 23 12:44:24 2018 -0700
tree: 28f11126fa3be137b7c246886952763d72e21401
parent: fd73fe985329b36bbb1e0070d67da639c12b187c [diff]

Revert "BACKPORT, FROMLIST: fscrypt: add Speck128/256 support"

This reverts commit 4b08356a76b859b8f4599bf8821a6702ac50a029.

Resolves conflicts with a later CL, e7724207f71e "fscrypt: log the
crypto algorithm implementations".

[astrachan: This is an update to 076c36fce1ea which reverted only
            the fscrypt changes, not the ext4 changes, due to a
            historical bad merge.]
Bug: 116008047
Change-Id: I772d78d6e4bd126dcd2b25049c719f8522a1c157
Signed-off-by: Alistair Strachan <astrachan@google.com>

fs/ext4/crypto.c[diff]
fs/ext4/crypto_fname.c[diff]
fs/ext4/crypto_key.c[diff]
fs/ext4/crypto_policy.c[diff]
fs/ext4/ext4.h[diff]
fs/ext4/ext4_crypto.h[diff]

6 files changed