projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[AF_UNIX]: Fix datagram connect race causing an OOPS.
[powerpc.git]
/
crypto
/
des.c
diff --git
a/crypto/des.c
b/crypto/des.c
index
2d74cab
..
1df3a71
100644
(file)
--- a/
crypto/des.c
+++ b/
crypto/des.c
@@
-783,9
+783,11
@@
static void dkey(u32 *pe, const u8 *k)
}
}
}
}
-static int des_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
+static int des_setkey(struct crypto_tfm *tfm, const u8 *key,
+ unsigned int keylen)
{
{
- struct des_ctx *dctx = ctx;
+ struct des_ctx *dctx = crypto_tfm_ctx(tfm);
+ u32 *flags = &tfm->crt_flags;
u32 tmp[DES_EXPKEY_WORDS];
int ret;
u32 tmp[DES_EXPKEY_WORDS];
int ret;
@@
-803,9
+805,10
@@
static int des_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
return 0;
}
return 0;
}
-static void des_encrypt(
void *ctx
, u8 *dst, const u8 *src)
+static void des_encrypt(
struct crypto_tfm *tfm
, u8 *dst, const u8 *src)
{
{
- const u32 *K = ((struct des_ctx *)ctx)->expkey;
+ struct des_ctx *ctx = crypto_tfm_ctx(tfm);
+ const u32 *K = ctx->expkey;
const __le32 *s = (const __le32 *)src;
__le32 *d = (__le32 *)dst;
u32 L, R, A, B;
const __le32 *s = (const __le32 *)src;
__le32 *d = (__le32 *)dst;
u32 L, R, A, B;
@@
-825,9
+828,10
@@
static void des_encrypt(void *ctx, u8 *dst, const u8 *src)
d[1] = cpu_to_le32(L);
}
d[1] = cpu_to_le32(L);
}
-static void des_decrypt(
void *ctx
, u8 *dst, const u8 *src)
+static void des_decrypt(
struct crypto_tfm *tfm
, u8 *dst, const u8 *src)
{
{
- const u32 *K = ((struct des_ctx *)ctx)->expkey + DES_EXPKEY_WORDS - 2;
+ struct des_ctx *ctx = crypto_tfm_ctx(tfm);
+ const u32 *K = ctx->expkey + DES_EXPKEY_WORDS - 2;
const __le32 *s = (const __le32 *)src;
__le32 *d = (__le32 *)dst;
u32 L, R, A, B;
const __le32 *s = (const __le32 *)src;
__le32 *d = (__le32 *)dst;
u32 L, R, A, B;
@@
-860,12
+864,13
@@
static void des_decrypt(void *ctx, u8 *dst, const u8 *src)
* property.
*
*/
* property.
*
*/
-static int des3_ede_setkey(
void *ctx
, const u8 *key,
- unsigned int keylen
, u32 *flags
)
+static int des3_ede_setkey(
struct crypto_tfm *tfm
, const u8 *key,
+ unsigned int keylen)
{
const u32 *K = (const u32 *)key;
{
const u32 *K = (const u32 *)key;
- struct des3_ede_ctx *dctx = c
tx
;
+ struct des3_ede_ctx *dctx = c
rypto_tfm_ctx(tfm)
;
u32 *expkey = dctx->expkey;
u32 *expkey = dctx->expkey;
+ u32 *flags = &tfm->crt_flags;
if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
!((K[2] ^ K[4]) | (K[3] ^ K[5]))))
if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
!((K[2] ^ K[4]) | (K[3] ^ K[5]))))
@@
-881,9
+886,9
@@
static int des3_ede_setkey(void *ctx, const u8 *key,
return 0;
}
return 0;
}
-static void des3_ede_encrypt(
void *ctx
, u8 *dst, const u8 *src)
+static void des3_ede_encrypt(
struct crypto_tfm *tfm
, u8 *dst, const u8 *src)
{
{
- struct des3_ede_ctx *dctx = c
tx
;
+ struct des3_ede_ctx *dctx = c
rypto_tfm_ctx(tfm)
;
const u32 *K = dctx->expkey;
const __le32 *s = (const __le32 *)src;
__le32 *d = (__le32 *)dst;
const u32 *K = dctx->expkey;
const __le32 *s = (const __le32 *)src;
__le32 *d = (__le32 *)dst;
@@
-912,9
+917,9
@@
static void des3_ede_encrypt(void *ctx, u8 *dst, const u8 *src)
d[1] = cpu_to_le32(L);
}
d[1] = cpu_to_le32(L);
}
-static void des3_ede_decrypt(
void *ctx
, u8 *dst, const u8 *src)
+static void des3_ede_decrypt(
struct crypto_tfm *tfm
, u8 *dst, const u8 *src)
{
{
- struct des3_ede_ctx *dctx = c
tx
;
+ struct des3_ede_ctx *dctx = c
rypto_tfm_ctx(tfm)
;
const u32 *K = dctx->expkey + DES3_EDE_EXPKEY_WORDS - 2;
const __le32 *s = (const __le32 *)src;
__le32 *d = (__le32 *)dst;
const u32 *K = dctx->expkey + DES3_EDE_EXPKEY_WORDS - 2;
const __le32 *s = (const __le32 *)src;
__le32 *d = (__le32 *)dst;