aboutsummaryrefslogtreecommitdiffstats
path: root/module/icp/io/skein_mod.c
diff options
context:
space:
mode:
Diffstat (limited to 'module/icp/io/skein_mod.c')
-rw-r--r--module/icp/io/skein_mod.c29
1 files changed, 2 insertions, 27 deletions
diff --git a/module/icp/io/skein_mod.c b/module/icp/io/skein_mod.c
index 49dcbadd8..250c0001a 100644
--- a/module/icp/io/skein_mod.c
+++ b/module/icp/io/skein_mod.c
@@ -23,7 +23,6 @@
* Copyright 2013 Saso Kiselkov. All rights reserved.
*/
-#include <sys/modctl.h>
#include <sys/crypto/common.h>
#include <sys/crypto/icp.h>
#include <sys/crypto/spi.h>
@@ -31,25 +30,6 @@
#define SKEIN_MODULE_IMPL
#include <sys/skein.h>
-/*
- * Like the sha2 module, we create the skein module with two modlinkages:
- * - modlmisc to allow direct calls to Skein_* API functions.
- * - modlcrypto to integrate well into the Kernel Crypto Framework (KCF).
- */
-static struct modlmisc modlmisc = {
- &mod_cryptoops,
- "Skein Message-Digest Algorithm"
-};
-
-static struct modlcrypto modlcrypto = {
- &mod_cryptoops,
- "Skein Kernel SW Provider"
-};
-
-static struct modlinkage modlinkage = {
- MODREV_1, {&modlmisc, &modlcrypto, NULL}
-};
-
static crypto_mech_info_t skein_mech_info_tab[] = {
{CKM_SKEIN_256, SKEIN_256_MECH_INFO_TYPE,
CRYPTO_FG_DIGEST | CRYPTO_FG_DIGEST_ATOMIC,
@@ -214,11 +194,6 @@ skein_get_digest_bitlen(const crypto_mechanism_t *mechanism, size_t *result)
int
skein_mod_init(void)
{
- int error;
-
- if ((error = mod_install(&modlinkage)) != 0)
- return (error);
-
/*
* Try to register with KCF - failure shouldn't unload us, since we
* still may want to continue providing misc/skein functionality.
@@ -231,7 +206,7 @@ skein_mod_init(void)
int
skein_mod_fini(void)
{
- int ret;
+ int ret = 0;
if (skein_prov_handle != 0) {
if ((ret = crypto_unregister_provider(skein_prov_handle)) !=
@@ -244,7 +219,7 @@ skein_mod_fini(void)
skein_prov_handle = 0;
}
- return (mod_remove(&modlinkage));
+ return (0);
}
/*