Merge tag 'v4.20' into next

[linux-2.6-microblaze.git] / lib / chacha20.c

diff --git a/lib/chacha20.c b/lib/chacha20.c
index c1cc50f..d907fec 100644 (file)
--- a/lib/chacha20.c
+++ b/lib/chacha20.c
@@ -16,9 +16,9 @@
 #include <asm/unaligned.h>
 #include <crypto/chacha20.h>
 
-void chacha20_block(u32 *state, u32 *stream)
+void chacha20_block(u32 *state, u8 *stream)
 {
-       u32 x[16], *out = stream;
+       u32 x[16];
        int i;
 
        for (i = 0; i < ARRAY_SIZE(x); i++)
@@ -67,7 +67,7 @@ void chacha20_block(u32 *state, u32 *stream)
        }
 
        for (i = 0; i < ARRAY_SIZE(x); i++)
-               out[i] = cpu_to_le32(x[i] + state[i]);
+               put_unaligned_le32(x[i] + state[i], &stream[i * sizeof(u32)]);
 
        state[12]++;
 }