Commit c1e26e1e authored by Jan Glauber's avatar Jan Glauber Committed by Linus Torvalds

[PATCH] s390: in-kernel crypto rename

Replace all references to z990 by s390 in the in-kernel crypto files in
arch/s390/crypto.  The code is not specific to a particular machine (z990) but
to the s390 platform.  Big diff, does nothing..
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 d0f4c16f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Cryptographic API # Cryptographic API
# #
obj-$(CONFIG_CRYPTO_SHA1_Z990) += sha1_z990.o obj-$(CONFIG_CRYPTO_SHA1_S390) += sha1_s390.o
obj-$(CONFIG_CRYPTO_DES_Z990) += des_z990.o des_check_key.o obj-$(CONFIG_CRYPTO_DES_S390) += des_s390.o des_check_key.o
obj-$(CONFIG_CRYPTO_TEST) += crypt_z990_query.o obj-$(CONFIG_CRYPTO_TEST) += crypt_s390_query.o
/* /*
* Cryptographic API. * Cryptographic API.
* *
* Support for z990 cryptographic instructions. * Support for s390 cryptographic instructions.
* Testing module for querying processor crypto capabilities. * Testing module for querying processor crypto capabilities.
* *
* Copyright (c) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation * Copyright (c) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
...@@ -17,91 +17,93 @@ ...@@ -17,91 +17,93 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/errno.h> #include <asm/errno.h>
#include "crypt_z990.h" #include "crypt_s390.h"
static void static void query_available_functions(void)
query_available_functions(void)
{ {
printk(KERN_INFO "#####################\n"); printk(KERN_INFO "#####################\n");
//query available KM functions
/* query available KM functions */
printk(KERN_INFO "KM_QUERY: %d\n", printk(KERN_INFO "KM_QUERY: %d\n",
crypt_z990_func_available(KM_QUERY)); crypt_s390_func_available(KM_QUERY));
printk(KERN_INFO "KM_DEA: %d\n", printk(KERN_INFO "KM_DEA: %d\n",
crypt_z990_func_available(KM_DEA_ENCRYPT)); crypt_s390_func_available(KM_DEA_ENCRYPT));
printk(KERN_INFO "KM_TDEA_128: %d\n", printk(KERN_INFO "KM_TDEA_128: %d\n",
crypt_z990_func_available(KM_TDEA_128_ENCRYPT)); crypt_s390_func_available(KM_TDEA_128_ENCRYPT));
printk(KERN_INFO "KM_TDEA_192: %d\n", printk(KERN_INFO "KM_TDEA_192: %d\n",
crypt_z990_func_available(KM_TDEA_192_ENCRYPT)); crypt_s390_func_available(KM_TDEA_192_ENCRYPT));
//query available KMC functions
/* query available KMC functions */
printk(KERN_INFO "KMC_QUERY: %d\n", printk(KERN_INFO "KMC_QUERY: %d\n",
crypt_z990_func_available(KMC_QUERY)); crypt_s390_func_available(KMC_QUERY));
printk(KERN_INFO "KMC_DEA: %d\n", printk(KERN_INFO "KMC_DEA: %d\n",
crypt_z990_func_available(KMC_DEA_ENCRYPT)); crypt_s390_func_available(KMC_DEA_ENCRYPT));
printk(KERN_INFO "KMC_TDEA_128: %d\n", printk(KERN_INFO "KMC_TDEA_128: %d\n",
crypt_z990_func_available(KMC_TDEA_128_ENCRYPT)); crypt_s390_func_available(KMC_TDEA_128_ENCRYPT));
printk(KERN_INFO "KMC_TDEA_192: %d\n", printk(KERN_INFO "KMC_TDEA_192: %d\n",
crypt_z990_func_available(KMC_TDEA_192_ENCRYPT)); crypt_s390_func_available(KMC_TDEA_192_ENCRYPT));
//query available KIMD fucntions
/* query available KIMD fucntions */
printk(KERN_INFO "KIMD_QUERY: %d\n", printk(KERN_INFO "KIMD_QUERY: %d\n",
crypt_z990_func_available(KIMD_QUERY)); crypt_s390_func_available(KIMD_QUERY));
printk(KERN_INFO "KIMD_SHA_1: %d\n", printk(KERN_INFO "KIMD_SHA_1: %d\n",
crypt_z990_func_available(KIMD_SHA_1)); crypt_s390_func_available(KIMD_SHA_1));
//query available KLMD functions
/* query available KLMD functions */
printk(KERN_INFO "KLMD_QUERY: %d\n", printk(KERN_INFO "KLMD_QUERY: %d\n",
crypt_z990_func_available(KLMD_QUERY)); crypt_s390_func_available(KLMD_QUERY));
printk(KERN_INFO "KLMD_SHA_1: %d\n", printk(KERN_INFO "KLMD_SHA_1: %d\n",
crypt_z990_func_available(KLMD_SHA_1)); crypt_s390_func_available(KLMD_SHA_1));
//query available KMAC functions
/* query available KMAC functions */
printk(KERN_INFO "KMAC_QUERY: %d\n", printk(KERN_INFO "KMAC_QUERY: %d\n",
crypt_z990_func_available(KMAC_QUERY)); crypt_s3990_func_available(KMAC_QUERY));
printk(KERN_INFO "KMAC_DEA: %d\n", printk(KERN_INFO "KMAC_DEA: %d\n",
crypt_z990_func_available(KMAC_DEA)); crypt_s390_func_available(KMAC_DEA));
printk(KERN_INFO "KMAC_TDEA_128: %d\n", printk(KERN_INFO "KMAC_TDEA_128: %d\n",
crypt_z990_func_available(KMAC_TDEA_128)); crypt_s390_func_available(KMAC_TDEA_128));
printk(KERN_INFO "KMAC_TDEA_192: %d\n", printk(KERN_INFO "KMAC_TDEA_192: %d\n",
crypt_z990_func_available(KMAC_TDEA_192)); crypt_s390_func_available(KMAC_TDEA_192));
} }
static int static int init(void)
init(void)
{ {
struct crypt_z990_query_status status = { struct crypt_s390_query_status status = {
.high = 0, .high = 0,
.low = 0 .low = 0
}; };
printk(KERN_INFO "crypt_z990: querying available crypto functions\n"); printk(KERN_INFO "crypt_s390: querying available crypto functions\n");
crypt_z990_km(KM_QUERY, &status, NULL, NULL, 0); crypt_s390_km(KM_QUERY, &status, NULL, NULL, 0);
printk(KERN_INFO "KM: %016llx %016llx\n", printk(KERN_INFO "KM:\t%016llx %016llx\n",
(unsigned long long) status.high, (unsigned long long) status.high,
(unsigned long long) status.low); (unsigned long long) status.low);
status.high = status.low = 0; status.high = status.low = 0;
crypt_z990_kmc(KMC_QUERY, &status, NULL, NULL, 0); crypt_s390_kmc(KMC_QUERY, &status, NULL, NULL, 0);
printk(KERN_INFO "KMC: %016llx %016llx\n", printk(KERN_INFO "KMC:\t%016llx %016llx\n",
(unsigned long long) status.high, (unsigned long long) status.high,
(unsigned long long) status.low); (unsigned long long) status.low);
status.high = status.low = 0; status.high = status.low = 0;
crypt_z990_kimd(KIMD_QUERY, &status, NULL, 0); crypt_s390_kimd(KIMD_QUERY, &status, NULL, 0);
printk(KERN_INFO "KIMD: %016llx %016llx\n", printk(KERN_INFO "KIMD:\t%016llx %016llx\n",
(unsigned long long) status.high, (unsigned long long) status.high,
(unsigned long long) status.low); (unsigned long long) status.low);
status.high = status.low = 0; status.high = status.low = 0;
crypt_z990_klmd(KLMD_QUERY, &status, NULL, 0); crypt_s390_klmd(KLMD_QUERY, &status, NULL, 0);
printk(KERN_INFO "KLMD: %016llx %016llx\n", printk(KERN_INFO "KLMD:\t%016llx %016llx\n",
(unsigned long long) status.high, (unsigned long long) status.high,
(unsigned long long) status.low); (unsigned long long) status.low);
status.high = status.low = 0; status.high = status.low = 0;
crypt_z990_kmac(KMAC_QUERY, &status, NULL, 0); crypt_s390_kmac(KMAC_QUERY, &status, NULL, 0);
printk(KERN_INFO "KMAC: %016llx %016llx\n", printk(KERN_INFO "KMAC:\t%016llx %016llx\n",
(unsigned long long) status.high, (unsigned long long) status.high,
(unsigned long long) status.low); (unsigned long long) status.low);
query_available_functions(); query_available_functions();
return -1; return -ECANCELED;
} }
static void __exit static void __exit cleanup(void)
cleanup(void)
{ {
} }
......
/* /*
* Cryptographic API. * Cryptographic API.
* *
* z990 implementation of the DES Cipher Algorithm. * s390 implementation of the DES Cipher Algorithm.
* *
* Copyright (c) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation * Copyright (c) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Author(s): Thomas Spatzier (tspat@de.ibm.com) * Author(s): Thomas Spatzier (tspat@de.ibm.com)
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include "crypt_z990.h" #include "crypt_s390.h"
#include "crypto_des.h" #include "crypto_des.h"
#define DES_BLOCK_SIZE 8 #define DES_BLOCK_SIZE 8
...@@ -31,17 +31,17 @@ ...@@ -31,17 +31,17 @@
#define DES3_192_KEY_SIZE (3 * DES_KEY_SIZE) #define DES3_192_KEY_SIZE (3 * DES_KEY_SIZE)
#define DES3_192_BLOCK_SIZE DES_BLOCK_SIZE #define DES3_192_BLOCK_SIZE DES_BLOCK_SIZE
struct crypt_z990_des_ctx { struct crypt_s390_des_ctx {
u8 iv[DES_BLOCK_SIZE]; u8 iv[DES_BLOCK_SIZE];
u8 key[DES_KEY_SIZE]; u8 key[DES_KEY_SIZE];
}; };
struct crypt_z990_des3_128_ctx { struct crypt_s390_des3_128_ctx {
u8 iv[DES_BLOCK_SIZE]; u8 iv[DES_BLOCK_SIZE];
u8 key[DES3_128_KEY_SIZE]; u8 key[DES3_128_KEY_SIZE];
}; };
struct crypt_z990_des3_192_ctx { struct crypt_s390_des3_192_ctx {
u8 iv[DES_BLOCK_SIZE]; u8 iv[DES_BLOCK_SIZE];
u8 key[DES3_192_KEY_SIZE]; u8 key[DES3_192_KEY_SIZE];
}; };
...@@ -49,7 +49,7 @@ struct crypt_z990_des3_192_ctx { ...@@ -49,7 +49,7 @@ struct crypt_z990_des3_192_ctx {
static int static int
des_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags) des_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
{ {
struct crypt_z990_des_ctx *dctx; struct crypt_s390_des_ctx *dctx;
int ret; int ret;
dctx = ctx; dctx = ctx;
...@@ -65,26 +65,26 @@ des_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags) ...@@ -65,26 +65,26 @@ des_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
static void static void
des_encrypt(void *ctx, u8 *dst, const u8 *src) des_encrypt(void *ctx, u8 *dst, const u8 *src)
{ {
struct crypt_z990_des_ctx *dctx; struct crypt_s390_des_ctx *dctx;
dctx = ctx; dctx = ctx;
crypt_z990_km(KM_DEA_ENCRYPT, dctx->key, dst, src, DES_BLOCK_SIZE); crypt_s390_km(KM_DEA_ENCRYPT, dctx->key, dst, src, DES_BLOCK_SIZE);
} }
static void static void
des_decrypt(void *ctx, u8 *dst, const u8 *src) des_decrypt(void *ctx, u8 *dst, const u8 *src)
{ {
struct crypt_z990_des_ctx *dctx; struct crypt_s390_des_ctx *dctx;
dctx = ctx; dctx = ctx;
crypt_z990_km(KM_DEA_DECRYPT, dctx->key, dst, src, DES_BLOCK_SIZE); crypt_s390_km(KM_DEA_DECRYPT, dctx->key, dst, src, DES_BLOCK_SIZE);
} }
static struct crypto_alg des_alg = { static struct crypto_alg des_alg = {
.cra_name = "des", .cra_name = "des",
.cra_flags = CRYPTO_ALG_TYPE_CIPHER, .cra_flags = CRYPTO_ALG_TYPE_CIPHER,
.cra_blocksize = DES_BLOCK_SIZE, .cra_blocksize = DES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crypt_z990_des_ctx), .cra_ctxsize = sizeof(struct crypt_s390_des_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT(des_alg.cra_list), .cra_list = LIST_HEAD_INIT(des_alg.cra_list),
.cra_u = { .cipher = { .cra_u = { .cipher = {
...@@ -111,7 +111,7 @@ static int ...@@ -111,7 +111,7 @@ static int
des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags) des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
{ {
int i, ret; int i, ret;
struct crypt_z990_des3_128_ctx *dctx; struct crypt_s390_des3_128_ctx *dctx;
const u8* temp_key = key; const u8* temp_key = key;
dctx = ctx; dctx = ctx;
...@@ -132,20 +132,20 @@ des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags) ...@@ -132,20 +132,20 @@ des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
static void static void
des3_128_encrypt(void *ctx, u8 *dst, const u8 *src) des3_128_encrypt(void *ctx, u8 *dst, const u8 *src)
{ {
struct crypt_z990_des3_128_ctx *dctx; struct crypt_s390_des3_128_ctx *dctx;
dctx = ctx; dctx = ctx;
crypt_z990_km(KM_TDEA_128_ENCRYPT, dctx->key, dst, (void*)src, crypt_s390_km(KM_TDEA_128_ENCRYPT, dctx->key, dst, (void*)src,
DES3_128_BLOCK_SIZE); DES3_128_BLOCK_SIZE);
} }
static void static void
des3_128_decrypt(void *ctx, u8 *dst, const u8 *src) des3_128_decrypt(void *ctx, u8 *dst, const u8 *src)
{ {
struct crypt_z990_des3_128_ctx *dctx; struct crypt_s390_des3_128_ctx *dctx;
dctx = ctx; dctx = ctx;
crypt_z990_km(KM_TDEA_128_DECRYPT, dctx->key, dst, (void*)src, crypt_s390_km(KM_TDEA_128_DECRYPT, dctx->key, dst, (void*)src,
DES3_128_BLOCK_SIZE); DES3_128_BLOCK_SIZE);
} }
...@@ -153,7 +153,7 @@ static struct crypto_alg des3_128_alg = { ...@@ -153,7 +153,7 @@ static struct crypto_alg des3_128_alg = {
.cra_name = "des3_ede128", .cra_name = "des3_ede128",
.cra_flags = CRYPTO_ALG_TYPE_CIPHER, .cra_flags = CRYPTO_ALG_TYPE_CIPHER,
.cra_blocksize = DES3_128_BLOCK_SIZE, .cra_blocksize = DES3_128_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crypt_z990_des3_128_ctx), .cra_ctxsize = sizeof(struct crypt_s390_des3_128_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT(des3_128_alg.cra_list), .cra_list = LIST_HEAD_INIT(des3_128_alg.cra_list),
.cra_u = { .cipher = { .cra_u = { .cipher = {
...@@ -181,7 +181,7 @@ static int ...@@ -181,7 +181,7 @@ static int
des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags) des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
{ {
int i, ret; int i, ret;
struct crypt_z990_des3_192_ctx *dctx; struct crypt_s390_des3_192_ctx *dctx;
const u8* temp_key; const u8* temp_key;
dctx = ctx; dctx = ctx;
...@@ -206,20 +206,20 @@ des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags) ...@@ -206,20 +206,20 @@ des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)
static void static void
des3_192_encrypt(void *ctx, u8 *dst, const u8 *src) des3_192_encrypt(void *ctx, u8 *dst, const u8 *src)
{ {
struct crypt_z990_des3_192_ctx *dctx; struct crypt_s390_des3_192_ctx *dctx;
dctx = ctx; dctx = ctx;
crypt_z990_km(KM_TDEA_192_ENCRYPT, dctx->key, dst, (void*)src, crypt_s390_km(KM_TDEA_192_ENCRYPT, dctx->key, dst, (void*)src,
DES3_192_BLOCK_SIZE); DES3_192_BLOCK_SIZE);
} }
static void static void
des3_192_decrypt(void *ctx, u8 *dst, const u8 *src) des3_192_decrypt(void *ctx, u8 *dst, const u8 *src)
{ {
struct crypt_z990_des3_192_ctx *dctx; struct crypt_s390_des3_192_ctx *dctx;
dctx = ctx; dctx = ctx;
crypt_z990_km(KM_TDEA_192_DECRYPT, dctx->key, dst, (void*)src, crypt_s390_km(KM_TDEA_192_DECRYPT, dctx->key, dst, (void*)src,
DES3_192_BLOCK_SIZE); DES3_192_BLOCK_SIZE);
} }
...@@ -227,7 +227,7 @@ static struct crypto_alg des3_192_alg = { ...@@ -227,7 +227,7 @@ static struct crypto_alg des3_192_alg = {
.cra_name = "des3_ede", .cra_name = "des3_ede",
.cra_flags = CRYPTO_ALG_TYPE_CIPHER, .cra_flags = CRYPTO_ALG_TYPE_CIPHER,
.cra_blocksize = DES3_192_BLOCK_SIZE, .cra_blocksize = DES3_192_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crypt_z990_des3_192_ctx), .cra_ctxsize = sizeof(struct crypt_s390_des3_192_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT(des3_192_alg.cra_list), .cra_list = LIST_HEAD_INIT(des3_192_alg.cra_list),
.cra_u = { .cipher = { .cra_u = { .cipher = {
...@@ -245,9 +245,9 @@ init(void) ...@@ -245,9 +245,9 @@ init(void)
{ {
int ret; int ret;
if (!crypt_z990_func_available(KM_DEA_ENCRYPT) || if (!crypt_s390_func_available(KM_DEA_ENCRYPT) ||
!crypt_z990_func_available(KM_TDEA_128_ENCRYPT) || !crypt_s390_func_available(KM_TDEA_128_ENCRYPT) ||
!crypt_z990_func_available(KM_TDEA_192_ENCRYPT)){ !crypt_s390_func_available(KM_TDEA_192_ENCRYPT)){
return -ENOSYS; return -ENOSYS;
} }
...@@ -262,7 +262,7 @@ init(void) ...@@ -262,7 +262,7 @@ init(void)
return -EEXIST; return -EEXIST;
} }
printk(KERN_INFO "crypt_z990: des_z990 loaded.\n"); printk(KERN_INFO "crypt_s390: des_s390 loaded.\n");
return 0; return 0;
} }
......
/* /*
* Cryptographic API. * Cryptographic API.
* *
* z990 implementation of the SHA1 Secure Hash Algorithm. * s390 implementation of the SHA1 Secure Hash Algorithm.
* *
* Derived from cryptoapi implementation, adapted for in-place * Derived from cryptoapi implementation, adapted for in-place
* scatterlist interface. Originally based on the public domain * scatterlist interface. Originally based on the public domain
...@@ -28,22 +28,22 @@ ...@@ -28,22 +28,22 @@
#include <linux/crypto.h> #include <linux/crypto.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include "crypt_z990.h" #include "crypt_s390.h"
#define SHA1_DIGEST_SIZE 20 #define SHA1_DIGEST_SIZE 20
#define SHA1_BLOCK_SIZE 64 #define SHA1_BLOCK_SIZE 64
struct crypt_z990_sha1_ctx { struct crypt_s390_sha1_ctx {
u64 count; u64 count;
u32 state[5]; u32 state[5];
u32 buf_len; u32 buf_len;
u8 buffer[2 * SHA1_BLOCK_SIZE]; u8 buffer[2 * SHA1_BLOCK_SIZE];
}; };
static void static void
sha1_init(void *ctx) sha1_init(void *ctx)
{ {
static const struct crypt_z990_sha1_ctx initstate = { static const struct crypt_s390_sha1_ctx initstate = {
.state = { .state = {
0x67452301, 0x67452301,
0xEFCDAB89, 0xEFCDAB89,
...@@ -58,7 +58,7 @@ sha1_init(void *ctx) ...@@ -58,7 +58,7 @@ sha1_init(void *ctx)
static void static void
sha1_update(void *ctx, const u8 *data, unsigned int len) sha1_update(void *ctx, const u8 *data, unsigned int len)
{ {
struct crypt_z990_sha1_ctx *sctx; struct crypt_s390_sha1_ctx *sctx;
long imd_len; long imd_len;
sctx = ctx; sctx = ctx;
...@@ -69,7 +69,7 @@ sha1_update(void *ctx, const u8 *data, unsigned int len) ...@@ -69,7 +69,7 @@ sha1_update(void *ctx, const u8 *data, unsigned int len)
//complete full block and hash //complete full block and hash
memcpy(sctx->buffer + sctx->buf_len, data, memcpy(sctx->buffer + sctx->buf_len, data,
SHA1_BLOCK_SIZE - sctx->buf_len); SHA1_BLOCK_SIZE - sctx->buf_len);
crypt_z990_kimd(KIMD_SHA_1, sctx->state, sctx->buffer, crypt_s390_kimd(KIMD_SHA_1, sctx->state, sctx->buffer,
SHA1_BLOCK_SIZE); SHA1_BLOCK_SIZE);
data += SHA1_BLOCK_SIZE - sctx->buf_len; data += SHA1_BLOCK_SIZE - sctx->buf_len;
len -= SHA1_BLOCK_SIZE - sctx->buf_len; len -= SHA1_BLOCK_SIZE - sctx->buf_len;
...@@ -79,7 +79,7 @@ sha1_update(void *ctx, const u8 *data, unsigned int len) ...@@ -79,7 +79,7 @@ sha1_update(void *ctx, const u8 *data, unsigned int len)
//rest of data contains full blocks? //rest of data contains full blocks?
imd_len = len & ~0x3ful; imd_len = len & ~0x3ful;
if (imd_len){ if (imd_len){
crypt_z990_kimd(KIMD_SHA_1, sctx->state, data, imd_len); crypt_s390_kimd(KIMD_SHA_1, sctx->state, data, imd_len);
data += imd_len; data += imd_len;
len -= imd_len; len -= imd_len;
} }
...@@ -92,7 +92,7 @@ sha1_update(void *ctx, const u8 *data, unsigned int len) ...@@ -92,7 +92,7 @@ sha1_update(void *ctx, const u8 *data, unsigned int len)
static void static void
pad_message(struct crypt_z990_sha1_ctx* sctx) pad_message(struct crypt_s390_sha1_ctx* sctx)
{ {
int index; int index;
...@@ -113,11 +113,11 @@ pad_message(struct crypt_z990_sha1_ctx* sctx) ...@@ -113,11 +113,11 @@ pad_message(struct crypt_z990_sha1_ctx* sctx)
static void static void
sha1_final(void* ctx, u8 *out) sha1_final(void* ctx, u8 *out)
{ {
struct crypt_z990_sha1_ctx *sctx = ctx; struct crypt_s390_sha1_ctx *sctx = ctx;
//must perform manual padding //must perform manual padding
pad_message(sctx); pad_message(sctx);
crypt_z990_kimd(KIMD_SHA_1, sctx->state, sctx->buffer, sctx->buf_len); crypt_s390_kimd(KIMD_SHA_1, sctx->state, sctx->buffer, sctx->buf_len);
//copy digest to out //copy digest to out
memcpy(out, sctx->state, SHA1_DIGEST_SIZE); memcpy(out, sctx->state, SHA1_DIGEST_SIZE);
/* Wipe context */ /* Wipe context */
...@@ -128,7 +128,7 @@ static struct crypto_alg alg = { ...@@ -128,7 +128,7 @@ static struct crypto_alg alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_flags = CRYPTO_ALG_TYPE_DIGEST, .cra_flags = CRYPTO_ALG_TYPE_DIGEST,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crypt_z990_sha1_ctx), .cra_ctxsize = sizeof(struct crypt_s390_sha1_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT(alg.cra_list), .cra_list = LIST_HEAD_INIT(alg.cra_list),
.cra_u = { .digest = { .cra_u = { .digest = {
...@@ -143,10 +143,10 @@ init(void) ...@@ -143,10 +143,10 @@ init(void)
{ {
int ret = -ENOSYS; int ret = -ENOSYS;
if (crypt_z990_func_available(KIMD_SHA_1)){ if (crypt_s390_func_available(KIMD_SHA_1)){
ret = crypto_register_alg(&alg); ret = crypto_register_alg(&alg);
if (ret == 0){ if (ret == 0){
printk(KERN_INFO "crypt_z990: sha1_z990 loaded.\n"); printk(KERN_INFO "crypt_s390: sha1_s390 loaded.\n");
} }
} }
return ret; return ret;
......
...@@ -632,13 +632,13 @@ CONFIG_CRYPTO=y ...@@ -632,13 +632,13 @@ CONFIG_CRYPTO=y
# CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD4 is not set
# CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MD5 is not set
# CONFIG_CRYPTO_SHA1 is not set # CONFIG_CRYPTO_SHA1 is not set
# CONFIG_CRYPTO_SHA1_Z990 is not set # CONFIG_CRYPTO_SHA1_S390 is not set
# CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA256 is not set
# CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_WP512 is not set
# CONFIG_CRYPTO_TGR192 is not set # CONFIG_CRYPTO_TGR192 is not set
# CONFIG_CRYPTO_DES is not set # CONFIG_CRYPTO_DES is not set
# CONFIG_CRYPTO_DES_Z990 is not set # CONFIG_CRYPTO_DES_S390 is not set
# CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_SERPENT is not set
......
...@@ -40,8 +40,8 @@ config CRYPTO_SHA1 ...@@ -40,8 +40,8 @@ config CRYPTO_SHA1
help help
SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2). SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
config CRYPTO_SHA1_Z990 config CRYPTO_SHA1_S390
tristate "SHA1 digest algorithm for IBM zSeries z990" tristate "SHA1 digest algorithm (s390)"
depends on CRYPTO && ARCH_S390 depends on CRYPTO && ARCH_S390
help help
SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2). SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
...@@ -98,8 +98,8 @@ config CRYPTO_DES ...@@ -98,8 +98,8 @@ config CRYPTO_DES
help help
DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
config CRYPTO_DES_Z990 config CRYPTO_DES_S390
tristate "DES and Triple DES cipher algorithms for IBM zSeries z990" tristate "DES and Triple DES cipher algorithms (s390)"
depends on CRYPTO && ARCH_S390 depends on CRYPTO && ARCH_S390
help help
DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment