diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-04-01 13:12:09 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-04-01 13:12:09 +0200 |
| commit | 831fd9fdce82ad6727c15552b430c5e54420d92f (patch) | |
| tree | 92cc49cb728ae789fcf1306a4a36206cd0f7a098 /crypto/tgr192.c | |
| parent | fa52b9919271e59a73b989df5c92bbf0bb983c3d (diff) | |
| parent | 1d5d6bd2502dff39b91d2280711ecbf86c1287a8 (diff) | |
| download | linux-crypto-831fd9fdce82ad6727c15552b430c5e54420d92f.tar.gz linux-crypto-831fd9fdce82ad6727c15552b430c5e54420d92f.zip | |
Merge tag 'v5.1-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 5.1-rc3
Sync with upstream (which now contains fbdev-v5.1 changes) to
prepare a base for fbdev-v5.2 changes.
Diffstat (limited to 'crypto/tgr192.c')
| -rw-r--r-- | crypto/tgr192.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/tgr192.c b/crypto/tgr192.c index 022d3dd7..f8e1d9f9 100644 --- a/crypto/tgr192.c +++ b/crypto/tgr192.c @@ -25,8 +25,9 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/mm.h> -#include <asm/byteorder.h> #include <linux/types.h> +#include <asm/byteorder.h> +#include <asm/unaligned.h> #define TGR192_DIGEST_SIZE 24 #define TGR160_DIGEST_SIZE 20 @@ -468,10 +469,9 @@ static void tgr192_transform(struct tgr192_ctx *tctx, const u8 * data) u64 a, b, c, aa, bb, cc; u64 x[8]; int i; - const __le64 *ptr = (const __le64 *)data; for (i = 0; i < 8; i++) - x[i] = le64_to_cpu(ptr[i]); + x[i] = get_unaligned_le64(data + i * sizeof(__le64)); /* save */ a = aa = tctx->a; |