git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: usb-audio: add support for Akai MPD16
[safe/jmp/linux-2.6]
/
crypto
/
khazad.c
diff --git
a/crypto/khazad.c
b/crypto/khazad.c
index
5b8dc9a
..
527e4e3
100644
(file)
--- a/
crypto/khazad.c
+++ b/
crypto/khazad.c
@@
-23,7
+23,6
@@
#include <linux/module.h>
#include <linux/mm.h>
#include <asm/byteorder.h>
#include <linux/module.h>
#include <linux/mm.h>
#include <asm/byteorder.h>
-#include <asm/scatterlist.h>
#include <linux/crypto.h>
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/types.h>
@@
-754,20
+753,14
@@
static const u64 c[KHAZAD_ROUNDS + 1] = {
0xccc41d14c363da5dULL, 0x5fdc7dcd7f5a6c5cULL, 0xf726ffede89d6f8eULL
};
0xccc41d14c363da5dULL, 0x5fdc7dcd7f5a6c5cULL, 0xf726ffede89d6f8eULL
};
-static int khazad_setkey(
void *ctx_arg
, const u8 *in_key,
-
unsigned int key_len, u32 *flags
)
+static int khazad_setkey(
struct crypto_tfm *tfm
, const u8 *in_key,
+
unsigned int key_len
)
{
{
- struct khazad_ctx *ctx = c
tx_arg
;
+ struct khazad_ctx *ctx = c
rypto_tfm_ctx(tfm)
;
const __be32 *key = (const __be32 *)in_key;
int r;
const u64 *S = T7;
u64 K2, K1;
const __be32 *key = (const __be32 *)in_key;
int r;
const u64 *S = T7;
u64 K2, K1;
-
- if (key_len != 16)
- {
- *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
- return -EINVAL;
- }
/* key is supposed to be 32-bit aligned */
K2 = ((u64)be32_to_cpu(key[0]) << 32) | be32_to_cpu(key[1]);
/* key is supposed to be 32-bit aligned */
K2 = ((u64)be32_to_cpu(key[0]) << 32) | be32_to_cpu(key[1]);
@@
-841,15
+834,15
@@
static void khazad_crypt(const u64 roundKey[KHAZAD_ROUNDS + 1],
*dst = cpu_to_be64(state);
}
*dst = cpu_to_be64(state);
}
-static void khazad_encrypt(
void *ctx_arg
, u8 *dst, const u8 *src)
+static void khazad_encrypt(
struct crypto_tfm *tfm
, u8 *dst, const u8 *src)
{
{
- struct khazad_ctx *ctx = c
tx_arg
;
+ struct khazad_ctx *ctx = c
rypto_tfm_ctx(tfm)
;
khazad_crypt(ctx->E, dst, src);
}
khazad_crypt(ctx->E, dst, src);
}
-static void khazad_decrypt(
void *ctx_arg
, u8 *dst, const u8 *src)
+static void khazad_decrypt(
struct crypto_tfm *tfm
, u8 *dst, const u8 *src)
{
{
- struct khazad_ctx *ctx = c
tx_arg
;
+ struct khazad_ctx *ctx = c
rypto_tfm_ctx(tfm)
;
khazad_crypt(ctx->D, dst, src);
}
khazad_crypt(ctx->D, dst, src);
}
@@
-869,7
+862,7
@@
static struct crypto_alg khazad_alg = {
.cia_decrypt = khazad_decrypt } }
};
.cia_decrypt = khazad_decrypt } }
};
-static int __init init(void)
+static int __init
khazad_mod_
init(void)
{
int ret = 0;
{
int ret = 0;
@@
-877,14
+870,14
@@
static int __init init(void)
return ret;
}
return ret;
}
-static void __exit fini(void)
+static void __exit
khazad_mod_
fini(void)
{
crypto_unregister_alg(&khazad_alg);
}
{
crypto_unregister_alg(&khazad_alg);
}
-module_init(init);
-module_exit(fini);
+module_init(
khazad_mod_
init);
+module_exit(
khazad_mod_
fini);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Khazad Cryptographic Algorithm");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Khazad Cryptographic Algorithm");