Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ed55eac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto update from Herbert Xu:

 - Added aesni/avx/x86_64 implementations for camellia.

 - Optimised AVX code for cast5/serpent/twofish/cast6.

 - Fixed vmac bug with unaligned input.

 - Allow compression algorithms in FIPS mode.

 - Optimised crc32c implementation for Intel.

 - Misc fixes.

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (32 commits)
  crypto: caam - Updated SEC-4.0 device tree binding for ERA information.
  crypto: testmgr - remove superfluous initializers for xts(aes)
  crypto: testmgr - allow compression algs in fips mode
  crypto: testmgr - add larger crc32c test vector to test FPU path in crc32c_intel
  crypto: testmgr - clean alg_test_null entries in alg_test_descs[]
  crypto: testmgr - remove fips_allowed flag from camellia-aesni null-tests
  crypto: cast5/cast6 - move lookup tables to shared module
  padata: use __this_cpu_read per-cpu helper
  crypto: s5p-sss - Fix compilation error
  crypto: picoxcell - Add terminating entry for platform_device_id table
  crypto: omap-aes - select BLKCIPHER2
  crypto: camellia - add AES-NI/AVX/x86_64 assembler implementation of camellia cipher
  crypto: camellia-x86_64 - share common functions and move structures and function definitions to header file
  crypto: tcrypt - add async speed test for camellia cipher
  crypto: tegra-aes - fix error-valued pointer dereference
  crypto: tegra - fix missing unlock on error case
  crypto: cast5/avx - avoid using temporary stack buffers
  crypto: serpent/avx - avoid using temporary stack buffers
  crypto: twofish/avx - avoid using temporary stack buffers
  crypto: cast6/avx - avoid using temporary stack buffers
  ...
parents 08242bc2 a2c0911c

Documentation/devicetree/bindings/crypto/fsl-sec4.txt

+3 −2
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ PROPERTIES 
   - compatible

      Usage: required

      Value type: <string>

      Definition: Must include "fsl,sec-v4.0"

      Definition: Must include "fsl,sec-v4.0". Also includes SEC

           ERA versions (optional) with which the device is compatible.



   - #address-cells

       Usage: required
@@ -106,7 +107,7 @@ PROPERTIES 


EXAMPLE

	crypto@300000 {

		compatible = "fsl,sec-v4.0";

		compatible = "fsl,sec-v4.0", "fsl,sec-era-v2.0";

		#address-cells = <1>;

		#size-cells = <1>;

		reg = <0x300000 0x10000>;

arch/x86/crypto/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ obj-$(CONFIG_CRYPTO_SERPENT_SSE2_586) += serpent-sse2-i586.o 


obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o

obj-$(CONFIG_CRYPTO_CAMELLIA_X86_64) += camellia-x86_64.o

obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64) += camellia-aesni-avx-x86_64.o

obj-$(CONFIG_CRYPTO_CAST5_AVX_X86_64) += cast5-avx-x86_64.o

obj-$(CONFIG_CRYPTO_CAST6_AVX_X86_64) += cast6-avx-x86_64.o

obj-$(CONFIG_CRYPTO_BLOWFISH_X86_64) += blowfish-x86_64.o
@@ -34,6 +35,8 @@ serpent-sse2-i586-y := serpent-sse2-i586-asm_32.o serpent_sse2_glue.o 


aes-x86_64-y := aes-x86_64-asm_64.o aes_glue.o

camellia-x86_64-y := camellia-x86_64-asm_64.o camellia_glue.o

camellia-aesni-avx-x86_64-y := camellia-aesni-avx-asm_64.o \

			       camellia_aesni_avx_glue.o

cast5-avx-x86_64-y := cast5-avx-x86_64-asm_64.o cast5_avx_glue.o

cast6-avx-x86_64-y := cast6-avx-x86_64-asm_64.o cast6_avx_glue.o

