mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

KEYS: asymmetric: Use new crypto interface without scatterlists

Browse source 
Use the new akcipher and sig interfaces which no longer have
scatterlists in them.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2023-06-15 18:28:55 +08:00
parent e5221fa6a3
commit 63ba4d6759
1 changed files with 138 additions and 98 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

236
crypto/asymmetric_keys/public_key.c
View file

@ -8,16 +8,17 @@
*/ */
#define pr_fmt(fmt) "PKEY: "fmt #define pr_fmt(fmt) "PKEY: "fmt
#include <linux/module.h>
#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/seq_file.h>
#include <linux/scatterlist.h>
#include <linux/asn1.h>
#include <keys/asymmetric-subtype.h>
#include <crypto/public_key.h>
#include <crypto/akcipher.h> #include <crypto/akcipher.h>
#include <crypto/public_key.h>
#include <crypto/sig.h>
#include <keys/asymmetric-subtype.h>
#include <linux/asn1.h>
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
#include <linux/string.h>
MODULE_DESCRIPTION("In-software asymmetric public-key subtype"); MODULE_DESCRIPTION("In-software asymmetric public-key subtype");
MODULE_AUTHOR("Red Hat, Inc."); MODULE_AUTHOR("Red Hat, Inc.");
@ -65,10 +66,13 @@ static void public_key_destroy(void *payload0, void *payload3)
static int static int
software_key_determine_akcipher(const struct public_key *pkey, software_key_determine_akcipher(const struct public_key *pkey,
const char *encoding, const char *hash_algo, const char *encoding, const char *hash_algo,
char alg_name[CRYPTO_MAX_ALG_NAME]) char alg_name[CRYPTO_MAX_ALG_NAME], bool *sig,
enum kernel_pkey_operation op)
{ {
int n; int n;
*sig = true;
if (!encoding) if (!encoding)
return -EINVAL; return -EINVAL;
@ -77,14 +81,18 @@ software_key_determine_akcipher(const struct public_key *pkey,
* RSA signatures usually use EMSA-PKCS1-1_5 [RFC3447 sec 8.2]. * RSA signatures usually use EMSA-PKCS1-1_5 [RFC3447 sec 8.2].
*/ */
if (strcmp(encoding, "pkcs1") == 0) { if (strcmp(encoding, "pkcs1") == 0) {
if (!hash_algo) if (!hash_algo) {
*sig = false;
n = snprintf(alg_name, CRYPTO_MAX_ALG_NAME, n = snprintf(alg_name, CRYPTO_MAX_ALG_NAME,
"pkcs1pad(%s)", "pkcs1pad(%s)",
pkey->pkey_algo); pkey->pkey_algo);
else } else {
*sig = op == kernel_pkey_sign ||
op == kernel_pkey_verify;
n = snprintf(alg_name, CRYPTO_MAX_ALG_NAME, n = snprintf(alg_name, CRYPTO_MAX_ALG_NAME,
"pkcs1pad(%s,%s)", "pkcs1pad(%s,%s)",
pkey->pkey_algo, hash_algo); pkey->pkey_algo, hash_algo);
}
return n >= CRYPTO_MAX_ALG_NAME ? -EINVAL : 0; return n >= CRYPTO_MAX_ALG_NAME ? -EINVAL : 0;
} }
if (strcmp(encoding, "raw") != 0) if (strcmp(encoding, "raw") != 0)
@ -95,6 +103,7 @@ software_key_determine_akcipher(const struct public_key *pkey,
*/ */
if (hash_algo) if (hash_algo)
return -EINVAL; return -EINVAL;
*sig = false;
} else if (strncmp(pkey->pkey_algo, "ecdsa", 5) == 0) { } else if (strncmp(pkey->pkey_algo, "ecdsa", 5) == 0) {
if (strcmp(encoding, "x962") != 0) if (strcmp(encoding, "x962") != 0)
return -EINVAL; return -EINVAL;
@ -152,37 +161,70 @@ static int software_key_query(const struct kernel_pkey_params *params,
struct crypto_akcipher *tfm; struct crypto_akcipher *tfm;
struct public_key *pkey = params->key->payload.data[asym_crypto]; struct public_key *pkey = params->key->payload.data[asym_crypto];
char alg_name[CRYPTO_MAX_ALG_NAME]; char alg_name[CRYPTO_MAX_ALG_NAME];
struct crypto_sig *sig;
u8 *key, *ptr; u8 *key, *ptr;
int ret, len; int ret, len;
bool issig;
ret = software_key_determine_akcipher(pkey, params->encoding, ret = software_key_determine_akcipher(pkey, params->encoding,
params->hash_algo, alg_name); params->hash_algo, alg_name,
&issig, kernel_pkey_sign);
if (ret < 0) if (ret < 0)
return ret; return ret;
tfm = crypto_alloc_akcipher(alg_name, 0, 0);
if (IS_ERR(tfm))
return PTR_ERR(tfm);
ret = -ENOMEM;
key = kmalloc(pkey->keylen + sizeof(u32) * 2 + pkey->paramlen, key = kmalloc(pkey->keylen + sizeof(u32) * 2 + pkey->paramlen,
GFP_KERNEL); GFP_KERNEL);
if (!key) if (!key)
goto error_free_tfm; return -ENOMEM;
memcpy(key, pkey->key, pkey->keylen); memcpy(key, pkey->key, pkey->keylen);
ptr = key + pkey->keylen; ptr = key + pkey->keylen;
ptr = pkey_pack_u32(ptr, pkey->algo); ptr = pkey_pack_u32(ptr, pkey->algo);
ptr = pkey_pack_u32(ptr, pkey->paramlen); ptr = pkey_pack_u32(ptr, pkey->paramlen);
memcpy(ptr, pkey->params, pkey->paramlen); memcpy(ptr, pkey->params, pkey->paramlen);
if (pkey->key_is_private) if (issig) {
ret = crypto_akcipher_set_priv_key(tfm, key, pkey->keylen); sig = crypto_alloc_sig(alg_name, 0, 0);
else if (IS_ERR(sig))
ret = crypto_akcipher_set_pub_key(tfm, key, pkey->keylen); goto error_free_key;
if (ret < 0)
goto error_free_key; if (pkey->key_is_private)
ret = crypto_sig_set_privkey(sig, key, pkey->keylen);
else
ret = crypto_sig_set_pubkey(sig, key, pkey->keylen);
if (ret < 0)
goto error_free_tfm;
len = crypto_sig_maxsize(sig);
info->supported_ops = KEYCTL_SUPPORTS_VERIFY;
if (pkey->key_is_private)
info->supported_ops |= KEYCTL_SUPPORTS_SIGN;
if (strcmp(params->encoding, "pkcs1") == 0) {
info->supported_ops |= KEYCTL_SUPPORTS_ENCRYPT;
if (pkey->key_is_private)
info->supported_ops |= KEYCTL_SUPPORTS_DECRYPT;
}
} else {
tfm = crypto_alloc_akcipher(alg_name, 0, 0);
if (IS_ERR(tfm))
goto error_free_key;
if (pkey->key_is_private)
ret = crypto_akcipher_set_priv_key(tfm, key, pkey->keylen);
else
ret = crypto_akcipher_set_pub_key(tfm, key, pkey->keylen);
if (ret < 0)
goto error_free_tfm;
len = crypto_akcipher_maxsize(tfm);
info->supported_ops = KEYCTL_SUPPORTS_ENCRYPT;
if (pkey->key_is_private)
info->supported_ops |= KEYCTL_SUPPORTS_DECRYPT;
}
len = crypto_akcipher_maxsize(tfm);
info->key_size = len * 8; info->key_size = len * 8;
if (strncmp(pkey->pkey_algo, "ecdsa", 5) == 0) { if (strncmp(pkey->pkey_algo, "ecdsa", 5) == 0) {
@ -208,17 +250,16 @@ static int software_key_query(const struct kernel_pkey_params *params,
info->max_enc_size = len; info->max_enc_size = len;
info->max_dec_size = len; info->max_dec_size = len;
info->supported_ops = (KEYCTL_SUPPORTS_ENCRYPT |
KEYCTL_SUPPORTS_VERIFY);
if (pkey->key_is_private)
info->supported_ops |= (KEYCTL_SUPPORTS_DECRYPT |
KEYCTL_SUPPORTS_SIGN);
ret = 0; ret = 0;
error_free_tfm:
if (issig)
crypto_free_sig(sig);
else
crypto_free_akcipher(tfm);
error_free_key: error_free_key:
kfree(key); kfree(key);
error_free_tfm:
crypto_free_akcipher(tfm);
pr_devel("<==%s() = %d\n", __func__, ret); pr_devel("<==%s() = %d\n", __func__, ret);
return ret; return ret;
} }
@ -230,34 +271,26 @@ static int software_key_eds_op(struct kernel_pkey_params *params,
const void *in, void *out) const void *in, void *out)
{ {
const struct public_key *pkey = params->key->payload.data[asym_crypto]; const struct public_key *pkey = params->key->payload.data[asym_crypto];
struct akcipher_request *req;
struct crypto_akcipher *tfm;
struct crypto_wait cwait;
struct scatterlist in_sg, out_sg;
char alg_name[CRYPTO_MAX_ALG_NAME]; char alg_name[CRYPTO_MAX_ALG_NAME];
struct crypto_akcipher *tfm;
struct crypto_sig *sig;
char *key, *ptr; char *key, *ptr;
bool issig;
int ksz;
int ret; int ret;
pr_devel("==>%s()\n", __func__); pr_devel("==>%s()\n", __func__);
ret = software_key_determine_akcipher(pkey, params->encoding, ret = software_key_determine_akcipher(pkey, params->encoding,
params->hash_algo, alg_name); params->hash_algo, alg_name,
&issig, params->op);
if (ret < 0) if (ret < 0)
return ret; return ret;
tfm = crypto_alloc_akcipher(alg_name, 0, 0);
if (IS_ERR(tfm))
return PTR_ERR(tfm);
ret = -ENOMEM;
req = akcipher_request_alloc(tfm, GFP_KERNEL);
if (!req)
goto error_free_tfm;
key = kmalloc(pkey->keylen + sizeof(u32) * 2 + pkey->paramlen, key = kmalloc(pkey->keylen + sizeof(u32) * 2 + pkey->paramlen,
GFP_KERNEL); GFP_KERNEL);
if (!key) if (!key)
goto error_free_req; return -ENOMEM;
memcpy(key, pkey->key, pkey->keylen); memcpy(key, pkey->key, pkey->keylen);
ptr = key + pkey->keylen; ptr = key + pkey->keylen;
@ -265,47 +298,70 @@ static int software_key_eds_op(struct kernel_pkey_params *params,
ptr = pkey_pack_u32(ptr, pkey->paramlen); ptr = pkey_pack_u32(ptr, pkey->paramlen);
memcpy(ptr, pkey->params, pkey->paramlen); memcpy(ptr, pkey->params, pkey->paramlen);
if (pkey->key_is_private) if (issig) {
ret = crypto_akcipher_set_priv_key(tfm, key, pkey->keylen); sig = crypto_alloc_sig(alg_name, 0, 0);
else if (IS_ERR(sig))
ret = crypto_akcipher_set_pub_key(tfm, key, pkey->keylen); goto error_free_key;
if (ret)
goto error_free_key;
sg_init_one(&in_sg, in, params->in_len); if (pkey->key_is_private)
sg_init_one(&out_sg, out, params->out_len); ret = crypto_sig_set_privkey(sig, key, pkey->keylen);
akcipher_request_set_crypt(req, &in_sg, &out_sg, params->in_len, else
params->out_len); ret = crypto_sig_set_pubkey(sig, key, pkey->keylen);
crypto_init_wait(&cwait); if (ret)
akcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG | goto error_free_tfm;
CRYPTO_TFM_REQ_MAY_SLEEP,
crypto_req_done, &cwait); ksz = crypto_sig_maxsize(sig);
} else {
tfm = crypto_alloc_akcipher(alg_name, 0, 0);
if (IS_ERR(tfm))
goto error_free_key;
if (pkey->key_is_private)
ret = crypto_akcipher_set_priv_key(tfm, key, pkey->keylen);
else
ret = crypto_akcipher_set_pub_key(tfm, key, pkey->keylen);
if (ret)
goto error_free_tfm;
ksz = crypto_akcipher_maxsize(tfm);
}
ret = -EINVAL;
/* Perform the encryption calculation. */ /* Perform the encryption calculation. */
switch (params->op) { switch (params->op) {
case kernel_pkey_encrypt: case kernel_pkey_encrypt:
ret = crypto_akcipher_encrypt(req); if (issig)
break;
ret = crypto_akcipher_sync_encrypt(tfm, in, params->in_len,
out, params->out_len);
break; break;
case kernel_pkey_decrypt: case kernel_pkey_decrypt:
ret = crypto_akcipher_decrypt(req); if (issig)
break;
ret = crypto_akcipher_sync_decrypt(tfm, in, params->in_len,
out, params->out_len);
break; break;
case kernel_pkey_sign: case kernel_pkey_sign:
ret = crypto_akcipher_sign(req); if (!issig)
break;
ret = crypto_sig_sign(sig, in, params->in_len,
out, params->out_len);
break; break;
default: default:
BUG(); BUG();
} }
ret = crypto_wait_req(ret, &cwait);
if (ret == 0) if (ret == 0)
ret = req->dst_len; ret = ksz;
error_free_tfm:
if (issig)
crypto_free_sig(sig);
else
crypto_free_akcipher(tfm);
error_free_key: error_free_key:
kfree(key); kfree(key);
error_free_req:
akcipher_request_free(req);
error_free_tfm:
crypto_free_akcipher(tfm);
pr_devel("<==%s() = %d\n", __func__, ret); pr_devel("<==%s() = %d\n", __func__, ret);
return ret; return ret;
} }
@ -316,12 +372,10 @@ static int software_key_eds_op(struct kernel_pkey_params *params,
int public_key_verify_signature(const struct public_key *pkey, int public_key_verify_signature(const struct public_key *pkey,
const struct public_key_signature *sig) const struct public_key_signature *sig)
{ {
struct crypto_wait cwait;
struct crypto_akcipher *tfm;
struct akcipher_request *req;
struct scatterlist src_sg[2];
char alg_name[CRYPTO_MAX_ALG_NAME]; char alg_name[CRYPTO_MAX_ALG_NAME];
struct crypto_sig *tfm;
char *key, *ptr; char *key, *ptr;
bool issig;
int ret; int ret;
pr_devel("==>%s()\n", __func__); pr_devel("==>%s()\n", __func__);
@ -346,23 +400,19 @@ int public_key_verify_signature(const struct public_key *pkey,
} }
ret = software_key_determine_akcipher(pkey, sig->encoding, ret = software_key_determine_akcipher(pkey, sig->encoding,
sig->hash_algo, alg_name); sig->hash_algo, alg_name,
&issig, kernel_pkey_verify);
if (ret < 0) if (ret < 0)
return ret; return ret;
tfm = crypto_alloc_akcipher(alg_name, 0, 0); tfm = crypto_alloc_sig(alg_name, 0, 0);
if (IS_ERR(tfm)) if (IS_ERR(tfm))
return PTR_ERR(tfm); return PTR_ERR(tfm);
ret = -ENOMEM;
req = akcipher_request_alloc(tfm, GFP_KERNEL);
if (!req)
goto error_free_tfm;
key = kmalloc(pkey->keylen + sizeof(u32) * 2 + pkey->paramlen, key = kmalloc(pkey->keylen + sizeof(u32) * 2 + pkey->paramlen,
GFP_KERNEL); GFP_KERNEL);
if (!key) if (!key)
goto error_free_req; goto error_free_tfm;
memcpy(key, pkey->key, pkey->keylen); memcpy(key, pkey->key, pkey->keylen);
ptr = key + pkey->keylen; ptr = key + pkey->keylen;
@ -371,29 +421,19 @@ int public_key_verify_signature(const struct public_key *pkey,
memcpy(ptr, pkey->params, pkey->paramlen); memcpy(ptr, pkey->params, pkey->paramlen);
if (pkey->key_is_private) if (pkey->key_is_private)
ret = crypto_akcipher_set_priv_key(tfm, key, pkey->keylen); ret = crypto_sig_set_privkey(tfm, key, pkey->keylen);
else else
ret = crypto_akcipher_set_pub_key(tfm, key, pkey->keylen); ret = crypto_sig_set_pubkey(tfm, key, pkey->keylen);
if (ret) if (ret)
goto error_free_key; goto error_free_key;
sg_init_table(src_sg, 2); ret = crypto_sig_verify(tfm, sig->s, sig->s_size,
sg_set_buf(&src_sg[0], sig->s, sig->s_size); sig->digest, sig->digest_size);
sg_set_buf(&src_sg[1], sig->digest, sig->digest_size);
akcipher_request_set_crypt(req, src_sg, NULL, sig->s_size,
sig->digest_size);
crypto_init_wait(&cwait);
akcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG |
CRYPTO_TFM_REQ_MAY_SLEEP,
crypto_req_done, &cwait);
ret = crypto_wait_req(crypto_akcipher_verify(req), &cwait);
error_free_key: error_free_key:
kfree(key); kfree(key);
error_free_req:
akcipher_request_free(req);
error_free_tfm: error_free_tfm:
crypto_free_akcipher(tfm); crypto_free_sig(tfm);
pr_devel("<==%s() = %d\n", __func__, ret); pr_devel("<==%s() = %d\n", __func__, ret);
if (WARN_ON_ONCE(ret > 0)) if (WARN_ON_ONCE(ret > 0))
ret = -EINVAL; ret = -EINVAL;