[PATCH v4 2/3] staging: skein: Adds Loadable Module Support

2014-10-23 Thread Eric Rost 
Adds loadable module support for the Skein Hashing Algorithm.

Signed-off-by: Eric Rost 
---
 drivers/staging/skein/Kconfig |  2 +-
 drivers/staging/skein/skein_generic.c | 19 ++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/skein/Kconfig b/drivers/staging/skein/Kconfig
index de8bdd7..012a823 100644
--- 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/skein_generic.c 
b/drivers/staging/skein/skein_generic.c
index 815f9a4..3c9c6d0 100644
--- a/drivers/staging/skein/skein_generic.c
+++ b/drivers/staging/skein/skein_generic.c
@@ -16,6 +16,7 @@
  */
 #include 
 #include 
+#include 
 #include 
 #include "skein_base.h"
 
@@ -142,6 +143,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,
}
 };
 
@@ -159,6 +161,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,
}
 };
 
@@ -176,6 +179,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,
}
 };
 
@@ -191,4 +195,17 @@ static int __init skein_generic_init(void)
return 0;
 }
 
-device_initcall(skein_generic_init);
+static void __exit skein_generic_fini(void)
+{
+   crypto_unregister_shash();
+   crypto_unregister_shash();
+   crypto_unregister_shash();
+}
+
+module_init(skein_generic_init);
+module_exit(skein_generic_fini);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Skein Hash Algorithm");
+
+MODULE_ALIAS("skein");
-- 
2.1.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v4 2/3] staging: skein: Adds Loadable Module Support

2014-10-23 Thread Eric Rost 
Adds loadable module support for the Skein Hashing Algorithm.

Signed-off-by: Eric Rost eric.r...@mybabylon.net
---
 drivers/staging/skein/Kconfig |  2 +-
 drivers/staging/skein/skein_generic.c | 19 ++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/skein/Kconfig b/drivers/staging/skein/Kconfig
index de8bdd7..012a823 100644
--- 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/skein_generic.c 
b/drivers/staging/skein/skein_generic.c
index 815f9a4..3c9c6d0 100644
--- 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
 
@@ -142,6 +143,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,
}
 };
 
@@ -159,6 +161,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,
}
 };
 
@@ -176,6 +179,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,
}
 };
 
@@ -191,4 +195,17 @@ static int __init skein_generic_init(void)
return 0;
 }
 
-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);
-- 
2.1.1

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/