blowfish-x86_64-y := blowfish-x86_64-asm_64.o blowfish_glue.o
@@ -47,3 +50,5 @@ serpent-avx-x86_64-y := serpent-avx-x86_64-asm_64.o serpent_avx_glue.o 
aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o fpu.o

ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o

sha1-ssse3-y := sha1_ssse3_asm.o sha1_ssse3_glue.o

crc32c-intel-y := crc32c-intel_glue.o

crc32c-intel-$(CONFIG_CRYPTO_CRC32C_X86_64) += crc32c-pcl-intel-asm_64.o

arch/x86/crypto/camellia-aesni-avx-asm_64.S

0 → 100644
+1102 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/x86/crypto/camellia_aesni_avx_glue.c

0 → 100644
+558 −0
Original line number Diff line number Diff line 
/*

 * Glue Code for x86_64/AVX/AES-NI assembler optimized version of Camellia

 *

 * Copyright © 2012 Jussi Kivilinna <jussi.kivilinna@mbnet.fi>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 */



#include <linux/module.h>

#include <linux/types.h>

#include <linux/crypto.h>

#include <linux/err.h>

#include <crypto/algapi.h>

#include <crypto/ctr.h>

#include <crypto/lrw.h>

#include <crypto/xts.h>

#include <asm/xcr.h>

#include <asm/xsave.h>

#include <asm/crypto/camellia.h>

#include <asm/crypto/ablk_helper.h>

#include <asm/crypto/glue_helper.h>



#define CAMELLIA_AESNI_PARALLEL_BLOCKS 16



/* 16-way AES-NI parallel cipher functions */

asmlinkage void camellia_ecb_enc_16way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src);

asmlinkage void camellia_ecb_dec_16way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src);



asmlinkage void camellia_cbc_dec_16way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src);

asmlinkage void camellia_ctr_16way(struct camellia_ctx *ctx, u8 *dst,

				   const u8 *src, le128 *iv);



static const struct common_glue_ctx camellia_enc = {

	.num_funcs = 3,

	.fpu_blocks_limit = CAMELLIA_AESNI_PARALLEL_BLOCKS,



	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_ecb_enc_16way) }

	}, {

		.num_blocks = 2,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_enc_blk_2way) }

	}, {

		.num_blocks = 1,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_enc_blk) }

	} }

};



static const struct common_glue_ctx camellia_ctr = {

	.num_funcs = 3,

	.fpu_blocks_limit = CAMELLIA_AESNI_PARALLEL_BLOCKS,



	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_ctr_16way) }

	}, {

		.num_blocks = 2,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_crypt_ctr_2way) }

	}, {

		.num_blocks = 1,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_crypt_ctr) }

	} }

};



static const struct common_glue_ctx camellia_dec = {

	.num_funcs = 3,

	.fpu_blocks_limit = CAMELLIA_AESNI_PARALLEL_BLOCKS,



	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_ecb_dec_16way) }

	}, {

		.num_blocks = 2,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_dec_blk_2way) }

	}, {

		.num_blocks = 1,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_dec_blk) }

	} }

};



static const struct common_glue_ctx camellia_dec_cbc = {

	.num_funcs = 3,

	.fpu_blocks_limit = CAMELLIA_AESNI_PARALLEL_BLOCKS,



	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_cbc_dec_16way) }

	}, {

		.num_blocks = 2,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_decrypt_cbc_2way) }

	}, {

		.num_blocks = 1,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_dec_blk) }

	} }

};



static int ecb_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,

		       struct scatterlist *src, unsigned int nbytes)

{

	return glue_ecb_crypt_128bit(&camellia_enc, desc, dst, src, nbytes);

}



static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,

		       struct scatterlist *src, unsigned int nbytes)

{

	return glue_ecb_crypt_128bit(&camellia_dec, desc, dst, src, nbytes);

}



static int cbc_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,

		       struct scatterlist *src, unsigned int nbytes)

{

