crypto: x86/poly1305 - unify Poly1305 state struct with generic code

[linux-2.6-microblaze.git] / crypto / poly1305_generic.c

diff --git a/crypto/poly1305_generic.c b/crypto/poly1305_generic.c
index 067f493..f3fcd95 100644 (file)
--- a/crypto/poly1305_generic.c
+++ b/crypto/poly1305_generic.c
@@ -25,7 +25,7 @@ int crypto_poly1305_init(struct shash_desc *desc)
 
        poly1305_core_init(&dctx->h);
        dctx->buflen = 0;
-       dctx->rset = false;
+       dctx->rset = 0;
        dctx->sset = false;
 
        return 0;
@@ -43,7 +43,7 @@ static void poly1305_blocks(struct poly1305_desc_ctx *dctx, const u8 *src,
                srclen = datalen;
        }
 
-       poly1305_core_blocks(&dctx->h, &dctx->r, src,
+       poly1305_core_blocks(&dctx->h, dctx->r, src,
                             srclen / POLY1305_BLOCK_SIZE, 1);
 }
 
@@ -95,7 +95,7 @@ int crypto_poly1305_final(struct shash_desc *desc, u8 *dst)
                dctx->buf[dctx->buflen++] = 1;
                memset(dctx->buf + dctx->buflen, 0,
                       POLY1305_BLOCK_SIZE - dctx->buflen);
-               poly1305_core_blocks(&dctx->h, &dctx->r, dctx->buf, 1, 0);
+               poly1305_core_blocks(&dctx->h, dctx->r, dctx->buf, 1, 0);
        }
 
        poly1305_core_emit(&dctx->h, digest);