diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2019-08-12 14:36:27 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2019-08-12 14:36:27 +0200 |
commit | c37dd209adcf9a17dccab32db8a0f9fa068bf81b (patch) | |
tree | 1f7d1531e21179d1bc47d322c97286a24a23db3e /crypto/lrw.c | |
parent | dbe02bf7c56e55a5d9ef542dc3cf4cfc12f3017c (diff) | |
parent | 0a4fa7ef65b9f8d2d8cd0db31769f3a0eb77e76f (diff) | |
download | linux-crypto-c37dd209adcf9a17dccab32db8a0f9fa068bf81b.tar.gz linux-crypto-c37dd209adcf9a17dccab32db8a0f9fa068bf81b.zip |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull a single EFI fix for v5.3 from Ard:
- Fix mixed mode breakage in EFI config table handling for TPM.
Diffstat (limited to 'crypto/lrw.c')
-rw-r--r-- | crypto/lrw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/lrw.c b/crypto/lrw.c index 58009cf6..be829f6a 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -384,7 +384,7 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb) inst->alg.base.cra_priority = alg->base.cra_priority; inst->alg.base.cra_blocksize = LRW_BLOCK_SIZE; inst->alg.base.cra_alignmask = alg->base.cra_alignmask | - (__alignof__(__be32) - 1); + (__alignof__(be128) - 1); inst->alg.ivsize = LRW_BLOCK_SIZE; inst->alg.min_keysize = crypto_skcipher_alg_min_keysize(alg) + |