.. | .. |
---|
26 | 26 | |
---|
27 | 27 | extern int __camellia_setkey(struct camellia_ctx *cctx, |
---|
28 | 28 | const unsigned char *key, |
---|
29 | | - unsigned int key_len, u32 *flags); |
---|
| 29 | + unsigned int key_len); |
---|
30 | 30 | |
---|
31 | 31 | extern int xts_camellia_setkey(struct crypto_skcipher *tfm, const u8 *key, |
---|
32 | 32 | unsigned int keylen); |
---|
33 | 33 | |
---|
34 | 34 | /* regular block cipher functions */ |
---|
35 | | -asmlinkage void __camellia_enc_blk(struct camellia_ctx *ctx, u8 *dst, |
---|
36 | | - const u8 *src, bool xor); |
---|
37 | | -asmlinkage void camellia_dec_blk(struct camellia_ctx *ctx, u8 *dst, |
---|
38 | | - const u8 *src); |
---|
| 35 | +asmlinkage void __camellia_enc_blk(const void *ctx, u8 *dst, const u8 *src, |
---|
| 36 | + bool xor); |
---|
| 37 | +asmlinkage void camellia_dec_blk(const void *ctx, u8 *dst, const u8 *src); |
---|
39 | 38 | |
---|
40 | 39 | /* 2-way parallel cipher functions */ |
---|
41 | | -asmlinkage void __camellia_enc_blk_2way(struct camellia_ctx *ctx, u8 *dst, |
---|
42 | | - const u8 *src, bool xor); |
---|
43 | | -asmlinkage void camellia_dec_blk_2way(struct camellia_ctx *ctx, u8 *dst, |
---|
44 | | - const u8 *src); |
---|
| 40 | +asmlinkage void __camellia_enc_blk_2way(const void *ctx, u8 *dst, const u8 *src, |
---|
| 41 | + bool xor); |
---|
| 42 | +asmlinkage void camellia_dec_blk_2way(const void *ctx, u8 *dst, const u8 *src); |
---|
45 | 43 | |
---|
46 | 44 | /* 16-way parallel cipher functions (avx/aes-ni) */ |
---|
47 | | -asmlinkage void camellia_ecb_enc_16way(struct camellia_ctx *ctx, u8 *dst, |
---|
48 | | - const u8 *src); |
---|
49 | | -asmlinkage void camellia_ecb_dec_16way(struct camellia_ctx *ctx, u8 *dst, |
---|
50 | | - const u8 *src); |
---|
| 45 | +asmlinkage void camellia_ecb_enc_16way(const void *ctx, u8 *dst, const u8 *src); |
---|
| 46 | +asmlinkage void camellia_ecb_dec_16way(const void *ctx, u8 *dst, const u8 *src); |
---|
51 | 47 | |
---|
52 | | -asmlinkage void camellia_cbc_dec_16way(struct camellia_ctx *ctx, u8 *dst, |
---|
53 | | - const u8 *src); |
---|
54 | | -asmlinkage void camellia_ctr_16way(struct camellia_ctx *ctx, u8 *dst, |
---|
55 | | - const u8 *src, le128 *iv); |
---|
| 48 | +asmlinkage void camellia_cbc_dec_16way(const void *ctx, u8 *dst, const u8 *src); |
---|
| 49 | +asmlinkage void camellia_ctr_16way(const void *ctx, u8 *dst, const u8 *src, |
---|
| 50 | + le128 *iv); |
---|
56 | 51 | |
---|
57 | | -asmlinkage void camellia_xts_enc_16way(struct camellia_ctx *ctx, u8 *dst, |
---|
58 | | - const u8 *src, le128 *iv); |
---|
59 | | -asmlinkage void camellia_xts_dec_16way(struct camellia_ctx *ctx, u8 *dst, |
---|
60 | | - const u8 *src, le128 *iv); |
---|
| 52 | +asmlinkage void camellia_xts_enc_16way(const void *ctx, u8 *dst, const u8 *src, |
---|
| 53 | + le128 *iv); |
---|
| 54 | +asmlinkage void camellia_xts_dec_16way(const void *ctx, u8 *dst, const u8 *src, |
---|
| 55 | + le128 *iv); |
---|
61 | 56 | |
---|
62 | | -static inline void camellia_enc_blk(struct camellia_ctx *ctx, u8 *dst, |
---|
63 | | - const u8 *src) |
---|
| 57 | +static inline void camellia_enc_blk(const void *ctx, u8 *dst, const u8 *src) |
---|
64 | 58 | { |
---|
65 | 59 | __camellia_enc_blk(ctx, dst, src, false); |
---|
66 | 60 | } |
---|
67 | 61 | |
---|
68 | | -static inline void camellia_enc_blk_xor(struct camellia_ctx *ctx, u8 *dst, |
---|
69 | | - const u8 *src) |
---|
| 62 | +static inline void camellia_enc_blk_xor(const void *ctx, u8 *dst, const u8 *src) |
---|
70 | 63 | { |
---|
71 | 64 | __camellia_enc_blk(ctx, dst, src, true); |
---|
72 | 65 | } |
---|
73 | 66 | |
---|
74 | | -static inline void camellia_enc_blk_2way(struct camellia_ctx *ctx, u8 *dst, |
---|
| 67 | +static inline void camellia_enc_blk_2way(const void *ctx, u8 *dst, |
---|
75 | 68 | const u8 *src) |
---|
76 | 69 | { |
---|
77 | 70 | __camellia_enc_blk_2way(ctx, dst, src, false); |
---|
78 | 71 | } |
---|
79 | 72 | |
---|
80 | | -static inline void camellia_enc_blk_xor_2way(struct camellia_ctx *ctx, u8 *dst, |
---|
| 73 | +static inline void camellia_enc_blk_xor_2way(const void *ctx, u8 *dst, |
---|
81 | 74 | const u8 *src) |
---|
82 | 75 | { |
---|
83 | 76 | __camellia_enc_blk_2way(ctx, dst, src, true); |
---|
84 | 77 | } |
---|
85 | 78 | |
---|
86 | 79 | /* glue helpers */ |
---|
87 | | -extern void camellia_decrypt_cbc_2way(void *ctx, u128 *dst, const u128 *src); |
---|
88 | | -extern void camellia_crypt_ctr(void *ctx, u128 *dst, const u128 *src, |
---|
| 80 | +extern void camellia_decrypt_cbc_2way(const void *ctx, u8 *dst, const u8 *src); |
---|
| 81 | +extern void camellia_crypt_ctr(const void *ctx, u8 *dst, const u8 *src, |
---|
89 | 82 | le128 *iv); |
---|
90 | | -extern void camellia_crypt_ctr_2way(void *ctx, u128 *dst, const u128 *src, |
---|
| 83 | +extern void camellia_crypt_ctr_2way(const void *ctx, u8 *dst, const u8 *src, |
---|
91 | 84 | le128 *iv); |
---|
92 | 85 | |
---|
93 | | -extern void camellia_xts_enc(void *ctx, u128 *dst, const u128 *src, le128 *iv); |
---|
94 | | -extern void camellia_xts_dec(void *ctx, u128 *dst, const u128 *src, le128 *iv); |
---|
| 86 | +extern void camellia_xts_enc(const void *ctx, u8 *dst, const u8 *src, |
---|
| 87 | + le128 *iv); |
---|
| 88 | +extern void camellia_xts_dec(const void *ctx, u8 *dst, const u8 *src, |
---|
| 89 | + le128 *iv); |
---|
95 | 90 | |
---|
96 | 91 | #endif /* ASM_X86_CAMELLIA_H */ |
---|