apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

[CRYPTO] all: Pass tfm instead of ctx to algorithms

Browse Source 
Up until now algorithms have been happy to get a context pointer since
they know everything that's in the tfm already (e.g., alignment, block
size).

However, once we have parameterised algorithms, such information will
be specific to each tfm.  So the algorithm API needs to be changed to
pass the tfm structure instead of the context pointer.

This patch is basically a text substitution.  The only tricky bit is
the assembly routines that need to get the context pointer offset
through asm-offsets.h.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu
2006-05-16 22:09:29 +10:00
parent 43600106e3
commit 6c2bb98bc3
37 changed files with 349 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/i386/crypto/aes-i586-asm.S
+14 -14
View File
@@ -36,19 +36,19 @@
.file "aes-i586-asm.S" .file "aes-i586-asm.S"
.text .text
#include <asm/asm-offsets.h>
#define tlen 1024 // length of each of 4 'xor' arrays (256 32-bit words) #define tlen 1024 // length of each of 4 'xor' arrays (256 32-bit words)
// offsets to parameters with one register pushed onto stack /* offsets to parameters with one register pushed onto stack */
#define tfm 8
#define out_blk 12
#define in_blk 16
#define in_blk 16 // input byte array address parameter /* offsets in crypto_tfm structure */
#define out_blk 12 // output byte array address parameter #define ekey (crypto_tfm_ctx_offset + 0)
#define ctx 8 // AES context structure #define nrnd (crypto_tfm_ctx_offset + 256)
#define dkey (crypto_tfm_ctx_offset + 260)
// offsets in context structure
#define ekey 0 // encryption key schedule base address
#define nrnd 256 // number of rounds
#define dkey 260 // decryption key schedule base address
// register mapping for encrypt and decrypt subroutines // register mapping for encrypt and decrypt subroutines
@@ -217,7 +217,7 @@
do_col (table, r5,r0,r1,r4, r2,r3); /* idx=r5 */ do_col (table, r5,r0,r1,r4, r2,r3); /* idx=r5 */
// AES (Rijndael) Encryption Subroutine // AES (Rijndael) Encryption Subroutine
/* void aes_enc_blk(void *ctx, u8 *out_blk, const u8 *in_blk) */ /* void aes_enc_blk(struct crypto_tfm *tfm, u8 *out_blk, const u8 *in_blk) */
.global aes_enc_blk .global aes_enc_blk
@@ -228,7 +228,7 @@
aes_enc_blk: aes_enc_blk:
push %ebp push %ebp
mov ctx(%esp),%ebp // pointer to context mov tfm(%esp),%ebp
// CAUTION: the order and the values used in these assigns // CAUTION: the order and the values used in these assigns
// rely on the register mappings // rely on the register mappings
@@ -293,7 +293,7 @@ aes_enc_blk:
ret ret
// AES (Rijndael) Decryption Subroutine // AES (Rijndael) Decryption Subroutine
/* void aes_dec_blk(void *ctx, u8 *out_blk, const u8 *in_blk) */ /* void aes_dec_blk(struct crypto_tfm *tfm, u8 *out_blk, const u8 *in_blk) */
.global aes_dec_blk .global aes_dec_blk
@@ -304,7 +304,7 @@ aes_enc_blk:
aes_dec_blk: aes_dec_blk:
push %ebp push %ebp
mov ctx(%esp),%ebp // pointer to context mov tfm(%esp),%ebp
// CAUTION: the order and the values used in these assigns // CAUTION: the order and the values used in these assigns
// rely on the register mappings // rely on the register mappings
arch/i386/crypto/aes.c
+5 -5
View File
@@ -45,8 +45,8 @@
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/linkage.h> #include <linux/linkage.h>
asmlinkage void aes_enc_blk(void *ctx, u8 *dst, const u8 *src); asmlinkage void aes_enc_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
asmlinkage void aes_dec_blk(void *ctx, u8 *dst, const u8 *src); asmlinkage void aes_dec_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
#define AES_MIN_KEY_SIZE 16 #define AES_MIN_KEY_SIZE 16
#define AES_MAX_KEY_SIZE 32 #define AES_MAX_KEY_SIZE 32
@@ -378,12 +378,12 @@ static void gen_tabs(void)
k[8*(i)+11] = ss[3]; \ k[8*(i)+11] = ss[3]; \
} }
static int static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags) unsigned int key_len, u32 *flags)
{ {
int i; int i;
u32 ss[8]; u32 ss[8];
struct aes_ctx *ctx = ctx_arg; struct aes_ctx *ctx = crypto_tfm_ctx(tfm);
const __le32 *key = (const __le32 *)in_key; const __le32 *key = (const __le32 *)in_key;
/* encryption schedule */ /* encryption schedule */
arch/i386/kernel/asm-offsets.c
+3
View File
@@ -4,6 +4,7 @@
* to extract and format the required data. * to extract and format the required data.
*/ */
#include <linux/crypto.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/personality.h> #include <linux/personality.h>
@@ -69,4 +70,6 @@ void foo(void)
DEFINE(PAGE_SIZE_asm, PAGE_SIZE); DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL)); DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
} }
arch/s390/crypto/aes_s390.c
+7 -7
View File
@@ -37,10 +37,10 @@ struct s390_aes_ctx {
int key_len; int key_len;
}; };
static int aes_set_key(void *ctx, const u8 *in_key, unsigned int key_len, static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
u32 *flags) unsigned int key_len, u32 *flags)
{ {
struct s390_aes_ctx *sctx = ctx; struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
switch (key_len) { switch (key_len) {
case 16: case 16:
@@ -70,9 +70,9 @@ fail:
return -EINVAL; return -EINVAL;
} }
static void aes_encrypt(void *ctx, u8 *out, const u8 *in) static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
{ {
const struct s390_aes_ctx *sctx = ctx; const struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
switch (sctx->key_len) { switch (sctx->key_len) {
case 16: case 16:
@@ -90,9 +90,9 @@ static void aes_encrypt(void *ctx, u8 *out, const u8 *in)
} }
} }
static void aes_decrypt(void *ctx, u8 *out, const u8 *in) static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
{ {
const struct s390_aes_ctx *sctx = ctx; const struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
switch (sctx->key_len) { switch (sctx->key_len) {
case 16: case 16:
arch/s390/crypto/des_s390.c
+21 -21
View File
@@ -44,10 +44,10 @@ struct crypt_s390_des3_192_ctx {
u8 key[DES3_192_KEY_SIZE]; u8 key[DES3_192_KEY_SIZE];
}; };
static int des_setkey(void *ctx, const u8 *key, unsigned int keylen, static int des_setkey(struct crypto_tfm *tfm, const u8 *key,
u32 *flags) unsigned int keylen, u32 *flags)
{ {
struct crypt_s390_des_ctx *dctx = ctx; struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);
int ret; int ret;
/* test if key is valid (not a weak key) */ /* test if key is valid (not a weak key) */
@@ -57,16 +57,16 @@ static int des_setkey(void *ctx, const u8 *key, unsigned int keylen,
return ret; return ret;
} }
static void des_encrypt(void *ctx, u8 *out, const u8 *in) static void des_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
{ {
struct crypt_s390_des_ctx *dctx = ctx; struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);
crypt_s390_km(KM_DEA_ENCRYPT, dctx->key, out, in, DES_BLOCK_SIZE); crypt_s390_km(KM_DEA_ENCRYPT, dctx->key, out, in, DES_BLOCK_SIZE);
} }
static void des_decrypt(void *ctx, u8 *out, const u8 *in) static void des_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
{ {
struct crypt_s390_des_ctx *dctx = ctx; struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);
crypt_s390_km(KM_DEA_DECRYPT, dctx->key, out, in, DES_BLOCK_SIZE); crypt_s390_km(KM_DEA_DECRYPT, dctx->key, out, in, DES_BLOCK_SIZE);
} }
@@ -166,11 +166,11 @@ static struct crypto_alg des_alg = {
* Implementers MUST reject keys that exhibit this property. * Implementers MUST reject keys that exhibit this property.
* *
*/ */
static int des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen, static int des3_128_setkey(struct crypto_tfm *tfm, const u8 *key,
u32 *flags) unsigned int keylen, u32 *flags)
{ {
int i, ret; int i, ret;
struct crypt_s390_des3_128_ctx *dctx = ctx; struct crypt_s390_des3_128_ctx *dctx = crypto_tfm_ctx(tfm);
const u8* temp_key = key; const u8* temp_key = key;
if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE))) { if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE))) {
@@ -186,17 +186,17 @@ static int des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen,
return 0; return 0;
} }
static void des3_128_encrypt(void *ctx, u8 *dst, const u8 *src) static void des3_128_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
struct crypt_s390_des3_128_ctx *dctx = ctx; struct crypt_s390_des3_128_ctx *dctx = crypto_tfm_ctx(tfm);
crypt_s390_km(KM_TDEA_128_ENCRYPT, dctx->key, dst, (void*)src, crypt_s390_km(KM_TDEA_128_ENCRYPT, dctx->key, dst, (void*)src,
DES3_128_BLOCK_SIZE); DES3_128_BLOCK_SIZE);
} }
static void des3_128_decrypt(void *ctx, u8 *dst, const u8 *src) static void des3_128_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
struct crypt_s390_des3_128_ctx *dctx = ctx; struct crypt_s390_des3_128_ctx *dctx = crypto_tfm_ctx(tfm);
crypt_s390_km(KM_TDEA_128_DECRYPT, dctx->key, dst, (void*)src, crypt_s390_km(KM_TDEA_128_DECRYPT, dctx->key, dst, (void*)src,
DES3_128_BLOCK_SIZE); DES3_128_BLOCK_SIZE);
@@ -302,11 +302,11 @@ static struct crypto_alg des3_128_alg = {
* property. * property.
* *
*/ */
static int des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen, static int des3_192_setkey(struct crypto_tfm *tfm, const u8 *key,
u32 *flags) unsigned int keylen, u32 *flags)
{ {
int i, ret; int i, ret;
struct crypt_s390_des3_192_ctx *dctx = ctx; struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);
const u8* temp_key = key; const u8* temp_key = key;
if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) && if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&
@@ -325,17 +325,17 @@ static int des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen,
return 0; return 0;
} }
static void des3_192_encrypt(void *ctx, u8 *dst, const u8 *src) static void des3_192_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
struct crypt_s390_des3_192_ctx *dctx = ctx; struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);
crypt_s390_km(KM_TDEA_192_ENCRYPT, dctx->key, dst, (void*)src, crypt_s390_km(KM_TDEA_192_ENCRYPT, dctx->key, dst, (void*)src,
DES3_192_BLOCK_SIZE); DES3_192_BLOCK_SIZE);
} }
static void des3_192_decrypt(void *ctx, u8 *dst, const u8 *src) static void des3_192_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
struct crypt_s390_des3_192_ctx *dctx = ctx; struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);
crypt_s390_km(KM_TDEA_192_DECRYPT, dctx->key, dst, (void*)src, crypt_s390_km(KM_TDEA_192_DECRYPT, dctx->key, dst, (void*)src,
DES3_192_BLOCK_SIZE); DES3_192_BLOCK_SIZE);
arch/s390/crypto/sha1_s390.c
+7 -8
View File
@@ -40,9 +40,9 @@ struct crypt_s390_sha1_ctx {
u8 buffer[2 * SHA1_BLOCK_SIZE]; u8 buffer[2 * SHA1_BLOCK_SIZE];
}; };
static void sha1_init(void *ctx_arg) static void sha1_init(struct crypto_tfm *tfm)
{ {
struct crypt_s390_sha1_ctx *ctx = ctx_arg; struct crypt_s390_sha1_ctx *ctx = crypto_tfm_ctx(tfm);
static const u32 initstate[5] = { static const u32 initstate[5] = {
0x67452301, 0x67452301,
0xEFCDAB89, 0xEFCDAB89,
@@ -56,13 +56,13 @@ static void sha1_init(void *ctx_arg)
ctx->buf_len = 0; ctx->buf_len = 0;
} }
static void static void sha1_update(struct crypto_tfm *tfm, const u8 *data,
sha1_update(void *ctx, const u8 *data, unsigned int len) unsigned int len)
{ {
struct crypt_s390_sha1_ctx *sctx; struct crypt_s390_sha1_ctx *sctx;
long imd_len; long imd_len;
sctx = ctx; sctx = crypto_tfm_ctx(tfm);
sctx->count += len * 8; //message bit length sctx->count += len * 8; //message bit length
//anything in buffer yet? -> must be completed //anything in buffer yet? -> must be completed
@@ -111,10 +111,9 @@ pad_message(struct crypt_s390_sha1_ctx* sctx)
} }
/* Add padding and return the message digest. */ /* Add padding and return the message digest. */
static void static void sha1_final(struct crypto_tfm *tfm, u8 *out)
sha1_final(void* ctx, u8 *out)
{ {
struct crypt_s390_sha1_ctx *sctx = ctx; struct crypt_s390_sha1_ctx *sctx = crypto_tfm_ctx(tfm);
//must perform manual padding //must perform manual padding
pad_message(sctx); pad_message(sctx);
arch/s390/crypto/sha256_s390.c
+7 -6
View File
@@ -31,9 +31,9 @@ struct s390_sha256_ctx {
u8 buf[2 * SHA256_BLOCK_SIZE]; u8 buf[2 * SHA256_BLOCK_SIZE];
}; };
static void sha256_init(void *ctx) static void sha256_init(struct crypto_tfm *tfm)
{ {
struct s390_sha256_ctx *sctx = ctx; struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);
sctx->state[0] = 0x6a09e667; sctx->state[0] = 0x6a09e667;
sctx->state[1] = 0xbb67ae85; sctx->state[1] = 0xbb67ae85;
@@ -46,9 +46,10 @@ static void sha256_init(void *ctx)
sctx->count = 0; sctx->count = 0;
} }
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 s390_sha256_ctx *sctx = ctx; struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);
unsigned int index; unsigned int index;
int ret; int ret;
@@ -107,9 +108,9 @@ static void pad_message(struct s390_sha256_ctx* sctx)
} }
/* Add padding and return the message digest */ /* Add padding and return the message digest */
static void sha256_final(void* ctx, u8 *out) static void sha256_final(struct crypto_tfm *tfm, u8 *out)
{ {
struct s390_sha256_ctx *sctx = ctx; struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);
/* must perform manual padding */ /* must perform manual padding */
pad_message(sctx); pad_message(sctx);
arch/x86_64/crypto/aes-x86_64-asm.S
+11 -7
View File
@@ -15,6 +15,10 @@
.text .text
#include <asm/asm-offsets.h>
#define BASE crypto_tfm_ctx_offset
#define R1 %rax #define R1 %rax
#define R1E %eax #define R1E %eax
#define R1X %ax #define R1X %ax
@@ -46,19 +50,19 @@
#define R10 %r10 #define R10 %r10
#define R11 %r11 #define R11 %r11
#define prologue(FUNC,BASE,B128,B192,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11) \ #define prologue(FUNC,KEY,B128,B192,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11) \
.global FUNC; \ .global FUNC; \
.type FUNC,@function; \ .type FUNC,@function; \
.align 8; \ .align 8; \
FUNC: movq r1,r2; \ FUNC: movq r1,r2; \
movq r3,r4; \ movq r3,r4; \
leaq BASE+52(r8),r9; \ leaq BASE+KEY+52(r8),r9; \
movq r10,r11; \ movq r10,r11; \
movl (r7),r5 ## E; \ movl (r7),r5 ## E; \
movl 4(r7),r1 ## E; \ movl 4(r7),r1 ## E; \
movl 8(r7),r6 ## E; \ movl 8(r7),r6 ## E; \
movl 12(r7),r7 ## E; \ movl 12(r7),r7 ## E; \
movl (r8),r10 ## E; \ movl BASE(r8),r10 ## E; \
xorl -48(r9),r5 ## E; \ xorl -48(r9),r5 ## E; \
xorl -44(r9),r1 ## E; \ xorl -44(r9),r1 ## E; \
xorl -40(r9),r6 ## E; \ xorl -40(r9),r6 ## E; \
@@ -128,8 +132,8 @@ FUNC: movq r1,r2; \
movl r3 ## E,r1 ## E; \ movl r3 ## E,r1 ## E; \
movl r4 ## E,r2 ## E; movl r4 ## E,r2 ## E;
#define entry(FUNC,BASE,B128,B192) \ #define entry(FUNC,KEY,B128,B192) \
prologue(FUNC,BASE,B128,B192,R2,R8,R7,R9,R1,R3,R4,R6,R10,R5,R11) prologue(FUNC,KEY,B128,B192,R2,R8,R7,R9,R1,R3,R4,R6,R10,R5,R11)
#define return epilogue(R8,R2,R9,R7,R5,R6,R3,R4,R11) #define return epilogue(R8,R2,R9,R7,R5,R6,R3,R4,R11)
@@ -147,7 +151,7 @@ FUNC: movq r1,r2; \
#define decrypt_final(TAB,OFFSET) \ #define decrypt_final(TAB,OFFSET) \
round(TAB,OFFSET,R2,R1,R4,R3,R6,R5,R7,R10,R5,R6,R3,R4) round(TAB,OFFSET,R2,R1,R4,R3,R6,R5,R7,R10,R5,R6,R3,R4)
/* void aes_encrypt(void *ctx, u8 *out, const u8 *in) */ /* void aes_encrypt(stuct crypto_tfm *tfm, u8 *out, const u8 *in) */
entry(aes_encrypt,0,enc128,enc192) entry(aes_encrypt,0,enc128,enc192)
encrypt_round(aes_ft_tab,-96) encrypt_round(aes_ft_tab,-96)
@@ -166,7 +170,7 @@ enc128: encrypt_round(aes_ft_tab,-32)
encrypt_final(aes_fl_tab,112) encrypt_final(aes_fl_tab,112)
return return
/* void aes_decrypt(void *ctx, u8 *out, const u8 *in) */ /* void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) */
entry(aes_decrypt,240,dec128,dec192) entry(aes_decrypt,240,dec128,dec192)
decrypt_round(aes_it_tab,-96) decrypt_round(aes_it_tab,-96)
arch/x86_64/crypto/aes.c
+5 -5
View File
@@ -227,10 +227,10 @@ static void __init gen_tabs(void)
t ^= E_KEY[8 * i + 7]; E_KEY[8 * i + 15] = t; \ t ^= E_KEY[8 * i + 7]; E_KEY[8 * i + 15] = t; \
} }
static int aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
u32 *flags) unsigned int key_len, u32 *flags)
{ {
struct aes_ctx *ctx = ctx_arg; struct aes_ctx *ctx = crypto_tfm_ctx(tfm);
const __le32 *key = (const __le32 *)in_key; const __le32 *key = (const __le32 *)in_key;
u32 i, j, t, u, v, w; u32 i, j, t, u, v, w;
@@ -283,8 +283,8 @@ static int aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len,
return 0; return 0;
} }
extern void aes_encrypt(void *ctx_arg, u8 *out, const u8 *in); extern void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in);
extern void aes_decrypt(void *ctx_arg, u8 *out, const u8 *in); extern void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in);
static struct crypto_alg aes_alg = { static struct crypto_alg aes_alg = {
.cra_name = "aes", .cra_name = "aes",
arch/x86_64/kernel/asm-offsets.c
+3
View File
@@ -4,6 +4,7 @@
* and format the required data. * and format the required data.
*/ */
#include <linux/crypto.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/errno.h> #include <linux/errno.h>
@@ -68,5 +69,7 @@ int main(void)
DEFINE(pbe_next, offsetof(struct pbe, next)); DEFINE(pbe_next, offsetof(struct pbe, next));
BLANK(); BLANK();
DEFINE(TSS_ist, offsetof(struct tss_struct, ist)); DEFINE(TSS_ist, offsetof(struct tss_struct, ist));
BLANK();
DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
return 0; return 0;
} }
crypto/aes.c
+7 -7
View File
@@ -248,10 +248,10 @@ gen_tabs (void)
t ^= E_KEY[8 * i + 7]; E_KEY[8 * i + 15] = t; \ t ^= E_KEY[8 * i + 7]; E_KEY[8 * i + 15] = t; \
} }
static int static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags) unsigned int key_len, u32 *flags)
{ {
struct aes_ctx *ctx = ctx_arg; struct aes_ctx *ctx = crypto_tfm_ctx(tfm);
const __le32 *key = (const __le32 *)in_key; const __le32 *key = (const __le32 *)in_key;
u32 i, t, u, v, w; u32 i, t, u, v, w;
@@ -318,9 +318,9 @@ aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags)
f_rl(bo, bi, 2, k); \ f_rl(bo, bi, 2, k); \
f_rl(bo, bi, 3, k) f_rl(bo, bi, 3, k)
static void aes_encrypt(void *ctx_arg, u8 *out, const u8 *in) static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
{ {
const struct aes_ctx *ctx = ctx_arg; const struct aes_ctx *ctx = crypto_tfm_ctx(tfm);
const __le32 *src = (const __le32 *)in; const __le32 *src = (const __le32 *)in;
__le32 *dst = (__le32 *)out; __le32 *dst = (__le32 *)out;
u32 b0[4], b1[4]; u32 b0[4], b1[4];
@@ -373,9 +373,9 @@ static void aes_encrypt(void *ctx_arg, u8 *out, const u8 *in)
i_rl(bo, bi, 2, k); \ i_rl(bo, bi, 2, k); \
i_rl(bo, bi, 3, k) i_rl(bo, bi, 3, k)
static void aes_decrypt(void *ctx_arg, u8 *out, const u8 *in) static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
{ {
const struct aes_ctx *ctx = ctx_arg; const struct aes_ctx *ctx = crypto_tfm_ctx(tfm);
const __le32 *src = (const __le32 *)in; const __le32 *src = (const __le32 *)in;
__le32 *dst = (__le32 *)out; __le32 *dst = (__le32 *)out;
u32 b0[4], b1[4]; u32 b0[4], b1[4];
crypto/anubis.c
+6 -7
View File
@@ -460,16 +460,15 @@ static const u32 rc[] = {
0xf726ffedU, 0xe89d6f8eU, 0x19a0f089U, 0xf726ffedU, 0xe89d6f8eU, 0x19a0f089U,
}; };
static int anubis_setkey(void *ctx_arg, const u8 *in_key, static int anubis_setkey(struct crypto_tfm *tfm, const u8 *in_key,
unsigned int key_len, u32 *flags) unsigned int key_len, u32 *flags)
{ {
struct anubis_ctx *ctx = crypto_tfm_ctx(tfm);
const __be32 *key = (const __be32 *)in_key; const __be32 *key = (const __be32 *)in_key;
int N, R, i, r; int N, R, i, r;
u32 kappa[ANUBIS_MAX_N]; u32 kappa[ANUBIS_MAX_N];
u32 inter[ANUBIS_MAX_N]; u32 inter[ANUBIS_MAX_N];
struct anubis_ctx *ctx = ctx_arg;
switch (key_len) switch (key_len)
{ {
case 16: case 20: case 24: case 28: case 16: case 20: case 24: case 28:
@@ -660,15 +659,15 @@ static void anubis_crypt(u32 roundKey[ANUBIS_MAX_ROUNDS + 1][4],
dst[i] = cpu_to_be32(inter[i]); dst[i] = cpu_to_be32(inter[i]);
} }
static void anubis_encrypt(void *ctx_arg, u8 *dst, const u8 *src) static void anubis_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
struct anubis_ctx *ctx = ctx_arg; struct anubis_ctx *ctx = crypto_tfm_ctx(tfm);
anubis_crypt(ctx->E, dst, src, ctx->R); anubis_crypt(ctx->E, dst, src, ctx->R);
} }
static void anubis_decrypt(void *ctx_arg, u8 *dst, const u8 *src) static void anubis_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
struct anubis_ctx *ctx = ctx_arg; struct anubis_ctx *ctx = crypto_tfm_ctx(tfm);
anubis_crypt(ctx->D, dst, src, ctx->R); anubis_crypt(ctx->D, dst, src, ctx->R);
} }
crypto/arc4.c
+5 -4
View File
@@ -24,9 +24,10 @@ struct arc4_ctx {
u8 x, y; u8 x, y;
}; };
static int arc4_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags) static int arc4_set_key(struct crypto_tfm *tfm, const u8 *in_key,
unsigned int key_len, u32 *flags)
{ {
struct arc4_ctx *ctx = ctx_arg; struct arc4_ctx *ctx = crypto_tfm_ctx(tfm);
int i, j = 0, k = 0; int i, j = 0, k = 0;
ctx->x = 1; ctx->x = 1;
@@ -48,9 +49,9 @@ static int arc4_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u
return 0; return 0;
} }
static void arc4_crypt(void *ctx_arg, u8 *out, const u8 *in) static void arc4_crypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
{ {
struct arc4_ctx *ctx = ctx_arg; struct arc4_ctx *ctx = crypto_tfm_ctx(tfm);
u8 *const S = ctx->S; u8 *const S = ctx->S;
u8 x = ctx->x; u8 x = ctx->x;
crypto/blowfish.c
+11 -8
View File
@@ -349,7 +349,7 @@ static void encrypt_block(struct bf_ctx *bctx, u32 *dst, u32 *src)
dst[1] = yl; dst[1] = yl;
} }
static void bf_encrypt(void *ctx, u8 *dst, const u8 *src) static void bf_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
const __be32 *in_blk = (const __be32 *)src; const __be32 *in_blk = (const __be32 *)src;
__be32 *const out_blk = (__be32 *)dst; __be32 *const out_blk = (__be32 *)dst;
@@ -357,17 +357,18 @@ static void bf_encrypt(void *ctx, u8 *dst, const u8 *src)
in32[0] = be32_to_cpu(in_blk[0]); in32[0] = be32_to_cpu(in_blk[0]);
in32[1] = be32_to_cpu(in_blk[1]); in32[1] = be32_to_cpu(in_blk[1]);
encrypt_block(ctx, out32, in32); encrypt_block(crypto_tfm_ctx(tfm), out32, in32);
out_blk[0] = cpu_to_be32(out32[0]); out_blk[0] = cpu_to_be32(out32[0]);
out_blk[1] = cpu_to_be32(out32[1]); out_blk[1] = cpu_to_be32(out32[1]);
} }
static void bf_decrypt(void *ctx, u8 *dst, const u8 *src) static void bf_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
struct bf_ctx *ctx = crypto_tfm_ctx(tfm);
const __be32 *in_blk = (const __be32 *)src; const __be32 *in_blk = (const __be32 *)src;
__be32 *const out_blk = (__be32 *)dst; __be32 *const out_blk = (__be32 *)dst;
const u32 *P = ((struct bf_ctx *)ctx)->p; const u32 *P = ctx->p;
const u32 *S = ((struct bf_ctx *)ctx)->s; const u32 *S = ctx->s;
u32 yl = be32_to_cpu(in_blk[0]); u32 yl = be32_to_cpu(in_blk[0]);
u32 yr = be32_to_cpu(in_blk[1]); u32 yr = be32_to_cpu(in_blk[1]);
@@ -398,12 +399,14 @@ static void bf_decrypt(void *ctx, u8 *dst, const u8 *src)
/* /*
* Calculates the blowfish S and P boxes for encryption and decryption. * Calculates the blowfish S and P boxes for encryption and decryption.
*/ */
static int bf_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags) static int bf_setkey(struct crypto_tfm *tfm, const u8 *key,
unsigned int keylen, u32 *flags)
{ {
struct bf_ctx *ctx = crypto_tfm_ctx(tfm);
u32 *P = ctx->p;
u32 *S = ctx->s;
short i, j, count; short i, j, count;
u32 data[2], temp; u32 data[2], temp;
u32 *P = ((struct bf_ctx *)ctx)->p;
u32 *S = ((struct bf_ctx *)ctx)->s;
/* Copy the initialization s-boxes */ /* Copy the initialization s-boxes */
for (i = 0, count = 0; i < 256; i++) for (i = 0, count = 0; i < 256; i++)
crypto/cast5.c
+7 -7
View File
@@ -577,9 +577,9 @@ static const u32 sb8[256] = {
(((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff]) ) (((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff]) )
static void cast5_encrypt(void *ctx, u8 * outbuf, const u8 * inbuf) static void cast5_encrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf)
{ {
struct cast5_ctx *c = (struct cast5_ctx *) ctx; struct cast5_ctx *c = crypto_tfm_ctx(tfm);
const __be32 *src = (const __be32 *)inbuf; const __be32 *src = (const __be32 *)inbuf;
__be32 *dst = (__be32 *)outbuf; __be32 *dst = (__be32 *)outbuf;
u32 l, r, t; u32 l, r, t;
@@ -642,9 +642,9 @@ static void cast5_encrypt(void *ctx, u8 * outbuf, const u8 * inbuf)
dst[1] = cpu_to_be32(l); dst[1] = cpu_to_be32(l);
} }
static void cast5_decrypt(void *ctx, u8 * outbuf, const u8 * inbuf) static void cast5_decrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf)
{ {
struct cast5_ctx *c = (struct cast5_ctx *) ctx; struct cast5_ctx *c = crypto_tfm_ctx(tfm);
const __be32 *src = (const __be32 *)inbuf; const __be32 *src = (const __be32 *)inbuf;
__be32 *dst = (__be32 *)outbuf; __be32 *dst = (__be32 *)outbuf;
u32 l, r, t; u32 l, r, t;
@@ -769,15 +769,15 @@ static void key_schedule(u32 * x, u32 * z, u32 * k)
} }
static int static int cast5_setkey(struct crypto_tfm *tfm, const u8 *key,
cast5_setkey(void *ctx, const u8 * key, unsigned key_len, u32 * flags) unsigned key_len, u32 *flags)
{ {
struct cast5_ctx *c = crypto_tfm_ctx(tfm);
int i; int i;
u32 x[4]; u32 x[4];
u32 z[4]; u32 z[4];
u32 k[16]; u32 k[16];
__be32 p_key[4]; __be32 p_key[4];
struct cast5_ctx *c = (struct cast5_ctx *) ctx;
if (key_len < 5 || key_len > 16) { if (key_len < 5 || key_len > 16) {
*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
crypto/cast6.c
+8 -7
View File
@@ -381,13 +381,13 @@ static inline void W(u32 *key, unsigned int i) {
key[7] ^= F2(key[0], Tr[i % 4][7], Tm[i][7]); key[7] ^= F2(key[0], Tr[i % 4][7], Tm[i][7]);
} }
static int static int cast6_setkey(struct crypto_tfm *tfm, const u8 *in_key,
cast6_setkey(void *ctx, const u8 * in_key, unsigned key_len, u32 * flags) unsigned key_len, u32 *flags)
{ {
int i; int i;
u32 key[8]; u32 key[8];
__be32 p_key[8]; /* padded key */ __be32 p_key[8]; /* padded key */
struct cast6_ctx *c = (struct cast6_ctx *) ctx; struct cast6_ctx *c = crypto_tfm_ctx(tfm);
if (key_len < 16 || key_len > 32 || key_len % 4 != 0) { if (key_len < 16 || key_len > 32 || key_len % 4 != 0) {
*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
@@ -444,8 +444,9 @@ static inline void QBAR (u32 * block, u8 * Kr, u32 * Km) {
block[2] ^= F1(block[3], Kr[0], Km[0]); block[2] ^= F1(block[3], Kr[0], Km[0]);
} }
static void cast6_encrypt (void * ctx, u8 * outbuf, const u8 * inbuf) { static void cast6_encrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf)
struct cast6_ctx * c = (struct cast6_ctx *)ctx; {
struct cast6_ctx *c = crypto_tfm_ctx(tfm);
const __be32 *src = (const __be32 *)inbuf; const __be32 *src = (const __be32 *)inbuf;
__be32 *dst = (__be32 *)outbuf; __be32 *dst = (__be32 *)outbuf;
u32 block[4]; u32 block[4];
@@ -476,8 +477,8 @@ static void cast6_encrypt (void * ctx, u8 * outbuf, const u8 * inbuf) {
dst[3] = cpu_to_be32(block[3]); dst[3] = cpu_to_be32(block[3]);
} }
static void cast6_decrypt (void * ctx, u8 * outbuf, const u8 * inbuf) { static void cast6_decrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf) {
struct cast6_ctx * c = (struct cast6_ctx *)ctx; struct cast6_ctx * c = crypto_tfm_ctx(tfm);
const __be32 *src = (const __be32 *)inbuf; const __be32 *src = (const __be32 *)inbuf;
__be32 *dst = (__be32 *)outbuf; __be32 *dst = (__be32 *)outbuf;
u32 block[4]; u32 block[4];
crypto/cipher.c
+7 -7
View File
@@ -187,7 +187,7 @@ static unsigned int cbc_process_encrypt(const struct cipher_desc *desc,
void (*xor)(u8 *, const u8 *) = tfm->crt_u.cipher.cit_xor_block; void (*xor)(u8 *, const u8 *) = tfm->crt_u.cipher.cit_xor_block;
int bsize = crypto_tfm_alg_blocksize(tfm); int bsize = crypto_tfm_alg_blocksize(tfm);
void (*fn)(void *, u8 *, const u8 *) = desc->crfn; void (*fn)(struct crypto_tfm *, u8 *, const u8 *) = desc->crfn;
u8 *iv = desc->info; u8 *iv = desc->info;
unsigned int done = 0; unsigned int done = 0;
@@ -195,7 +195,7 @@ static unsigned int cbc_process_encrypt(const struct cipher_desc *desc,
do { do {
xor(iv, src); xor(iv, src);
fn(crypto_tfm_ctx(tfm), dst, iv); fn(tfm, dst, iv);
memcpy(iv, dst, bsize); memcpy(iv, dst, bsize);
src += bsize; src += bsize;
@@ -218,7 +218,7 @@ static unsigned int cbc_process_decrypt(const struct cipher_desc *desc,
u8 *buf = (u8 *)ALIGN((unsigned long)stack, alignmask + 1); u8 *buf = (u8 *)ALIGN((unsigned long)stack, alignmask + 1);
u8 **dst_p = src == dst ? &buf : &dst; u8 **dst_p = src == dst ? &buf : &dst;
void (*fn)(void *, u8 *, const u8 *) = desc->crfn; void (*fn)(struct crypto_tfm *, u8 *, const u8 *) = desc->crfn;
u8 *iv = desc->info; u8 *iv = desc->info;
unsigned int done = 0; unsigned int done = 0;
@@ -227,7 +227,7 @@ static unsigned int cbc_process_decrypt(const struct cipher_desc *desc,
do { do {
u8 *tmp_dst = *dst_p; u8 *tmp_dst = *dst_p;
fn(crypto_tfm_ctx(tfm), tmp_dst, src); fn(tfm, tmp_dst, src);
xor(tmp_dst, iv); xor(tmp_dst, iv);
memcpy(iv, src, bsize); memcpy(iv, src, bsize);
if (tmp_dst != dst) if (tmp_dst != dst)
@@ -245,13 +245,13 @@ static unsigned int ecb_process(const struct cipher_desc *desc, u8 *dst,
{ {
struct crypto_tfm *tfm = desc->tfm; struct crypto_tfm *tfm = desc->tfm;
int bsize = crypto_tfm_alg_blocksize(tfm); int bsize = crypto_tfm_alg_blocksize(tfm);
void (*fn)(void *, u8 *, const u8 *) = desc->crfn; void (*fn)(struct crypto_tfm *, u8 *, const u8 *) = desc->crfn;
unsigned int done = 0; unsigned int done = 0;
nbytes -= bsize; nbytes -= bsize;
do { do {
fn(crypto_tfm_ctx(tfm), dst, src); fn(tfm, dst, src);
src += bsize; src += bsize;
dst += bsize; dst += bsize;
@@ -268,7 +268,7 @@ static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
return -EINVAL; return -EINVAL;
} else } else
return cia->cia_setkey(crypto_tfm_ctx(tfm), key, keylen, return cia->cia_setkey(tfm, key, keylen,
&tfm->crt_flags); &tfm->crt_flags);
} }
crypto/compress.c
+2 -4
View File
@@ -22,8 +22,7 @@ static int crypto_compress(struct crypto_tfm *tfm,
const u8 *src, unsigned int slen, const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen) u8 *dst, unsigned int *dlen)
{ {
return tfm->__crt_alg->cra_compress.coa_compress(crypto_tfm_ctx(tfm), return tfm->__crt_alg->cra_compress.coa_compress(tfm, src, slen, dst,
src, slen, dst,
dlen); dlen);
} }
@@ -31,8 +30,7 @@ static int crypto_decompress(struct crypto_tfm *tfm,
const u8 *src, unsigned int slen, const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen) u8 *dst, unsigned int *dlen)
{ {
return tfm->__crt_alg->cra_compress.coa_decompress(crypto_tfm_ctx(tfm), return tfm->__crt_alg->cra_compress.coa_decompress(tfm, src, slen, dst,
src, slen, dst,
dlen); dlen);
} }
crypto/crc32c.c
+10 -9
View File
@@ -31,9 +31,9 @@ struct chksum_ctx {
* crc using table. * crc using table.
*/ */
static void chksum_init(void *ctx) static void chksum_init(struct crypto_tfm *tfm)
{ {
struct chksum_ctx *mctx = ctx; struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
mctx->crc = ~(u32)0; /* common usage */ mctx->crc = ~(u32)0; /* common usage */
} }
@@ -43,10 +43,10 @@ static void chksum_init(void *ctx)
* If your algorithm starts with ~0, then XOR with ~0 before you set * If your algorithm starts with ~0, then XOR with ~0 before you set
* the seed. * the seed.
*/ */
static int chksum_setkey(void *ctx, const u8 *key, unsigned int keylen, static int chksum_setkey(struct crypto_tfm *tfm, const u8 *key,
u32 *flags) unsigned int keylen, u32 *flags)
{ {
struct chksum_ctx *mctx = ctx; struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
if (keylen != sizeof(mctx->crc)) { if (keylen != sizeof(mctx->crc)) {
if (flags) if (flags)
@@ -57,9 +57,10 @@ static int chksum_setkey(void *ctx, const u8 *key, unsigned int keylen,
return 0; return 0;
} }
static void chksum_update(void *ctx, const u8 *data, unsigned int length) static void chksum_update(struct crypto_tfm *tfm, const u8 *data,
unsigned int length)
{ {
struct chksum_ctx *mctx = ctx; struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
u32 mcrc; u32 mcrc;
mcrc = crc32c(mctx->crc, data, (size_t)length); mcrc = crc32c(mctx->crc, data, (size_t)length);
@@ -67,9 +68,9 @@ static void chksum_update(void *ctx, const u8 *data, unsigned int length)
mctx->crc = mcrc; mctx->crc = mcrc;
} }
static void chksum_final(void *ctx, u8 *out) static void chksum_final(struct crypto_tfm *tfm, u8 *out)
{ {
struct chksum_ctx *mctx = ctx; struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
u32 mcrc = (mctx->crc ^ ~(u32)0); u32 mcrc = (mctx->crc ^ ~(u32)0);
*(u32 *)out = __le32_to_cpu(mcrc); *(u32 *)out = __le32_to_cpu(mcrc);
crypto/crypto_null.c
+9 -8
View File
@@ -27,8 +27,8 @@
#define NULL_BLOCK_SIZE 1 #define NULL_BLOCK_SIZE 1
#define NULL_DIGEST_SIZE 0 #define NULL_DIGEST_SIZE 0
static int null_compress(void *ctx, const u8 *src, unsigned int slen, static int null_compress(struct crypto_tfm *tfm, const u8 *src,
u8 *dst, unsigned int *dlen) unsigned int slen, u8 *dst, unsigned int *dlen)
{ {
if (slen > *dlen) if (slen > *dlen)
return -EINVAL; return -EINVAL;
@@ -37,20 +37,21 @@ static int null_compress(void *ctx, const u8 *src, unsigned int slen,
return 0; return 0;
} }
static void null_init(void *ctx) static void null_init(struct crypto_tfm *tfm)
{ } { }
static void null_update(void *ctx, const u8 *data, unsigned int len) static void null_update(struct crypto_tfm *tfm, const u8 *data,
unsigned int len)
{ } { }
static void null_final(void *ctx, u8 *out) static void null_final(struct crypto_tfm *tfm, u8 *out)
{ } { }
static int null_setkey(void *ctx, const u8 *key, static int null_setkey(struct crypto_tfm *tfm, const u8 *key,
unsigned int keylen, u32 *flags) unsigned int keylen, u32 *flags)
{ return 0; } { return 0; }
static void null_crypt(void *ctx, u8 *dst, const u8 *src) static void null_crypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
memcpy(dst, src, NULL_BLOCK_SIZE); memcpy(dst, src, NULL_BLOCK_SIZE);
} }

Some files were not shown because too many files have changed in this diff Show More