diff options
| author |   Jason Gunthorpe <jgg@mellanox.com> | 2019-02-04 14:53:42 -0700 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-02-04 14:53:42 -0700 |
| commit | 6a8a2aa62da2fbe51f5449993fd366398048f465 (patch) | |
| tree | 566c6fcc782eefbca054af8553371d09b9d0734c /crypto/sm3_generic.c | |
| parent | IB/core: Remove ib_sg_dma_address() and ib_sg_dma_len() (diff) | |
| parent | Linux 5.0-rc5 (diff) | |
| download | linux-dev-6a8a2aa62da2fbe51f5449993fd366398048f465.tar.xz linux-dev-6a8a2aa62da2fbe51f5449993fd366398048f465.zip | |
Merge tag 'v5.0-rc5' into rdma.git for-next
Linux 5.0-rc5
Needed to merge the include/uapi changes so we have an up to date
single-tree for these files. Patches already posted are also expected to
need this for dependencies.
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 9a5c60f08aad..c0cf87ae7ef6 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); |