Skip to content

L
linux
Commit 6158efc0 authored by Herbert Xu's avatar Herbert Xu
Browse files
Options

[CRYPTO] tcrypt: Use async blkcipher interface 

This patch converts the tcrypt module to use the asynchronous block cipher
interface.  As all synchronous block ciphers can be used through the async
interface, tcrypt is still able to test them.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 32e3983f
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 39 deletions
crypto/tcrypt.c
View file @ 6158efc0
...@@ -57,6 +57,11 @@ ...@@ -57,6 +57,11 @@
#define ENCRYPT 1 #define ENCRYPT 1
#define DECRYPT 0 #define DECRYPT 0
struct tcrypt_result {
struct completion completion;
int err;
};
static unsigned int IDX[8] = { IDX1, IDX2, IDX3, IDX4, IDX5, IDX6, IDX7, IDX8 }; static unsigned int IDX[8] = { IDX1, IDX2, IDX3, IDX4, IDX5, IDX6, IDX7, IDX8 };
/* /*
...@@ -84,6 +89,17 @@ static void hexdump(unsigned char *buf, unsigned int len) ...@@ -84,6 +89,17 @@ static void hexdump(unsigned char *buf, unsigned int len)
printk("\n"); printk("\n");
} }
static void tcrypt_complete(struct crypto_async_request *req, int err)
{
struct tcrypt_result *res = req->data;
if (err == -EINPROGRESS)
return;
res->err = err;
complete(&res->completion);
}
static void test_hash(char *algo, struct hash_testvec *template, static void test_hash(char *algo, struct hash_testvec *template,
unsigned int tcount) unsigned int tcount)
{ {
...@@ -203,15 +219,14 @@ static void test_cipher(char *algo, int enc, ...@@ -203,15 +219,14 @@ static void test_cipher(char *algo, int enc,
{ {
unsigned int ret, i, j, k, temp; unsigned int ret, i, j, k, temp;
unsigned int tsize; unsigned int tsize;
unsigned int iv_len;
unsigned int len;
char *q; char *q;
struct crypto_blkcipher *tfm; struct crypto_ablkcipher *tfm;
char *key; char *key;
struct cipher_testvec *cipher_tv; struct cipher_testvec *cipher_tv;
struct blkcipher_desc desc; struct ablkcipher_request *req;
struct scatterlist sg[8]; struct scatterlist sg[8];
const char *e; const char *e;
struct tcrypt_result result;
if (enc == ENCRYPT) if (enc == ENCRYPT)
e = "encryption"; e = "encryption";
...@@ -232,15 +247,24 @@ static void test_cipher(char *algo, int enc, ...@@ -232,15 +247,24 @@ static void test_cipher(char *algo, int enc,
memcpy(tvmem, template, tsize); memcpy(tvmem, template, tsize);
cipher_tv = (void *)tvmem; cipher_tv = (void *)tvmem;
tfm = crypto_alloc_blkcipher(algo, 0, CRYPTO_ALG_ASYNC); init_completion(&result.completion);
tfm = crypto_alloc_ablkcipher(algo, 0, 0);
if (IS_ERR(tfm)) { if (IS_ERR(tfm)) {
printk("failed to load transform for %s: %ld\n", algo, printk("failed to load transform for %s: %ld\n", algo,
PTR_ERR(tfm)); PTR_ERR(tfm));
return; return;
} }
desc.tfm = tfm;
desc.flags = 0; req = ablkcipher_request_alloc(tfm, GFP_KERNEL);
if (!req) {
printk("failed to allocate request for %s\n", algo);
goto out;
}
ablkcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
tcrypt_complete, &result);
j = 0; j = 0;
for (i = 0; i < tcount; i++) { for (i = 0; i < tcount; i++) {
...@@ -249,17 +273,17 @@ static void test_cipher(char *algo, int enc, ...@@ -249,17 +273,17 @@ static void test_cipher(char *algo, int enc,
printk("test %u (%d bit key):\n", printk("test %u (%d bit key):\n",
j, cipher_tv[i].klen * 8); j, cipher_tv[i].klen * 8);
crypto_blkcipher_clear_flags(tfm, ~0); crypto_ablkcipher_clear_flags(tfm, ~0);
if (cipher_tv[i].wk) if (cipher_tv[i].wk)
crypto_blkcipher_set_flags( crypto_ablkcipher_set_flags(
tfm, CRYPTO_TFM_REQ_WEAK_KEY); tfm, CRYPTO_TFM_REQ_WEAK_KEY);
key = cipher_tv[i].key; key = cipher_tv[i].key;
ret = crypto_blkcipher_setkey(tfm, key, ret = crypto_ablkcipher_setkey(tfm, key,
cipher_tv[i].klen); cipher_tv[i].klen);
if (ret) { if (ret) {
printk("setkey() failed flags=%x\n", printk("setkey() failed flags=%x\n",
crypto_blkcipher_get_flags(tfm)); crypto_ablkcipher_get_flags(tfm));
if (!cipher_tv[i].fail) if (!cipher_tv[i].fail)
goto out; goto out;
...@@ -268,19 +292,28 @@ static void test_cipher(char *algo, int enc, ...@@ -268,19 +292,28 @@ static void test_cipher(char *algo, int enc,
sg_set_buf(&sg[0], cipher_tv[i].input, sg_set_buf(&sg[0], cipher_tv[i].input,
cipher_tv[i].ilen); cipher_tv[i].ilen);
iv_len = crypto_blkcipher_ivsize(tfm); ablkcipher_request_set_crypt(req, sg, sg,
if (iv_len) cipher_tv[i].ilen,
crypto_blkcipher_set_iv(tfm, cipher_tv[i].iv, cipher_tv[i].iv);
iv_len);
len = cipher_tv[i].ilen;
ret = enc ? ret = enc ?
crypto_blkcipher_encrypt(&desc, sg, sg, len) : crypto_ablkcipher_encrypt(req) :
crypto_blkcipher_decrypt(&desc, sg, sg, len); crypto_ablkcipher_decrypt(req);
if (ret) { switch (ret) {
printk("%s () failed flags=%x\n", e, case 0:
desc.flags); break;
case -EINPROGRESS:
case -EBUSY:
ret = wait_for_completion_interruptible(
&result.completion);
if (!ret && !((ret = result.err))) {
INIT_COMPLETION(result.completion);
break;
}
/* fall through */
default:
printk("%s () failed err=%d\n", e, -ret);
goto out; goto out;
} }
...@@ -303,17 +336,17 @@ static void test_cipher(char *algo, int enc, ...@@ -303,17 +336,17 @@ static void test_cipher(char *algo, int enc,
printk("test %u (%d bit key):\n", printk("test %u (%d bit key):\n",
j, cipher_tv[i].klen * 8); j, cipher_tv[i].klen * 8);
crypto_blkcipher_clear_flags(tfm, ~0); crypto_ablkcipher_clear_flags(tfm, ~0);
if (cipher_tv[i].wk) if (cipher_tv[i].wk)
crypto_blkcipher_set_flags( crypto_ablkcipher_set_flags(
tfm, CRYPTO_TFM_REQ_WEAK_KEY); tfm, CRYPTO_TFM_REQ_WEAK_KEY);
key = cipher_tv[i].key; key = cipher_tv[i].key;
ret = crypto_blkcipher_setkey(tfm, key, ret = crypto_ablkcipher_setkey(tfm, key,
cipher_tv[i].klen); cipher_tv[i].klen);
if (ret) { if (ret) {
printk("setkey() failed flags=%x\n", printk("setkey() failed flags=%x\n",
crypto_blkcipher_get_flags(tfm)); crypto_ablkcipher_get_flags(tfm));
if (!cipher_tv[i].fail) if (!cipher_tv[i].fail)
goto out; goto out;
...@@ -329,19 +362,28 @@ static void test_cipher(char *algo, int enc, ...@@ -329,19 +362,28 @@ static void test_cipher(char *algo, int enc,
cipher_tv[i].tap[k]); cipher_tv[i].tap[k]);
} }
iv_len = crypto_blkcipher_ivsize(tfm); ablkcipher_request_set_crypt(req, sg, sg,
if (iv_len) cipher_tv[i].ilen,
crypto_blkcipher_set_iv(tfm, cipher_tv[i].iv, cipher_tv[i].iv);
iv_len);
len = cipher_tv[i].ilen;
ret = enc ? ret = enc ?
crypto_blkcipher_encrypt(&desc, sg, sg, len) : crypto_ablkcipher_encrypt(req) :
crypto_blkcipher_decrypt(&desc, sg, sg, len); crypto_ablkcipher_decrypt(req);
if (ret) { switch (ret) {
printk("%s () failed flags=%x\n", e, case 0:
desc.flags); break;
case -EINPROGRESS:
case -EBUSY:
ret = wait_for_completion_interruptible(
&result.completion);
if (!ret && !((ret = result.err))) {
INIT_COMPLETION(result.completion);
break;
}
/* fall through */
default:
printk("%s () failed err=%d\n", e, -ret);
goto out; goto out;
} }
...@@ -360,7 +402,8 @@ static void test_cipher(char *algo, int enc, ...@@ -360,7 +402,8 @@ static void test_cipher(char *algo, int enc,
} }
out: out:
crypto_free_blkcipher(tfm); crypto_free_ablkcipher(tfm);
ablkcipher_request_free(req);
} }
static int test_cipher_jiffies(struct blkcipher_desc *desc, int enc, char *p, static int test_cipher_jiffies(struct blkcipher_desc *desc, int enc, char *p,
...@@ -832,7 +875,7 @@ static void test_available(void) ...@@ -832,7 +875,7 @@ static void test_available(void)
while (*name) { while (*name) {
printk("alg %s ", *name); printk("alg %s ", *name);
printk(crypto_has_alg(*name, 0, CRYPTO_ALG_ASYNC) ? printk(crypto_has_alg(*name, 0, 0) ?
"found\n" : "not found\n"); "found\n" : "not found\n");
name++; name++;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7