adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 11:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

crypto: null - Switch to shash

Browse source 
This patch changes digest_null to the new shash interface.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2008-11-08 08:09:56 +08:00
parent 3751f402e0
commit d35d2454ce
2 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crypto/Kconfig
View file

@ -102,6 +102,7 @@ config CRYPTO_NULL
tristate "Null algorithms" tristate "Null algorithms"
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
select CRYPTO_BLKCIPHER select CRYPTO_BLKCIPHER
select CRYPTO_HASH
help help
These are 'Null' algorithms, used by IPsec, which do nothing. These are 'Null' algorithms, used by IPsec, which do nothing.

64
crypto/crypto_null.c
View file

@ -17,6 +17,7 @@
* *
*/ */
#include <crypto/internal/hash.h>
#include <crypto/internal/skcipher.h> #include <crypto/internal/skcipher.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
@ -38,15 +39,31 @@ static int null_compress(struct crypto_tfm *tfm, const u8 *src,
return 0; return 0;
} }
static void null_init(struct crypto_tfm *tfm) static int null_init(struct shash_desc *desc)
{ } {
return 0;
}
static void null_update(struct crypto_tfm *tfm, const u8 *data, static int null_update(struct shash_desc *desc, const u8 *data,
unsigned int len) unsigned int len)
{ } {
return 0;
}
static void null_final(struct crypto_tfm *tfm, u8 *out) static int null_final(struct shash_desc *desc, u8 *out)
{ } {
return 0;
}
static int null_digest(struct shash_desc *desc, const u8 *data,
unsigned int len, u8 *out)
{
return 0;
}
static int null_hash_setkey(struct crypto_shash *tfm, const u8 *key,
unsigned int keylen)
{ return 0; }
static int null_setkey(struct crypto_tfm *tfm, const u8 *key, static int null_setkey(struct crypto_tfm *tfm, const u8 *key,
unsigned int keylen) unsigned int keylen)
@ -89,19 +106,20 @@ static struct crypto_alg compress_null = {
.coa_decompress = null_compress } } .coa_decompress = null_compress } }
}; };
static struct crypto_alg digest_null = { static struct shash_alg digest_null = {
.cra_name = "digest_null", .digestsize = NULL_DIGEST_SIZE,
.cra_flags = CRYPTO_ALG_TYPE_DIGEST, .setkey = null_hash_setkey,
.cra_blocksize = NULL_BLOCK_SIZE, .init = null_init,
.cra_ctxsize = 0, .update = null_update,
.cra_module = THIS_MODULE, .finup = null_digest,
.cra_list = LIST_HEAD_INIT(digest_null.cra_list), .digest = null_digest,
.cra_u = { .digest = { .final = null_final,
.dia_digestsize = NULL_DIGEST_SIZE, .base = {
.dia_setkey = null_setkey, .cra_name = "digest_null",
.dia_init = null_init, .cra_flags = CRYPTO_ALG_TYPE_SHASH,
.dia_update = null_update, .cra_blocksize = NULL_BLOCK_SIZE,
.dia_final = null_final } } .cra_module = THIS_MODULE,
}
}; };
static struct crypto_alg cipher_null = { static struct crypto_alg cipher_null = {
@ -154,7 +172,7 @@ static int __init crypto_null_mod_init(void)
if (ret < 0) if (ret < 0)
goto out_unregister_cipher; goto out_unregister_cipher;
ret = crypto_register_alg(&digest_null); ret = crypto_register_shash(&digest_null);
if (ret < 0) if (ret < 0)
goto out_unregister_skcipher; goto out_unregister_skcipher;
@ -166,7 +184,7 @@ out:
return ret; return ret;
out_unregister_digest: out_unregister_digest:
crypto_unregister_alg(&digest_null); crypto_unregister_shash(&digest_null);
out_unregister_skcipher: out_unregister_skcipher:
crypto_unregister_alg(&skcipher_null); crypto_unregister_alg(&skcipher_null);
out_unregister_cipher: out_unregister_cipher:
@ -177,7 +195,7 @@ out_unregister_cipher:
static void __exit crypto_null_mod_fini(void) static void __exit crypto_null_mod_fini(void)
{ {
crypto_unregister_alg(&compress_null); crypto_unregister_alg(&compress_null);
crypto_unregister_alg(&digest_null); crypto_unregister_shash(&digest_null);
crypto_unregister_alg(&skcipher_null); crypto_unregister_alg(&skcipher_null);
crypto_unregister_alg(&cipher_null); crypto_unregister_alg(&cipher_null);
} }