	return glue_cbc_encrypt_128bit(GLUE_FUNC_CAST(camellia_enc_blk), desc,

				       dst, src, nbytes);

}



static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,

		       struct scatterlist *src, unsigned int nbytes)

{

	return glue_cbc_decrypt_128bit(&camellia_dec_cbc, desc, dst, src,

				       nbytes);

}



static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,

		     struct scatterlist *src, unsigned int nbytes)

{

	return glue_ctr_crypt_128bit(&camellia_ctr, desc, dst, src, nbytes);

}



static inline bool camellia_fpu_begin(bool fpu_enabled, unsigned int nbytes)

{

	return glue_fpu_begin(CAMELLIA_BLOCK_SIZE,

			      CAMELLIA_AESNI_PARALLEL_BLOCKS, NULL, fpu_enabled,

			      nbytes);

}



static inline void camellia_fpu_end(bool fpu_enabled)

{

	glue_fpu_end(fpu_enabled);

}



static int camellia_setkey(struct crypto_tfm *tfm, const u8 *in_key,

			   unsigned int key_len)

{

	return __camellia_setkey(crypto_tfm_ctx(tfm), in_key, key_len,

				 &tfm->crt_flags);

}



struct crypt_priv {

	struct camellia_ctx *ctx;

	bool fpu_enabled;

};



static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)

{

	const unsigned int bsize = CAMELLIA_BLOCK_SIZE;

	struct crypt_priv *ctx = priv;

	int i;



	ctx->fpu_enabled = camellia_fpu_begin(ctx->fpu_enabled, nbytes);



	if (nbytes >= CAMELLIA_AESNI_PARALLEL_BLOCKS * bsize) {

		camellia_ecb_enc_16way(ctx->ctx, srcdst, srcdst);

		srcdst += bsize * CAMELLIA_AESNI_PARALLEL_BLOCKS;

		nbytes -= bsize * CAMELLIA_AESNI_PARALLEL_BLOCKS;

	}



	while (nbytes >= CAMELLIA_PARALLEL_BLOCKS * bsize) {

		camellia_enc_blk_2way(ctx->ctx, srcdst, srcdst);

		srcdst += bsize * CAMELLIA_PARALLEL_BLOCKS;

		nbytes -= bsize * CAMELLIA_PARALLEL_BLOCKS;

	}



	for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)

		camellia_enc_blk(ctx->ctx, srcdst, srcdst);

}



static void decrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)

{

	const unsigned int bsize = CAMELLIA_BLOCK_SIZE;

	struct crypt_priv *ctx = priv;

	int i;



	ctx->fpu_enabled = camellia_fpu_begin(ctx->fpu_enabled, nbytes);



	if (nbytes >= CAMELLIA_AESNI_PARALLEL_BLOCKS * bsize) {

		camellia_ecb_dec_16way(ctx->ctx, srcdst, srcdst);

		srcdst += bsize * CAMELLIA_AESNI_PARALLEL_BLOCKS;

		nbytes -= bsize * CAMELLIA_AESNI_PARALLEL_BLOCKS;

	}



	while (nbytes >= CAMELLIA_PARALLEL_BLOCKS * bsize) {

		camellia_dec_blk_2way(ctx->ctx, srcdst, srcdst);

		srcdst += bsize * CAMELLIA_PARALLEL_BLOCKS;

		nbytes -= bsize * CAMELLIA_PARALLEL_BLOCKS;

	}



	for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)

		camellia_dec_blk(ctx->ctx, srcdst, srcdst);

}



static int lrw_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,

		       struct scatterlist *src, unsigned int nbytes)

{

	struct camellia_lrw_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);

	be128 buf[CAMELLIA_AESNI_PARALLEL_BLOCKS];

	struct crypt_priv crypt_ctx = {

		.ctx = &ctx->camellia_ctx,

		.fpu_enabled = false,

	};

	struct lrw_crypt_req req = {

		.tbuf = buf,

		.tbuflen = sizeof(buf),



		.table_ctx = &ctx->lrw_table,

		.crypt_ctx = &crypt_ctx,

		.crypt_fn = encrypt_callback,

	};

	int ret;



	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;

	ret = lrw_crypt(desc, dst, src, nbytes, &req);

	camellia_fpu_end(crypt_ctx.fpu_enabled);



	return ret;

}



static int lrw_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,

		       struct scatterlist *src, unsigned int nbytes)

{

	struct camellia_lrw_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);

	be128 buf[CAMELLIA_AESNI_PARALLEL_BLOCKS];

	struct crypt_priv crypt_ctx = {

		.ctx = &ctx->camellia_ctx,

		.fpu_enabled = false,

	};

	struct lrw_crypt_req req = {

		.tbuf = buf,

		.tbuflen = sizeof(buf),



		.table_ctx = &ctx->lrw_table,

		.crypt_ctx = &crypt_ctx,

		.crypt_fn = decrypt_callback,

	};

	int ret;



	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;

	ret = lrw_crypt(desc, dst, src, nbytes, &req);

	camellia_fpu_end(crypt_ctx.fpu_enabled);



	return ret;

}



static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,

		       struct scatterlist *src, unsigned int nbytes)

{

	struct camellia_xts_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);

	be128 buf[CAMELLIA_AESNI_PARALLEL_BLOCKS];

	struct crypt_priv crypt_ctx = {

		.ctx = &ctx->crypt_ctx,

		.fpu_enabled = false,

	};

	struct xts_crypt_req req = {

		.tbuf = buf,

		.tbuflen = sizeof(buf),



		.tweak_ctx = &ctx->tweak_ctx,

		.tweak_fn = XTS_TWEAK_CAST(camellia_enc_blk),

		.crypt_ctx = &crypt_ctx,

		.crypt_fn = encrypt_callback,

	};

	int ret;



	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;

	ret = xts_crypt(desc, dst, src, nbytes, &req);

	camellia_fpu_end(crypt_ctx.fpu_enabled);



	return ret;

}



static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,

		       struct scatterlist *src, unsigned int nbytes)

{

	struct camellia_xts_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);

	be128 buf[CAMELLIA_AESNI_PARALLEL_BLOCKS];

	struct crypt_priv crypt_ctx = {

		.ctx = &ctx->crypt_ctx,

		.fpu_enabled = false,

	};

	struct xts_crypt_req req = {

		.tbuf = buf,

		.tbuflen = sizeof(buf),



		.tweak_ctx = &ctx->tweak_ctx,

		.tweak_fn = XTS_TWEAK_CAST(camellia_enc_blk),

		.crypt_ctx = &crypt_ctx,

		.crypt_fn = decrypt_callback,

	};

	int ret;



	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;

	ret = xts_crypt(desc, dst, src, nbytes, &req);

	camellia_fpu_end(crypt_ctx.fpu_enabled);



	return ret;

}



static struct crypto_alg cmll_algs[10] = { {

	.cra_name		= "__ecb-camellia-aesni",

	.cra_driver_name	= "__driver-ecb-camellia-aesni",

	.cra_priority		= 0,

	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,

	.cra_blocksize		= CAMELLIA_BLOCK_SIZE,

