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

Commit c1357833 authored by Jan Glauber's avatar Jan Glauber Committed by Linus Torvalds
Browse files

[PATCH] s390: des crypto code cleanup



Beautify the s390 in-kernel-crypto des code.

Signed-off-by: default avatarJan Glauber <jan.glauber@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7aa89746
Loading
Loading
Loading
Loading
+67 −88
Original line number Diff line number Diff line
@@ -15,10 +15,8 @@
 */
#include <linux/init.h>
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/errno.h>
#include <asm/scatterlist.h>
#include <linux/crypto.h>

#include "crypt_s390.h"
#include "crypto_des.h"

@@ -46,37 +44,30 @@ struct crypt_s390_des3_192_ctx {
	u8 key[DES3_192_KEY_SIZE];
};

static int
des_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
static int des_setkey(void *ctx, const u8 *key, unsigned int keylen,
		      u32 *flags)
{
	struct crypt_s390_des_ctx *dctx;
	struct crypt_s390_des_ctx *dctx = ctx;
	int ret;

	dctx = ctx;
	//test if key is valid (not a weak key)
	/* test if key is valid (not a weak key) */
	ret = crypto_des_check_key(key, keylen, flags);
	if (ret == 0){
	if (ret == 0)
		memcpy(dctx->key, key, keylen);
	}
	return ret;
}


static void
des_encrypt(void *ctx, u8 *dst, const u8 *src)
static void des_encrypt(void *ctx, u8 *dst, const u8 *src)
{
	struct crypt_s390_des_ctx *dctx;
	struct crypt_s390_des_ctx *dctx = ctx;

	dctx = ctx;
	crypt_s390_km(KM_DEA_ENCRYPT, dctx->key, dst, src, DES_BLOCK_SIZE);
}

static void
des_decrypt(void *ctx, u8 *dst, const u8 *src)
static void des_decrypt(void *ctx, u8 *dst, const u8 *src)
{
	struct crypt_s390_des_ctx *dctx;
	struct crypt_s390_des_ctx *dctx = ctx;

	dctx = ctx;
	crypt_s390_km(KM_DEA_DECRYPT, dctx->key, dst, src, DES_BLOCK_SIZE);
}

@@ -87,12 +78,15 @@ static struct crypto_alg des_alg = {
	.cra_ctxsize		=	sizeof(struct crypt_s390_des_ctx),
	.cra_module		=	THIS_MODULE,
	.cra_list		=	LIST_HEAD_INIT(des_alg.cra_list),
	.cra_u			=	{ .cipher = {
	.cra_u			=	{
		.cipher = {
			.cia_min_keysize	=	DES_KEY_SIZE,
			.cia_max_keysize	=	DES_KEY_SIZE,
			.cia_setkey		=	des_setkey,
			.cia_encrypt		=	des_encrypt,
	.cia_decrypt		=	des_decrypt } }
			.cia_decrypt		=	des_decrypt
		}
	}
};

/*
@@ -107,16 +101,14 @@ static struct crypto_alg des_alg = {
 *   Implementers MUST reject keys that exhibit this property.
 *
 */
static int
des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
static int des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen,
			   u32 *flags)
{
	int i, ret;
	struct crypt_s390_des3_128_ctx *dctx;
	struct crypt_s390_des3_128_ctx *dctx = ctx;
	const u8* temp_key = key;

	dctx = ctx;
	if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE))) {

		*flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;
		return -EINVAL;
	}
@@ -129,22 +121,18 @@ des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
	return 0;
}

static void
des3_128_encrypt(void *ctx, u8 *dst, const u8 *src)
static void des3_128_encrypt(void *ctx, u8 *dst, const u8 *src)
{
	struct crypt_s390_des3_128_ctx *dctx;
	struct crypt_s390_des3_128_ctx *dctx = ctx;

	dctx = ctx;
	crypt_s390_km(KM_TDEA_128_ENCRYPT, dctx->key, dst, (void*)src,
		      DES3_128_BLOCK_SIZE);
}

static void
des3_128_decrypt(void *ctx, u8 *dst, const u8 *src)
static void des3_128_decrypt(void *ctx, u8 *dst, const u8 *src)
{
	struct crypt_s390_des3_128_ctx *dctx;
	struct crypt_s390_des3_128_ctx *dctx = ctx;

	dctx = ctx;
	crypt_s390_km(KM_TDEA_128_DECRYPT, dctx->key, dst, (void*)src,
		      DES3_128_BLOCK_SIZE);
}
@@ -156,12 +144,15 @@ static struct crypto_alg des3_128_alg = {
	.cra_ctxsize		=	sizeof(struct crypt_s390_des3_128_ctx),
	.cra_module		=	THIS_MODULE,
	.cra_list		=	LIST_HEAD_INIT(des3_128_alg.cra_list),
	.cra_u			=	{ .cipher = {
	.cra_u			=	{
		.cipher = {
			.cia_min_keysize	=	DES3_128_KEY_SIZE,
			.cia_max_keysize	=	DES3_128_KEY_SIZE,
			.cia_setkey		=	des3_128_setkey,
			.cia_encrypt		=	des3_128_encrypt,
	.cia_decrypt		=	des3_128_decrypt } }
			.cia_decrypt		=	des3_128_decrypt
		}
	}
};

/*
@@ -177,15 +168,13 @@ static struct crypto_alg des3_128_alg = {
 *   property.
 *
 */
static int
des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
static int des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen,
			   u32 *flags)
{
	int i, ret;
	struct crypt_s390_des3_192_ctx *dctx;
	const u8* temp_key;
	struct crypt_s390_des3_192_ctx *dctx = ctx;
	const u8* temp_key = key;

	dctx = ctx;
	temp_key = key;
	if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&
	    memcmp(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2],
		   DES_KEY_SIZE))) {
@@ -195,30 +184,25 @@ des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
	}
	for (i = 0; i < 3; i++, temp_key += DES_KEY_SIZE) {
		ret = crypto_des_check_key(temp_key, DES_KEY_SIZE, flags);
		if (ret < 0){
		if (ret < 0)
			return ret;
	}
	}
	memcpy(dctx->key, key, keylen);
	return 0;
}

static void
des3_192_encrypt(void *ctx, u8 *dst, const u8 *src)
static void des3_192_encrypt(void *ctx, u8 *dst, const u8 *src)
{
	struct crypt_s390_des3_192_ctx *dctx;
	struct crypt_s390_des3_192_ctx *dctx = ctx;

	dctx = ctx;
	crypt_s390_km(KM_TDEA_192_ENCRYPT, dctx->key, dst, (void*)src,
		      DES3_192_BLOCK_SIZE);
}

static void
des3_192_decrypt(void *ctx, u8 *dst, const u8 *src)
static void des3_192_decrypt(void *ctx, u8 *dst, const u8 *src)
{
	struct crypt_s390_des3_192_ctx *dctx;
	struct crypt_s390_des3_192_ctx *dctx = ctx;

	dctx = ctx;
	crypt_s390_km(KM_TDEA_192_DECRYPT, dctx->key, dst, (void*)src,
		      DES3_192_BLOCK_SIZE);
}
@@ -230,28 +214,26 @@ static struct crypto_alg des3_192_alg = {
	.cra_ctxsize		=	sizeof(struct crypt_s390_des3_192_ctx),
	.cra_module		=	THIS_MODULE,
	.cra_list		=	LIST_HEAD_INIT(des3_192_alg.cra_list),
	.cra_u			=	{ .cipher = {
	.cra_u			=	{
		.cipher = {
			.cia_min_keysize	=	DES3_192_KEY_SIZE,
			.cia_max_keysize	=	DES3_192_KEY_SIZE,
			.cia_setkey		=	des3_192_setkey,
			.cia_encrypt		=	des3_192_encrypt,
	.cia_decrypt		=	des3_192_decrypt } }
			.cia_decrypt		=	des3_192_decrypt
		}
	}
};



static int
init(void)
static int init(void)
{
	int ret;
	int ret = 0;

	if (!crypt_s390_func_available(KM_DEA_ENCRYPT) ||
	    !crypt_s390_func_available(KM_TDEA_128_ENCRYPT) ||
	    !crypt_s390_func_available(KM_TDEA_192_ENCRYPT)){
	    !crypt_s390_func_available(KM_TDEA_192_ENCRYPT))
		return -ENOSYS;
	}

	ret = 0;
	ret |= (crypto_register_alg(&des_alg) == 0) ? 0:1;
	ret |= (crypto_register_alg(&des3_128_alg) == 0) ? 0:2;
	ret |= (crypto_register_alg(&des3_192_alg) == 0) ? 0:4;
@@ -261,13 +243,10 @@ init(void)
		crypto_unregister_alg(&des_alg);
		return -EEXIST;
	}

	printk(KERN_INFO "crypt_s390: des_s390 loaded.\n");
	return 0;
}

static void __exit
fini(void)
static void __exit fini(void)
{
	crypto_unregister_alg(&des3_192_alg);
	crypto_unregister_alg(&des3_128_alg);