Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83f7a2c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] skcipher: Fix section mismatches
parents ab875cf6 f13ba2f7

crypto/chainiv.c

+1 −3
Original line number Diff line number Diff line
@@ -318,10 +318,8 @@ int __init chainiv_module_init(void) 
{

	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);

}
 
EXPORT_SYMBOL_GPL(chainiv_module_exit);

crypto/eseqiv.c

+0 −2
Original line number Diff line number Diff line
@@ -251,10 +251,8 @@ int __init eseqiv_module_init(void) 
{

	return crypto_register_template(&eseqiv_tmpl);

}

EXPORT_SYMBOL_GPL(eseqiv_module_init);



void __exit eseqiv_module_exit(void)

{

	crypto_unregister_template(&eseqiv_tmpl);

}
 
EXPORT_SYMBOL_GPL(eseqiv_module_exit);

include/crypto/internal/skcipher.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 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);

void chainiv_module_exit(void);



static inline struct crypto_ablkcipher *skcipher_geniv_cipher(

	struct crypto_ablkcipher *geniv)