diff options
| author | James Morris <james.morris@microsoft.com> | 2019-01-22 14:33:10 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-01-22 14:33:10 -0800 |
| commit | aaf6aed3ef1a735e34339a51f26f5f3e5fe9a478 (patch) | |
| tree | ad35f7c066ef1e52febbbfc0fc62fe9623cc4e00 /crypto/sm3_generic.c | |
| parent | 7ff17fe228094bad025c79c39e9e23af4364644c (diff) | |
| parent | bc2a1ca9b6b0c50decebcbb4c6b4160cf81eed93 (diff) | |
| download | linux-crypto-aaf6aed3ef1a735e34339a51f26f5f3e5fe9a478.tar.gz linux-crypto-aaf6aed3ef1a735e34339a51f26f5f3e5fe9a478.zip | |
Merge tag 'v5.0-rc3' into next-general
Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot
of the LSM code.
Diffstat (limited to 'crypto/sm3_generic.c')
| -rw-r--r-- | crypto/sm3_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/sm3_generic.c b/crypto/sm3_generic.c index 9a5c60f0..c0cf87ae 100644 --- a/crypto/sm3_generic.c +++ b/crypto/sm3_generic.c @@ -100,7 +100,7 @@ static void sm3_compress(u32 *w, u32 *wt, u32 *m) for (i = 0; i <= 63; i++) { - ss1 = rol32((rol32(a, 12) + e + rol32(t(i), i)), 7); + ss1 = rol32((rol32(a, 12) + e + rol32(t(i), i & 31)), 7); ss2 = ss1 ^ rol32(a, 12); |