Commit 904e0ab5 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:
  [HWRNG] omap: Minor updates
  [CRYPTO] kconfig: Ordering cleanup
  [CRYPTO] all: Clean up init()/fini()
  [CRYPTO] padlock-aes: Use generic setkey function
  [CRYPTO] aes: Export generic setkey
  [CRYPTO] api: Make the crypto subsystem fully modular
  [CRYPTO] cts: Add CTS mode required for Kerberos AES support
  [CRYPTO] lrw: Replace all adds to big endians variables with be*_add_cpu
  [CRYPTO] tcrypt: Change the XTEA test vectors
  [CRYPTO] tcrypt: Shrink the tcrypt module
  [CRYPTO] tcrypt: Change the usage of the test vectors
  [CRYPTO] api: Constify function pointer tables
  [CRYPTO] aes-x86-32: Remove unused return code
  [CRYPTO] tcrypt: Shrink speed templates
  [CRYPTO] tcrypt: Group common speed templates
  [CRYPTO] sha512: Rename sha512 to sha512_generic
  [CRYPTO] sha384: Hardware acceleration for s390
  [CRYPTO] sha512: Hardware acceleration for s390
  [CRYPTO] s390: Generic sha_update and sha_final
  [CRYPTO] api: Switch to proc_create()
parents 98a1e95f c49a7f18

arch/s390/crypto/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ 
# Cryptographic API

#



obj-$(CONFIG_CRYPTO_SHA1_S390) += sha1_s390.o

obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256_s390.o

obj-$(CONFIG_CRYPTO_SHA1_S390) += sha1_s390.o sha_common.o

obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256_s390.o sha_common.o

obj-$(CONFIG_CRYPTO_SHA512_S390) += sha512_s390.o sha_common.o

obj-$(CONFIG_CRYPTO_DES_S390) += des_s390.o des_check_key.o

obj-$(CONFIG_CRYPTO_AES_S390) += aes_s390.o

obj-$(CONFIG_S390_PRNG) += prng.o

arch/s390/crypto/crypt_s390.h

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ enum crypt_s390_kimd_func { 
	KIMD_QUERY   = CRYPT_S390_KIMD | 0,

	KIMD_SHA_1   = CRYPT_S390_KIMD | 1,

	KIMD_SHA_256 = CRYPT_S390_KIMD | 2,

	KIMD_SHA_512 = CRYPT_S390_KIMD | 3,

};



/*
@@ -92,6 +93,7 @@ enum crypt_s390_klmd_func { 
	KLMD_QUERY   = CRYPT_S390_KLMD | 0,

	KLMD_SHA_1   = CRYPT_S390_KLMD | 1,

	KLMD_SHA_256 = CRYPT_S390_KLMD | 2,

	KLMD_SHA_512 = CRYPT_S390_KLMD | 3,

};



/*

arch/s390/crypto/sha.h

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

 * Cryptographic API.

 *

 * s390 generic implementation of the SHA Secure Hash Algorithms.

 *

 * Copyright IBM Corp. 2007

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

 *

 * 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.

 *

 */

#ifndef _CRYPTO_ARCH_S390_SHA_H

#define _CRYPTO_ARCH_S390_SHA_H



#include <linux/crypto.h>

#include <crypto/sha.h>



/* must be big enough for the largest SHA variant */

#define SHA_MAX_STATE_SIZE	16

#define SHA_MAX_BLOCK_SIZE      SHA512_BLOCK_SIZE



struct s390_sha_ctx {

	u64 count;              /* message length in bytes */

	u32 state[SHA_MAX_STATE_SIZE];

	u8 buf[2 * SHA_MAX_BLOCK_SIZE];

	int func;		/* KIMD function to use */

};



void s390_sha_update(struct crypto_tfm *tfm, const u8 *data, unsigned int len);

void s390_sha_final(struct crypto_tfm *tfm, u8 *out);



#endif

arch/s390/crypto/sha1_s390.c

+6 −85
Original line number Diff line number Diff line
@@ -29,16 +29,11 @@ 
#include <crypto/sha.h>



#include "crypt_s390.h"



struct s390_sha1_ctx {

	u64 count;		/* message length */

	u32 state[5];

	u8 buf[2 * SHA1_BLOCK_SIZE];

};

#include "sha.h"



static void sha1_init(struct crypto_tfm *tfm)