	.cra_ctxsize		= sizeof(struct camellia_ctx),

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_u = {

		.blkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,

			.max_keysize	= CAMELLIA_MAX_KEY_SIZE,

			.setkey		= camellia_setkey,

			.encrypt	= ecb_encrypt,

			.decrypt	= ecb_decrypt,

		},

	},

}, {

	.cra_name		= "__cbc-camellia-aesni",

	.cra_driver_name	= "__driver-cbc-camellia-aesni",

	.cra_priority		= 0,

	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,

	.cra_blocksize		= CAMELLIA_BLOCK_SIZE,

	.cra_ctxsize		= sizeof(struct camellia_ctx),

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_u = {

		.blkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,

			.max_keysize	= CAMELLIA_MAX_KEY_SIZE,

			.setkey		= camellia_setkey,

			.encrypt	= cbc_encrypt,

			.decrypt	= cbc_decrypt,

		},

	},

}, {

	.cra_name		= "__ctr-camellia-aesni",

	.cra_driver_name	= "__driver-ctr-camellia-aesni",

	.cra_priority		= 0,

	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,

	.cra_blocksize		= 1,

	.cra_ctxsize		= sizeof(struct camellia_ctx),

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_u = {

		.blkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,

			.max_keysize	= CAMELLIA_MAX_KEY_SIZE,

			.ivsize		= CAMELLIA_BLOCK_SIZE,

			.setkey		= camellia_setkey,

			.encrypt	= ctr_crypt,

			.decrypt	= ctr_crypt,

		},

	},

}, {

	.cra_name		= "__lrw-camellia-aesni",

	.cra_driver_name	= "__driver-lrw-camellia-aesni",

	.cra_priority		= 0,

	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,

	.cra_blocksize		= CAMELLIA_BLOCK_SIZE,

	.cra_ctxsize		= sizeof(struct camellia_lrw_ctx),

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_exit		= lrw_camellia_exit_tfm,

	.cra_u = {

		.blkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE +

					  CAMELLIA_BLOCK_SIZE,

			.max_keysize	= CAMELLIA_MAX_KEY_SIZE +

					  CAMELLIA_BLOCK_SIZE,

			.ivsize		= CAMELLIA_BLOCK_SIZE,

			.setkey		= lrw_camellia_setkey,

			.encrypt	= lrw_encrypt,

			.decrypt	= lrw_decrypt,

		},

	},

}, {

	.cra_name		= "__xts-camellia-aesni",

	.cra_driver_name	= "__driver-xts-camellia-aesni",

	.cra_priority		= 0,

	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,

	.cra_blocksize		= CAMELLIA_BLOCK_SIZE,

	.cra_ctxsize		= sizeof(struct camellia_xts_ctx),

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_u = {

		.blkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE * 2,

			.max_keysize	= CAMELLIA_MAX_KEY_SIZE * 2,

			.ivsize		= CAMELLIA_BLOCK_SIZE,

			.setkey		= xts_camellia_setkey,

			.encrypt	= xts_encrypt,

			.decrypt	= xts_decrypt,

		},

	},

}, {

	.cra_name		= "ecb(camellia)",

	.cra_driver_name	= "ecb-camellia-aesni",

	.cra_priority		= 400,

	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,

	.cra_blocksize		= CAMELLIA_BLOCK_SIZE,

	.cra_ctxsize		= sizeof(struct async_helper_ctx),

	.cra_alignmask		= 0,

	.cra_type		= &crypto_ablkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_init		= ablk_init,

	.cra_exit		= ablk_exit,

	.cra_u = {

		.ablkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,

			.max_keysize	= CAMELLIA_MAX_KEY_SIZE,

			.setkey		= ablk_set_key,

			.encrypt	= ablk_encrypt,

			.decrypt	= ablk_decrypt,

		},

	},

}, {

	.cra_name		= "cbc(camellia)",

	.cra_driver_name	= "cbc-camellia-aesni",

	.cra_priority		= 400,

	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,

	.cra_blocksize		= CAMELLIA_BLOCK_SIZE,

	.cra_ctxsize		= sizeof(struct async_helper_ctx),

	.cra_alignmask		= 0,

	.cra_type		= &crypto_ablkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_init		= ablk_init,

	.cra_exit		= ablk_exit,

	.cra_u = {

		.ablkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,

			.max_keysize	= CAMELLIA_MAX_KEY_SIZE,

			.ivsize		= CAMELLIA_BLOCK_SIZE,

			.setkey		= ablk_set_key,

			.encrypt	= __ablk_encrypt,

			.decrypt	= ablk_decrypt,

		},

	},

}, {

	.cra_name		= "ctr(camellia)",

	.cra_driver_name	= "ctr-camellia-aesni",

	.cra_priority		= 400,

	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,

	.cra_blocksize		= 1,

	.cra_ctxsize		= sizeof(struct async_helper_ctx),

	.cra_alignmask		= 0,

	.cra_type		= &crypto_ablkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_init		= ablk_init,

	.cra_exit		= ablk_exit,

	.cra_u = {

		.ablkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,

			.max_keysize	= CAMELLIA_MAX_KEY_SIZE,

			.ivsize		= CAMELLIA_BLOCK_SIZE,

			.setkey		= ablk_set_key,

			.encrypt	= ablk_encrypt,

			.decrypt	= ablk_encrypt,

			.geniv		= "chainiv",

		},

	},

}, {

	.cra_name		= "lrw(camellia)",

	.cra_driver_name	= "lrw-camellia-aesni",

	.cra_priority		= 400,

	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,

	.cra_blocksize		= CAMELLIA_BLOCK_SIZE,

	.cra_ctxsize		= sizeof(struct async_helper_ctx),

	.cra_alignmask		= 0,

	.cra_type		= &crypto_ablkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_init		= ablk_init,

	.cra_exit		= ablk_exit,

	.cra_u = {

		.ablkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE +

					  CAMELLIA_BLOCK_SIZE,

			.max_keysize	= CAMELLIA_MAX_KEY_SIZE +

					  CAMELLIA_BLOCK_SIZE,

			.ivsize		= CAMELLIA_BLOCK_SIZE,

			.setkey		= ablk_set_key,

			.encrypt	= ablk_encrypt,

			.decrypt	= ablk_decrypt,

		},

	},

}, {

	.cra_name		= "xts(camellia)",

	.cra_driver_name	= "xts-camellia-aesni",

	.cra_priority		= 400,

	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,

	.cra_blocksize		= CAMELLIA_BLOCK_SIZE,

	.cra_ctxsize		= sizeof(struct async_helper_ctx),

	.cra_alignmask		= 0,

	.cra_type		= &crypto_ablkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_init		= ablk_init,

	.cra_exit		= ablk_exit,

	.cra_u = {

		.ablkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE * 2,

			.max_keysize	= CAMELLIA_MAX_KEY_SIZE * 2,

			.ivsize		= CAMELLIA_BLOCK_SIZE,

			.setkey		= ablk_set_key,

			.encrypt	= ablk_encrypt,

			.decrypt	= ablk_decrypt,

		},

	},

} };



static int __init camellia_aesni_init(void)

{

	u64 xcr0;



	if (!cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) {

		pr_info("AVX or AES-NI instructions are not detected.\n");

		return -ENODEV;

	}



	xcr0 = xgetbv(XCR_XFEATURE_ENABLED_MASK);

	if ((xcr0 & (XSTATE_SSE | XSTATE_YMM)) != (XSTATE_SSE | XSTATE_YMM)) {

		pr_info("AVX detected but unusable.\n");

		return -ENODEV;

	}



	return crypto_register_algs(cmll_algs, ARRAY_SIZE(cmll_algs));

}



static void __exit camellia_aesni_fini(void)

{

	crypto_unregister_algs(cmll_algs, ARRAY_SIZE(cmll_algs));

}



module_init(camellia_aesni_init);

module_exit(camellia_aesni_fini);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Camellia Cipher Algorithm, AES-NI/AVX optimized");

MODULE_ALIAS("camellia");

MODULE_ALIAS("camellia-asm");

arch/x86/crypto/camellia_glue.c

+29 −63
Original line number Diff line number Diff line
@@ -32,53 +32,24 @@ 
#include <crypto/algapi.h>

#include <crypto/lrw.h>

#include <crypto/xts.h>

#include <asm/crypto/camellia.h>

#include <asm/crypto/glue_helper.h>



#define CAMELLIA_MIN_KEY_SIZE	16

#define CAMELLIA_MAX_KEY_SIZE	32

#define CAMELLIA_BLOCK_SIZE	16

#define CAMELLIA_TABLE_BYTE_LEN	272



struct camellia_ctx {

	u64 key_table[CAMELLIA_TABLE_BYTE_LEN / sizeof(u64)];

	u32 key_length;

};



/* regular block cipher functions */

asmlinkage void __camellia_enc_blk(struct camellia_ctx *ctx, u8 *dst,

				   const u8 *src, bool xor);

EXPORT_SYMBOL_GPL(__camellia_enc_blk);

asmlinkage void camellia_dec_blk(struct camellia_ctx *ctx, u8 *dst,

				 const u8 *src);

EXPORT_SYMBOL_GPL(camellia_dec_blk);



/* 2-way parallel cipher functions */

asmlinkage void __camellia_enc_blk_2way(struct camellia_ctx *ctx, u8 *dst,

					const u8 *src, bool xor);

EXPORT_SYMBOL_GPL(__camellia_enc_blk_2way);

asmlinkage void camellia_dec_blk_2way(struct camellia_ctx *ctx, u8 *dst,

				      const u8 *src);



static inline void camellia_enc_blk(struct camellia_ctx *ctx, u8 *dst,

				    const u8 *src)

{

	__camellia_enc_blk(ctx, dst, src, false);

}



static inline void camellia_enc_blk_xor(struct camellia_ctx *ctx, u8 *dst,

					const u8 *src)

{

	__camellia_enc_blk(ctx, dst, src, true);

}



static inline void camellia_enc_blk_2way(struct camellia_ctx *ctx, u8 *dst,

					 const u8 *src)

{

	__camellia_enc_blk_2way(ctx, dst, src, false);

}



static inline void camellia_enc_blk_xor_2way(struct camellia_ctx *ctx, u8 *dst,

					     const u8 *src)

{

	__camellia_enc_blk_2way(ctx, dst, src, true);

}

EXPORT_SYMBOL_GPL(camellia_dec_blk_2way);



static void camellia_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)

{
@@ -1275,8 +1246,7 @@ static void camellia_setup192(const unsigned char *key, u64 *subkey) 
	camellia_setup256(kk, subkey);

}



static int __camellia_setkey(struct camellia_ctx *cctx,

			     const unsigned char *key,

int __camellia_setkey(struct camellia_ctx *cctx, const unsigned char *key,

		      unsigned int key_len, u32 *flags)

{

	if (key_len != 16 && key_len != 24 && key_len != 32) {
@@ -1300,6 +1270,7 @@ static int __camellia_setkey(struct camellia_ctx *cctx, 


	return 0;

}

EXPORT_SYMBOL_GPL(__camellia_setkey);



static int camellia_setkey(struct crypto_tfm *tfm, const u8 *in_key,

			   unsigned int key_len)
@@ -1308,7 +1279,7 @@ static int camellia_setkey(struct crypto_tfm *tfm, const u8 *in_key, 
				 &tfm->crt_flags);

}



static void camellia_decrypt_cbc_2way(void *ctx, u128 *dst, const u128 *src)

void camellia_decrypt_cbc_2way(void *ctx, u128 *dst, const u128 *src)

{

	u128 iv = *src;
@@ -1316,22 +1287,23 @@ static void camellia_decrypt_cbc_2way(void *ctx, u128 *dst, const u128 *src) 


	u128_xor(&dst[1], &dst[1], &iv);

}

EXPORT_SYMBOL_GPL(camellia_decrypt_cbc_2way);



static void camellia_crypt_ctr(void *ctx, u128 *dst, const u128 *src, u128 *iv)

void camellia_crypt_ctr(void *ctx, u128 *dst, const u128 *src, le128 *iv)

{

	be128 ctrblk;



	if (dst != src)

		*dst = *src;



	u128_to_be128(&ctrblk, iv);

	u128_inc(iv);

	le128_to_be128(&ctrblk, iv);

	le128_inc(iv);



	camellia_enc_blk_xor(ctx, (u8 *)dst, (u8 *)&ctrblk);

}

EXPORT_SYMBOL_GPL(camellia_crypt_ctr);



static void camellia_crypt_ctr_2way(void *ctx, u128 *dst, const u128 *src,

				    u128 *iv)

void camellia_crypt_ctr_2way(void *ctx, u128 *dst, const u128 *src, le128 *iv)

{

	be128 ctrblks[2];
@@ -1340,13 +1312,14 @@ static void camellia_crypt_ctr_2way(void *ctx, u128 *dst, const u128 *src, 
		dst[1] = src[1];

	}



	u128_to_be128(&ctrblks[0], iv);

	u128_inc(iv);

	u128_to_be128(&ctrblks[1], iv);

	u128_inc(iv);

	le128_to_be128(&ctrblks[0], iv);

	le128_inc(iv);

	le128_to_be128(&ctrblks[1], iv);

	le128_inc(iv);



	camellia_enc_blk_xor_2way(ctx, (u8 *)dst, (u8 *)ctrblks);

}

EXPORT_SYMBOL_GPL(camellia_crypt_ctr_2way);



static const struct common_glue_ctx camellia_enc = {

	.num_funcs = 2,
@@ -1464,12 +1437,7 @@ static void decrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes) 
		camellia_dec_blk(ctx, srcdst, srcdst);

}



struct camellia_lrw_ctx {

	struct lrw_table_ctx lrw_table;

	struct camellia_ctx camellia_ctx;

};



static int lrw_camellia_setkey(struct crypto_tfm *tfm, const u8 *key,

int lrw_camellia_setkey(struct crypto_tfm *tfm, const u8 *key,

			unsigned int keylen)

{

	struct camellia_lrw_ctx *ctx = crypto_tfm_ctx(tfm);
@@ -1484,6 +1452,7 @@ static int lrw_camellia_setkey(struct crypto_tfm *tfm, const u8 *key, 
	return lrw_init_table(&ctx->lrw_table,

			      key + keylen - CAMELLIA_BLOCK_SIZE);

}

EXPORT_SYMBOL_GPL(lrw_camellia_setkey);



static int lrw_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,

		       struct scatterlist *src, unsigned int nbytes)
@@ -1519,19 +1488,15 @@ static int lrw_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, 
	return lrw_crypt(desc, dst, src, nbytes, &req);

}



static void lrw_exit_tfm(struct crypto_tfm *tfm)

void lrw_camellia_exit_tfm(struct crypto_tfm *tfm)

{

	struct camellia_lrw_ctx *ctx = crypto_tfm_ctx(tfm);



	lrw_free_table(&ctx->lrw_table);

}

EXPORT_SYMBOL_GPL(lrw_camellia_exit_tfm);



struct camellia_xts_ctx {

	struct camellia_ctx tweak_ctx;

	struct camellia_ctx crypt_ctx;

};



static int xts_camellia_setkey(struct crypto_tfm *tfm, const u8 *key,

int xts_camellia_setkey(struct crypto_tfm *tfm, const u8 *key,

			unsigned int keylen)

{

	struct camellia_xts_ctx *ctx = crypto_tfm_ctx(tfm);
@@ -1555,6 +1520,7 @@ static int xts_camellia_setkey(struct crypto_tfm *tfm, const u8 *key, 
	return __camellia_setkey(&ctx->tweak_ctx, key + keylen / 2, keylen / 2,

				flags);

}

EXPORT_SYMBOL_GPL(xts_camellia_setkey);



static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,

		       struct scatterlist *src, unsigned int nbytes)
@@ -1679,7 +1645,7 @@ static struct crypto_alg camellia_algs[6] = { { 
	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_exit		= lrw_exit_tfm,

	.cra_exit		= lrw_camellia_exit_tfm,

	.cra_u = {

		.blkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE +