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

Commit 332a3392 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: (102 commits)
  crypto: sha-s390 - Fix warnings in import function
  crypto: vmac - New hash algorithm for intel_txt support
  crypto: api - Do not displace newly registered algorithms
  crypto: ansi_cprng - Fix module initialization
  crypto: xcbc - Fix alignment calculation of xcbc_tfm_ctx
  crypto: fips - Depend on ansi_cprng
  crypto: blkcipher - Do not use eseqiv on stream ciphers
  crypto: ctr - Use chainiv on raw counter mode
  Revert crypto: fips - Select CPRNG
  crypto: rng - Fix typo
  crypto: talitos - add support for 36 bit addressing
  crypto: talitos - align locks on cache lines
  crypto: talitos - simplify hmac data size calculation
  crypto: mv_cesa - Add support for Orion5X crypto engine
  crypto: cryptd - Add support to access underlaying shash
  crypto: gcm - Use GHASH digest algorithm
  crypto: ghash - Add GHASH digest algorithm for GCM
  crypto: authenc - Convert to ahash
  crypto: api - Fix aligned ctx helper
  crypto: hmac - Prehash ipad/opad
  ...
parents a9c86d42 81bd5f6c

arch/s390/crypto/des_s390.c

+6 −5
Original line number Diff line number Diff line
@@ -250,8 +250,9 @@ static int des3_128_setkey(struct crypto_tfm *tfm, const u8 *key, 
	const u8 *temp_key = key;

	u32 *flags = &tfm->crt_flags;



	if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE))) {

		*flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;

	if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE)) &&

	    (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {

		*flags |= CRYPTO_TFM_RES_WEAK_KEY;

		return -EINVAL;

	}

	for (i = 0; i < 2; i++, temp_key += DES_KEY_SIZE) {
@@ -411,9 +412,9 @@ static int des3_192_setkey(struct crypto_tfm *tfm, const u8 *key, 


	if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&

	    memcmp(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2],

		   DES_KEY_SIZE))) {



		*flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;

		   DES_KEY_SIZE)) &&

	    (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {

		*flags |= CRYPTO_TFM_RES_WEAK_KEY;

		return -EINVAL;

	}

	for (i = 0; i < 3; i++, temp_key += DES_KEY_SIZE) {

arch/s390/crypto/sha1_s390.c

+26 −0
Original line number Diff line number Diff line
@@ -46,12 +46,38 @@ static int sha1_init(struct shash_desc *desc) 
	return 0;

}



static int sha1_export(struct shash_desc *desc, void *out)

{

	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);

	struct sha1_state *octx = out;



	octx->count = sctx->count;

	memcpy(octx->state, sctx->state, sizeof(octx->state));

	memcpy(octx->buffer, sctx->buf, sizeof(octx->buffer));

	return 0;

}



static int sha1_import(struct shash_desc *desc, const void *in)

{

	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);

	const struct sha1_state *ictx = in;



	sctx->count = ictx->count;

	memcpy(sctx->state, ictx->state, sizeof(ictx->state));

	memcpy(sctx->buf, ictx->buffer, sizeof(ictx->buffer));

	sctx->func = KIMD_SHA_1;

	return 0;

}



static struct shash_alg alg = {

	.digestsize	=	SHA1_DIGEST_SIZE,

	.init		=	sha1_init,

	.update		=	s390_sha_update,

	.final		=	s390_sha_final,

	.export		=	sha1_export,

	.import		=	sha1_import,

	.descsize	=	sizeof(struct s390_sha_ctx),

	.statesize	=	sizeof(struct sha1_state),

	.base		=	{

		.cra_name	=	"sha1",

		.cra_driver_name=	"sha1-s390",

arch/s390/crypto/sha256_s390.c

+26 −0
Original line number Diff line number Diff line
@@ -42,12 +42,38 @@ static int sha256_init(struct shash_desc *desc) 
	return 0;

}



static int sha256_export(struct shash_desc *desc, void *out)

{

	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);

	struct sha256_state *octx = out;



	octx->count = sctx->count;

	memcpy(octx->state, sctx->state, sizeof(octx->state));

	memcpy(octx->buf, sctx->buf, sizeof(octx->buf));

	return 0;

}



static int sha256_import(struct shash_desc *desc, const void *in)

{

	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);

	const struct sha256_state *ictx = in;



	sctx->count = ictx->count;

	memcpy(sctx->state, ictx->state, sizeof(ictx->state));

	memcpy(sctx->buf, ictx->buf, sizeof(ictx->buf));

	sctx->func = KIMD_SHA_256;

	return 0;

}



static struct shash_alg alg = {

	.digestsize	=	SHA256_DIGEST_SIZE,

	.init		=	sha256_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	=	"sha256",

		.cra_driver_name=	"sha256-s390",

arch/s390/crypto/sha512_s390.c

+36 −0
Original line number Diff line number Diff line
@@ -13,7 +13,10 @@ 
 *

 */

#include <crypto/internal/hash.h>

#include <crypto/sha.h>

#include <linux/errno.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/module.h>



#include "sha.h"
@@ -37,12 +40,42 @@ static int sha512_init(struct shash_desc *desc) 
	return 0;

}



static int sha512_export(struct shash_desc *desc, void *out)

{

	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);

	struct sha512_state *octx = out;



	octx->count[0] = sctx->count;

	octx->count[1] = 0;

	memcpy(octx->state, sctx->state, sizeof(octx->state));

	memcpy(octx->buf, sctx->buf, sizeof(octx->buf));

	return 0;

}



static int sha512_import(struct shash_desc *desc, const void *in)

{

	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);

	const struct sha512_state *ictx = in;



	if (unlikely(ictx->count[1]))

		return -ERANGE;

	sctx->count = ictx->count[0];



	memcpy(sctx->state, ictx->state, sizeof(ictx->state));

	memcpy(sctx->buf, ictx->buf, sizeof(ictx->buf));

	sctx->func = KIMD_SHA_512;

	return 0;

}



static struct shash_alg sha512_alg = {

	.digestsize	=	SHA512_DIGEST_SIZE,

	.init		=	sha512_init,

	.update		=	s390_sha_update,

	.final		=	s390_sha_final,

	.export		=	sha512_export,

	.import		=	sha512_import,

	.descsize	=	sizeof(struct s390_sha_ctx),

	.statesize	=	sizeof(struct sha512_state),

	.base		=	{

		.cra_name	=	"sha512",

		.cra_driver_name=	"sha512-s390",
@@ -78,7 +111,10 @@ static struct shash_alg sha384_alg = { 
	.init		=	sha384_init,

	.update		=	s390_sha_update,

	.final		=	s390_sha_final,

	.export		=	sha512_export,

	.import		=	sha512_import,

	.descsize	=	sizeof(struct s390_sha_ctx),

	.statesize	=	sizeof(struct sha512_state),

	.base		=	{

		.cra_name	=	"sha384",

		.cra_driver_name=	"sha384-s390",

arch/x86/crypto/aesni-intel_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ static int __init aesni_init(void) 
	int err;



	if (!cpu_has_aes) {

		printk(KERN_ERR "Intel AES-NI instructions are not detected.\n");

		printk(KERN_INFO "Intel AES-NI instructions are not detected.\n");

		return -ENODEV;

	}

	if ((err = crypto_register_alg(&aesni_alg)))