redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

crypto: s390/des - convert to skcipher API

Browse source 
Convert the glue code for the S390 CPACF implementations of DES-ECB,
DES-CBC, DES-CTR, 3DES-ECB, 3DES-CBC, and 3DES-CTR from the deprecated
"blkcipher" API to the "skcipher" API.  This is needed in order for the
blkcipher API to be removed.

Note: I made CTR use the same function for encryption and decryption,
since CTR encryption and decryption are identical.

Signed-off-by: Eric Biggers <ebiggers@google.com>
reviewed-by: Harald Freudenberger <freude@linux.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2019-10-12 13:18:09 -07:00 committed by Herbert Xu
parent d00c063981
commit fabdf25388
1 changed files with 172 additions and 247 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

419
arch/s390/crypto/des_s390.c
View file

@ -17,6 +17,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <crypto/algapi.h> #include <crypto/algapi.h>
#include <crypto/internal/des.h> #include <crypto/internal/des.h>
#include <crypto/internal/skcipher.h>
#include <asm/cpacf.h> #include <asm/cpacf.h>
#define DES3_KEY_SIZE (3 * DES_KEY_SIZE) #define DES3_KEY_SIZE (3 * DES_KEY_SIZE)
@ -45,6 +46,12 @@ static int des_setkey(struct crypto_tfm *tfm, const u8 *key,
return 0; return 0;
} }
static int des_setkey_skcipher(struct crypto_skcipher *tfm, const u8 *key,
unsigned int key_len)
{
return des_setkey(crypto_skcipher_tfm(tfm), key, key_len);
}
static void s390_des_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) static void s390_des_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
{ {
struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm); struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm);
@ -79,28 +86,30 @@ static struct crypto_alg des_alg = {
} }
}; };
static int ecb_desall_crypt(struct blkcipher_desc *desc, unsigned long fc, static int ecb_desall_crypt(struct skcipher_request *req, unsigned long fc)
struct blkcipher_walk *walk)
{ {
struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct s390_des_ctx *ctx = crypto_skcipher_ctx(tfm);
struct skcipher_walk walk;
unsigned int nbytes, n; unsigned int nbytes, n;
int ret; int ret;
ret = blkcipher_walk_virt(desc, walk); ret = skcipher_walk_virt(&walk, req, false);
while ((nbytes = walk->nbytes) >= DES_BLOCK_SIZE) { while ((nbytes = walk.nbytes) != 0) {
/* only use complete blocks */ /* only use complete blocks */
n = nbytes & ~(DES_BLOCK_SIZE - 1); n = nbytes & ~(DES_BLOCK_SIZE - 1);
cpacf_km(fc, ctx->key, walk->dst.virt.addr, cpacf_km(fc, ctx->key, walk.dst.virt.addr,
walk->src.virt.addr, n); walk.src.virt.addr, n);
ret = blkcipher_walk_done(desc, walk, nbytes - n); ret = skcipher_walk_done(&walk, nbytes - n);
} }
return ret; return ret;
} }
static int cbc_desall_crypt(struct blkcipher_desc *desc, unsigned long fc, static int cbc_desall_crypt(struct skcipher_request *req, unsigned long fc)
struct blkcipher_walk *walk)
{ {
struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct s390_des_ctx *ctx = crypto_skcipher_ctx(tfm);
struct skcipher_walk walk;
unsigned int nbytes, n; unsigned int nbytes, n;
int ret; int ret;
struct { struct {
@ -108,99 +117,69 @@ static int cbc_desall_crypt(struct blkcipher_desc *desc, unsigned long fc,
u8 key[DES3_KEY_SIZE]; u8 key[DES3_KEY_SIZE];
} param; } param;
ret = blkcipher_walk_virt(desc, walk); ret = skcipher_walk_virt(&walk, req, false);
memcpy(param.iv, walk->iv, DES_BLOCK_SIZE); if (ret)
return ret;
memcpy(param.iv, walk.iv, DES_BLOCK_SIZE);
memcpy(param.key, ctx->key, DES3_KEY_SIZE); memcpy(param.key, ctx->key, DES3_KEY_SIZE);
while ((nbytes = walk->nbytes) >= DES_BLOCK_SIZE) { while ((nbytes = walk.nbytes) != 0) {
/* only use complete blocks */ /* only use complete blocks */
n = nbytes & ~(DES_BLOCK_SIZE - 1); n = nbytes & ~(DES_BLOCK_SIZE - 1);
cpacf_kmc(fc, &param, walk->dst.virt.addr, cpacf_kmc(fc, &param, walk.dst.virt.addr,
walk->src.virt.addr, n); walk.src.virt.addr, n);
ret = blkcipher_walk_done(desc, walk, nbytes - n); memcpy(walk.iv, param.iv, DES_BLOCK_SIZE);
ret = skcipher_walk_done(&walk, nbytes - n);
} }
memcpy(walk->iv, param.iv, DES_BLOCK_SIZE);
return ret; return ret;
} }
static int ecb_des_encrypt(struct blkcipher_desc *desc, static int ecb_des_encrypt(struct skcipher_request *req)
struct scatterlist *dst, struct scatterlist *src,
unsigned int nbytes)
{ {
struct blkcipher_walk walk; return ecb_desall_crypt(req, CPACF_KM_DEA);
blkcipher_walk_init(&walk, dst, src, nbytes);
return ecb_desall_crypt(desc, CPACF_KM_DEA, &walk);
} }
static int ecb_des_decrypt(struct blkcipher_desc *desc, static int ecb_des_decrypt(struct skcipher_request *req)
struct scatterlist *dst, struct scatterlist *src,
unsigned int nbytes)
{ {
struct blkcipher_walk walk; return ecb_desall_crypt(req, CPACF_KM_DEA | CPACF_DECRYPT);
blkcipher_walk_init(&walk, dst, src, nbytes);
return ecb_desall_crypt(desc, CPACF_KM_DEA | CPACF_DECRYPT, &walk);
} }
static struct crypto_alg ecb_des_alg = { static struct skcipher_alg ecb_des_alg = {
.cra_name = "ecb(des)", .base.cra_name = "ecb(des)",
.cra_driver_name = "ecb-des-s390", .base.cra_driver_name = "ecb-des-s390",
.cra_priority = 400, /* combo: des + ecb */ .base.cra_priority = 400, /* combo: des + ecb */
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER, .base.cra_blocksize = DES_BLOCK_SIZE,
.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct s390_des_ctx),
.cra_ctxsize = sizeof(struct s390_des_ctx), .base.cra_module = THIS_MODULE,
.cra_type = &crypto_blkcipher_type, .min_keysize = DES_KEY_SIZE,
.cra_module = THIS_MODULE, .max_keysize = DES_KEY_SIZE,
.cra_u = { .setkey = des_setkey_skcipher,
.blkcipher = { .encrypt = ecb_des_encrypt,
.min_keysize = DES_KEY_SIZE, .decrypt = ecb_des_decrypt,
.max_keysize = DES_KEY_SIZE,
.setkey = des_setkey,
.encrypt = ecb_des_encrypt,
.decrypt = ecb_des_decrypt,
}
}
}; };
static int cbc_des_encrypt(struct blkcipher_desc *desc, static int cbc_des_encrypt(struct skcipher_request *req)
struct scatterlist *dst, struct scatterlist *src,
unsigned int nbytes)
{ {
struct blkcipher_walk walk; return cbc_desall_crypt(req, CPACF_KMC_DEA);
blkcipher_walk_init(&walk, dst, src, nbytes);
return cbc_desall_crypt(desc, CPACF_KMC_DEA, &walk);
} }
static int cbc_des_decrypt(struct blkcipher_desc *desc, static int cbc_des_decrypt(struct skcipher_request *req)
struct scatterlist *dst, struct scatterlist *src,
unsigned int nbytes)
{ {
struct blkcipher_walk walk; return cbc_desall_crypt(req, CPACF_KMC_DEA | CPACF_DECRYPT);
blkcipher_walk_init(&walk, dst, src, nbytes);
return cbc_desall_crypt(desc, CPACF_KMC_DEA | CPACF_DECRYPT, &walk);
} }
static struct crypto_alg cbc_des_alg = { static struct skcipher_alg cbc_des_alg = {
.cra_name = "cbc(des)", .base.cra_name = "cbc(des)",
.cra_driver_name = "cbc-des-s390", .base.cra_driver_name = "cbc-des-s390",
.cra_priority = 400, /* combo: des + cbc */ .base.cra_priority = 400, /* combo: des + cbc */
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER, .base.cra_blocksize = DES_BLOCK_SIZE,
.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct s390_des_ctx),
.cra_ctxsize = sizeof(struct s390_des_ctx), .base.cra_module = THIS_MODULE,
.cra_type = &crypto_blkcipher_type, .min_keysize = DES_KEY_SIZE,
.cra_module = THIS_MODULE, .max_keysize = DES_KEY_SIZE,
.cra_u = { .ivsize = DES_BLOCK_SIZE,
.blkcipher = { .setkey = des_setkey_skcipher,
.min_keysize = DES_KEY_SIZE, .encrypt = cbc_des_encrypt,
.max_keysize = DES_KEY_SIZE, .decrypt = cbc_des_decrypt,
.ivsize = DES_BLOCK_SIZE,
.setkey = des_setkey,
.encrypt = cbc_des_encrypt,
.decrypt = cbc_des_decrypt,
}
}
}; };
/* /*
@ -232,6 +211,12 @@ static int des3_setkey(struct crypto_tfm *tfm, const u8 *key,
return 0; return 0;
} }
static int des3_setkey_skcipher(struct crypto_skcipher *tfm, const u8 *key,
unsigned int key_len)
{
return des3_setkey(crypto_skcipher_tfm(tfm), key, key_len);
}
static void des3_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) static void des3_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{ {
struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm); struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm);
@ -266,87 +251,53 @@ static struct crypto_alg des3_alg = {
} }
}; };
static int ecb_des3_encrypt(struct blkcipher_desc *desc, static int ecb_des3_encrypt(struct skcipher_request *req)
struct scatterlist *dst, struct scatterlist *src,
unsigned int nbytes)
{ {
struct blkcipher_walk walk; return ecb_desall_crypt(req, CPACF_KM_TDEA_192);
blkcipher_walk_init(&walk, dst, src, nbytes);
return ecb_desall_crypt(desc, CPACF_KM_TDEA_192, &walk);
} }
static int ecb_des3_decrypt(struct blkcipher_desc *desc, static int ecb_des3_decrypt(struct skcipher_request *req)
struct scatterlist *dst, struct scatterlist *src,
unsigned int nbytes)
{ {
struct blkcipher_walk walk; return ecb_desall_crypt(req, CPACF_KM_TDEA_192 | CPACF_DECRYPT);
blkcipher_walk_init(&walk, dst, src, nbytes);
return ecb_desall_crypt(desc, CPACF_KM_TDEA_192 | CPACF_DECRYPT,
&walk);
} }
static struct crypto_alg ecb_des3_alg = { static struct skcipher_alg ecb_des3_alg = {
.cra_name = "ecb(des3_ede)", .base.cra_name = "ecb(des3_ede)",
.cra_driver_name = "ecb-des3_ede-s390", .base.cra_driver_name = "ecb-des3_ede-s390",
.cra_priority = 400, /* combo: des3 + ecb */ .base.cra_priority = 400, /* combo: des3 + ecb */
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER, .base.cra_blocksize = DES_BLOCK_SIZE,
.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct s390_des_ctx),
.cra_ctxsize = sizeof(struct s390_des_ctx), .base.cra_module = THIS_MODULE,
.cra_type = &crypto_blkcipher_type, .min_keysize = DES3_KEY_SIZE,
.cra_module = THIS_MODULE, .max_keysize = DES3_KEY_SIZE,
.cra_u = { .setkey = des3_setkey_skcipher,
.blkcipher = { .encrypt = ecb_des3_encrypt,
.min_keysize = DES3_KEY_SIZE, .decrypt = ecb_des3_decrypt,
.max_keysize = DES3_KEY_SIZE,
.setkey = des3_setkey,
.encrypt = ecb_des3_encrypt,
.decrypt = ecb_des3_decrypt,
}
}
}; };
static int cbc_des3_encrypt(struct blkcipher_desc *desc, static int cbc_des3_encrypt(struct skcipher_request *req)
struct scatterlist *dst, struct scatterlist *src,
unsigned int nbytes)
{ {
struct blkcipher_walk walk; return cbc_desall_crypt(req, CPACF_KMC_TDEA_192);
blkcipher_walk_init(&walk, dst, src, nbytes);
return cbc_desall_crypt(desc, CPACF_KMC_TDEA_192, &walk);
} }
static int cbc_des3_decrypt(struct blkcipher_desc *desc, static int cbc_des3_decrypt(struct skcipher_request *req)
struct scatterlist *dst, struct scatterlist *src,
unsigned int nbytes)
{ {
struct blkcipher_walk walk; return cbc_desall_crypt(req, CPACF_KMC_TDEA_192 | CPACF_DECRYPT);
blkcipher_walk_init(&walk, dst, src, nbytes);
return cbc_desall_crypt(desc, CPACF_KMC_TDEA_192 | CPACF_DECRYPT,
&walk);
} }
static struct crypto_alg cbc_des3_alg = { static struct skcipher_alg cbc_des3_alg = {
.cra_name = "cbc(des3_ede)", .base.cra_name = "cbc(des3_ede)",
.cra_driver_name = "cbc-des3_ede-s390", .base.cra_driver_name = "cbc-des3_ede-s390",
.cra_priority = 400, /* combo: des3 + cbc */ .base.cra_priority = 400, /* combo: des3 + cbc */
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER, .base.cra_blocksize = DES_BLOCK_SIZE,
.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct s390_des_ctx),
.cra_ctxsize = sizeof(struct s390_des_ctx), .base.cra_module = THIS_MODULE,
.cra_type = &crypto_blkcipher_type, .min_keysize = DES3_KEY_SIZE,
.cra_module = THIS_MODULE, .max_keysize = DES3_KEY_SIZE,
.cra_u = { .ivsize = DES_BLOCK_SIZE,
.blkcipher = { .setkey = des3_setkey_skcipher,
.min_keysize = DES3_KEY_SIZE, .encrypt = cbc_des3_encrypt,
.max_keysize = DES3_KEY_SIZE, .decrypt = cbc_des3_decrypt,
.ivsize = DES_BLOCK_SIZE,
.setkey = des3_setkey,
.encrypt = cbc_des3_encrypt,
.decrypt = cbc_des3_decrypt,
}
}
}; };
static unsigned int __ctrblk_init(u8 *ctrptr, u8 *iv, unsigned int nbytes) static unsigned int __ctrblk_init(u8 *ctrptr, u8 *iv, unsigned int nbytes)
@ -364,128 +315,90 @@ static unsigned int __ctrblk_init(u8 *ctrptr, u8 *iv, unsigned int nbytes)
return n; return n;
} }
static int ctr_desall_crypt(struct blkcipher_desc *desc, unsigned long fc, static int ctr_desall_crypt(struct skcipher_request *req, unsigned long fc)
struct blkcipher_walk *walk)
{ {
struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct s390_des_ctx *ctx = crypto_skcipher_ctx(tfm);
u8 buf[DES_BLOCK_SIZE], *ctrptr; u8 buf[DES_BLOCK_SIZE], *ctrptr;
struct skcipher_walk walk;
unsigned int n, nbytes; unsigned int n, nbytes;
int ret, locked; int ret, locked;
locked = mutex_trylock(&ctrblk_lock); locked = mutex_trylock(&ctrblk_lock);
ret = blkcipher_walk_virt_block(desc, walk, DES_BLOCK_SIZE); ret = skcipher_walk_virt(&walk, req, false);
while ((nbytes = walk->nbytes) >= DES_BLOCK_SIZE) { while ((nbytes = walk.nbytes) >= DES_BLOCK_SIZE) {
n = DES_BLOCK_SIZE; n = DES_BLOCK_SIZE;
if (nbytes >= 2*DES_BLOCK_SIZE && locked) if (nbytes >= 2*DES_BLOCK_SIZE && locked)
n = __ctrblk_init(ctrblk, walk->iv, nbytes); n = __ctrblk_init(ctrblk, walk.iv, nbytes);
ctrptr = (n > DES_BLOCK_SIZE) ? ctrblk : walk->iv; ctrptr = (n > DES_BLOCK_SIZE) ? ctrblk : walk.iv;
cpacf_kmctr(fc, ctx->key, walk->dst.virt.addr, cpacf_kmctr(fc, ctx->key, walk.dst.virt.addr,
walk->src.virt.addr, n, ctrptr); walk.src.virt.addr, n, ctrptr);
if (ctrptr == ctrblk) if (ctrptr == ctrblk)
memcpy(walk->iv, ctrptr + n - DES_BLOCK_SIZE, memcpy(walk.iv, ctrptr + n - DES_BLOCK_SIZE,
DES_BLOCK_SIZE); DES_BLOCK_SIZE);
crypto_inc(walk->iv, DES_BLOCK_SIZE); crypto_inc(walk.iv, DES_BLOCK_SIZE);
ret = blkcipher_walk_done(desc, walk, nbytes - n); ret = skcipher_walk_done(&walk, nbytes - n);
} }
if (locked) if (locked)
mutex_unlock(&ctrblk_lock); mutex_unlock(&ctrblk_lock);
/* final block may be < DES_BLOCK_SIZE, copy only nbytes */ /* final block may be < DES_BLOCK_SIZE, copy only nbytes */
if (nbytes) { if (nbytes) {
cpacf_kmctr(fc, ctx->key, buf, walk->src.virt.addr, cpacf_kmctr(fc, ctx->key, buf, walk.src.virt.addr,
DES_BLOCK_SIZE, walk->iv); DES_BLOCK_SIZE, walk.iv);
memcpy(walk->dst.virt.addr, buf, nbytes); memcpy(walk.dst.virt.addr, buf, nbytes);
crypto_inc(walk->iv, DES_BLOCK_SIZE); crypto_inc(walk.iv, DES_BLOCK_SIZE);
ret = blkcipher_walk_done(desc, walk, 0); ret = skcipher_walk_done(&walk, 0);
} }
return ret; return ret;
} }
static int ctr_des_encrypt(struct blkcipher_desc *desc, static int ctr_des_crypt(struct skcipher_request *req)
struct scatterlist *dst, struct scatterlist *src,
unsigned int nbytes)
{ {
struct blkcipher_walk walk; return ctr_desall_crypt(req, CPACF_KMCTR_DEA);
blkcipher_walk_init(&walk, dst, src, nbytes);
return ctr_desall_crypt(desc, CPACF_KMCTR_DEA, &walk);
} }
static int ctr_des_decrypt(struct blkcipher_desc *desc, static struct skcipher_alg ctr_des_alg = {
struct scatterlist *dst, struct scatterlist *src, .base.cra_name = "ctr(des)",
unsigned int nbytes) .base.cra_driver_name = "ctr-des-s390",
{ .base.cra_priority = 400, /* combo: des + ctr */
struct blkcipher_walk walk; .base.cra_blocksize = 1,
.base.cra_ctxsize = sizeof(struct s390_des_ctx),
blkcipher_walk_init(&walk, dst, src, nbytes); .base.cra_module = THIS_MODULE,
return ctr_desall_crypt(desc, CPACF_KMCTR_DEA | CPACF_DECRYPT, &walk); .min_keysize = DES_KEY_SIZE,
} .max_keysize = DES_KEY_SIZE,
.ivsize = DES_BLOCK_SIZE,
static struct crypto_alg ctr_des_alg = { .setkey = des_setkey_skcipher,
.cra_name = "ctr(des)", .encrypt = ctr_des_crypt,
.cra_driver_name = "ctr-des-s390", .decrypt = ctr_des_crypt,
.cra_priority = 400, /* combo: des + ctr */ .chunksize = DES_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER,
.cra_blocksize = 1,
.cra_ctxsize = sizeof(struct s390_des_ctx),
.cra_type = &crypto_blkcipher_type,
.cra_module = THIS_MODULE,
.cra_u = {
.blkcipher = {
.min_keysize = DES_KEY_SIZE,
.max_keysize = DES_KEY_SIZE,
.ivsize = DES_BLOCK_SIZE,
.setkey = des_setkey,
.encrypt = ctr_des_encrypt,
.decrypt = ctr_des_decrypt,
}
}
}; };
static int ctr_des3_encrypt(struct blkcipher_desc *desc, static int ctr_des3_crypt(struct skcipher_request *req)
struct scatterlist *dst, struct scatterlist *src,
unsigned int nbytes)
{ {
struct blkcipher_walk walk; return ctr_desall_crypt(req, CPACF_KMCTR_TDEA_192);
blkcipher_walk_init(&walk, dst, src, nbytes);
return ctr_desall_crypt(desc, CPACF_KMCTR_TDEA_192, &walk);
} }
static int ctr_des3_decrypt(struct blkcipher_desc *desc, static struct skcipher_alg ctr_des3_alg = {
struct scatterlist *dst, struct scatterlist *src, .base.cra_name = "ctr(des3_ede)",
unsigned int nbytes) .base.cra_driver_name = "ctr-des3_ede-s390",
{ .base.cra_priority = 400, /* combo: des3 + ede */
struct blkcipher_walk walk; .base.cra_blocksize = 1,
.base.cra_ctxsize = sizeof(struct s390_des_ctx),
blkcipher_walk_init(&walk, dst, src, nbytes); .base.cra_module = THIS_MODULE,
return ctr_desall_crypt(desc, CPACF_KMCTR_TDEA_192 | CPACF_DECRYPT, .min_keysize = DES3_KEY_SIZE,
&walk); .max_keysize = DES3_KEY_SIZE,
} .ivsize = DES_BLOCK_SIZE,
.setkey = des3_setkey_skcipher,
static struct crypto_alg ctr_des3_alg = { .encrypt = ctr_des3_crypt,
.cra_name = "ctr(des3_ede)", .decrypt = ctr_des3_crypt,
.cra_driver_name = "ctr-des3_ede-s390", .chunksize = DES_BLOCK_SIZE,
.cra_priority = 400, /* combo: des3 + ede */
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER,
.cra_blocksize = 1,
.cra_ctxsize = sizeof(struct s390_des_ctx),
.cra_type = &crypto_blkcipher_type,
.cra_module = THIS_MODULE,
.cra_u = {
.blkcipher = {
.min_keysize = DES3_KEY_SIZE,
.max_keysize = DES3_KEY_SIZE,
.ivsize = DES_BLOCK_SIZE,
.setkey = des3_setkey,
.encrypt = ctr_des3_encrypt,
.decrypt = ctr_des3_decrypt,
}
}
}; };
static struct crypto_alg *des_s390_algs_ptr[8]; static struct crypto_alg *des_s390_algs_ptr[2];
static int des_s390_algs_num; static int des_s390_algs_num;
static struct skcipher_alg *des_s390_skciphers_ptr[6];
static int des_s390_skciphers_num;
static int des_s390_register_alg(struct crypto_alg *alg) static int des_s390_register_alg(struct crypto_alg *alg)
{ {
@ -497,10 +410,22 @@ static int des_s390_register_alg(struct crypto_alg *alg)
return ret; return ret;
} }
static int des_s390_register_skcipher(struct skcipher_alg *alg)
{
int ret;
ret = crypto_register_skcipher(alg);
if (!ret)
des_s390_skciphers_ptr[des_s390_skciphers_num++] = alg;
return ret;
}
static void des_s390_exit(void) static void des_s390_exit(void)
{ {
while (des_s390_algs_num--) while (des_s390_algs_num--)
crypto_unregister_alg(des_s390_algs_ptr[des_s390_algs_num]); crypto_unregister_alg(des_s390_algs_ptr[des_s390_algs_num]);
while (des_s390_skciphers_num--)
crypto_unregister_skcipher(des_s390_skciphers_ptr[des_s390_skciphers_num]);
if (ctrblk) if (ctrblk)
free_page((unsigned long) ctrblk); free_page((unsigned long) ctrblk);
} }
@ -518,12 +443,12 @@ static int __init des_s390_init(void)
ret = des_s390_register_alg(&des_alg); ret = des_s390_register_alg(&des_alg);
if (ret) if (ret)
goto out_err; goto out_err;
ret = des_s390_register_alg(&ecb_des_alg); ret = des_s390_register_skcipher(&ecb_des_alg);
if (ret) if (ret)
goto out_err; goto out_err;
} }
if (cpacf_test_func(&kmc_functions, CPACF_KMC_DEA)) { if (cpacf_test_func(&kmc_functions, CPACF_KMC_DEA)) {
ret = des_s390_register_alg(&cbc_des_alg); ret = des_s390_register_skcipher(&cbc_des_alg);
if (ret) if (ret)
goto out_err; goto out_err;
} }
@ -531,12 +456,12 @@ static int __init des_s390_init(void)
ret = des_s390_register_alg(&des3_alg); ret = des_s390_register_alg(&des3_alg);
if (ret) if (ret)
goto out_err; goto out_err;
ret = des_s390_register_alg(&ecb_des3_alg); ret = des_s390_register_skcipher(&ecb_des3_alg);
if (ret) if (ret)
goto out_err; goto out_err;
} }
if (cpacf_test_func(&kmc_functions, CPACF_KMC_TDEA_192)) { if (cpacf_test_func(&kmc_functions, CPACF_KMC_TDEA_192)) {
ret = des_s390_register_alg(&cbc_des3_alg); ret = des_s390_register_skcipher(&cbc_des3_alg);
if (ret) if (ret)
goto out_err; goto out_err;
} }
@ -551,12 +476,12 @@ static int __init des_s390_init(void)
} }
if (cpacf_test_func(&kmctr_functions, CPACF_KMCTR_DEA)) { if (cpacf_test_func(&kmctr_functions, CPACF_KMCTR_DEA)) {
ret = des_s390_register_alg(&ctr_des_alg); ret = des_s390_register_skcipher(&ctr_des_alg);
if (ret) if (ret)
goto out_err; goto out_err;
} }
if (cpacf_test_func(&kmctr_functions, CPACF_KMCTR_TDEA_192)) { if (cpacf_test_func(&kmctr_functions, CPACF_KMCTR_TDEA_192)) {
ret = des_s390_register_alg(&ctr_des3_alg); ret = des_s390_register_skcipher(&ctr_des3_alg);
if (ret) if (ret)
goto out_err; goto out_err;
} }