Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-03 19:55:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bluetooth: Use crypto_wait_req

Browse Source 
This patch replaces the custom crypto completion function with
crypto_req_done.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2023-02-06 18:22:19 +08:00
parent 20066bf700
commit fe93d841dd
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
net/bluetooth/ecdh_helper.c
View File

@ -25,22 +25,6 @@
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <crypto/ecdh.h> #include <crypto/ecdh.h>
struct ecdh_completion {
struct completion completion;
int err;
};
static void ecdh_complete(struct crypto_async_request *req, int err)
{
struct ecdh_completion *res = req->data;
if (err == -EINPROGRESS)
return;
res->err = err;
complete(&res->completion);
}
static inline void swap_digits(u64 *in, u64 *out, unsigned int ndigits) static inline void swap_digits(u64 *in, u64 *out, unsigned int ndigits)
{ {
int i; int i;
@ -60,9 +44,9 @@ static inline void swap_digits(u64 *in, u64 *out, unsigned int ndigits)
int compute_ecdh_secret(struct crypto_kpp *tfm, const u8 public_key[64], int compute_ecdh_secret(struct crypto_kpp *tfm, const u8 public_key[64],
u8 secret[32]) u8 secret[32])
{ {
DECLARE_CRYPTO_WAIT(result);
struct kpp_request *req; struct kpp_request *req;
u8 *tmp; u8 *tmp;
struct ecdh_completion result;
struct scatterlist src, dst; struct scatterlist src, dst;
int err; int err;
@ -76,8 +60,6 @@ int compute_ecdh_secret(struct crypto_kpp *tfm, const u8 public_key[64],
goto free_tmp; goto free_tmp;
} }
init_completion(&result.completion);
swap_digits((u64 *)public_key, (u64 *)tmp, 4); /* x */ swap_digits((u64 *)public_key, (u64 *)tmp, 4); /* x */
swap_digits((u64 *)&public_key[32], (u64 *)&tmp[32], 4); /* y */ swap_digits((u64 *)&public_key[32], (u64 *)&tmp[32], 4); /* y */
@ -86,12 +68,9 @@ int compute_ecdh_secret(struct crypto_kpp *tfm, const u8 public_key[64],
kpp_request_set_input(req, &src, 64); kpp_request_set_input(req, &src, 64);
kpp_request_set_output(req, &dst, 32); kpp_request_set_output(req, &dst, 32);
kpp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, kpp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
ecdh_complete, &result); crypto_req_done, &result);
err = crypto_kpp_compute_shared_secret(req); err = crypto_kpp_compute_shared_secret(req);
if (err == -EINPROGRESS) { err = crypto_wait_req(err, &result);
wait_for_completion(&result.completion);
err = result.err;
}
if (err < 0) { if (err < 0) {
pr_err("alg: ecdh: compute shared secret failed. err %d\n", pr_err("alg: ecdh: compute shared secret failed. err %d\n",
err); err);
@ -165,9 +144,9 @@ int set_ecdh_privkey(struct crypto_kpp *tfm, const u8 private_key[32])
*/ */
int generate_ecdh_public_key(struct crypto_kpp *tfm, u8 public_key[64]) int generate_ecdh_public_key(struct crypto_kpp *tfm, u8 public_key[64])
{ {
DECLARE_CRYPTO_WAIT(result);
struct kpp_request *req; struct kpp_request *req;
u8 *tmp; u8 *tmp;
struct ecdh_completion result;
struct scatterlist dst; struct scatterlist dst;
int err; int err;
@ -181,18 +160,14 @@ int generate_ecdh_public_key(struct crypto_kpp *tfm, u8 public_key[64])
goto free_tmp; goto free_tmp;
} }
init_completion(&result.completion);
sg_init_one(&dst, tmp, 64); sg_init_one(&dst, tmp, 64);
kpp_request_set_input(req, NULL, 0); kpp_request_set_input(req, NULL, 0);
kpp_request_set_output(req, &dst, 64); kpp_request_set_output(req, &dst, 64);
kpp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, kpp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
ecdh_complete, &result); crypto_req_done, &result);
err = crypto_kpp_generate_public_key(req); err = crypto_kpp_generate_public_key(req);
if (err == -EINPROGRESS) { err = crypto_wait_req(err, &result);
wait_for_completion(&result.completion);
err = result.err;
}
if (err < 0) if (err < 0)
goto free_all; goto free_all;