staging: skein: Adds Loadable Module Support

Adds loadable module support to the Skein Hashing Algorithm driver.

Signed-off-by: Eric Rost <eric.rost@mybabylon.net>
Reviewed-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/skein/Kconfig b/drivers/staging/skein/Kconfig
index de8bdd768a7fe484b9b4db25e4ec351fdf811988..012a8233376e31c16acad0a4e3156b80c82a4ebe 100644 (file)
--- a/drivers/staging/skein/Kconfig
+++ b/drivers/staging/skein/Kconfig
@@ -1,5 +1,5 @@
 config CRYPTO_SKEIN
-       bool "Skein digest algorithm"
+       tristate "Skein digest algorithm"
        depends on (X86 || UML_X86) && 64BIT && CRYPTO
        select CRYPTO_HASH
        select CRYPTO_ALGAPI

diff --git a/drivers/staging/skein/Makefile b/drivers/staging/skein/Makefile
index d8177cccf3f0e6beaa0dcb5653d31185f95471e9..b7f947fb98f0ff9a5bd1f30f6d78601ea4c3f15d 100644 (file)
--- a/drivers/staging/skein/Makefile
+++ b/drivers/staging/skein/Makefile
@@ -1,9 +1,10 @@
 #
 # Makefile for the skein secure hash algorithm
 #
-obj-$(CONFIG_CRYPTO_SKEIN) += skein_base.o \
-                             skein_api.o \
-                             skein_block.o \
-                             threefish_block.o \
-                             threefish_api.o \
-                             skein_generic.o
+obj-$(CONFIG_CRYPTO_SKEIN) += skein.o
+skein-y := skein_base.o \
+          skein_api.o \
+          skein_block.o \
+          threefish_block.o \
+          threefish_api.o \
+          skein_generic.o

diff --git a/drivers/staging/skein/skein_generic.c b/drivers/staging/skein/skein_generic.c
index f2d6dfbc66a4485528e86904d103b0661c9bee2c..60d16b639b912cf99de40970ebefa2ab30baa790 100644 (file)
--- a/drivers/staging/skein/skein_generic.c
+++ b/drivers/staging/skein/skein_generic.c
@@ -16,6 +16,7 @@
  */
 #include <linux/types.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <crypto/internal/hash.h>
 #include "skein_base.h"
 
@@ -139,6 +140,7 @@ static struct shash_alg alg256 = {
                .cra_driver_name        =       "skein",
                .cra_flags              =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          =       SKEIN_256_BLOCK_BYTES,
+               .cra_module             =       THIS_MODULE,
        }
 };
 
@@ -156,6 +158,7 @@ static struct shash_alg alg512 = {
                .cra_driver_name        =       "skein",
                .cra_flags              =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          =       SKEIN_512_BLOCK_BYTES,
+               .cra_module             =       THIS_MODULE,
        }
 };
 
@@ -173,6 +176,7 @@ static struct shash_alg alg1024 = {
                .cra_driver_name        =       "skein",
                .cra_flags              =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          =       SKEIN_1024_BLOCK_BYTES,
+               .cra_module             =       THIS_MODULE,
        }
 };
 
@@ -196,4 +200,17 @@ out:
        return -1;
 }
 
-device_initcall(skein_generic_init);
+static void __exit skein_generic_fini(void)
+{
+       crypto_unregister_shash(&alg256);
+       crypto_unregister_shash(&alg512);
+       crypto_unregister_shash(&alg1024);
+}
+
+module_init(skein_generic_init);
+module_exit(skein_generic_fini);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Skein Hash Algorithm");
+
+MODULE_ALIAS("skein");