Merge tag 'chrome-platform-for-linus-4.19' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / crypto / rmd256.c

diff --git a/crypto/rmd256.c b/crypto/rmd256.c
index f50c025cc9623a65abdbce4d494db5ddb20f02aa..0e9d30676a0136fe02b8e7ca8c01483a34e19d38 100644 (file)
--- a/crypto/rmd256.c
+++ b/crypto/rmd256.c
@@ -49,7 +49,7 @@ struct rmd256_ctx {
 
 static void rmd256_transform(u32 *state, const __le32 *in)
 {
-       u32 aa, bb, cc, dd, aaa, bbb, ccc, ddd, tmp;
+       u32 aa, bb, cc, dd, aaa, bbb, ccc, ddd;
 
        /* Initialize left lane */
        aa = state[0];
@@ -100,7 +100,7 @@ static void rmd256_transform(u32 *state, const __le32 *in)
        ROUND(bbb, ccc, ddd, aaa, F4, KK1, in[12],  6);
 
        /* Swap contents of "a" registers */
-       tmp = aa; aa = aaa; aaa = tmp;
+       swap(aa, aaa);
 
        /* round 2: left lane */
        ROUND(aa, bb, cc, dd, F2, K2, in[7],   7);
@@ -139,7 +139,7 @@ static void rmd256_transform(u32 *state, const __le32 *in)
        ROUND(bbb, ccc, ddd, aaa, F3, KK2, in[2],  11);
 
        /* Swap contents of "b" registers */
-       tmp = bb; bb = bbb; bbb = tmp;
+       swap(bb, bbb);
 
        /* round 3: left lane */
        ROUND(aa, bb, cc, dd, F3, K3, in[3],  11);
@@ -178,7 +178,7 @@ static void rmd256_transform(u32 *state, const __le32 *in)
        ROUND(bbb, ccc, ddd, aaa, F2, KK3, in[13],  5);
 
        /* Swap contents of "c" registers */
-       tmp = cc; cc = ccc; ccc = tmp;
+       swap(cc, ccc);
 
        /* round 4: left lane */
        ROUND(aa, bb, cc, dd, F4, K4, in[1],  11);
@@ -217,7 +217,7 @@ static void rmd256_transform(u32 *state, const __le32 *in)
        ROUND(bbb, ccc, ddd, aaa, F1, KK4, in[14],  8);
 
        /* Swap contents of "d" registers */
-       tmp = dd; dd = ddd; ddd = tmp;
+       swap(dd, ddd);
 
        /* combine results */
        state[0] += aa;
@@ -322,7 +322,6 @@ static struct shash_alg alg = {
        .descsize       =       sizeof(struct rmd256_ctx),
        .base           =       {
                .cra_name        =      "rmd256",
-               .cra_flags       =      CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize   =      RMD256_BLOCK_SIZE,
                .cra_module      =      THIS_MODULE,
        }