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

Commit d66e6737 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:
 - Optimised AES/SHA1 for ARM.
 - IPsec ESN support in talitos and caam.
 - x86_64/avx implementation of cast5/cast6.
 - Add/use multi-algorithm registration helpers where possible.
 - Added IBM Power7+ in-Nest support.
 - Misc fixes.

Fix up trivial conflicts in crypto/Kconfig due to the sparc64 crypto
config options being added next to the new ARM ones.

[ Side note: cut-and-paste duplicate help texts make those conflicts
  harder to read than necessary, thanks to git being smart about
  minimizing conflicts and maximizing the common parts... ]

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (71 commits)
  crypto: x86/glue_helper - fix storing of new IV in CBC encryption
  crypto: cast5/avx - fix storing of new IV in CBC encryption
  crypto: tcrypt - add missing tests for camellia and ghash
  crypto: testmgr - make test_aead also test 'dst != src' code paths
  crypto: testmgr - make test_skcipher also test 'dst != src' code paths
  crypto: testmgr - add test vectors for CTR mode IV increasement
  crypto: testmgr - add test vectors for partial ctr(cast5) and ctr(cast6)
  crypto: testmgr - allow non-multi page and multi page skcipher tests from same test template
  crypto: caam - increase TRNG clocks per sample
  crypto, tcrypt: remove local_bh_disable/enable() around local_irq_disable/enable()
  crypto: tegra-aes - fix error return code
  crypto: crypto4xx - fix error return code
  crypto: hifn_795x - fix error return code
  crypto: ux500 - fix error return code
  crypto: caam - fix error IDs for SEC v5.x RNG4
  hwrng: mxc-rnga - Access data via structure
  hwrng: mxc-rnga - Adapt clocks to new i.mx clock framework
  crypto: caam - add IPsec ESN support
  crypto: 842 - remove .cra_list initialization
  Revert "[CRYPTO] cast6: inline bloat--"
  ...
parents 612a9aab c9f97a27

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -3438,6 +3438,18 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git 
S:	Maintained

F:	arch/ia64/



IBM Power in-Nest Crypto Acceleration

M:	Kent Yoder <key@linux.vnet.ibm.com>

L:	linux-crypto@vger.kernel.org

S:	Supported

F:	drivers/crypto/nx/



IBM Power 842 compression accelerator

M:	Robert Jennings <rcj@linux.vnet.ibm.com>

S:	Supported

F:	drivers/crypto/nx/nx-842.c

F:	include/linux/nx842.h



IBM Power Linux RAID adapter

M:	Brian King <brking@us.ibm.com>

S:	Supported

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ core-$(CONFIG_VFP) += arch/arm/vfp/ 
# If we have a machine-specific directory, then include it in the build.

core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/

core-y				+= arch/arm/net/

core-y				+= arch/arm/crypto/

core-y				+= $(machdirs) $(platdirs)



drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

arch/arm/crypto/Makefile

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#

# Arch-specific CryptoAPI modules.

#



obj-$(CONFIG_CRYPTO_AES_ARM) += aes-arm.o

obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o



aes-arm-y  := aes-armv4.o aes_glue.o

sha1-arm-y := sha1-armv4-large.o sha1_glue.o

arch/arm/crypto/aes-armv4.S

0 → 100644
+1112 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/crypto/aes_glue.c

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

 * Glue Code for the asm optimized version of the AES Cipher Algorithm

 */



#include <linux/module.h>

#include <linux/crypto.h>

#include <crypto/aes.h>



#define AES_MAXNR 14



typedef struct {

	unsigned int rd_key[4 *(AES_MAXNR + 1)];

	int rounds;

} AES_KEY;



struct AES_CTX {

	AES_KEY enc_key;

	AES_KEY dec_key;

};



asmlinkage void AES_encrypt(const u8 *in, u8 *out, AES_KEY *ctx);

asmlinkage void AES_decrypt(const u8 *in, u8 *out, AES_KEY *ctx);

asmlinkage int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key);

asmlinkage int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key);



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

{

	struct AES_CTX *ctx = crypto_tfm_ctx(tfm);

	AES_encrypt(src, dst, &ctx->enc_key);

}



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

{

	struct AES_CTX *ctx = crypto_tfm_ctx(tfm);

	AES_decrypt(src, dst, &ctx->dec_key);

}



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

		unsigned int key_len)

{

	struct AES_CTX *ctx = crypto_tfm_ctx(tfm);



	switch (key_len) {

	case AES_KEYSIZE_128:

		key_len = 128;

		break;

	case AES_KEYSIZE_192:

		key_len = 192;

		break;

	case AES_KEYSIZE_256:

		key_len = 256;

		break;

	default:

		tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;

		return -EINVAL;

	}



	if (private_AES_set_encrypt_key(in_key, key_len, &ctx->enc_key) == -1) {

		tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;

		return -EINVAL;

	}

	/* private_AES_set_decrypt_key expects an encryption key as input */

	ctx->dec_key = ctx->enc_key;

	if (private_AES_set_decrypt_key(in_key, key_len, &ctx->dec_key) == -1) {

		tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;

		return -EINVAL;

	}

	return 0;

}



static struct crypto_alg aes_alg = {

	.cra_name		= "aes",

	.cra_driver_name	= "aes-asm",

	.cra_priority		= 200,

	.cra_flags		= CRYPTO_ALG_TYPE_CIPHER,

	.cra_blocksize		= AES_BLOCK_SIZE,

	.cra_ctxsize		= sizeof(struct AES_CTX),

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(aes_alg.cra_list),

	.cra_u	= {

		.cipher	= {

			.cia_min_keysize	= AES_MIN_KEY_SIZE,

			.cia_max_keysize	= AES_MAX_KEY_SIZE,

			.cia_setkey			= aes_set_key,

			.cia_encrypt		= aes_encrypt,

			.cia_decrypt		= aes_decrypt

		}

	}

};



static int __init aes_init(void)

{

	return crypto_register_alg(&aes_alg);

}



static void __exit aes_fini(void)

{

	crypto_unregister_alg(&aes_alg);

}



module_init(aes_init);

module_exit(aes_fini);



MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm (ASM)");

MODULE_LICENSE("GPL");

MODULE_ALIAS("aes");

MODULE_ALIAS("aes-asm");

MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>");