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/chacha_generic.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 '')
| -rw-r--r-- | crypto/chacha_generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/chacha_generic.c b/crypto/chacha_generic.c index 04404c47..085d8d21 100644 --- a/crypto/chacha_generic.c +++ b/crypto/chacha_generic.c @@ -32,7 +32,7 @@ static void chacha_docrypt(u32 *state, u8 *dst, const u8 *src, } static int chacha_stream_xor(struct skcipher_request *req, - struct chacha_ctx *ctx, u8 *iv) + const struct chacha_ctx *ctx, const u8 *iv) { struct skcipher_walk walk; u32 state[16]; @@ -56,7 +56,7 @@ static int chacha_stream_xor(struct skcipher_request *req, return err; } -void crypto_chacha_init(u32 *state, struct chacha_ctx *ctx, u8 *iv) +void crypto_chacha_init(u32 *state, const struct chacha_ctx *ctx, const u8 *iv) { state[0] = 0x61707865; /* "expa" */ state[1] = 0x3320646e; /* "nd 3" */ |