Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 04:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CRYPTO] skcipher: Move chainiv/seqiv into crypto_blkcipher module

Browse Source 
For compatibility with dm-crypt initramfs setups it is useful to merge
chainiv/seqiv into the crypto_blkcipher module.  Since they're required
by most algorithms anyway this is an acceptable trade-off.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2008-02-23 11:12:06 +08:00
parent c8620c2590
commit 76fc60a2e3
6 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/Makefile
View File

@ -12,9 +12,9 @@ obj-$(CONFIG_CRYPTO_AEAD) += aead.o
crypto_blkcipher-objs := ablkcipher.o
crypto_blkcipher-objs += blkcipher.o
crypto_blkcipher-objs += chainiv.o
crypto_blkcipher-objs += eseqiv.o
obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o
obj-$(CONFIG_CRYPTO_BLKCIPHER) += chainiv.o
obj-$(CONFIG_CRYPTO_BLKCIPHER) += eseqiv.o
obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o
crypto_hash-objs := hash.o

3
crypto/ablkcipher.c
View File

@ -341,6 +341,3 @@ err:
return ERR_PTR(err);
}
EXPORT_SYMBOL_GPL(crypto_alloc_ablkcipher);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Asynchronous block chaining cipher type");

29
crypto/blkcipher.c
View File

@ -696,5 +696,34 @@ void skcipher_geniv_exit(struct crypto_tfm *tfm)
}
EXPORT_SYMBOL_GPL(skcipher_geniv_exit);
static int __init blkcipher_module_init(void)
{
int err;
err = chainiv_module_init();
if (err)
goto out;
err = eseqiv_module_init();
if (err)
goto eseqiv_err;
out:
return err;
eseqiv_err:
chainiv_module_exit();
goto out;
}
static void __exit blkcipher_module_exit(void)
{
eseqiv_module_exit();
chainiv_module_exit();
}
module_init(blkcipher_module_init);
module_exit(blkcipher_module_exit);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Generic block chaining cipher type");

12
crypto/chainiv.c
View File

@ -314,18 +314,14 @@ static struct crypto_template chainiv_tmpl = {
.module = THIS_MODULE,
};
static int __init chainiv_module_init(void)
int __init chainiv_module_init(void)
{
return crypto_register_template(&chainiv_tmpl);
}
EXPORT_SYMBOL_GPL(chainiv_module_init);
static void __exit chainiv_module_exit(void)
void __exit chainiv_module_exit(void)
{
crypto_unregister_template(&chainiv_tmpl);
}
module_init(chainiv_module_init);
module_exit(chainiv_module_exit);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Chain IV Generator");
EXPORT_SYMBOL_GPL(chainiv_module_exit);

12
crypto/eseqiv.c
View File

@ -247,18 +247,14 @@ static struct crypto_template eseqiv_tmpl = {
.module = THIS_MODULE,
};
static int __init eseqiv_module_init(void)
int __init eseqiv_module_init(void)
{
return crypto_register_template(&eseqiv_tmpl);
}
EXPORT_SYMBOL_GPL(eseqiv_module_init);
static void __exit eseqiv_module_exit(void)
void __exit eseqiv_module_exit(void)
{
crypto_unregister_template(&eseqiv_tmpl);
}
module_init(eseqiv_module_init);
module_exit(eseqiv_module_exit);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Encrypted Sequence Number IV Generator");
EXPORT_SYMBOL_GPL(eseqiv_module_exit);

6
include/crypto/internal/skcipher.h
View File

@ -15,6 +15,7 @@
#include <crypto/algapi.h>
#include <crypto/skcipher.h>
#include <linux/init.h>
#include <linux/types.h>
struct rtattr;
@ -64,6 +65,11 @@ void skcipher_geniv_free(struct crypto_instance *inst);
int skcipher_geniv_init(struct crypto_tfm *tfm);
void skcipher_geniv_exit(struct crypto_tfm *tfm);
int __init eseqiv_module_init(void);
void __exit eseqiv_module_exit(void);
int __init chainiv_module_init(void);
void __exit chainiv_module_exit(void);
static inline struct crypto_ablkcipher *skcipher_geniv_cipher(
struct crypto_ablkcipher *geniv)
{