{

	struct s390_sha1_ctx *sctx = crypto_tfm_ctx(tfm);

	struct s390_sha_ctx *sctx = crypto_tfm_ctx(tfm);



	sctx->state[0] = SHA1_H0;

	sctx->state[1] = SHA1_H1;
@@ -46,79 +41,7 @@ static void sha1_init(struct crypto_tfm *tfm) 
	sctx->state[3] = SHA1_H3;

	sctx->state[4] = SHA1_H4;

	sctx->count = 0;

}



static void sha1_update(struct crypto_tfm *tfm, const u8 *data,

			unsigned int len)

{

	struct s390_sha1_ctx *sctx = crypto_tfm_ctx(tfm);

	unsigned int index;

	int ret;



	/* how much is already in the buffer? */

	index = sctx->count & 0x3f;



	sctx->count += len;



	if (index + len < SHA1_BLOCK_SIZE)

		goto store;



	/* process one stored block */

	if (index) {

		memcpy(sctx->buf + index, data, SHA1_BLOCK_SIZE - index);

		ret = crypt_s390_kimd(KIMD_SHA_1, sctx->state, sctx->buf,

				      SHA1_BLOCK_SIZE);

		BUG_ON(ret != SHA1_BLOCK_SIZE);

		data += SHA1_BLOCK_SIZE - index;

		len -= SHA1_BLOCK_SIZE - index;

	}



	/* process as many blocks as possible */

	if (len >= SHA1_BLOCK_SIZE) {

		ret = crypt_s390_kimd(KIMD_SHA_1, sctx->state, data,

				      len & ~(SHA1_BLOCK_SIZE - 1));

		BUG_ON(ret != (len & ~(SHA1_BLOCK_SIZE - 1)));

		data += ret;

		len -= ret;

	}



store:

	/* anything left? */

	if (len)

		memcpy(sctx->buf + index , data, len);

}



/* Add padding and return the message digest. */

static void sha1_final(struct crypto_tfm *tfm, u8 *out)

{

	struct s390_sha1_ctx *sctx = crypto_tfm_ctx(tfm);

	u64 bits;

	unsigned int index, end;

	int ret;



	/* must perform manual padding */

	index = sctx->count & 0x3f;

	end =  (index < 56) ? SHA1_BLOCK_SIZE : (2 * SHA1_BLOCK_SIZE);



	/* start pad with 1 */

	sctx->buf[index] = 0x80;



	/* pad with zeros */

	index++;

	memset(sctx->buf + index, 0x00, end - index - 8);



	/* append message length */

	bits = sctx->count * 8;

	memcpy(sctx->buf + end - 8, &bits, sizeof(bits));



	ret = crypt_s390_kimd(KIMD_SHA_1, sctx->state, sctx->buf, end);

	BUG_ON(ret != end);



	/* copy digest to out */

	memcpy(out, sctx->state, SHA1_DIGEST_SIZE);



	/* wipe context */

	memset(sctx, 0, sizeof *sctx);

	sctx->func = KIMD_SHA_1;

}



static struct crypto_alg alg = {
@@ -127,21 +50,20 @@ static struct crypto_alg alg = { 
	.cra_priority	=	CRYPT_S390_PRIORITY,

	.cra_flags	=	CRYPTO_ALG_TYPE_DIGEST,

	.cra_blocksize	=	SHA1_BLOCK_SIZE,

	.cra_ctxsize	=	sizeof(struct s390_sha1_ctx),

	.cra_ctxsize	=	sizeof(struct s390_sha_ctx),

	.cra_module	=	THIS_MODULE,

	.cra_list	=	LIST_HEAD_INIT(alg.cra_list),

	.cra_u		=	{ .digest = {

	.dia_digestsize	=	SHA1_DIGEST_SIZE,

	.dia_init	=	sha1_init,

	.dia_update	=	sha1_update,

	.dia_final	=	sha1_final } }

	.dia_update	=	s390_sha_update,

	.dia_final	=	s390_sha_final } }

};



static int __init sha1_s390_init(void)

{

	if (!crypt_s390_func_available(KIMD_SHA_1))

		return -EOPNOTSUPP;



	return crypto_register_alg(&alg);

}
@@ -154,6 +76,5 @@ module_init(sha1_s390_init); 
module_exit(sha1_s390_fini);



MODULE_ALIAS("sha1");



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");

arch/s390/crypto/sha256_s390.c

