git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
crypto
/
sha256.c
diff --git
a/crypto/sha256.c
b/crypto/sha256.c
index
9d5ef67
..
bc71d85
100644
(file)
--- a/
crypto/sha256.c
+++ b/
crypto/sha256.c
@@
-230,9
+230,9
@@
static void sha256_transform(u32 *state, const u8 *input)
memset(W, 0, 64 * sizeof(u32));
}
memset(W, 0, 64 * sizeof(u32));
}
-static void sha256_init(
void *ctx
)
+static void sha256_init(
struct crypto_tfm *tfm
)
{
{
- struct sha256_ctx *sctx = c
tx
;
+ struct sha256_ctx *sctx = c
rypto_tfm_ctx(tfm)
;
sctx->state[0] = H0;
sctx->state[1] = H1;
sctx->state[2] = H2;
sctx->state[0] = H0;
sctx->state[1] = H1;
sctx->state[2] = H2;
@@
-242,12
+242,12
@@
static void sha256_init(void *ctx)
sctx->state[6] = H6;
sctx->state[7] = H7;
sctx->count[0] = sctx->count[1] = 0;
sctx->state[6] = H6;
sctx->state[7] = H7;
sctx->count[0] = sctx->count[1] = 0;
- memset(sctx->buf, 0, sizeof(sctx->buf));
}
}
-static void sha256_update(void *ctx, const u8 *data, unsigned int len)
+static void sha256_update(struct crypto_tfm *tfm, const u8 *data,
+ unsigned int len)
{
{
- struct sha256_ctx *sctx = c
tx
;
+ struct sha256_ctx *sctx = c
rypto_tfm_ctx(tfm)
;
unsigned int i, index, part_len;
/* Compute number of bytes mod 128 */
unsigned int i, index, part_len;
/* Compute number of bytes mod 128 */
@@
-277,9
+277,9
@@
static void sha256_update(void *ctx, const u8 *data, unsigned int len)
memcpy(&sctx->buf[index], &data[i], len-i);
}
memcpy(&sctx->buf[index], &data[i], len-i);
}
-static void sha256_final(
void* ctx
, u8 *out)
+static void sha256_final(
struct crypto_tfm *tfm
, u8 *out)
{
{
- struct sha256_ctx *sctx = c
tx
;
+ struct sha256_ctx *sctx = c
rypto_tfm_ctx(tfm)
;
__be32 *dst = (__be32 *)out;
__be32 bits[2];
unsigned int index, pad_len;
__be32 *dst = (__be32 *)out;
__be32 bits[2];
unsigned int index, pad_len;
@@
-293,10
+293,10
@@
static void sha256_final(void* ctx, u8 *out)
/* Pad out to 56 mod 64. */
index = (sctx->count[0] >> 3) & 0x3f;
pad_len = (index < 56) ? (56 - index) : ((64+56) - index);
/* Pad out to 56 mod 64. */
index = (sctx->count[0] >> 3) & 0x3f;
pad_len = (index < 56) ? (56 - index) : ((64+56) - index);
- sha256_update(
sctx
, padding, pad_len);
+ sha256_update(
tfm
, padding, pad_len);
/* Append length (before padding) */
/* Append length (before padding) */
- sha256_update(
sctx
, (const u8 *)bits, sizeof(bits));
+ sha256_update(
tfm
, (const u8 *)bits, sizeof(bits));
/* Store state in digest */
for (i = 0; i < 8; i++)
/* Store state in digest */
for (i = 0; i < 8; i++)
@@
-313,6
+313,7
@@
static struct crypto_alg alg = {
.cra_blocksize = SHA256_HMAC_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct sha256_ctx),
.cra_module = THIS_MODULE,
.cra_blocksize = SHA256_HMAC_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct sha256_ctx),
.cra_module = THIS_MODULE,
+ .cra_alignmask = 3,
.cra_list = LIST_HEAD_INIT(alg.cra_list),
.cra_u = { .digest = {
.dia_digestsize = SHA256_DIGEST_SIZE,
.cra_list = LIST_HEAD_INIT(alg.cra_list),
.cra_u = { .digest = {
.dia_digestsize = SHA256_DIGEST_SIZE,