diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 11:19:47 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 11:19:47 +0800 |
commit | 8322c8407e49034b534abd03d7daa9e267139b4e (patch) | |
tree | cad5cc216e7ef7a5e25e135c94f511cd3e59088c /crypto/ghash-generic.c | |
parent | 9900fc24982726c6957b008d35ef281ecada85fb (diff) | |
parent | 06b68744d85e6d6fb2e54bdb1aae6ec6599790d6 (diff) | |
download | linux-crypto-8322c8407e49034b534abd03d7daa9e267139b4e.tar.gz linux-crypto-8322c8407e49034b534abd03d7daa9e267139b4e.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in vmx ghash fix.
Diffstat (limited to '')
-rw-r--r-- | crypto/ghash-generic.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/crypto/ghash-generic.c b/crypto/ghash-generic.c index bac70995..12ad3e3a 100644 --- a/crypto/ghash-generic.c +++ b/crypto/ghash-generic.c @@ -14,24 +14,13 @@ #include <crypto/algapi.h> #include <crypto/gf128mul.h> +#include <crypto/ghash.h> #include <crypto/internal/hash.h> #include <linux/crypto.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> -#define GHASH_BLOCK_SIZE 16 -#define GHASH_DIGEST_SIZE 16 - -struct ghash_ctx { - struct gf128mul_4k *gf128; -}; - -struct ghash_desc_ctx { - u8 buffer[GHASH_BLOCK_SIZE]; - u32 bytes; -}; - static int ghash_init(struct shash_desc *desc) { struct ghash_desc_ctx *dctx = shash_desc_ctx(desc); |