Skip to content

Commit

Permalink
crypto: ghash-generic - move common definitions to a new header file
Browse files Browse the repository at this point in the history
commit a397ba8 upstream.

Move common values and types used by ghash-generic to a new header file
so drivers can directly use ghash-generic as a fallback implementation.

Fixes: cc333cd ("crypto: vmx - Adding GHASH routines for VMX module")
Signed-off-by: Marcelo Cerri <marcelo.cerri@canonical.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
marcelocerri authored and gregkh committed Oct 22, 2016
1 parent 847d63f commit 4f8c2ad
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 12 deletions.
13 changes: 1 addition & 12 deletions crypto/ghash-generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
23 changes: 23 additions & 0 deletions include/crypto/ghash.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Common values for GHASH algorithms
*/

#ifndef __CRYPTO_GHASH_H__
#define __CRYPTO_GHASH_H__

#include <linux/types.h>
#include <crypto/gf128mul.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;
};

#endif

0 comments on commit 4f8c2ad

Please sign in to comment.