diff options
| author | James Morris <jmorris@namei.org> | 2018-02-21 08:21:41 -0800 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2018-02-21 08:21:41 -0800 |
| commit | 45ce5d915020b8c76238e123748e0eb6e9ddd6ad (patch) | |
| tree | 916682ca7617ad686d2f8f9cac41ec4e9c432b00 /crypto/ghash-generic.c | |
| parent | 4a06f454768a7e11e8f10b900b450786546cbba1 (diff) | |
| parent | 17a3638239bb39acce5f03e779c69bc0e4a5c736 (diff) | |
| download | linux-crypto-45ce5d915020b8c76238e123748e0eb6e9ddd6ad.tar.gz linux-crypto-45ce5d915020b8c76238e123748e0eb6e9ddd6ad.zip | |
Merge tag 'v4.16-rc2' into next-general
Sync to Linux 4.16-rc2 for developers to work against.
Diffstat (limited to 'crypto/ghash-generic.c')
| -rw-r--r-- | crypto/ghash-generic.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/crypto/ghash-generic.c b/crypto/ghash-generic.c index 12ad3e3a..1bffb3f7 100644 --- a/crypto/ghash-generic.c +++ b/crypto/ghash-generic.c @@ -56,9 +56,6 @@ static int ghash_update(struct shash_desc *desc, struct ghash_ctx *ctx = crypto_shash_ctx(desc->tfm); u8 *dst = dctx->buffer; - if (!ctx->gf128) - return -ENOKEY; - if (dctx->bytes) { int n = min(srclen, dctx->bytes); u8 *pos = dst + (GHASH_BLOCK_SIZE - dctx->bytes); @@ -111,9 +108,6 @@ static int ghash_final(struct shash_desc *desc, u8 *dst) struct ghash_ctx *ctx = crypto_shash_ctx(desc->tfm); u8 *buf = dctx->buffer; - if (!ctx->gf128) - return -ENOKEY; - ghash_flush(ctx, dctx); memcpy(dst, buf, GHASH_BLOCK_SIZE); |