git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus
[pandora-kernel.git]
/
crypto
/
wp512.c
diff --git
a/crypto/wp512.c
b/crypto/wp512.c
index
b226a12
..
bff2856
100644
(file)
--- a/
crypto/wp512.c
+++ b/
crypto/wp512.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>
@@
-981,9
+980,9
@@
static void wp512_process_buffer(struct wp512_ctx *wctx) {
}
}
-static void wp512_init (void *ctx) {
+static void wp512_init(struct crypto_tfm *tfm) {
+ struct wp512_ctx *wctx = crypto_tfm_ctx(tfm);
int i;
int i;
- struct wp512_ctx *wctx = ctx;
memset(wctx->bitLength, 0, 32);
wctx->bufferBits = wctx->bufferPos = 0;
memset(wctx->bitLength, 0, 32);
wctx->bufferBits = wctx->bufferPos = 0;
@@
-993,10
+992,10
@@
static void wp512_init (void *ctx) {
}
}
}
}
-static void wp512_update(void *ctx, const u8 *source, unsigned int len)
+static void wp512_update(struct crypto_tfm *tfm, const u8 *source,
+ unsigned int len)
{
{
-
- struct wp512_ctx *wctx = ctx;
+ struct wp512_ctx *wctx = crypto_tfm_ctx(tfm);
int sourcePos = 0;
unsigned int bits_len = len * 8; // convert to number of bits
int sourceGap = (8 - ((int)bits_len & 7)) & 7;
int sourcePos = 0;
unsigned int bits_len = len * 8; // convert to number of bits
int sourceGap = (8 - ((int)bits_len & 7)) & 7;
@@
-1054,9
+1053,9
@@
static void wp512_update(void *ctx, const u8 *source, unsigned int len)
}
}
-static void wp512_final(
void *ctx
, u8 *out)
+static void wp512_final(
struct crypto_tfm *tfm
, u8 *out)
{
{
- struct wp512_ctx *wctx = c
tx
;
+ struct wp512_ctx *wctx = c
rypto_tfm_ctx(tfm)
;
int i;
u8 *buffer = wctx->buffer;
u8 *bitLength = wctx->bitLength;
int i;
u8 *buffer = wctx->buffer;
u8 *bitLength = wctx->bitLength;
@@
-1087,22
+1086,20
@@
static void wp512_final(void *ctx, u8 *out)
wctx->bufferPos = bufferPos;
}
wctx->bufferPos = bufferPos;
}
-static void wp384_final(
void *ctx
, u8 *out)
+static void wp384_final(
struct crypto_tfm *tfm
, u8 *out)
{
{
- struct wp512_ctx *wctx = ctx;
u8 D[64];
u8 D[64];
- wp512_final
(wctx
, D);
+ wp512_final
(tfm
, D);
memcpy (out, D, WP384_DIGEST_SIZE);
memset (D, 0, WP512_DIGEST_SIZE);
}
memcpy (out, D, WP384_DIGEST_SIZE);
memset (D, 0, WP512_DIGEST_SIZE);
}
-static void wp256_final(
void *ctx
, u8 *out)
+static void wp256_final(
struct crypto_tfm *tfm
, u8 *out)
{
{
- struct wp512_ctx *wctx = ctx;
u8 D[64];
u8 D[64];
- wp512_final
(wctx
, D);
+ wp512_final
(tfm
, D);
memcpy (out, D, WP256_DIGEST_SIZE);
memset (D, 0, WP512_DIGEST_SIZE);
}
memcpy (out, D, WP256_DIGEST_SIZE);
memset (D, 0, WP512_DIGEST_SIZE);
}
@@
-1149,7
+1146,7
@@
static struct crypto_alg wp256 = {
.dia_final = wp256_final } }
};
.dia_final = wp256_final } }
};
-static int __init init(void)
+static int __init
wp512_mod_
init(void)
{
int ret = 0;
{
int ret = 0;
@@
-1175,7
+1172,7
@@
out:
return ret;
}
return ret;
}
-static void __exit fini(void)
+static void __exit
wp512_mod_
fini(void)
{
crypto_unregister_alg(&wp512);
crypto_unregister_alg(&wp384);
{
crypto_unregister_alg(&wp512);
crypto_unregister_alg(&wp384);
@@
-1185,8
+1182,8
@@
static void __exit fini(void)
MODULE_ALIAS("wp384");
MODULE_ALIAS("wp256");
MODULE_ALIAS("wp384");
MODULE_ALIAS("wp256");
-module_init(init);
-module_exit(fini);
+module_init(
wp512_mod_
init);
+module_exit(
wp512_mod_
fini);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Whirlpool Message Digest Algorithm");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Whirlpool Message Digest Algorithm");