summaryrefslogtreecommitdiff
path: root/fs/ext4/crypto_key.c (follow)
Commit message (Expand)AuthorAge
* Merge android-4.4.163 (0ca3fca) into msm-4.4Srinivasarao P2018-11-15
|\
| * Revert "BACKPORT, FROMLIST: fscrypt: add Speck128/256 support"Alistair Strachan2018-10-23
* | Merge android-4.4.133 (3f51ea2) into msm-4.4Srinivasarao P2018-05-31
|\|
| * BACKPORT, FROMLIST: fscrypt: add Speck128/256 supportEric Biggers2018-05-25
* | Merge android-4.4.103 (9fbf3d7) into msm-4.4Srinivasarao P2018-01-02
|\|
| * Merge 4.4.103 into android-4.4Greg Kroah-Hartman2017-11-30
| |\
| | * fscrypt: lock mutex before checking for bounce page poolEric Biggers2017-11-30
* | | Merge android-4.4@ceee5bd (v4.4.95) into msm-4.4Blagovest Kolenichev2017-11-06
|\| |
| * | Merge 4.4.95 into android-4.4Greg Kroah-Hartman2017-10-30
| |\|
| | * fscrypt: fix dereference of NULL user_key_payloadEric Biggers2017-10-27
| | * fscrypt: remove broken support for detecting keyring key revocationEric Biggers2017-03-31
* | | Merge branch 'android-4.4@c71ad0f' into branch 'msm-4.4'Blagovest Kolenichev2017-04-20
|\| |
| * | Merge 4.4.59 into android-4.4Greg Kroah-Hartman2017-04-06
| * | Merge remote-tracking branch 'common/android-4.4' into android-4.4.yDmitry Shmidt2017-02-15
| |\ \ | | |/ | |/|
| | * ANDROID: ext4: add a non-reversible key derivation methodEric Biggers2017-02-10
| | * ANDROID: ext4: allow encrypting filenames using HEH algorithmEric Biggers2017-02-10
* | | ext4 crypto: enable HW based encryption with ICEAndrey Markovytch2016-09-15
|/ /
* / ext4 crypto: add missing locking for keyring_key accessTheodore Ts'o2016-02-17
|/
* Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/t...Linus Torvalds2015-11-06
|\
| * ext4 crypto: replace some BUG_ON()'s with error checksTheodore Ts'o2015-10-03
* | KEYS: Merge the type-specific data with the payload dataDavid Howells2015-10-21
|/
* ext4 crypto: fix spelling typo in commentLaurent Navet2015-07-22
* ext4 crypto: exit cleanly if ext4_derive_key_aes() failsLaurent Navet2015-07-22
* ext4 crypto: use per-inode tfm structureTheodore Ts'o2015-05-31
* ext4 crypto: get rid of ci_mode from struct ext4_crypt_infoTheodore Ts'o2015-05-18
* ext4 crypto: use slab cachesTheodore Ts'o2015-05-18
* ext4 crypto: reorganize how we store keys in the inodeTheodore Ts'o2015-05-18
* ext4 crypto: separate kernel and userspace structure for the keyTheodore Ts'o2015-05-18
* ext4 crypto: add padding to filenames before encryptingTheodore Ts'o2015-05-01
* ext4 crypto: enable encryption feature flagTheodore Ts'o2015-04-16
* ext4 crypto: add encryption key management facilitiesMichael Halcrow2015-04-12