Commit 18e33e6d authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: hash - Move ahash functions into crypto/hash.h 



All new crypto interfaces should go into individual files as much
as possible in order to ensure that crypto.h does not collapse under
its own weight.

This patch moves the ahash code into crypto/hash.h and crypto/internal/hash.h
respectively.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5773a3e6

crypto/cryptd.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include <crypto/algapi.h>

#include <crypto/internal/hash.h>

#include <linux/err.h>

#include <linux/init.h>

#include <linux/kernel.h>

crypto/digest.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 *

 */



#include <crypto/internal/hash.h>

#include <crypto/scatterwalk.h>

#include <linux/mm.h>

#include <linux/errno.h>

crypto/hash.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * any later version.

 */



#include <crypto/internal/hash.h>

#include <linux/errno.h>

#include <linux/kernel.h>

#include <linux/module.h>

crypto/tcrypt.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 *

 */



#include <crypto/hash.h>

#include <linux/err.h>

#include <linux/init.h>

#include <linux/module.h>

include/crypto/algapi.h

+0 −36
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ extern const struct crypto_type crypto_ablkcipher_type; 
extern const struct crypto_type crypto_aead_type;

extern const struct crypto_type crypto_blkcipher_type;

extern const struct crypto_type crypto_hash_type;

extern const struct crypto_type crypto_ahash_type;



void crypto_mod_put(struct crypto_alg *alg);
@@ -315,40 +314,5 @@ static inline int crypto_requires_sync(u32 type, u32 mask) 
	return (type ^ CRYPTO_ALG_ASYNC) & mask & CRYPTO_ALG_ASYNC;

}



static inline void *crypto_ahash_ctx(struct crypto_ahash *tfm)

{

	return crypto_tfm_ctx(&tfm->base);

}



static inline struct ahash_alg *crypto_ahash_alg(

	struct crypto_ahash *tfm)

{

	return &crypto_ahash_tfm(tfm)->__crt_alg->cra_ahash;

}



static inline int ahash_enqueue_request(struct crypto_queue *queue,

					     struct ahash_request *request)

{

	return crypto_enqueue_request(queue, &request->base);

}



static inline struct ahash_request *ahash_dequeue_request(

	struct crypto_queue *queue)

{

	return ahash_request_cast(crypto_dequeue_request(queue));

}



static inline void *ahash_request_ctx(struct ahash_request *req)

{

	return req->__ctx;

}



static inline int ahash_tfm_in_queue(struct crypto_queue *queue,

					  struct crypto_ahash *tfm)

{

	return crypto_tfm_in_queue(queue, crypto_ahash_tfm(tfm));

}





#endif	/* _CRYPTO_ALGAPI_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE