Commit a23a334b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (34 commits)
  crypto: caam - ablkcipher support
  crypto: caam - faster aead implementation
  crypto: caam - structure renaming
  crypto: caam - shorter names
  crypto: talitos - don't bad_key in ablkcipher setkey
  crypto: talitos - remove unused giv from ablkcipher methods
  crypto: talitos - don't set done notification in hot path
  crypto: talitos - ensure request ordering within a single tfm
  crypto: gf128mul - fix call to memset()
  crypto: s390 - support hardware accelerated SHA-224
  crypto: algif_hash - Handle initial af_alg_make_sg error correctly
  crypto: sha1_generic - use SHA1_BLOCK_SIZE
  hwrng: ppc4xx - add support for ppc4xx TRNG
  crypto: crypto4xx - Perform read/modify/write on device control register
  crypto: caam - fix build warning when DEBUG_FS not configured
  crypto: arc4 - Fixed coding style issues
  crypto: crc32c - Fixed coding style issue
  crypto: omap-sham - do not schedule tasklet if there is no active requests
  crypto: omap-sham - clear device flags when finishing request
  crypto: omap-sham - irq handler must not clear error code
  ...
parents a6422850 acdca31d

arch/s390/crypto/sha256_s390.c

+55 −11
Original line number Diff line number Diff line 
/*

 * Cryptographic API.

 *

 * s390 implementation of the SHA256 Secure Hash Algorithm.

 * s390 implementation of the SHA256 and SHA224 Secure Hash Algorithm.

 *

 * s390 Version:

 *   Copyright IBM Corp. 2005,2007

 *   Copyright IBM Corp. 2005,2011

 *   Author(s): Jan Glauber (jang@de.ibm.com)

 *

 * Derived from "crypto/sha256_generic.c"

 * and "arch/s390/crypto/sha1_s390.c"

 *

 * 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)
@@ -65,7 +62,7 @@ static int sha256_import(struct shash_desc *desc, const void *in) 
	return 0;

}



static struct shash_alg alg = {

static struct shash_alg sha256_alg = {

	.digestsize	=	SHA256_DIGEST_SIZE,

	.init		=	sha256_init,

	.update		=	s390_sha_update,
@@ -84,22 +81,69 @@ static struct shash_alg alg = { 
	}

};



static int sha256_s390_init(void)

static int sha224_init(struct shash_desc *desc)

{

	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);



	sctx->state[0] = SHA224_H0;

	sctx->state[1] = SHA224_H1;

	sctx->state[2] = SHA224_H2;

	sctx->state[3] = SHA224_H3;

	sctx->state[4] = SHA224_H4;

	sctx->state[5] = SHA224_H5;

	sctx->state[6] = SHA224_H6;

	sctx->state[7] = SHA224_H7;

	sctx->count = 0;

	sctx->func = KIMD_SHA_256;



	return 0;

}



static struct shash_alg sha224_alg = {

	.digestsize	=	SHA224_DIGEST_SIZE,

	.init		=	sha224_init,

	.update		=	s390_sha_update,

	.final		=	s390_sha_final,

	.export		=	sha256_export,

	.import		=	sha256_import,

	.descsize	=	sizeof(struct s390_sha_ctx),

	.statesize	=	sizeof(struct sha256_state),

	.base		=	{

		.cra_name	=	"sha224",

		.cra_driver_name=	"sha224-s390",

		.cra_priority	=	CRYPT_S390_PRIORITY,

		.cra_flags	=	CRYPTO_ALG_TYPE_SHASH,

		.cra_blocksize	=	SHA224_BLOCK_SIZE,

		.cra_module	=	THIS_MODULE,

	}

};



static int __init sha256_s390_init(void)

{

	int ret;



	if (!crypt_s390_func_available(KIMD_SHA_256, CRYPT_S390_MSA))

		return -EOPNOTSUPP;



	return crypto_register_shash(&alg);

	ret = crypto_register_shash(&sha256_alg);

	if (ret < 0)

		goto out;

	ret = crypto_register_shash(&sha224_alg);

	if (ret < 0)

		crypto_unregister_shash(&sha256_alg);

out:

	return ret;

}



static void __exit sha256_s390_fini(void)

{

	crypto_unregister_shash(&alg);

	crypto_unregister_shash(&sha224_alg);

	crypto_unregister_shash(&sha256_alg);

}



module_init(sha256_s390_init);

module_exit(sha256_s390_fini);



MODULE_ALIAS("sha256");

MODULE_ALIAS("sha224");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm");
 
MODULE_DESCRIPTION("SHA256 and SHA224 Secure Hash Algorithm");

arch/x86/crypto/ghash-clmulni-intel_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int ghash_async_setkey(struct crypto_ahash *tfm, const u8 *key, 
	crypto_ahash_set_flags(tfm, crypto_ahash_get_flags(child)

			       & CRYPTO_TFM_RES_MASK);



	return 0;

	return err;

}



static int ghash_async_init_tfm(struct crypto_tfm *tfm)

crypto/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ config CRYPTO_WP512 


config CRYPTO_GHASH_CLMUL_NI_INTEL

	tristate "GHASH digest algorithm (CLMUL-NI accelerated)"

	depends on (X86 || UML_X86) && 64BIT

	depends on X86 && 64BIT

	select CRYPTO_SHASH

	select CRYPTO_CRYPTD

	help
@@ -533,7 +533,7 @@ config CRYPTO_AES_X86_64 


config CRYPTO_AES_NI_INTEL

	tristate "AES cipher algorithms (AES-NI)"

	depends on (X86 || UML_X86)

	depends on X86

	select CRYPTO_AES_X86_64 if 64BIT

	select CRYPTO_AES_586 if !64BIT

	select CRYPTO_CRYPTD

crypto/algif_hash.c

+3 −1
Original line number Diff line number Diff line
@@ -68,8 +68,10 @@ static int hash_sendmsg(struct kiocb *unused, struct socket *sock, 
			int newlen;



			newlen = af_alg_make_sg(&ctx->sgl, from, len, 0);

			if (newlen < 0)

			if (newlen < 0) {

				err = copied ? 0 : newlen;

				goto unlock;

			}



			ahash_request_set_crypt(&ctx->req, ctx->sgl.sg, NULL,

						newlen);

crypto/arc4.c

+7 −8
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ static int arc4_set_key(struct crypto_tfm *tfm, const u8 *in_key, 
	for (i = 0; i < 256; i++)

		ctx->S[i] = i;



	for(i = 0; i < 256; i++)

	{

	for (i = 0; i < 256; i++) {

		u8 a = ctx->S[i];

		j = (j + in_key[k] + a) & 0xff;

		ctx->S[i] = ctx->S[j];

CRA Git | Maintained and supported by SUSTech CRA and CCSE