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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] skcipher: Fix section mismatches
This commit is contained in:
Linus Torvalds 2008-03-09 10:06:14 -07:00
commit 83f7a2c118
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/chainiv.c
View File

@ -318,10 +318,8 @@ int __init chainiv_module_init(void)
{ {
return crypto_register_template(&chainiv_tmpl); return crypto_register_template(&chainiv_tmpl);
} }
EXPORT_SYMBOL_GPL(chainiv_module_init);
void __exit chainiv_module_exit(void) void chainiv_module_exit(void)
{ {
crypto_unregister_template(&chainiv_tmpl); crypto_unregister_template(&chainiv_tmpl);
} }
EXPORT_SYMBOL_GPL(chainiv_module_exit);

2
crypto/eseqiv.c
View File

@ -251,10 +251,8 @@ int __init eseqiv_module_init(void)
{ {
return crypto_register_template(&eseqiv_tmpl); return crypto_register_template(&eseqiv_tmpl);
} }
EXPORT_SYMBOL_GPL(eseqiv_module_init);
void __exit eseqiv_module_exit(void) void __exit eseqiv_module_exit(void)
{ {
crypto_unregister_template(&eseqiv_tmpl); crypto_unregister_template(&eseqiv_tmpl);
} }
EXPORT_SYMBOL_GPL(eseqiv_module_exit);

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

@ -68,7 +68,7 @@ void skcipher_geniv_exit(struct crypto_tfm *tfm);
int __init eseqiv_module_init(void); int __init eseqiv_module_init(void);
void __exit eseqiv_module_exit(void); void __exit eseqiv_module_exit(void);
int __init chainiv_module_init(void); int __init chainiv_module_init(void);
void __exit chainiv_module_exit(void); void chainiv_module_exit(void);
static inline struct crypto_ablkcipher *skcipher_geniv_cipher( static inline struct crypto_ablkcipher *skcipher_geniv_cipher(
struct crypto_ablkcipher *geniv) struct crypto_ablkcipher *geniv)