AES-XCBC-MAC
Subsystems (3)
PATCH 2/2 AES-XCBC-MAC
This patch introduces AES-XCBC-MAC using the "keyed hash" interface. It accordingly depends on the previous patch.
---
commit f23d1b52e77f339a9eaa89a1b913d6373fe60fb6
tree bab6efc5808414f13dcefb4bb164c3e111000fa3
parent 9c6b9affbacf12fc1e32868eaa14fef279b2696c
author Kazunori MIYAZAWA <[email protected]> Tue, 13 Jun 2006 10:05:50 +0900 committer Kazunori MIYAZAWA <[email protected]> Tue, 13 Jun 2006 10:05:50 +0900
crypto/Kconfig | 9 ++ crypto/Makefile | 1 crypto/cipher.c | 20 ++++ crypto/internal.h | 16 +++ crypto/tcrypt.c | 99 +++++++++++++++++++++ crypto/tcrypt.h | 80 +++++++++++++++++ crypto/xcbc.c | 230 ++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/crypto.h | 30 ++++++ 8 files changed, 482 insertions(+), 3 deletions(-)
crypto/Kconfig +9 -0
@@ -16,6 +16,15 @@ config CRYPTO_HMAC HMAC: Keyed-Hashing for Message Authentication (RFC2104). This is required for IPSec. +config CRYPTO_XCBC + bool "XCBC support" + depends on CRYPTO && EXPERIMENTAL + help + XCBC: Keyed-Hashing with encryption algorithm + http://www.ietf.org/rfc/rfc3566.txt + http://csrc.nist.gov/encryption/modes/proposedmodes/ + xcbc-mac/xcbc-mac-spec.pdf + config CRYPTO_NULL tristate "Null algorithms" depends on CRYPTO
crypto/Makefile +1 -0
@@ -8,6 +8,7 @@ obj-$(CONFIG_CRYPTO) += api.o scatterwal $(proc-crypto-y) obj-$(CONFIG_CRYPTO_HMAC) += hmac.o +obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o obj-$(CONFIG_CRYPTO_MD4) += md4.o obj-$(CONFIG_CRYPTO_MD5) += md5.o
crypto/cipher.c +19 -1
@@ -402,6 +402,7 @@ int crypto_init_cipher_ops(struct cryptobreak ;case CRYPTO_TFM_MODE_CBC : +case CRYPTO_TFM_MODE_XCBC : ops->cit_encrypt = cbc_encrypt; ops->cit_decrypt = cbc_decrypt; ops->cit_encrypt_iv = cbc_encrypt_iv;
@@ -426,7 +427,7 @@ int crypto_init_cipher_ops(struct cryptoBUG (); } -if (ops->cit_mode ==CRYPTO_TFM_MODE_CBC ) { +if (ops->cit_mode & (CRYPTO_TFM_MODE_CBC |CRYPTO_TFM_MODE_XCBC )) {unsigned long align;unsigned long addr;
@@ -453,6 +454,16 @@ int crypto_init_cipher_ops(struct crypto addr =ALIGN (addr, align); addr +=ALIGN (tfm->__crt_alg->cra_ctxsize, align); ops->cit_iv = (void *)addr; +#ifdef CONFIG_CRYPTO_XCBC +if (ops->cit_mode &CRYPTO_TFM_MODE_XCBC ) { + tfm->crt_keyedhash.kht_init = crypto_xcbc_init; + tfm->crt_keyedhash.kht_update = crypto_xcbc_update; + tfm->crt_keyedhash.kht_final = crypto_xcbc_final; + tfm->crt_keyedhash.keyed_hash = crypto_xcbc; + tfm->crt_keyedhash.kht_digestsize = crypto_tfm_alg_blocksize; + ret =crypto_alloc_xcbc_block (tfm); + } +#endif } out:
@@ -461,4 +472,11 @@ out:void crypto_exit_cipher_ops (struct crypto_tfm *tfm) { +#ifdef CONFIG_CRYPTO_XCBC +struct cipher_tfm *ops = &tfm->crt_cipher; +if (ops->cit_mode &CRYPTO_TFM_MODE_CBC && + ops->cit_mode &CRYPTO_TFM_MODE_XCBC ) { +crypto_free_xcbc_block (tfm); + } +#endif }
crypto/internal.h +16 -0
@@ -62,6 +62,22 @@ static inline void crypto_free_hmac_bloc { }#endif +#ifdef CONFIG_CRYPTO_XCBC +int crypto_alloc_xcbc_block (struct crypto_tfm *tfm); +static inline void crypto_free_xcbc_block (struct crypto_tfm *tfm) +{ +kfree (tfm->crt_keyedhash.kht_xcbc_block); +} +#else +static inline int crypto_alloc_xcbc_block (struct crypto_tfm *tfm) +{ +return 0 ; +} + +static inline void crypto_free_xcbc_block (struct crypto_tfm *tfm) +{ } +#endif +#ifdef CONFIG_PROC_FS void __init crypto_init_proc (void );#else
crypto/tcrypt.c +99 -0
111 lines not on this page · raw message
crypto/tcrypt.h +80 -0
92 lines not on this page · raw message
crypto/xcbc.c new file +230 -0
230 lines not on this page · raw message
include/linux/crypto.h +28 -2
@@ -45,6 +45,7 @@#define CRYPTO_TFM_MODE_CFB 0x00000004#define CRYPTO_TFM_MODE_CTR 0x00000008#define CRYPTO_TFM_MODE_HMAC 0x00000080 +#define CRYPTO_TFM_MODE_XCBC 0x00000080#define CRYPTO_TFM_REQ_WEAK_KEY 0x00000100#define CRYPTO_TFM_REQ_MAY_SLEEP 0x00000200
@@ -217,9 +218,22 @@ struct compress_tfm {#define crt_digest crt_u.digest#define crt_compress crt_u.compress -#if defined(CONFIG_CRYPTO_HMAC) +#if defined(CONFIG_CRYPTO_HMAC) || defined(CONFIG_CRYPTO_XCBC) +struct cit_xcbc_ctx { + /* + * XCBC needs 3 constants for the derived keys. + * Each lengh of those must equal the cipher + * block size so that cit_xcbc_const's length is + * 3 times of the blocksize and it contains + * concantinated constants. + */ + void *_block; + u8 *_const; +}; #define kht_hmac_block kht_u.hmac_block +#define kht_xcbc_block kht_u.xcbc_ctx._block +#define kht_xcbc_const kht_u.xcbc_ctx._const struct keyed_hash_tfm { int (*kht_init)(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen);
@@ -230,6 +244,7 @@ struct keyed_hash_tfm {unsigned int (*kht_digestsize)(struct crypto_tfm *tfm);union {void *hmac_block; +struct cit_xcbc_ctx xcbc_ctx; } kht_u; };#endif
@@ -459,5 +474,16 @@ int crypto_hmac(struct crypto_tfm *tfm, struct scatterlist *sg, unsigned int nsg, u8 *out);#endif /* CONFIG_CRYPTO_HMAC */ -#endif /* _LINUX_CRYPTO_H */ +/* +* * XCBC support +* */ +#ifdef CONFIG_CRYPTO_XCBC +int crypto_xcbc_init (struct crypto_tfm *tfm,u8 *key,unsigned int *keylen); +void crypto_xcbc_update (struct crypto_tfm *tfm,struct scatterlist *sg,unsigned int nsg); +int crypto_xcbc_final (struct crypto_tfm *tfm,u8 *key,unsigned int *keylen,u8 + *out); +int crypto_xcbc (struct crypto_tfm *tfm,u8 *key,unsigned int *keylen, +struct scatterlist *sg,unsigned int nsg,u8 *out); +#endif /* CONFIG_CRYPTO_XCBC */ +#endif /* _LINUX_CRYPTO_H */
In article <1150213447.4200.37.camel@hookipa> (at Wed, 14 Jun 2006 00:44:06 +0900), Kazunori MIYAZAWA <[email protected]> says:
Quoted 4 lines
This patch introduces AES-XCBC-MAC using the "keyed hash" interface. It accordingly depends on the previous patch.
Signed-off-by Kazunori MIYAZAWA <[email protected]>
--yoshfuji