On Wed, Jul 09, 2008 at 03:37:32PM +0800, Herbert Xu wrote: > > diff --git a/include/crypto/hash.h b/include/crypto/hash.h > new file mode 100644 > index 0000000..f9d54c0 > --- /dev/null > +++ b/include/crypto/hash.h I've moved this file to include/crypto/internal since it's meant to be used by ahash implementors rather than uesrs. Cheers, -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} <herbert@xxxxxxxxxxxxxxxxxxx> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- diff --git a/crypto/ahash.c b/crypto/ahash.c index bb0239c..27128f2 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -13,7 +13,7 @@ * */ -#include <crypto/hash.h> +#include <crypto/internal/hash.h> #include <crypto/scatterwalk.h> #include <linux/err.h> #include <linux/kernel.h> diff --git a/crypto/crc32c.c b/crypto/crc32c.c index 7049a98..a882d9e 100644 --- a/crypto/crc32c.c +++ b/crypto/crc32c.c @@ -14,7 +14,7 @@ * */ -#include <crypto/hash.h> +#include <crypto/internal/hash.h> #include <linux/init.h> #include <linux/module.h> #include <linux/string.h> diff --git a/include/crypto/hash.h b/include/crypto/hash.h deleted file mode 100644 index f9d54c0..0000000 --- a/include/crypto/hash.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Hash algorithms. - * - * Copyright (c) 2008 Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - */ - -#ifndef _CRYPTO_HASH_H -#define _CRYPTO_HASH_H - -#include <crypto/algapi.h> - -struct ahash_request; -struct scatterlist; - -struct crypto_hash_walk { - char *data; - - unsigned int offset; - unsigned int alignmask; - - struct page *pg; - unsigned int entrylen; - - unsigned int total; - struct scatterlist *sg; - - unsigned int flags; -}; - -int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err); -int crypto_hash_walk_first(struct ahash_request *req, - struct crypto_hash_walk *walk); - -#endif /* _CRYPTO_HASH_H */ - diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h new file mode 100644 index 0000000..93ac422 --- /dev/null +++ b/include/crypto/internal/hash.h @@ -0,0 +1,41 @@ +/* + * Hash algorithms. + * + * Copyright (c) 2008 Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + */ + +#ifndef _CRYPTO_INTERNAL_HASH_H +#define _CRYPTO_INTERNAL_HASH_H + +#include <crypto/algapi.h> + +struct ahash_request; +struct scatterlist; + +struct crypto_hash_walk { + char *data; + + unsigned int offset; + unsigned int alignmask; + + struct page *pg; + unsigned int entrylen; + + unsigned int total; + struct scatterlist *sg; + + unsigned int flags; +}; + +int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err); +int crypto_hash_walk_first(struct ahash_request *req, + struct crypto_hash_walk *walk); + +#endif /* _CRYPTO_INTERNAL_HASH_H */ + -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