+6 −84
Original line number Diff line number Diff line
@@ -22,16 +22,11 @@ 
#include <crypto/sha.h>



#include "crypt_s390.h"



struct s390_sha256_ctx {

	u64 count;		/* message length */

	u32 state[8];

	u8 buf[2 * SHA256_BLOCK_SIZE];

};

#include "sha.h"



static void sha256_init(struct crypto_tfm *tfm)

{

	struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);

	struct s390_sha_ctx *sctx = crypto_tfm_ctx(tfm);



	sctx->state[0] = SHA256_H0;

	sctx->state[1] = SHA256_H1;
@@ -42,79 +37,7 @@ static void sha256_init(struct crypto_tfm *tfm) 
	sctx->state[6] = SHA256_H6;

	sctx->state[7] = SHA256_H7;

	sctx->count = 0;

}



static void sha256_update(struct crypto_tfm *tfm, const u8 *data,

			  unsigned int len)

{

	struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);

	unsigned int index;

	int ret;



	/* how much is already in the buffer? */

	index = sctx->count & 0x3f;



	sctx->count += len;



	if ((index + len) < SHA256_BLOCK_SIZE)

		goto store;



	/* process one stored block */

	if (index) {

		memcpy(sctx->buf + index, data, SHA256_BLOCK_SIZE - index);

		ret = crypt_s390_kimd(KIMD_SHA_256, sctx->state, sctx->buf,

				      SHA256_BLOCK_SIZE);

		BUG_ON(ret != SHA256_BLOCK_SIZE);

		data += SHA256_BLOCK_SIZE - index;

		len -= SHA256_BLOCK_SIZE - index;

	}



	/* process as many blocks as possible */

	if (len >= SHA256_BLOCK_SIZE) {

		ret = crypt_s390_kimd(KIMD_SHA_256, sctx->state, data,

				      len & ~(SHA256_BLOCK_SIZE - 1));

		BUG_ON(ret != (len & ~(SHA256_BLOCK_SIZE - 1)));

		data += ret;

		len -= ret;

	}



store:

	/* anything left? */

	if (len)

		memcpy(sctx->buf + index , data, len);

}



/* Add padding and return the message digest */

static void sha256_final(struct crypto_tfm *tfm, u8 *out)

{

	struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);

	u64 bits;

	unsigned int index, end;

	int ret;



	/* must perform manual padding */

	index = sctx->count & 0x3f;

	end = (index < 56) ? SHA256_BLOCK_SIZE : (2 * SHA256_BLOCK_SIZE);



	/* start pad with 1 */

	sctx->buf[index] = 0x80;



	/* pad with zeros */

	index++;

	memset(sctx->buf + index, 0x00, end - index - 8);



	/* append message length */

	bits = sctx->count * 8;

	memcpy(sctx->buf + end - 8, &bits, sizeof(bits));



	ret = crypt_s390_kimd(KIMD_SHA_256, sctx->state, sctx->buf, end);

	BUG_ON(ret != end);



	/* copy digest to out */

	memcpy(out, sctx->state, SHA256_DIGEST_SIZE);



	/* wipe context */

	memset(sctx, 0, sizeof *sctx);

	sctx->func = KIMD_SHA_256;

}



static struct crypto_alg alg = {
@@ -123,14 +46,14 @@ static struct crypto_alg alg = { 
	.cra_priority	=	CRYPT_S390_PRIORITY,

	.cra_flags	=	CRYPTO_ALG_TYPE_DIGEST,

	.cra_blocksize	=	SHA256_BLOCK_SIZE,

	.cra_ctxsize	=	sizeof(struct s390_sha256_ctx),

	.cra_ctxsize	=	sizeof(struct s390_sha_ctx),

	.cra_module	=	THIS_MODULE,

	.cra_list	=	LIST_HEAD_INIT(alg.cra_list),

	.cra_u		=	{ .digest = {

	.dia_digestsize	=	SHA256_DIGEST_SIZE,

	.dia_init	=	sha256_init,

	.dia_update	=	sha256_update,

	.dia_final	=	sha256_final } }

	.dia_update	=	s390_sha_update,

	.dia_final	=	s390_sha_final } }

};



static int sha256_s390_init(void)
@@ -150,6 +73,5 @@ module_init(sha256_s390_init); 
module_exit(sha256_s390_fini);



MODULE_ALIAS("sha256");



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm");

CRA Git | Maintained and supported by SUSTech CRA and CCSE